git: 0b7192bd7c4f - main - devel/git: Make PCRE2 dependency mandatory

The branch main has been updated by garga:

URL: https://cgit.FreeBSD.org/ports/commit/?id=0b7192bd7c4f8e4c05e0a9cefcae347606ebadd1

commit 0b7192bd7c4f8e4c05e0a9cefcae347606ebadd1
Author:     Michael Osipov <michael.osipov@siemens.com>
AuthorDate: 2022-10-19 15:35:10 +0000
Commit:     Renato Botelho <garga@FreeBSD.org>
CommitDate: 2022-10-19 15:40:09 +0000

    devel/git: Make PCRE2 dependency mandatory
    
    According to project website, pcre 8.45 was the latest version of old
    pcre, which is now deprecated, and it must be replaced by pcre2.
    
    Remove OPTION and change port to depend of pcre2.
    
    PR:             267185
---
 devel/git/Makefile | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/devel/git/Makefile b/devel/git/Makefile
index d7d2679bc3e9..d191e028d943 100644
--- a/devel/git/Makefile
+++ b/devel/git/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	git
 DISTVERSION=	2.38.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	KERNEL_ORG/software/scm/git
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
@@ -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,13 @@ 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=	--with-libpcre2 \
+		--enable-pthreads=-pthread ac_cv_header_libcharset_h=no
 
 .if ${SUBPORT} == core
 
-OPTIONS_DEFINE=	CONTRIB CURL GITWEB HTMLDOCS ICONV NLS PCRE2 PERL SEND_EMAIL \
-		SUBTREE
-OPTIONS_DEFAULT=CONTRIB CURL GITWEB ICONV PCRE2 PERL SEND_EMAIL SUBTREE
+OPTIONS_DEFINE=	CONTRIB CURL GITWEB HTMLDOCS ICONV NLS 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 +106,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 +122,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