diff options
-rw-r--r-- | www/apache24/Makefile | 3 | ||||
-rw-r--r-- | www/c-icap/Makefile | 2 | ||||
-rw-r--r-- | www/elinks/Makefile | 5 | ||||
-rw-r--r-- | www/formication/Makefile | 3 | ||||
-rw-r--r-- | www/havp/Makefile | 4 | ||||
-rw-r--r-- | www/ikiwiki/Makefile | 5 | ||||
-rw-r--r-- | www/lightsquid/Makefile | 3 | ||||
-rw-r--r-- | www/lusca-head/Makefile | 2 | ||||
-rw-r--r-- | www/mod_ruby/Makefile | 4 | ||||
-rw-r--r-- | www/p5-Apache2-SiteControl/Makefile | 3 | ||||
-rw-r--r-- | www/p5-CGI-Application-Server/Makefile | 3 | ||||
-rw-r--r-- | www/p5-FCGI-Spawn/Makefile | 3 | ||||
-rw-r--r-- | www/p5-WWW-Mechanize-SpamCop/Makefile | 6 | ||||
-rw-r--r-- | www/p5-Web-Query/Makefile | 3 | ||||
-rw-r--r-- | www/rejik/Makefile | 6 | ||||
-rw-r--r-- | www/rt38/Makefile | 2 | ||||
-rw-r--r-- | www/xshttpd-devel/Makefile | 2 | ||||
-rw-r--r-- | www/xshttpd/Makefile | 2 | ||||
-rw-r--r-- | www/yabb/Makefile | 3 |
19 files changed, 35 insertions, 29 deletions
diff --git a/www/apache24/Makefile b/www/apache24/Makefile index e45cd39573c7..6c8a0be1597b 100644 --- a/www/apache24/Makefile +++ b/www/apache24/Makefile @@ -21,9 +21,8 @@ CONFLICTS_INSTALL= caudium14-1.* \ apache-*-2.2.* apache22-* USE_APACHE= common24 -USES= iconv +USES= iconv perl5 USE_AUTOTOOLS= autoconf libtool -USE_PERL5= yes USE_RC_SUBR= apache24 htcacheclean LIBTOOLFILES= configure.in diff --git a/www/c-icap/Makefile b/www/c-icap/Makefile index 452b52279143..800673a06585 100644 --- a/www/c-icap/Makefile +++ b/www/c-icap/Makefile @@ -63,7 +63,7 @@ USE_OPENLDAP= YES .endif .if ${PORT_OPTIONS:MPERL} -USE_PERL5= yes +USES+= perl5 .endif .include <bsd.port.pre.mk> diff --git a/www/elinks/Makefile b/www/elinks/Makefile index 119cb9cc71f3..1ca5904735df 100644 --- a/www/elinks/Makefile +++ b/www/elinks/Makefile @@ -11,9 +11,8 @@ MAINTAINER= beat@FreeBSD.org COMMENT= Elinks - links text WWW browser with enhancements GNU_CONFIGURE= yes -USE_GMAKE= yes USE_BZIP2= yes -USES= bison +USES= bison gmake USE_OPENSSL= yes LDFLAGS+= -L${LOCALBASE}/lib @@ -76,7 +75,7 @@ CONFIGURE_ARGS+= --without-lua .endif .if ${PORT_OPTIONS:MPERL} -USE_PERL5= yes +USES+= perl5 CONFIGURE_ARGS+= --with-perl .else CONFIGURE_ARGS+= --without-perl diff --git a/www/formication/Makefile b/www/formication/Makefile index 56fb427a0b76..d4d7c0ab4407 100644 --- a/www/formication/Makefile +++ b/www/formication/Makefile @@ -15,8 +15,9 @@ MASTER_SITES= http://www.ranner.eu/stuff/ \ MAINTAINER= michael@ranner.eu COMMENT= Formular processing tool written in perl +USES= perl5 USE_APACHE_RUN= 22+ -USE_PERL5_RUN= yes +USE_PERL5= run NO_BUILD= yes WRKSRC= ${WRKDIR}/${PORTNAME} diff --git a/www/havp/Makefile b/www/havp/Makefile index 353b0a01ba83..bd34bf0b670c 100644 --- a/www/havp/Makefile +++ b/www/havp/Makefile @@ -14,9 +14,9 @@ COMMENT= HTTP Antivirus Proxy LIB_DEPENDS= clamav.7:${PORTSDIR}/security/clamav +USES= gmake perl5 GNU_CONFIGURE= yes -USE_GMAKE= yes -USE_PERL5_BUILD= yes +USE_PERL5= build USE_RC_SUBR= havp CONFIGURE_ARGS= --disable-locking diff --git a/www/ikiwiki/Makefile b/www/ikiwiki/Makefile index 9a47de479975..360cc18005b8 100644 --- a/www/ikiwiki/Makefile +++ b/www/ikiwiki/Makefile @@ -33,9 +33,8 @@ RUN_DEPENDS:= ${BUILD_DEPENDS} \ WRKSRC= ${WRKDIR}/${PORTNAME} LICENSE= GPLv2 -PERL_CONFIGURE= yes -USE_GMAKE= yes -USES= gettext +USES= gettext perl5 gmake +USE_PERL5= configure OPTIONS_DEFINE= PO4A SEARCH W3M OPTIONS_DEFAULT= PO4A SEARCH diff --git a/www/lightsquid/Makefile b/www/lightsquid/Makefile index e3e695346477..efb6c3cbd901 100644 --- a/www/lightsquid/Makefile +++ b/www/lightsquid/Makefile @@ -14,8 +14,9 @@ COMMENT= A light and fast web based squid proxy traffic analyser OPTIONS_DEFINE= GD DOCS OPTIONS_DEFAULT= GD +USES= perl5 +USE_PERL5= run NO_BUILD= yes -USE_PERL5_RUN= yes .include <bsd.port.options.mk> diff --git a/www/lusca-head/Makefile b/www/lusca-head/Makefile index 27a398b7ce1c..b7a746ab2d21 100644 --- a/www/lusca-head/Makefile +++ b/www/lusca-head/Makefile @@ -87,8 +87,8 @@ MAINTAINER= adrian@FreeBSD.org COMMENT= HTTP Caching Proxy (Squid Derivative) - Stable Release CONFLICTS= squid-[0-9]* cacheboy* +USES= perl5 GNU_CONFIGURE= yes -USE_PERL5= yes USE_RC_SUBR= squid SQUID_UID?= squid diff --git a/www/mod_ruby/Makefile b/www/mod_ruby/Makefile index 0a4f744c0ea0..139590c914e0 100644 --- a/www/mod_ruby/Makefile +++ b/www/mod_ruby/Makefile @@ -12,10 +12,10 @@ DIST_SUBDIR= ruby MAINTAINER= dinoex@FreeBSD.org COMMENT= An Apache module that embeds Ruby interpreter within - +USES= perl5 USE_APACHE= 22 USE_RUBY= yes -USE_PERL5_BUILD= yes +USE_PERL5= build CONFIGURE_ARGS= --with-apxs="${APXS}" CFLAGS+= -DONIG_ESCAPE_REGEX_T_COLLISION diff --git a/www/p5-Apache2-SiteControl/Makefile b/www/p5-Apache2-SiteControl/Makefile index 5e02498f3b0a..53936f718a5a 100644 --- a/www/p5-Apache2-SiteControl/Makefile +++ b/www/p5-Apache2-SiteControl/Makefile @@ -29,7 +29,8 @@ RUN_DEPENDS= p5-Apache-AuthCookie>=3.08:${PORTSDIR}/www/p5-Apache-AuthCookie \ OPTIONS_DEFINE= RADIUS OPTIONS_DEFAULT= RADIUS -PERL_CONFIGURE= yes +USES= perl5 +USE_PERL5= configure MAN3= Apache2::SiteControl.3 \ Apache2::SiteControl::GrantAllRule.3 \ diff --git a/www/p5-CGI-Application-Server/Makefile b/www/p5-CGI-Application-Server/Makefile index 6bbe0e8687d3..2d104f70405e 100644 --- a/www/p5-CGI-Application-Server/Makefile +++ b/www/p5-CGI-Application-Server/Makefile @@ -26,7 +26,8 @@ TEST_DEPENDS= p5-CGI-Application>0:${PORTSDIR}/www/p5-CGI-Application \ p5-Test-HTTP-Server-Simple>0:${PORTSDIR}/www/p5-Test-HTTP-Server-Simple \ p5-Test-WWW-Mechanize>0:${PORTSDIR}/devel/p5-Test-WWW-Mechanize -PERL_CONFIGURE= yes +USES= perl5 +USE_PERL5= configure MAN3= CGI::Application::Server.3 diff --git a/www/p5-FCGI-Spawn/Makefile b/www/p5-FCGI-Spawn/Makefile index 2cbbc865a084..1fd9598229a6 100644 --- a/www/p5-FCGI-Spawn/Makefile +++ b/www/p5-FCGI-Spawn/Makefile @@ -17,7 +17,8 @@ RUN_DEPENDS:= ${BUILD_DEPENDS} TEST_DEPENDS= p5-Test-Most>0:${PORTSDIR}/devel/p5-Test-Most \ p5-Test-Strict>0:${PORTSDIR}/devel/p5-Test-Strict -PERL_CONFIGURE= yes +USES= perl5 +USE_PERL5= configure USE_RC_SUBR+= fcgi_spawn diff --git a/www/p5-WWW-Mechanize-SpamCop/Makefile b/www/p5-WWW-Mechanize-SpamCop/Makefile index 5c9061cff4da..985050144761 100644 --- a/www/p5-WWW-Mechanize-SpamCop/Makefile +++ b/www/p5-WWW-Mechanize-SpamCop/Makefile @@ -16,9 +16,9 @@ COMMENT= SpamCop reporting automation RUN_DEPENDS= p5-WWW-Mechanize>=0:${PORTSDIR}/www/p5-WWW-Mechanize -PERL_CONFIGURE= yes +USES= perl5 +USE_PERL5= configure MAN3= WWW::Mechanize::SpamCop.3 -.include <bsd.port.pre.mk> -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/www/p5-Web-Query/Makefile b/www/p5-Web-Query/Makefile index 41f2ac17f3bf..1e0fd7224e1b 100644 --- a/www/p5-Web-Query/Makefile +++ b/www/p5-Web-Query/Makefile @@ -16,7 +16,8 @@ BUILD_DEPENDS= p5-HTML-Selector-XPath>=0.06:${PORTSDIR}/www/p5-HTML-Selector-XPa p5-libwww>=5.385:${PORTSDIR}/www/p5-libwww RUN_DEPENDS:= ${BUILD_DEPENDS} -PERL_MODBUILD= yes +USES= perl5 +USE_PERL5= modbuild MAN3= Web::Query.3 diff --git a/www/rejik/Makefile b/www/rejik/Makefile index 90288f3442af..b9eca2d38929 100644 --- a/www/rejik/Makefile +++ b/www/rejik/Makefile @@ -31,7 +31,6 @@ DBL_DESC= With DBL scripts WWW_DESC= With error pages .include <bsd.port.options.mk> -.include <bsd.port.pre.mk> # Redifine this if you need SQUID_USER?= squid @@ -55,7 +54,8 @@ PLIST_SUB+= WWW="@comment " .if ${PORT_OPTIONS:MDBL} DISTFILES+= dbl-2.0.tgz -USE_PERL5_RUN= yes +USES+= perl5 +USE_PERL5= run RUN_DEPENDS+= p5-Text-Iconv>=0:${PORTSDIR}/converters/p5-Text-Iconv \ p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser \ wget:${PORTSDIR}/ftp/wget @@ -64,6 +64,8 @@ PLIST_SUB+= DBL="" PLIST_SUB+= DBL="@comment " .endif +.include <bsd.port.pre.mk> + post-extract: @${ECHO_MSG} "===> ----------------------------------------------" @${ECHO_MSG} "===> Make sure that squid runs under user squid" diff --git a/www/rt38/Makefile b/www/rt38/Makefile index 6539a0af6548..d104fe155779 100644 --- a/www/rt38/Makefile +++ b/www/rt38/Makefile @@ -40,7 +40,7 @@ BUILD_DEPENDS+= ${CORE_DEPS} \ RUN_DEPENDS+= ${BUILD_DEPENDS} -USE_PERL5= yes +USES= perl5 USE_AUTOTOOLS= autoconf .include <bsd.port.options.mk> diff --git a/www/xshttpd-devel/Makefile b/www/xshttpd-devel/Makefile index ae268f42a97f..8b91ad20b98b 100644 --- a/www/xshttpd-devel/Makefile +++ b/www/xshttpd-devel/Makefile @@ -59,7 +59,7 @@ CONFIGURE_ARGS+=--without-preprocessor .endif .if ${PORT_OPTIONS:MPERSISTENT_PERL} -USE_PERL5= yes +USES+= perl5 CONFIGURE_ARGS+=--with-perl PLIST_SUB+= PERL="" .else diff --git a/www/xshttpd/Makefile b/www/xshttpd/Makefile index 5ce6701aa15e..0edea1bb9755 100644 --- a/www/xshttpd/Makefile +++ b/www/xshttpd/Makefile @@ -63,7 +63,7 @@ CONFIGURE_ARGS+=--without-preprocessor .endif .if ${PORT_OPTIONS:MPERSISTENT_PERL} -USE_PERL5= yes +USES+= perl5 CONFIGURE_ARGS+=--with-perl .else CONFIGURE_ARGS+=--without-perl diff --git a/www/yabb/Makefile b/www/yabb/Makefile index 97b8cc48bc18..1ac3c7794995 100644 --- a/www/yabb/Makefile +++ b/www/yabb/Makefile @@ -18,8 +18,9 @@ LICENSE_PERMS= ${_LICENSE_PERMS_DEFAULT} RUN_DEPENDS= p5-Digest-HMAC>=0:${PORTSDIR}/security/p5-Digest-HMAC NO_PACKAGE= complicated (de)installation paradigm +USES= perl5 USE_ZIP= yes -USE_PERL5_RUN= yes +USE_PERL5= run NO_BUILD= yes WWWDOCROOT?= www YABBSUBDIR?= yabb |