Attachment 237458 Details for Bug 267185 – Patch against /usr/ports (main)

[patch] Patch against /usr/ports (main)

git-pcre2.patch (text/plain), 1.70 KB, created by Michael Osipov on 2022-10-19 13:59:26 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Osipov

Created: 2022-10-19 13:59:26 UTC

Size: 1.70 KB

patch

obsolete

>diff --git a/devel/git/Makefile b/devel/git/Makefile
>index d7d2679bc3e9..e3d7af6d6524 100644
>--- a/devel/git/Makefile
>+++ b/devel/git/Makefile
>@@ -27,6 +27,8 @@ WWW=		https://git-scm.com/
> LICENSE=	GPLv2
> LICENSE_FILE=	${WRKSRC}/COPYING
> 
>+LIB_DEPENDS=	libpcre2-8.so:devel/pcre2
>+
> SUBPORT?=	core
> 
> .if ${SUBPORT} != core
>@@ -79,13 +81,14 @@ SHEBANG_FILES=	*.perl */*.perl */*/*.perl */*.pl */*/*.pl */*/*/*.pl \
> 		templates/hooks--fsmonitor-watchman.sample
> TEST_TARGET=	test
> 
>-CONFIGURE_ARGS=	--enable-pthreads=-pthread ac_cv_header_libcharset_h=no
>+CONFIGURE_ARGS=	--enable-pthreads=-pthread ac_cv_header_libcharset_h=no \
>+		--with-libpcre2
> 
> .if ${SUBPORT} == core
> 
>-OPTIONS_DEFINE=	CONTRIB CURL GITWEB HTMLDOCS ICONV NLS PCRE2 PERL SEND_EMAIL \
>+OPTIONS_DEFINE=	CONTRIB CURL GITWEB HTMLDOCS ICONV NLS PERL SEND_EMAIL \
> 		SUBTREE
>-OPTIONS_DEFAULT=CONTRIB CURL GITWEB ICONV PCRE2 PERL SEND_EMAIL SUBTREE
>+OPTIONS_DEFAULT=CONTRIB CURL GITWEB ICONV PERL SEND_EMAIL SUBTREE
> 
> . if ${FLAVOR:U} == lite
> OPTIONS_EXCLUDE+=	GITWEB CONTRIB PERL
>@@ -104,7 +107,6 @@ CONTRIB_DESC=	Install contributed scripts
> CURL_DESC=	Install curl support (provides HTTPS transport)
> GITWEB_DESC=	Install gitweb
> HTMLDOCS_DESC=	Install additional documentation
>-PCRE2_DESC=	Use Perl Compatible Regular Expressions (v2)
> SEND_EMAIL_DESC=Enable the git-send-email(1) script
> SUBTREE_DESC=	Install git-subtree
> 
>@@ -121,9 +123,6 @@ GITWEB_IMPLIES=		PERL
> GITWEB_RUN_DEPENDS=	p5-CGI>=0:www/p5-CGI
> GITWEB_MAKE_ARGS_OFF=	NO_GITWEB=1
> 
>-PCRE2_LIB_DEPENDS=	libpcre2-8.so:devel/pcre2
>-PCRE2_CONFIGURE_WITH=	libpcre
>-
> SEND_EMAIL_IMPLIES=	PERL
> SEND_EMAIL_RUN_DEPENDS=	p5-Authen-SASL>=0:security/p5-Authen-SASL \
> 			p5-IO-Socket-SSL>=0:security/p5-IO-Socket-SSL

Actions: View | Diff

Attachments on bug 267185: 237458