From owner-svn-ports-head@FreeBSD.ORG Sat Sep 14 14:48:01 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 4CF5D756; Sat, 14 Sep 2013 14:48:01 +0000 (UTC) (envelope-from az@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 2CC272A94; Sat, 14 Sep 2013 14:48:01 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8EEm1PU076797; Sat, 14 Sep 2013 14:48:01 GMT (envelope-from az@svn.freebsd.org) Received: (from az@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8EElvLi076758; Sat, 14 Sep 2013 14:47:57 GMT (envelope-from az@svn.freebsd.org) Message-Id: <201309141447.r8EElvLi076758@svn.freebsd.org> From: Andrej Zverev Date: Sat, 14 Sep 2013 14:47:57 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r327292 - in head/www: apache24 c-icap elinks formication havp ikiwiki lightsquid lusca-head mod_ruby p5-Apache2-SiteControl p5-CGI-Application-Server p5-FCGI-Spawn p5-WWW-Mechanize-Spa... X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 14 Sep 2013 14:48:01 -0000 Author: az Date: Sat Sep 14 14:47:56 2013 New Revision: 327292 URL: http://svnweb.freebsd.org/changeset/ports/327292 Log: - convert to the new perl5 framework - convert USE_GMAKE to Uses Approved by: portmgr (bapt@, blanket) Modified: head/www/apache24/Makefile head/www/c-icap/Makefile head/www/elinks/Makefile head/www/formication/Makefile (contents, props changed) head/www/havp/Makefile (contents, props changed) head/www/ikiwiki/Makefile head/www/lightsquid/Makefile head/www/lusca-head/Makefile head/www/mod_ruby/Makefile head/www/p5-Apache2-SiteControl/Makefile (contents, props changed) head/www/p5-CGI-Application-Server/Makefile head/www/p5-FCGI-Spawn/Makefile (contents, props changed) head/www/p5-WWW-Mechanize-SpamCop/Makefile (contents, props changed) head/www/p5-Web-Query/Makefile head/www/rejik/Makefile (contents, props changed) head/www/rt38/Makefile head/www/xshttpd-devel/Makefile head/www/xshttpd/Makefile head/www/yabb/Makefile Modified: head/www/apache24/Makefile ============================================================================== --- head/www/apache24/Makefile Sat Sep 14 14:43:12 2013 (r327291) +++ head/www/apache24/Makefile Sat Sep 14 14:47:56 2013 (r327292) @@ -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 Modified: head/www/c-icap/Makefile ============================================================================== --- head/www/c-icap/Makefile Sat Sep 14 14:43:12 2013 (r327291) +++ head/www/c-icap/Makefile Sat Sep 14 14:47:56 2013 (r327292) @@ -63,7 +63,7 @@ USE_OPENLDAP= YES .endif .if ${PORT_OPTIONS:MPERL} -USE_PERL5= yes +USES+= perl5 .endif .include Modified: head/www/elinks/Makefile ============================================================================== --- head/www/elinks/Makefile Sat Sep 14 14:43:12 2013 (r327291) +++ head/www/elinks/Makefile Sat Sep 14 14:47:56 2013 (r327292) @@ -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 Modified: head/www/formication/Makefile ============================================================================== --- head/www/formication/Makefile Sat Sep 14 14:43:12 2013 (r327291) +++ head/www/formication/Makefile Sat Sep 14 14:47:56 2013 (r327292) @@ -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} Modified: head/www/havp/Makefile ============================================================================== --- head/www/havp/Makefile Sat Sep 14 14:43:12 2013 (r327291) +++ head/www/havp/Makefile Sat Sep 14 14:47:56 2013 (r327292) @@ -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 Modified: head/www/ikiwiki/Makefile ============================================================================== --- head/www/ikiwiki/Makefile Sat Sep 14 14:43:12 2013 (r327291) +++ head/www/ikiwiki/Makefile Sat Sep 14 14:47:56 2013 (r327292) @@ -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 Modified: head/www/lightsquid/Makefile ============================================================================== --- head/www/lightsquid/Makefile Sat Sep 14 14:43:12 2013 (r327291) +++ head/www/lightsquid/Makefile Sat Sep 14 14:47:56 2013 (r327292) @@ -14,8 +14,9 @@ COMMENT= A light and fast web based squi OPTIONS_DEFINE= GD DOCS OPTIONS_DEFAULT= GD +USES= perl5 +USE_PERL5= run NO_BUILD= yes -USE_PERL5_RUN= yes .include Modified: head/www/lusca-head/Makefile ============================================================================== --- head/www/lusca-head/Makefile Sat Sep 14 14:43:12 2013 (r327291) +++ head/www/lusca-head/Makefile Sat Sep 14 14:47:56 2013 (r327292) @@ -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 Modified: head/www/mod_ruby/Makefile ============================================================================== --- head/www/mod_ruby/Makefile Sat Sep 14 14:43:12 2013 (r327291) +++ head/www/mod_ruby/Makefile Sat Sep 14 14:47:56 2013 (r327292) @@ -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 Modified: head/www/p5-Apache2-SiteControl/Makefile ============================================================================== --- head/www/p5-Apache2-SiteControl/Makefile Sat Sep 14 14:43:12 2013 (r327291) +++ head/www/p5-Apache2-SiteControl/Makefile Sat Sep 14 14:47:56 2013 (r327292) @@ -29,7 +29,8 @@ RUN_DEPENDS= p5-Apache-AuthCookie>=3.08: OPTIONS_DEFINE= RADIUS OPTIONS_DEFAULT= RADIUS -PERL_CONFIGURE= yes +USES= perl5 +USE_PERL5= configure MAN3= Apache2::SiteControl.3 \ Apache2::SiteControl::GrantAllRule.3 \ Modified: head/www/p5-CGI-Application-Server/Makefile ============================================================================== --- head/www/p5-CGI-Application-Server/Makefile Sat Sep 14 14:43:12 2013 (r327291) +++ head/www/p5-CGI-Application-Server/Makefile Sat Sep 14 14:47:56 2013 (r327292) @@ -26,7 +26,8 @@ TEST_DEPENDS= p5-CGI-Application>0:${POR 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 Modified: head/www/p5-FCGI-Spawn/Makefile ============================================================================== --- head/www/p5-FCGI-Spawn/Makefile Sat Sep 14 14:43:12 2013 (r327291) +++ head/www/p5-FCGI-Spawn/Makefile Sat Sep 14 14:47:56 2013 (r327292) @@ -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 Modified: head/www/p5-WWW-Mechanize-SpamCop/Makefile ============================================================================== --- head/www/p5-WWW-Mechanize-SpamCop/Makefile Sat Sep 14 14:43:12 2013 (r327291) +++ head/www/p5-WWW-Mechanize-SpamCop/Makefile Sat Sep 14 14:47:56 2013 (r327292) @@ -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 -.include +.include Modified: head/www/p5-Web-Query/Makefile ============================================================================== --- head/www/p5-Web-Query/Makefile Sat Sep 14 14:43:12 2013 (r327291) +++ head/www/p5-Web-Query/Makefile Sat Sep 14 14:47:56 2013 (r327292) @@ -16,7 +16,8 @@ BUILD_DEPENDS= p5-HTML-Selector-XPath>=0 p5-libwww>=5.385:${PORTSDIR}/www/p5-libwww RUN_DEPENDS:= ${BUILD_DEPENDS} -PERL_MODBUILD= yes +USES= perl5 +USE_PERL5= modbuild MAN3= Web::Query.3 Modified: head/www/rejik/Makefile ============================================================================== --- head/www/rejik/Makefile Sat Sep 14 14:43:12 2013 (r327291) +++ head/www/rejik/Makefile Sat Sep 14 14:47:56 2013 (r327292) @@ -31,7 +31,6 @@ DBL_DESC= With DBL scripts WWW_DESC= With error pages .include -.include # 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 + post-extract: @${ECHO_MSG} "===> ----------------------------------------------" @${ECHO_MSG} "===> Make sure that squid runs under user squid" Modified: head/www/rt38/Makefile ============================================================================== --- head/www/rt38/Makefile Sat Sep 14 14:43:12 2013 (r327291) +++ head/www/rt38/Makefile Sat Sep 14 14:47:56 2013 (r327292) @@ -40,7 +40,7 @@ BUILD_DEPENDS+= ${CORE_DEPS} \ RUN_DEPENDS+= ${BUILD_DEPENDS} -USE_PERL5= yes +USES= perl5 USE_AUTOTOOLS= autoconf .include Modified: head/www/xshttpd-devel/Makefile ============================================================================== --- head/www/xshttpd-devel/Makefile Sat Sep 14 14:43:12 2013 (r327291) +++ head/www/xshttpd-devel/Makefile Sat Sep 14 14:47:56 2013 (r327292) @@ -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 Modified: head/www/xshttpd/Makefile ============================================================================== --- head/www/xshttpd/Makefile Sat Sep 14 14:43:12 2013 (r327291) +++ head/www/xshttpd/Makefile Sat Sep 14 14:47:56 2013 (r327292) @@ -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 Modified: head/www/yabb/Makefile ============================================================================== --- head/www/yabb/Makefile Sat Sep 14 14:43:12 2013 (r327291) +++ head/www/yabb/Makefile Sat Sep 14 14:47:56 2013 (r327292) @@ -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