| @@ -1,18 +1,19 @@ | | | @@ -1,18 +1,19 @@ |
1 | # $NetBSD: Makefile,v 1.49 2018/01/22 14:17:24 adam Exp $ | | 1 | # $NetBSD: Makefile,v 1.50 2018/02/08 11:28:46 jperkin Exp $ |
2 | | | 2 | |
3 | .include "../../devel/git/Makefile.common" | | 3 | .include "../../devel/git/Makefile.common" |
4 | | | 4 | |
5 | PKGNAME= git-base-${GIT_VERSION} | | 5 | PKGNAME= git-base-${GIT_VERSION} |
| | | 6 | PKGREVISION= 1 |
6 | COMMENT= GIT Tree History Storage Tool (base package) | | 7 | COMMENT= GIT Tree History Storage Tool (base package) |
7 | | | 8 | |
8 | CONFLICTS+= scmgit-base-[0-9]* | | 9 | CONFLICTS+= scmgit-base-[0-9]* |
9 | SUPERSEDES+= scmgit-base-[0-9]* | | 10 | SUPERSEDES+= scmgit-base-[0-9]* |
10 | | | 11 | |
11 | DEPENDS+= p5-Error>=0.17015:../../devel/p5-Error | | 12 | DEPENDS+= p5-Error>=0.17015:../../devel/p5-Error |
12 | # for git-send-email | | 13 | # for git-send-email |
13 | #DEPENDS+= {perl>=5.13.8,p5-MIME-Base64>=3.13}:../../converters/p5-MIME-Base64 | | 14 | #DEPENDS+= {perl>=5.13.8,p5-MIME-Base64>=3.13}:../../converters/p5-MIME-Base64 |
14 | DEPENDS+= p5-Email-Valid>=0.190:../../mail/p5-Email-Valid | | 15 | DEPENDS+= p5-Email-Valid>=0.190:../../mail/p5-Email-Valid |
15 | DEPENDS+= p5-MailTools>=2.11:../../mail/p5-MailTools | | 16 | DEPENDS+= p5-MailTools>=2.11:../../mail/p5-MailTools |
16 | DEPENDS+= p5-Net-SMTP-SSL>=1.01:../../mail/p5-Net-SMTP-SSL | | 17 | DEPENDS+= p5-Net-SMTP-SSL>=1.01:../../mail/p5-Net-SMTP-SSL |
17 | DEPENDS+= p5-Authen-SASL>=1.0:../../security/p5-Authen-SASL | | 18 | DEPENDS+= p5-Authen-SASL>=1.0:../../security/p5-Authen-SASL |
18 | | | 19 | |
| @@ -90,26 +91,30 @@ SUBST_FILES.fix-cd-P+= t/test-lib.sh | | | @@ -90,26 +91,30 @@ SUBST_FILES.fix-cd-P+= t/test-lib.sh |
90 | SUBST_MESSAGE.fix-cd-P= Fixing cd arguments. | | 91 | SUBST_MESSAGE.fix-cd-P= Fixing cd arguments. |
91 | SUBST_STAGE.fix-cd-P= pre-build | | 92 | SUBST_STAGE.fix-cd-P= pre-build |
92 | SUBST_SED.fix-cd-P= -e "s/cd -P/cd/g" | | 93 | SUBST_SED.fix-cd-P= -e "s/cd -P/cd/g" |
93 | .endif | | 94 | .endif |
94 | | | 95 | |
95 | LDFLAGS.SunOS+= -lintl -lnsl | | 96 | LDFLAGS.SunOS+= -lintl -lnsl |
96 | | | 97 | |
97 | .include "../../mk/compiler.mk" | | 98 | .include "../../mk/compiler.mk" |
98 | .if !empty(PKGSRC_COMPILER:Mclang) | | 99 | .if !empty(PKGSRC_COMPILER:Mclang) |
99 | # configure test gets confused by wrappers dropping -R / | | 100 | # configure test gets confused by wrappers dropping -R / |
100 | CONFIGURE_ARGS+= git_cv_ld_dashr=no | | 101 | CONFIGURE_ARGS+= git_cv_ld_dashr=no |
101 | .endif | | 102 | .endif |
102 | | | 103 | |
| | | 104 | # Prefer to install symlinks. |
| | | 105 | INSTALL_ENV+= NO_CROSS_DIRECTORY_HARDLINKS=1 |
| | | 106 | INSTALL_ENV+= NO_INSTALL_HARDLINKS=1 |
| | | 107 | |
103 | post-install: | | 108 | post-install: |
104 | ${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR} | | 109 | ${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR} |
105 | ${INSTALL_DATA} ${WRKSRC}/contrib/completion/git-completion.bash \ | | 110 | ${INSTALL_DATA} ${WRKSRC}/contrib/completion/git-completion.bash \ |
106 | ${DESTDIR}${EGDIR} | | 111 | ${DESTDIR}${EGDIR} |
107 | ${INSTALL_DATA} ${WRKSRC}/contrib/completion/git-prompt.sh \ | | 112 | ${INSTALL_DATA} ${WRKSRC}/contrib/completion/git-prompt.sh \ |
108 | ${DESTDIR}${EGDIR} | | 113 | ${DESTDIR}${EGDIR} |
109 | | | 114 | |
110 | .include "options.mk" | | 115 | .include "options.mk" |
111 | | | 116 | |
112 | .include "../../converters/libiconv/buildlink3.mk" | | 117 | .include "../../converters/libiconv/buildlink3.mk" |
113 | .include "../../devel/gettext-lib/buildlink3.mk" | | 118 | .include "../../devel/gettext-lib/buildlink3.mk" |
114 | .include "../../devel/pcre2/buildlink3.mk" | | 119 | .include "../../devel/pcre2/buildlink3.mk" |
115 | .include "../../devel/zlib/buildlink3.mk" | | 120 | .include "../../devel/zlib/buildlink3.mk" |