From nobody Sun Mar 31 10:57:31 2024 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 4V6rhC3ZdWz5FmNk; Sun, 31 Mar 2024 10:57:31 +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 4V6rhC37w2z4Gjt; Sun, 31 Mar 2024 10:57:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711882651; 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=hK4OltkE8PKZun9s+aEW0guQujphFXiWInLRnp7X/G8=; b=Ucg32NHZP8OSUW4LSSUZPXDl+9g5r43DePeiWDtrLiWiD+zahNP8PumuZfEbPl4mSbyhG8 am5hdvl4/haSMwJ+ogq6eDnJCFkOiNZkckXcfmCwAXvRSh50vYEKkyYv+BqpFuqUYyNU5G YadGde+WGCB5mNZpiwvgH/QWYlnx2Sebj+xA5QnRPOeOSFFlfyKh5WJi1+YhQJsDXX4mEe 3cMtJBeWz42JbdWX3Dt52aA3BsEo8Tjg7pF/LiiKrms9AB8f4/f9qgsoZUrxrZF9iXmuh9 Ayc57iQezRntek6aL4kRqf4PWExrbZYNBRmg166vXbEMyxhDBX7xQYguVlcKgw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711882651; a=rsa-sha256; cv=none; b=Eim+II7Vrc5ejrxU8A0y07w/AED+9pVlznrGrxukFkfYxn6S+7TbmKHyHycOEwBqXWBTbK 9LpY4wXLTm6dM07umv6Pq2CnzNgg7Ds2NGBhoyf55/RkEHWhnzjNs2kOg9CfgFzvtDx94+ d37WaB+Drb06YcST6NOrJnMPUSDYfsoqAgS6F5VnrgBxZq0BZV2oBaGyVJnm9xE8n18x4O h/wueaIcgRSG2dtzxWv++4+dZS2VgMtVXVoAniAAsKkYkNT/qmhDMeUCR8zXNHy+RY2zIX J84nRm+s5tFTExmZtxOc/8yspRkJpWcNZ18NVpSzCKjL5FLHnPp68FUobXg4uw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711882651; 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=hK4OltkE8PKZun9s+aEW0guQujphFXiWInLRnp7X/G8=; b=xNUoJLT8Dc5DOMwBxDDh9LmUE9AsLv78o2IrxpkuvVjUhAMoYCSEu/1E+FUghr2e26kSdn I0LY17hi3AC3WpnQsBNi+20AEXMZg4Sb6+NCTKGNVRZKmQ+HU73YyjJDzejZnfnB/CkWHg FNS8Hc7KafkWq0kd73EDOephxR1zUHJG0u3pSxuGYEY1pZ8kcj9BTqUvn3I1MBymbKyyNt VKHzjSDUjJ3SccqVLHSY15tLAkcKrBaF7S9O+fYTIpqgssgRUKnxqrBw8V5O8xQTC/KDb/ uGifkxfZNw4PF9RvRs6TTaD1nYhaPSypBSZemK62ABq+jYzkR8QRQDMybyLffQ== 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 4V6rhC2l1GzZph; Sun, 31 Mar 2024 10:57:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42VAvV78028249; Sun, 31 Mar 2024 10:57:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42VAvVR2028246; Sun, 31 Mar 2024 10:57:31 GMT (envelope-from git) Date: Sun, 31 Mar 2024 10:57:31 GMT Message-Id: <202403311057.42VAvVR2028246@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yasuhiro Kimura Subject: git: 8bedfcd99997 - main - ftp/wget: Pass --disable-pcre option to configure script 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: yasu X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8bedfcd99997faae8cff726fda33bd1380c75db9 Auto-Submitted: auto-generated The branch main has been updated by yasu: URL: https://cgit.FreeBSD.org/ports/commit/?id=8bedfcd99997faae8cff726fda33bd1380c75db9 commit 8bedfcd99997faae8cff726fda33bd1380c75db9 Author: Yasuhiro Kimura AuthorDate: 2024-03-31 10:56:56 +0000 Commit: Yasuhiro Kimura CommitDate: 2024-03-31 10:56:57 +0000 ftp/wget: Pass --disable-pcre option to configure script It prevents PCRE1 from being autodetected. While here, * Pet portclippy. * Tidy up Makefile with portfmt. Reported by: Scott Allendorf (via private mail) --- ftp/wget/Makefile | 60 +++++++++++++++++++++++++++++-------------------------- 1 file changed, 32 insertions(+), 28 deletions(-) diff --git a/ftp/wget/Makefile b/ftp/wget/Makefile index ecf361d8ebd7..708ae928bb85 100644 --- a/ftp/wget/Makefile +++ b/ftp/wget/Makefile @@ -14,66 +14,70 @@ TEST_DEPENDS= p5-HTTP-Daemon>=0:www/p5-HTTP-Daemon \ p5-IO-Socket-SSL>=0:security/p5-IO-Socket-SSL USES= charsetfix cpe iconv localbase pkgconfig tar:lz -USE_CSTD= c99 CPE_VENDOR= gnu -GNU_CONFIGURE= yes -GNU_CONFIGURE_MANPREFIX=${PREFIX}/share -OPTIONS_SUB= yes +USE_CSTD= c99 + +GNU_CONFIGURE= yes +GNU_CONFIGURE_MANPREFIX= ${PREFIX}/share +CONFIGURE_ARGS= --disable-pcre -OPTIONS_RADIO= SSL -OPTIONS_RADIO_SSL=GNUTLS OPENSSL -OPTIONS_DEFINE= DOCS IDN IPV6 MANPAGES METALINK NLS PCRE2 PSL NTLM -OPTIONS_DEFAULT=IDN MANPAGES OPENSSL NLS +OPTIONS_DEFINE= DOCS IDN IPV6 MANPAGES METALINK NLS NTLM PCRE2 PSL +OPTIONS_DEFAULT= IDN MANPAGES NLS OPENSSL +OPTIONS_RADIO= SSL +OPTIONS_RADIO_SSL= GNUTLS OPENSSL +OPTIONS_SUB= yes DOCS_DESC= Install info page +NTLM_DESC= Support NTLM authorization +PCRE2_DESC= Support PCRE2 style regular expressions + +DOCS_USES= makeinfo DOCS_CONFIGURE_ENV= MAKEINFO="${MAKEINFO}" -DOCS_INFO= wget -DOCS_USES= makeinfo +DOCS_INFO= wget IDN_LIB_DEPENDS= libidn2.so:dns/libidn2 \ libunistring.so:devel/libunistring -IDN_CONFIGURE_ENABLE= iri IDN_CONFIGURE_ON= --with-libidn=${LOCALBASE} \ --with-libunistring-prefix=${LOCALBASE} IDN_CONFIGURE_OFF= --with-included-libunistring +IDN_CONFIGURE_ENABLE= iri IPV6_CONFIGURE_ENABLE= ipv6 +MANPAGES_USES= perl5 +MANPAGES_USE= PERL5=build MANPAGES_CONFIGURE_ENV_OFF= ac_cv_path_POD2MAN=no -MANPAGES_USE= PERL5=build -MANPAGES_USES= perl5 -METALINK_CONFIGURE_WITH=metalink -METALINK_LIB_DEPENDS= libmetalink.so:misc/libmetalink +METALINK_LIB_DEPENDS= libmetalink.so:misc/libmetalink +METALINK_CONFIGURE_WITH= metalink NLS_USES= gettext NLS_CONFIGURE_ENABLE= nls -PCRE2_DESC= Support PCRE2 style regular expressions +NTLM_CONFIGURE_ENABLE= ntlm + PCRE2_LIB_DEPENDS= libpcre2-8.so:devel/pcre2 PCRE2_CONFIGURE_ENABLE= pcre2 -PSL_CONFIGURE_WITH= libpsl PSL_LIB_DEPENDS= libpsl.so:dns/libpsl - -NTLM_DESC= Support NTLM authorization -NTLM_CONFIGURE_ENABLE= ntlm +PSL_CONFIGURE_WITH= libpsl .include .if ${PORT_OPTIONS:MOPENSSL} -USES+= ssl -CONFIGURE_ARGS+=--with-ssl=openssl --with-libssl-prefix=${OPENSSLBASE} -CPPFLAGS+= -I${OPENSSLINC} -LDFLAGS+= -L${OPENSSLLIB} +USES+= ssl +CONFIGURE_ARGS+= --with-libssl-prefix=${OPENSSLBASE} \ + --with-ssl=openssl +CPPFLAGS+= -I${OPENSSLINC} +LDFLAGS+= -L${OPENSSLLIB} .elif ${PORT_OPTIONS:MGNUTLS} -LIB_DEPENDS+= libgnutls.so:security/gnutls -CONFIGURE_ARGS+=--with-ssl=gnutls +LIB_DEPENDS+= libgnutls.so:security/gnutls +CONFIGURE_ARGS+= --with-ssl=gnutls . if ${PORT_OPTIONS:MNTLM} -LIB_DEPENDS+= libnettle.so:security/nettle +LIB_DEPENDS+= libnettle.so:security/nettle . endif .else -CONFIGURE_ARGS+=--without-ssl +CONFIGURE_ARGS+= --without-ssl .endif TEST_TARGET= check