From owner-svn-ports-head@FreeBSD.ORG Sat Dec 28 11:25:44 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 ESMTPS id 7037CB45; Sat, 28 Dec 2013 11:25:44 +0000 (UTC) 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 5B7BF1558; Sat, 28 Dec 2013 11:25:44 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBSBPi5a061765; Sat, 28 Dec 2013 11:25:44 GMT (envelope-from ohauer@svn.freebsd.org) Received: (from ohauer@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBSBPhWB061762; Sat, 28 Dec 2013 11:25:43 GMT (envelope-from ohauer@svn.freebsd.org) Message-Id: <201312281125.rBSBPhWB061762@svn.freebsd.org> From: Olli Hauer Date: Sat, 28 Dec 2013 11:25:43 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r337856 - in head/www: libapreq2 p5-libapreq2 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.17 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, 28 Dec 2013 11:25:44 -0000 Author: ohauer Date: Sat Dec 28 11:25:43 2013 New Revision: 337856 URL: http://svnweb.freebsd.org/changeset/ports/337856 Log: - add stage support Modified: head/www/libapreq2/Makefile head/www/libapreq2/pkg-plist head/www/p5-libapreq2/Makefile Modified: head/www/libapreq2/Makefile ============================================================================== --- head/www/libapreq2/Makefile Sat Dec 28 11:23:04 2013 (r337855) +++ head/www/libapreq2/Makefile Sat Dec 28 11:25:43 2013 (r337856) @@ -11,11 +11,12 @@ MASTER_SITE_SUBDIR=libapreq MAINTAINER= apache@FreeBSD.org COMMENT= Generic Apache2 Request Library +LICENSE= AL2 + USE_APACHE= 22+ USE_GMAKE= yes USE_LDCONFIG= yes USE_AUTOTOOLS= autoconf libtool -NO_STAGE= yes CONFIGURE_ARGS+= --with-apache2-apxs=${APXS} --with-expat=${LOCALBASE} MAKE_ENV+= MAKE=${GMAKE} ## MakeMaker blows it without this @@ -23,33 +24,21 @@ MAKE_ENV+= MAKE=${GMAKE} ## MakeMake SHLIB_MAJOR= 11 PLIST_SUB= SHLIB_MAJOR="${SHLIB_MAJOR}" +# www/p5-libapreq2 .if defined (WITH_MODPERL2) -PKGNAMEPREFIX+= p5- +PLIST_SUB+= WITH_MODPERL2="" +PKGNAMEPREFIX= p5- +USES+= perl5 P5_APREQ_DEPENDS+= ${APACHE_PKGNAMEPREFIX}mod_perl2>=0:${PORTSDIR}/www/mod_perl2 \ p5-ExtUtils-XSBuilder>=0:${PORTSDIR}/devel/p5-ExtUtils-XSBuilder \ p5-Parse-RecDescent>=0:${PORTSDIR}/devel/p5-Parse-RecDescent + BUILD_DEPENDS+= ${P5_APREQ_DEPENDS} RUN_DEPENDS+= ${P5_APREQ_DEPENDS} -USES+= perl5 CONFIGURE_ARGS+= --enable-perl-glue --with-perl=${PERL5} -MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VER} -MAN3= APR::Request.3 \ - APR::Request::Apache2.3 \ - APR::Request::CGI.3 \ - APR::Request::Cookie.3 \ - APR::Request::Error.3 \ - APR::Request::Hook.3 \ - APR::Request::Param.3 \ - APR::Request::Parser.3 \ - Apache2::Cookie.3 \ - Apache2::Upload.3 \ - Apache2::Request.3 - -PLIST_SUB+= WITH_MODPERL2="" - post-patch: @${REINPLACE_CMD} -i '' -e "s!%%APACHEINCLUDEDIR%%!${APACHEINCLUDEDIR}!" \ ${WRKSRC}/glue/perl/Makefile.PL Modified: head/www/libapreq2/pkg-plist ============================================================================== --- head/www/libapreq2/pkg-plist Sat Dec 28 11:23:04 2013 (r337855) +++ head/www/libapreq2/pkg-plist Sat Dec 28 11:25:43 2013 (r337856) @@ -12,9 +12,17 @@ lib/libapreq2.a lib/libapreq2.la lib/libapreq2.so lib/libapreq2.so.%%SHLIB_MAJOR%% -%%APACHEMODDIR%%/mod_apreq2.a -%%APACHEMODDIR%%/mod_apreq2.la -%%APACHEMODDIR%%/mod_apreq2.so +%%WITH_MODPERL2%%%%PERL5_MAN3%%/APR::Request.3.gz +%%WITH_MODPERL2%%%%PERL5_MAN3%%/APR::Request::Apache2.3.gz +%%WITH_MODPERL2%%%%PERL5_MAN3%%/APR::Request::CGI.3.gz +%%WITH_MODPERL2%%%%PERL5_MAN3%%/APR::Request::Cookie.3.gz +%%WITH_MODPERL2%%%%PERL5_MAN3%%/APR::Request::Error.3.gz +%%WITH_MODPERL2%%%%PERL5_MAN3%%/APR::Request::Hook.3.gz +%%WITH_MODPERL2%%%%PERL5_MAN3%%/APR::Request::Param.3.gz +%%WITH_MODPERL2%%%%PERL5_MAN3%%/APR::Request::Parser.3.gz +%%WITH_MODPERL2%%%%PERL5_MAN3%%/Apache2::Cookie.3.gz +%%WITH_MODPERL2%%%%PERL5_MAN3%%/Apache2::Request.3.gz +%%WITH_MODPERL2%%%%PERL5_MAN3%%/Apache2::Upload.3.gz %%WITH_MODPERL2%%%%SITE_PERL%%/%%PERL_ARCH%%/APR/Request.pm %%WITH_MODPERL2%%%%SITE_PERL%%/%%PERL_ARCH%%/APR/Request.pod %%WITH_MODPERL2%%%%SITE_PERL%%/%%PERL_ARCH%%/APR/Request/Apache2.pm @@ -25,8 +33,8 @@ lib/libapreq2.so.%%SHLIB_MAJOR%% %%WITH_MODPERL2%%%%SITE_PERL%%/%%PERL_ARCH%%/APR/Request/Cookie.pod %%WITH_MODPERL2%%%%SITE_PERL%%/%%PERL_ARCH%%/APR/Request/Error.pm %%WITH_MODPERL2%%%%SITE_PERL%%/%%PERL_ARCH%%/APR/Request/Error.pod -%%WITH_MODPERL2%%%%SITE_PERL%%/%%PERL_ARCH%%/APR/Request/Hook.pod %%WITH_MODPERL2%%%%SITE_PERL%%/%%PERL_ARCH%%/APR/Request/Hook.pm +%%WITH_MODPERL2%%%%SITE_PERL%%/%%PERL_ARCH%%/APR/Request/Hook.pod %%WITH_MODPERL2%%%%SITE_PERL%%/%%PERL_ARCH%%/APR/Request/Param.pm %%WITH_MODPERL2%%%%SITE_PERL%%/%%PERL_ARCH%%/APR/Request/Param.pod %%WITH_MODPERL2%%%%SITE_PERL%%/%%PERL_ARCH%%/APR/Request/Parser.pm @@ -42,27 +50,29 @@ lib/libapreq2.so.%%SHLIB_MAJOR%% %%WITH_MODPERL2%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/Cookie/Cookie.so %%WITH_MODPERL2%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/Error/Error.bs %%WITH_MODPERL2%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/Error/Error.so -%%WITH_MODPERL2%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/Hook/Hook.so %%WITH_MODPERL2%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/Hook/Hook.bs +%%WITH_MODPERL2%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/Hook/Hook.so %%WITH_MODPERL2%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/Param/Param.bs %%WITH_MODPERL2%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/Param/Param.so -%%WITH_MODPERL2%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/Parser/Parser.so %%WITH_MODPERL2%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/Parser/Parser.bs +%%WITH_MODPERL2%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/Parser/Parser.so %%WITH_MODPERL2%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/Request.bs %%WITH_MODPERL2%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/Request.so -%%WITH_MODPERL2%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/libapreq2/.packlist -%%WITH_MODPERL2%%@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/APR/Request/ -%%WITH_MODPERL2%%@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/APR/ -%%WITH_MODPERL2%%@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Apache2/ -%%WITH_MODPERL2%%@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/Apache2/ -%%WITH_MODPERL2%%@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/CGI/ -%%WITH_MODPERL2%%@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/Cookie/ -%%WITH_MODPERL2%%@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/Error/ -%%WITH_MODPERL2%%@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/Hook/ -%%WITH_MODPERL2%%@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/Param/ -%%WITH_MODPERL2%%@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/Parser/ -%%WITH_MODPERL2%%@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/ +%%APACHEMODDIR%%/mod_apreq2.a +%%APACHEMODDIR%%/mod_apreq2.la +%%APACHEMODDIR%%/mod_apreq2.so %%WITH_MODPERL2%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/libapreq2 +%%WITH_MODPERL2%%@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/Parser +%%WITH_MODPERL2%%@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/Param +%%WITH_MODPERL2%%@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/Hook +%%WITH_MODPERL2%%@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/Error +%%WITH_MODPERL2%%@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/Cookie +%%WITH_MODPERL2%%@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/CGI +%%WITH_MODPERL2%%@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/Apache2 +%%WITH_MODPERL2%%@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request +%%WITH_MODPERL2%%@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Apache2 +%%WITH_MODPERL2%%@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/APR/Request +%%WITH_MODPERL2%%@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/APR +@dirrm include/apreq2 @dirrm %%APACHEINCLUDEDIR%%/apreq2 @dirrmtry %%APACHEINCLUDEDIR%% -@dirrm include/apreq2 Modified: head/www/p5-libapreq2/Makefile ============================================================================== --- head/www/p5-libapreq2/Makefile Sat Dec 28 11:23:04 2013 (r337855) +++ head/www/p5-libapreq2/Makefile Sat Dec 28 11:25:43 2013 (r337856) @@ -11,5 +11,4 @@ MASTERDIR= ${.CURDIR}/../libapreq2 WITH_MODPERL2= yes MAKE_ENV+= MAKE=${GMAKE} ## MakeMaker blows it without this -NO_STAGE= yes .include "${MASTERDIR}/Makefile"