git: f8de24dec542 - main - Revert "devel/git: Make PCRE2 dependency mandatory"

The branch main has been updated by garga:

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

commit f8de24dec542c1d95ebc6fa30c57deee8ad5e306
Author:     Renato Botelho <garga@FreeBSD.org>
AuthorDate: 2022-10-19 16:42:34 +0000
Commit:     Renato Botelho <garga@FreeBSD.org>
CommitDate: 2022-10-19 16:42:34 +0000

    Revert "devel/git: Make PCRE2 dependency mandatory"
    
    As pointed out by jbeich, old PCRE support was already removed and git
    can be built without any PCRE support.
    
    This reverts commit 0b7192bd7c4f8e4c05e0a9cefcae347606ebadd1.
    
    Pointy-hat to:  garga
---
 devel/git/Makefile | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/devel/git/Makefile b/devel/git/Makefile
index d191e028d943..d7d2679bc3e9 100644
--- a/devel/git/Makefile
+++ b/devel/git/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	git
 DISTVERSION=	2.38.1
-PORTREVISION=	2
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	KERNEL_ORG/software/scm/git
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
@@ -27,8 +27,6 @@ WWW=		https://git-scm.com/
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libpcre2-8.so:devel/pcre2
-
 SUBPORT?=	core
 
 .if ${SUBPORT} != core
@@ -81,13 +79,13 @@ SHEBANG_FILES=	*.perl */*.perl */*/*.perl */*.pl */*/*.pl */*/*/*.pl \
 		templates/hooks--fsmonitor-watchman.sample
 TEST_TARGET=	test
 
-CONFIGURE_ARGS=	--with-libpcre2 \
-		--enable-pthreads=-pthread ac_cv_header_libcharset_h=no
+CONFIGURE_ARGS=	--enable-pthreads=-pthread ac_cv_header_libcharset_h=no
 
 .if ${SUBPORT} == core
 
-OPTIONS_DEFINE=	CONTRIB CURL GITWEB HTMLDOCS ICONV NLS PERL SEND_EMAIL SUBTREE
-OPTIONS_DEFAULT=CONTRIB CURL GITWEB ICONV PERL SEND_EMAIL SUBTREE
+OPTIONS_DEFINE=	CONTRIB CURL GITWEB HTMLDOCS ICONV NLS PCRE2 PERL SEND_EMAIL \
+		SUBTREE
+OPTIONS_DEFAULT=CONTRIB CURL GITWEB ICONV PCRE2 PERL SEND_EMAIL SUBTREE
 
 . if ${FLAVOR:U} == lite
 OPTIONS_EXCLUDE+=	GITWEB CONTRIB PERL
@@ -106,6 +104,7 @@ 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
 
@@ -122,6 +121,9 @@ 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