Date: Tue, 14 May 2013 08:27:48 +0000 (UTC) From: Vasil Dimov <vd@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r318142 - head/ftp/wget Message-ID: <201305140827.r4E8RmVs029621@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: vd Date: Tue May 14 08:27:47 2013 New Revision: 318142 URL: http://svnweb.freebsd.org/changeset/ports/318142 Log: ftp/wget: Add an option for choosing whether to use PCRE or not. The "CONFIGURE_ENV=ac_cv_header_pcre_h=no" thingy was suggested by bapt@, thanks! Modified: head/ftp/wget/Makefile Modified: head/ftp/wget/Makefile ============================================================================== --- head/ftp/wget/Makefile Tue May 14 08:02:31 2013 (r318141) +++ head/ftp/wget/Makefile Tue May 14 08:27:47 2013 (r318142) @@ -3,7 +3,7 @@ PORTNAME= wget DISTVERSION= 1.14 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= ftp www ipv6 MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= wget @@ -18,21 +18,13 @@ USE_PERL5_BUILD=yes GNU_CONFIGURE= yes MAKE_JOBS_SAFE= yes -# Wget can handle the absence of pcre, but we hook an unconditional dependency -# to pcre because if it is present in the system during compile time, then -# wget will pick it and link with it. Thus the wget executable will later -# depend on the presence of the pcre library. Wget does not support to -# explicitly ignore the pcre library if it is present in the system and there -# is no elegant way to do that. -LIB_DEPENDS= pcre:${PORTSDIR}/devel/pcre -CPPFLAGS= -I${LOCALBASE}/include -LDFLAGS= -L${LOCALBASE}/lib - OPTIONS_RADIO= SSL OPTIONS_RADIO_SSL=GNUTLS OPENSSL -OPTIONS_DEFINE= IPV6 NLS IDN +OPTIONS_DEFINE= IPV6 NLS IDN PCRE OPTIONS_DEFAULT=OPENSSL IDN +PCRE_DESC= Support Perl regular expressions in addition to POSIX + .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MOPENSSL} @@ -73,6 +65,15 @@ CONFIGURE_ARGS+=--enable-iri --with-libi CONFIGURE_ARGS+=--disable-iri .endif +.if ${PORT_OPTIONS:MPCRE} +# Wget will pick pcre automatically and link with it if it is present. +LIB_DEPENDS+= pcre:${PORTSDIR}/devel/pcre +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib +.else +CONFIGURE_ENV+= ac_cv_header_pcre_h=no +.endif + MAN1= wget.1 INFO= wget
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201305140827.r4E8RmVs029621>