Mon Mar 26 07:28:18 2012 UTC ()
Fix inet_ntop/inet_pton conflict on SunOS and ABI=64.


(fhajny)
diff -r1.41 -r1.42 pkgsrc/devel/scmgit-base/Makefile
cvs diff -r1.41 -r1.42 pkgsrc/devel/scmgit-base/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/scmgit-base/Attic/Makefile 2012/03/09 17:02:14 1.41
+++ pkgsrc/devel/scmgit-base/Attic/Makefile 2012/03/26 07:28:18 1.42
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.41 2012/03/09 17:02:14 adam Exp $ 1# $NetBSD: Makefile,v 1.42 2012/03/26 07:28:18 fhajny Exp $
2 2
3.include "../../devel/scmgit/Makefile.common" 3.include "../../devel/scmgit/Makefile.common"
4 4
5PKGNAME= scmgit-base-${GIT_VERSION} 5PKGNAME= scmgit-base-${GIT_VERSION}
6COMMENT= GIT Tree History Storage Tool (base package) 6COMMENT= GIT Tree History Storage Tool (base package)
7 7
8PKG_DESTDIR_SUPPORT= user-destdir 8PKG_DESTDIR_SUPPORT= user-destdir
9 9
10CONFLICTS+= git<4.9.5nb1 # misc/git 10CONFLICTS+= git<4.9.5nb1 # misc/git
11 11
12DEPENDS+= p5-Error>=0.17015:../../devel/p5-Error 12DEPENDS+= p5-Error>=0.17015:../../devel/p5-Error
13# for git-send-email 13# for git-send-email
14DEPENDS+= p5-MIME-Base64>=3.13:../../converters/p5-MIME-Base64 14DEPENDS+= p5-MIME-Base64>=3.13:../../converters/p5-MIME-Base64
@@ -76,24 +76,24 @@ SUBST_STAGE.fix-paths= pre-build @@ -76,24 +76,24 @@ SUBST_STAGE.fix-paths= pre-build
76SUBST_VARS.fix-paths= PREFIX 76SUBST_VARS.fix-paths= PREFIX
77 77
78.include "../../mk/bsd.prefs.mk" 78.include "../../mk/bsd.prefs.mk"
79 79
80.if ${OPSYS} == "NetBSD" || ${OPSYS} == "SunOS" || ${OPSYS} == "OSF1" || ${OPSYS} == "HPUX" || ${OPSYS} == "QNX" || ${OPSYS} == "UnixWare" 80.if ${OPSYS} == "NetBSD" || ${OPSYS} == "SunOS" || ${OPSYS} == "OSF1" || ${OPSYS} == "HPUX" || ${OPSYS} == "QNX" || ${OPSYS} == "UnixWare"
81SUBST_CLASSES+= fix-cd-P 81SUBST_CLASSES+= fix-cd-P
82SUBST_FILES.fix-cd-P= git-sh-setup.sh 82SUBST_FILES.fix-cd-P= git-sh-setup.sh
83SUBST_FILES.fix-cd-P+= t/test-lib.sh 83SUBST_FILES.fix-cd-P+= t/test-lib.sh
84SUBST_MESSAGE.fix-cd-P= Fixing cd arguments. 84SUBST_MESSAGE.fix-cd-P= Fixing cd arguments.
85SUBST_STAGE.fix-cd-P= pre-build 85SUBST_STAGE.fix-cd-P= pre-build
86SUBST_SED.fix-cd-P= -e "s/cd -P/cd/g" 86SUBST_SED.fix-cd-P= -e "s/cd -P/cd/g"
87.endif 87.endif
88 88
89LDFLAGS.SunOS+= -lintl 89LDFLAGS.SunOS+= -lintl -lnsl
90 90
91.include "options.mk" 91.include "options.mk"
92 92
93.include "../../converters/libiconv/buildlink3.mk" 93.include "../../converters/libiconv/buildlink3.mk"
94.include "../../devel/zlib/buildlink3.mk" 94.include "../../devel/zlib/buildlink3.mk"
95.include "../../lang/perl5/module.mk" 95.include "../../lang/perl5/module.mk"
96.include "../../security/openssl/buildlink3.mk" 96.include "../../security/openssl/buildlink3.mk"
97.include "../../textproc/expat/buildlink3.mk" 97.include "../../textproc/expat/buildlink3.mk"
98.include "../../www/curl/buildlink3.mk" 98.include "../../www/curl/buildlink3.mk"
99.include "../../mk/bsd.pkg.mk" 99.include "../../mk/bsd.pkg.mk"