Date: Sun, 31 Mar 2024 10:57:31 GMT From: Yasuhiro Kimura <yasu@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 8bedfcd99997 - main - ftp/wget: Pass --disable-pcre option to configure script Message-ID: <202403311057.42VAvVR2028246@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by yasu: URL: https://cgit.FreeBSD.org/ports/commit/?id=8bedfcd99997faae8cff726fda33bd1380c75db9 commit 8bedfcd99997faae8cff726fda33bd1380c75db9 Author: Yasuhiro Kimura <yasu@FreeBSD.org> AuthorDate: 2024-03-31 10:56:56 +0000 Commit: Yasuhiro Kimura <yasu@FreeBSD.org> 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 <bsd.port.options.mk> .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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202403311057.42VAvVR2028246>