From nobody Wed Oct 19 15:40:15 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Msw0b63qcz4gFk8; Wed, 19 Oct 2022 15:40:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Msw0b5WRtz3Vsh; Wed, 19 Oct 2022 15:40:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666194015; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iLwLO8cPiic2JLFYJS0jhd+sPMJUtXpaoskEMh8HDyg=; b=LM++Mlv/A5TXGrNEUqxwHPjiXcGX13Yey4yK/QW8RzSjEwa4hqAX3aL3A+HCHshD5fN6xB s1x9daDRpVhVA4sEqw16N0Or8aSr3LZCZYSD8aTmhC0d8tprEsrbSnRQ7a0c1TV0rZMF/5 EXN/Cfs0uhaUYk93Vp/uwsbs4cYRjpKGEDRC0C6I2/AdyfR/YuKyZ1bO4cqUUFoOgqvn2z QEG/R9izKOAKS5Gs/47YRUQT8aCx60NE2FWLCHvmApdvxV1hoLwi1GJPBslsqSlxyJ0VFs ihuCrcEDCh2OsfpGwe6g+kSv/FIl44CpHYcGDwyFq16KMfKyn7UEa+FvK9uR0w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Msw0b4YyWzZSF; Wed, 19 Oct 2022 15:40:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 29JFeFEM041228; Wed, 19 Oct 2022 15:40:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29JFeF27041222; Wed, 19 Oct 2022 15:40:15 GMT (envelope-from git) Date: Wed, 19 Oct 2022 15:40:15 GMT Message-Id: <202210191540.29JFeF27041222@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Renato Botelho Subject: git: 0b7192bd7c4f - main - devel/git: Make PCRE2 dependency mandatory List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: garga X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0b7192bd7c4f8e4c05e0a9cefcae347606ebadd1 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666194015; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iLwLO8cPiic2JLFYJS0jhd+sPMJUtXpaoskEMh8HDyg=; b=PGx0DVPDnbEhMoKr7ifExQJXJovBvjbE5Py97LUUFQ/og95CByxQa/RHhr09FDh4EHjcsN fo5LF5flsy7XfCA3eazjnEDYxWf0Ti+xU7iOoZe3yjS9fKpP7s6KmtRXPf3Rs8tCFtGR6E Nr+ADLZdLGf3puBmanTyL/OFWCdYEUoqSosEXTlaVYB4AYkDLlAELMe/7hdnvr4ZSV7g4W f4q07H/IHCFg85Qhb2Zfd/w19uazouZKTQu+Rsjb9glMpQ+6uxqQ4PFntoAKFlPpT3ZCkc ieKhXiUwzH/ZPOdO4hM0jZk/gkFMWq1PJjuRt0kw0y/QYnV+6aRzuXUMhQ5qHg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1666194015; a=rsa-sha256; cv=none; b=qKv/Rh639Jgk34Z2ySZkoirNn5wjq2KeVI0ejHWwLPuIbSZD8ooqAd8Ljg9CwamVMctgo6 m2FQR64VNlUOJtW1kD4u/p+0ovFz/LVMZ0qxRuRVswMaROfA9oP8ezyAg/32HkSLmFNj3V u3qpsVifR+XYC+9RveOekkW2npNVQZq0ML2J7mqQ1v4movkr0wMcU8nbT2Zgn7p7fGUhQ9 ve6SDv/p9CylHouQEYEb77NA7DQeCrW6rDexHW8psPCqHcKzBAoMMPfNvfCUqSccvtZQJ/ RDXHrlNc05FmXwygPotg1rmKTAFkl1w4nbTYRZf2TxqqBRMF8Hu4uDb6x7jVyA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by garga: URL: https://cgit.FreeBSD.org/ports/commit/?id=0b7192bd7c4f8e4c05e0a9cefcae347606ebadd1 commit 0b7192bd7c4f8e4c05e0a9cefcae347606ebadd1 Author: Michael Osipov AuthorDate: 2022-10-19 15:35:10 +0000 Commit: Renato Botelho 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