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)
This commit is contained in:
Yasuhiro Kimura 2024-03-31 19:56:56 +09:00
parent d9726846d0
commit 8bedfcd999

View File

@ -14,66 +14,70 @@ TEST_DEPENDS= p5-HTTP-Daemon>=0:www/p5-HTTP-Daemon \
p5-IO-Socket-SSL>=0:security/p5-IO-Socket-SSL p5-IO-Socket-SSL>=0:security/p5-IO-Socket-SSL
USES= charsetfix cpe iconv localbase pkgconfig tar:lz USES= charsetfix cpe iconv localbase pkgconfig tar:lz
USE_CSTD= c99
CPE_VENDOR= gnu CPE_VENDOR= gnu
GNU_CONFIGURE= yes USE_CSTD= c99
GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
OPTIONS_SUB= yes
OPTIONS_RADIO= SSL GNU_CONFIGURE= yes
OPTIONS_RADIO_SSL=GNUTLS OPENSSL GNU_CONFIGURE_MANPREFIX= ${PREFIX}/share
OPTIONS_DEFINE= DOCS IDN IPV6 MANPAGES METALINK NLS PCRE2 PSL NTLM CONFIGURE_ARGS= --disable-pcre
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 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_CONFIGURE_ENV= MAKEINFO="${MAKEINFO}"
DOCS_INFO= wget DOCS_INFO= wget
DOCS_USES= makeinfo
IDN_LIB_DEPENDS= libidn2.so:dns/libidn2 \ IDN_LIB_DEPENDS= libidn2.so:dns/libidn2 \
libunistring.so:devel/libunistring libunistring.so:devel/libunistring
IDN_CONFIGURE_ENABLE= iri
IDN_CONFIGURE_ON= --with-libidn=${LOCALBASE} \ IDN_CONFIGURE_ON= --with-libidn=${LOCALBASE} \
--with-libunistring-prefix=${LOCALBASE} --with-libunistring-prefix=${LOCALBASE}
IDN_CONFIGURE_OFF= --with-included-libunistring IDN_CONFIGURE_OFF= --with-included-libunistring
IDN_CONFIGURE_ENABLE= iri
IPV6_CONFIGURE_ENABLE= ipv6 IPV6_CONFIGURE_ENABLE= ipv6
MANPAGES_USES= perl5
MANPAGES_USE= PERL5=build
MANPAGES_CONFIGURE_ENV_OFF= ac_cv_path_POD2MAN=no 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_USES= gettext
NLS_CONFIGURE_ENABLE= nls NLS_CONFIGURE_ENABLE= nls
PCRE2_DESC= Support PCRE2 style regular expressions NTLM_CONFIGURE_ENABLE= ntlm
PCRE2_LIB_DEPENDS= libpcre2-8.so:devel/pcre2 PCRE2_LIB_DEPENDS= libpcre2-8.so:devel/pcre2
PCRE2_CONFIGURE_ENABLE= pcre2 PCRE2_CONFIGURE_ENABLE= pcre2
PSL_CONFIGURE_WITH= libpsl
PSL_LIB_DEPENDS= libpsl.so:dns/libpsl PSL_LIB_DEPENDS= libpsl.so:dns/libpsl
PSL_CONFIGURE_WITH= libpsl
NTLM_DESC= Support NTLM authorization
NTLM_CONFIGURE_ENABLE= ntlm
.include <bsd.port.options.mk> .include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MOPENSSL} .if ${PORT_OPTIONS:MOPENSSL}
USES+= ssl USES+= ssl
CONFIGURE_ARGS+=--with-ssl=openssl --with-libssl-prefix=${OPENSSLBASE} CONFIGURE_ARGS+= --with-libssl-prefix=${OPENSSLBASE} \
CPPFLAGS+= -I${OPENSSLINC} --with-ssl=openssl
LDFLAGS+= -L${OPENSSLLIB} CPPFLAGS+= -I${OPENSSLINC}
LDFLAGS+= -L${OPENSSLLIB}
.elif ${PORT_OPTIONS:MGNUTLS} .elif ${PORT_OPTIONS:MGNUTLS}
LIB_DEPENDS+= libgnutls.so:security/gnutls LIB_DEPENDS+= libgnutls.so:security/gnutls
CONFIGURE_ARGS+=--with-ssl=gnutls CONFIGURE_ARGS+= --with-ssl=gnutls
. if ${PORT_OPTIONS:MNTLM} . if ${PORT_OPTIONS:MNTLM}
LIB_DEPENDS+= libnettle.so:security/nettle LIB_DEPENDS+= libnettle.so:security/nettle
. endif . endif
.else .else
CONFIGURE_ARGS+=--without-ssl CONFIGURE_ARGS+= --without-ssl
.endif .endif
TEST_TARGET= check TEST_TARGET= check