Fri Oct 25 21:46:27 2013 UTC ()
Override the test for clang -R support as it gets broken by the
wrappers.


(joerg)
diff -r1.5 -r1.6 pkgsrc/devel/git-base/Makefile
cvs diff -r1.5 -r1.6 pkgsrc/devel/git-base/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/git-base/Makefile 2013/10/18 19:48:48 1.5
+++ pkgsrc/devel/git-base/Makefile 2013/10/25 21:46:27 1.6
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.5 2013/10/18 19:48:48 adam Exp $ 1# $NetBSD: Makefile,v 1.6 2013/10/25 21:46:27 joerg Exp $
2 2
3.include "../../devel/git/Makefile.common" 3.include "../../devel/git/Makefile.common"
4 4
5PKGNAME= git-base-${GIT_VERSION} 5PKGNAME= git-base-${GIT_VERSION}
6COMMENT= GIT Tree History Storage Tool (base package) 6COMMENT= GIT Tree History Storage Tool (base package)
7 7
8CONFLICTS+= scmgit-base-[0-9]* 8CONFLICTS+= scmgit-base-[0-9]*
9SUPERSEDES+= scmgit-base-[0-9]* 9SUPERSEDES+= scmgit-base-[0-9]*
10 10
11DEPENDS+= p5-Error>=0.17015:../../devel/p5-Error 11DEPENDS+= p5-Error>=0.17015:../../devel/p5-Error
12# for git-send-email 12# for git-send-email
13DEPENDS+= p5-MIME-Base64>=3.13:../../converters/p5-MIME-Base64 13DEPENDS+= p5-MIME-Base64>=3.13:../../converters/p5-MIME-Base64
14DEPENDS+= p5-Email-Valid>=0.190:../../mail/p5-Email-Valid 14DEPENDS+= p5-Email-Valid>=0.190:../../mail/p5-Email-Valid
@@ -82,26 +82,32 @@ SUBST_VARS.fix-paths= PREFIX @@ -82,26 +82,32 @@ SUBST_VARS.fix-paths= PREFIX
82.include "../../mk/bsd.prefs.mk" 82.include "../../mk/bsd.prefs.mk"
83 83
84.if ${OPSYS} == "NetBSD" || ${OPSYS} == "SunOS" || ${OPSYS} == "OSF1" || ${OPSYS} == "HPUX" || ${OPSYS} == "QNX" || ${OPSYS} == "UnixWare" 84.if ${OPSYS} == "NetBSD" || ${OPSYS} == "SunOS" || ${OPSYS} == "OSF1" || ${OPSYS} == "HPUX" || ${OPSYS} == "QNX" || ${OPSYS} == "UnixWare"
85SUBST_CLASSES+= fix-cd-P 85SUBST_CLASSES+= fix-cd-P
86SUBST_FILES.fix-cd-P= git-sh-setup.sh 86SUBST_FILES.fix-cd-P= git-sh-setup.sh
87SUBST_FILES.fix-cd-P+= t/test-lib.sh 87SUBST_FILES.fix-cd-P+= t/test-lib.sh
88SUBST_MESSAGE.fix-cd-P= Fixing cd arguments. 88SUBST_MESSAGE.fix-cd-P= Fixing cd arguments.
89SUBST_STAGE.fix-cd-P= pre-build 89SUBST_STAGE.fix-cd-P= pre-build
90SUBST_SED.fix-cd-P= -e "s/cd -P/cd/g" 90SUBST_SED.fix-cd-P= -e "s/cd -P/cd/g"
91.endif 91.endif
92 92
93LDFLAGS.SunOS+= -lintl -lnsl 93LDFLAGS.SunOS+= -lintl -lnsl
94 94
 95.include "../../mk/compiler.mk"
 96.if !empty(PKGSRC_COMPILER:Mclang)
 97# configure test gets confused by wrappers dropping -R /
 98CONFIGURE_ARGS+= git_cv_ld_dashr=no
 99.endif
 100
95post-install: 101post-install:
96 ${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR} 102 ${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR}
97 ${INSTALL_DATA} ${WRKSRC}/contrib/completion/git-completion.bash \ 103 ${INSTALL_DATA} ${WRKSRC}/contrib/completion/git-completion.bash \
98 ${DESTDIR}${EGDIR} 104 ${DESTDIR}${EGDIR}
99 ${INSTALL_DATA} ${WRKSRC}/contrib/completion/git-prompt.sh \ 105 ${INSTALL_DATA} ${WRKSRC}/contrib/completion/git-prompt.sh \
100 ${DESTDIR}${EGDIR} 106 ${DESTDIR}${EGDIR}
101 107
102.include "options.mk" 108.include "options.mk"
103 109
104.include "../../converters/libiconv/buildlink3.mk" 110.include "../../converters/libiconv/buildlink3.mk"
105.include "../../devel/zlib/buildlink3.mk" 111.include "../../devel/zlib/buildlink3.mk"
106.include "../../lang/perl5/module.mk" 112.include "../../lang/perl5/module.mk"
107.include "../../security/openssl/buildlink3.mk" 113.include "../../security/openssl/buildlink3.mk"