Tue Nov 26 10:22:17 2019 UTC ()
git-base: depend on pcre2-10.34

That version has a different JIT version enabled. Remove PaX mprotect
workaround.

Bump PKGREVISION.


(wiz)
diff -r1.70 -r1.71 pkgsrc/devel/git-base/Makefile
cvs diff -r1.70 -r1.71 pkgsrc/devel/git-base/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/git-base/Makefile 2019/11/20 18:13:52 1.70
+++ pkgsrc/devel/git-base/Makefile 2019/11/26 10:22:17 1.71
@@ -1,18 +1,19 @@ @@ -1,18 +1,19 @@
1# $NetBSD: Makefile,v 1.70 2019/11/20 18:13:52 adam Exp $ 1# $NetBSD: Makefile,v 1.71 2019/11/26 10:22:17 wiz 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}
 6PKGREVISION= 1
6COMMENT= GIT Tree History Storage Tool (base package) 7COMMENT= GIT Tree History Storage Tool (base package)
7 8
8CONFLICTS+= scmgit-base-[0-9]* 9CONFLICTS+= scmgit-base-[0-9]*
9SUPERSEDES+= scmgit-base-[0-9]* 10SUPERSEDES+= scmgit-base-[0-9]*
10 11
11DEPENDS+= p5-Error>=0.17015:../../devel/p5-Error 12DEPENDS+= p5-Error>=0.17015:../../devel/p5-Error
12DEPENDS+= p5-Email-Valid>=0.190:../../mail/p5-Email-Valid 13DEPENDS+= p5-Email-Valid>=0.190:../../mail/p5-Email-Valid
13DEPENDS+= p5-MailTools>=2.11:../../mail/p5-MailTools 14DEPENDS+= p5-MailTools>=2.11:../../mail/p5-MailTools
14DEPENDS+= p5-Net-SMTP-SSL>=1.01:../../mail/p5-Net-SMTP-SSL 15DEPENDS+= p5-Net-SMTP-SSL>=1.01:../../mail/p5-Net-SMTP-SSL
15DEPENDS+= p5-Authen-SASL>=1.0:../../security/p5-Authen-SASL 16DEPENDS+= p5-Authen-SASL>=1.0:../../security/p5-Authen-SASL
16 17
17USE_LANGUAGES= c99 18USE_LANGUAGES= c99
18USE_TOOLS+= perl:run sh:run msgfmt 19USE_TOOLS+= perl:run sh:run msgfmt
@@ -84,33 +85,32 @@ SUBST_SED.fix-cd-P= -e "s/cd -P/cd/g" @@ -84,33 +85,32 @@ SUBST_SED.fix-cd-P= -e "s/cd -P/cd/g"
84 85
85LDFLAGS.SunOS+= -lintl -lnsl 86LDFLAGS.SunOS+= -lintl -lnsl
86 87
87.include "../../mk/compiler.mk" 88.include "../../mk/compiler.mk"
88.if !empty(PKGSRC_COMPILER:Mclang) 89.if !empty(PKGSRC_COMPILER:Mclang)
89# configure test gets confused by wrappers dropping -R / 90# configure test gets confused by wrappers dropping -R /
90CONFIGURE_ARGS+= git_cv_ld_dashr=no 91CONFIGURE_ARGS+= git_cv_ld_dashr=no
91.endif 92.endif
92 93
93# Prefer to install symlinks. 94# Prefer to install symlinks.
94INSTALL_ENV+= NO_CROSS_DIRECTORY_HARDLINKS=1 95INSTALL_ENV+= NO_CROSS_DIRECTORY_HARDLINKS=1
95INSTALL_ENV+= NO_INSTALL_HARDLINKS=1 96INSTALL_ENV+= NO_INSTALL_HARDLINKS=1
96 97
97NOT_PAX_MPROTECT_SAFE= bin/git # pcre2 
98 
99post-install: 98post-install:
100 ${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR} 99 ${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR}
101 ${INSTALL_DATA} ${WRKSRC}/contrib/completion/git-completion.bash \ 100 ${INSTALL_DATA} ${WRKSRC}/contrib/completion/git-completion.bash \
102 ${DESTDIR}${EGDIR} 101 ${DESTDIR}${EGDIR}
103 ${INSTALL_DATA} ${WRKSRC}/contrib/completion/git-prompt.sh \ 102 ${INSTALL_DATA} ${WRKSRC}/contrib/completion/git-prompt.sh \
104 ${DESTDIR}${EGDIR} 103 ${DESTDIR}${EGDIR}
105 104
106.include "options.mk" 105.include "options.mk"
107 106
108.include "../../converters/libiconv/buildlink3.mk" 107.include "../../converters/libiconv/buildlink3.mk"
109.include "../../devel/gettext-lib/buildlink3.mk" 108.include "../../devel/gettext-lib/buildlink3.mk"
 109BUILDLINK_API_DEPENDS.pcre2?= pcre2>=10.34
110.include "../../devel/pcre2/buildlink3.mk" 110.include "../../devel/pcre2/buildlink3.mk"
111.include "../../devel/zlib/buildlink3.mk" 111.include "../../devel/zlib/buildlink3.mk"
112.include "../../lang/perl5/buildlink3.mk" 112.include "../../lang/perl5/buildlink3.mk"
113.include "../../lang/perl5/vars.mk" 113.include "../../lang/perl5/vars.mk"
114.include "../../textproc/expat/buildlink3.mk" 114.include "../../textproc/expat/buildlink3.mk"
115.include "../../www/curl/buildlink3.mk" 115.include "../../www/curl/buildlink3.mk"
116.include "../../mk/bsd.pkg.mk" 116.include "../../mk/bsd.pkg.mk"