From nobody Wed Oct 19 16:45:47 2022 X-Original-To: dev-commits-ports-all@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 4MsxSD1qVTz4gNhp; Wed, 19 Oct 2022 16:45:48 +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 4MsxSD1HMQz3f1q; Wed, 19 Oct 2022 16:45:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666197948; 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=jwRQwzWzuzl45ot0dyaualin9mtqh/1gWqY7yqQ7ujI=; b=wT2CQmXm3d120TdWjo6w5bg4JVWMOw0KfUTWy4rGElwkLz9ZnRFikDGMvH3EvlHkLR38sm uPbyeQkOJH7d/x2SzOEGRjTM+xDnuBnsaZQVur7EwMI0o2sJDsx/B6pMPN62nV7m6F7Nml iq62j7dofGfKLlzIx9/r0XGDW2pdHULpsBnSJetpbcxB3TUdzohc8T3xLPMD1WW1IsTLN5 QOIUTXxyLj9HuPDLOxxB2mFZXI7tEkdestk6yvPZhV079IhMX0FxsjgwW3QXdzpkgS/fbq pDwnE2w6oPHzZHndK9wWfS4q0+QyBxGyJyA5/umeqMsz9QINktb6toShdkDdVA== 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 4MsxSD0LrBzbRh; Wed, 19 Oct 2022 16:45:48 +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 29JGjl1h024059; Wed, 19 Oct 2022 16:45:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29JGjl2I024058; Wed, 19 Oct 2022 16:45:47 GMT (envelope-from git) Date: Wed, 19 Oct 2022 16:45:47 GMT Message-Id: <202210191645.29JGjl2I024058@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: f8de24dec542 - main - Revert "devel/git: Make PCRE2 dependency mandatory" List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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: f8de24dec542c1d95ebc6fa30c57deee8ad5e306 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666197948; 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=jwRQwzWzuzl45ot0dyaualin9mtqh/1gWqY7yqQ7ujI=; b=Sy9pOpOrzhQ+AjOHcYdT9XFbKhIBOFmEBcmyBVW+4oZp0qEgG4y0IQ63oYM1H3X3SCg5cd f7KKaD6nm74XgvH/V7LCZALWvMt0QKnq42763/HOBZ5n1eTcXQ1k64hT2ReuiGW+nnaFOD RNRdkoI3gTEr1AXOjtafNgF+9ilbum2IpDjUsb0ApsR/GwicuL5clsRVHE3na2NRTXeeJ/ rgU2aO59hQ9eGfjvCxas8FRu2Djfl81sIM9mvGZHKWnV/GQBvGZrMqwaoJpUvG1gEUCX5I gm3oyO16+6MzdjaBudDvbWigRuKe5vq5DaoqV0xbKQej5zLc7xRQNJTTwdFhLQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1666197948; a=rsa-sha256; cv=none; b=NkPusJ7LpqUdYQTiLq7AmBDBRGM1uPtajREaxHUq9zaKhH9c5uF2uf1vfiFJtNc0USYXrt 04MnuzQbgWVviKw8NgZDbWJcJ9Cq6YGBsxhxciry8XJ+/8qKNUxJe8xegZzEhY+eVR6Sk1 l+MAg4/Op2q5dEWcUuf7vQaV20CIIclw45OHrtdMdMiUm6VdLqU3Uhqcv9W+erUDGvozOJ uHfUkWlghoyTm1RsDVNhSKxRDIOUit1VZd10GwKpqw90tmufXlMlWTxfYopw6+tzZdd+I6 iwxs7XWKFu5zhRjoIJP6aP9G0LCrtUqGztF4wCbnfk3gOnJovV670EaPlMGnRA== 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=f8de24dec542c1d95ebc6fa30c57deee8ad5e306 commit f8de24dec542c1d95ebc6fa30c57deee8ad5e306 Author: Renato Botelho AuthorDate: 2022-10-19 16:42:34 +0000 Commit: Renato Botelho 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