Received: by mail.netbsd.org (Postfix, from userid 605) id 708C284D69; Tue, 26 Nov 2019 10:22:18 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id EF63484CDA for ; Tue, 26 Nov 2019 10:22:17 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id SdfYx4pXXXf4 for ; Tue, 26 Nov 2019 10:22:17 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 4EC3984C2B for ; Tue, 26 Nov 2019 10:22:17 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 41FDEFA97; Tue, 26 Nov 2019 10:22:17 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1574763737176980" MIME-Version: 1.0 Date: Tue, 26 Nov 2019 10:22:17 +0000 From: "Thomas Klausner" Subject: CVS commit: pkgsrc/devel/git-base To: pkgsrc-changes@NetBSD.org Reply-To: wiz@netbsd.org X-Mailer: log_accum Message-Id: <20191126102217.41FDEFA97@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1574763737176980 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: wiz Date: Tue Nov 26 10:22:17 UTC 2019 Modified Files: pkgsrc/devel/git-base: Makefile Log Message: git-base: depend on pcre2-10.34 That version has a different JIT version enabled. Remove PaX mprotect workaround. Bump PKGREVISION. To generate a diff of this commit: cvs rdiff -u -r1.70 -r1.71 pkgsrc/devel/git-base/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1574763737176980 Content-Disposition: inline Content-Length: 1202 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/devel/git-base/Makefile diff -u pkgsrc/devel/git-base/Makefile:1.70 pkgsrc/devel/git-base/Makefile:1.71 --- pkgsrc/devel/git-base/Makefile:1.70 Wed Nov 20 18:13:52 2019 +++ pkgsrc/devel/git-base/Makefile Tue Nov 26 10:22:17 2019 @@ -1,8 +1,9 @@ -# $NetBSD: Makefile,v 1.70 2019/11/20 18:13:52 adam Exp $ +# $NetBSD: Makefile,v 1.71 2019/11/26 10:22:17 wiz Exp $ .include "../../devel/git/Makefile.common" PKGNAME= git-base-${GIT_VERSION} +PKGREVISION= 1 COMMENT= GIT Tree History Storage Tool (base package) CONFLICTS+= scmgit-base-[0-9]* @@ -94,8 +95,6 @@ CONFIGURE_ARGS+= git_cv_ld_dashr=no INSTALL_ENV+= NO_CROSS_DIRECTORY_HARDLINKS=1 INSTALL_ENV+= NO_INSTALL_HARDLINKS=1 -NOT_PAX_MPROTECT_SAFE= bin/git # pcre2 - post-install: ${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR} ${INSTALL_DATA} ${WRKSRC}/contrib/completion/git-completion.bash \ @@ -107,6 +106,7 @@ post-install: .include "../../converters/libiconv/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" +BUILDLINK_API_DEPENDS.pcre2?= pcre2>=10.34 .include "../../devel/pcre2/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" .include "../../lang/perl5/buildlink3.mk" --_----------=_1574763737176980--