Date: Sun, 10 Nov 2013 23:11:59 +0000 (UTC) From: Olli Hauer <ohauer@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r333454 - in head/www: mod_auth_cas mod_cvs2 mod_perl2 Message-ID: <201311102311.rAANBxWS082943@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ohauer Date: Sun Nov 10 23:11:59 2013 New Revision: 333454 URL: http://svnweb.freebsd.org/changeset/ports/333454 Log: - add stage support Modified: head/www/mod_auth_cas/Makefile head/www/mod_cvs2/Makefile head/www/mod_perl2/Makefile head/www/mod_perl2/pkg-plist (contents, props changed) Modified: head/www/mod_auth_cas/Makefile ============================================================================== --- head/www/mod_auth_cas/Makefile Sun Nov 10 23:09:39 2013 (r333453) +++ head/www/mod_auth_cas/Makefile Sun Nov 10 23:11:59 2013 (r333454) @@ -16,7 +16,7 @@ COMMENT= Apache 2.x module that supports LICENSE= AL2 -LIB_DEPENDS= curl:${PORTSDIR}/ftp/curl +LIB_DEPENDS= libcurl.so:${PORTSDIR}/ftp/curl NO_WRKSUBDIR= yes @@ -26,12 +26,8 @@ AP_GENPLIST= yes AP_LIB= ${LOCALBASE}/lib AP_EXTRAS= -l ssl -l curl -NO_STAGE= yes post-extract: ${CP} ${DISTDIR}/${DIST_SUBDIR}/mod_auth_cas.c ${WRKSRC}/mod_auth_cas.c ${CP} ${DISTDIR}/${DIST_SUBDIR}/mod_auth_cas.h ${WRKSRC}/mod_auth_cas.h -post-install: - @${CAT} ${PKGMESSAGE} - .include <bsd.port.mk> Modified: head/www/mod_cvs2/Makefile ============================================================================== --- head/www/mod_cvs2/Makefile Sun Nov 10 23:09:39 2013 (r333453) +++ head/www/mod_cvs2/Makefile Sun Nov 10 23:11:59 2013 (r333454) @@ -9,10 +9,7 @@ MASTER_SITES= http://resare.com/noa/mod_ PKGNAMEPREFIX= ${APACHE_PKGNAMEPREFIX} MAINTAINER= apache@FreeBSD.org -COMMENT= A module that makes Apache 2 CVS aware - - -LATEST_LINK= mod_cvs2 +COMMENT= Module that makes Apache 2 CVS aware USE_APACHE= 22+ AP_FAST_BUILD= yes @@ -20,14 +17,11 @@ AP_GENPLIST= yes PORTDOCS= reference.html guide.html README -NO_STAGE= yes post-install: -.if !defined (NOPORTDOCS) - @${MKDIR} ${DOCSDIR}/ - @${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}/ -. for f in ${PORTDOCS:NREADME} - @${INSTALL_DATA} ${WRKSRC}/doc/${f} ${DOCSDIR}/ -. endfor -.endif + @${MKDIR} ${STAGEDIR}${DOCSDIR} + @${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR} +.for f in ${PORTDOCS:NREADME} + @${INSTALL_DATA} ${WRKSRC}/doc/${f} ${STAGEDIR}${DOCSDIR} +.endfor .include <bsd.port.mk> Modified: head/www/mod_perl2/Makefile ============================================================================== --- head/www/mod_perl2/Makefile Sun Nov 10 23:09:39 2013 (r333453) +++ head/www/mod_perl2/Makefile Sun Nov 10 23:11:59 2013 (r333454) @@ -15,7 +15,6 @@ COMMENT= Embeds a Perl interpreter in th BUILD_DEPENDS= p5-BSD-Resource>=0:${PORTSDIR}/devel/p5-BSD-Resource RUN_DEPENDS:= ${BUILD_DEPENDS} - SUB_FILES= pkg-message SUB_LIST= APACHEMODDIR=${APACHEMODDIR} USE_APACHE= 22+ @@ -23,41 +22,6 @@ USES= gmake perl5 USE_PERL5= configure USE_CSTD= gnu89 -MAN3= APR.3 APR::Base64.3 APR::Brigade.3 APR::Bucket.3 \ - APR::BucketAlloc.3 APR::BucketType.3 APR::Const.3 \ - APR::Date.3 APR::Error.3 APR::Finfo.3 APR::IpSubnet.3 \ - APR::OS.3 APR::PerlIO.3 APR::Pool.3 APR::SockAddr.3 \ - APR::Socket.3 APR::Status.3 APR::String.3 APR::Table.3 \ - APR::ThreadMutex.3 APR::URI.3 APR::UUID.3 APR::Util.3 \ - Apache2::Access.3 Apache2::Build.3 Apache2::CmdParms.3 \ - Apache2::Command.3 Apache2::Connection.3 Apache2::Const.3 \ - Apache2::Directive.3 Apache2::Filter.3 Apache2::FilterRec.3 \ - Apache2::HookRun.3 Apache2::Log.3 Apache2::MPM.3 \ - Apache2::Module.3 Apache2::PerlSections.3 Apache2::Process.3 \ - Apache2::Reload.3 \ - Apache2::RequestIO.3 Apache2::RequestRec.3 \ - Apache2::RequestUtil.3 Apache2::Resource.3 \ - Apache2::Response.3 Apache2::ServerRec.3 \ - Apache2::ServerUtil.3 Apache2::SizeLimit.3 Apache2::Status.3 \ - Apache2::SubProcess.3 Apache2::SubRequest.3 Apache2::URI.3 \ - Apache2::Util.3 Apache2::compat.3 Apache2::porting.3 \ - Apache::Reload.3 Apache::SizeLimit.3 Apache::SizeLimit::Core.3 \ - Apache::Test.3 Apache::TestConfig.3 Apache::TestHandler.3 \ - Apache::TestMB.3 Apache::TestMM.3 Apache::TestReport.3 \ - Apache::TestRequest.3 Apache::TestRun.3 Apache::TestRunPHP.3 \ - Apache::TestRunPerl.3 Apache::TestServer.3 Apache::TestSmoke.3 \ - Apache::TestTrace.3 Apache::TestUtil.3 \ - Bundle::Apache2.3 Bundle::ApacheTest.3 ModPerl::BuildMM.3 \ - ModPerl::CScan.3 ModPerl::Code.3 ModPerl::Config.3 \ - ModPerl::Const.3 ModPerl::Global.3 ModPerl::MM.3 \ - ModPerl::MethodLookup.3 ModPerl::PerlRun.3 \ - ModPerl::PerlRunPrefork.3 ModPerl::Registry.3 \ - ModPerl::RegistryBB.3 ModPerl::RegistryCooker.3 \ - ModPerl::RegistryLoader.3 ModPerl::RegistryPrefork.3 \ - ModPerl::Util.3 mod_perl2.3 Apache2::ConnectionUtil.3 \ - APR::ThreadRWLock.3 - -NO_STAGE= yes .include <bsd.port.pre.mk> .if ${APACHE_VERSION} > 22 @@ -103,19 +67,17 @@ post-configure: ${PATCH_WRKSRC}/xs/APR/APR/Makefile post-install: - ${MKDIR} ${PREFIX}/${APACHEINCLUDEDIR}/modules/perl + ${MKDIR} ${STAGEDIR}${PREFIX}/${APACHEINCLUDEDIR}/modules/perl ${INSTALL_DATA} ${WRKSRC}/src/modules/perl/*.h \ - ${PREFIX}/${APACHEINCLUDEDIR}/modules/perl - ${INSTALL_DATA} ${WRKSRC}/xs/*.h ${PREFIX}/${APACHEINCLUDEDIR} - ${INSTALL_DATA} ${WRKSRC}/xs/APR/PerlIO/*.h ${PREFIX}/${APACHEINCLUDEDIR} - ${MKDIR} ${PREFIX}/${APACHEMODDIR} + ${STAGEDIR}${PREFIX}/${APACHEINCLUDEDIR}/modules/perl + ${INSTALL_DATA} ${WRKSRC}/xs/*.h ${STAGEDIR}${PREFIX}/${APACHEINCLUDEDIR} + ${INSTALL_DATA} ${WRKSRC}/xs/APR/PerlIO/*.h ${STAGEDIR}${PREFIX}/${APACHEINCLUDEDIR} + ${MKDIR} ${STAGEDIR}${PREFIX}/${APACHEMODDIR} ${INSTALL_PROGRAM} ${WRKSRC}/src/modules/perl/mod_perl.so \ - ${PREFIX}/${APACHEMODDIR}/mod_perl.so + ${STAGEDIR}${PREFIX}/${APACHEMODDIR}/mod_perl.so - ${APXS} -e -A -n perl ${PREFIX}/${APACHEMODDIR}/mod_perl.so - @${CAT} ${PKGMESSAGE} test: build - -@(cd ${WRKSRC} && ${MAKE} test) + -@(${MAKE} test -C ${WRKSRC}) .include <bsd.port.post.mk> Modified: head/www/mod_perl2/pkg-plist ============================================================================== --- head/www/mod_perl2/pkg-plist Sun Nov 10 23:09:39 2013 (r333453) +++ head/www/mod_perl2/pkg-plist Sun Nov 10 23:11:59 2013 (r333454) @@ -51,6 +51,98 @@ bin/mp2bug %%APACHEINCLUDEDIR%%/modules/perl/modperl_trace.h %%APACHEINCLUDEDIR%%/modules/perl/modperl_types.h %%APACHEINCLUDEDIR%%/modules/perl/modperl_util.h +%%PERL5_MAN3%%/APR.3.gz +%%PERL5_MAN3%%/APR::Base64.3.gz +%%PERL5_MAN3%%/APR::Brigade.3.gz +%%PERL5_MAN3%%/APR::Bucket.3.gz +%%PERL5_MAN3%%/APR::BucketAlloc.3.gz +%%PERL5_MAN3%%/APR::BucketType.3.gz +%%PERL5_MAN3%%/APR::Const.3.gz +%%PERL5_MAN3%%/APR::Date.3.gz +%%PERL5_MAN3%%/APR::Error.3.gz +%%PERL5_MAN3%%/APR::Finfo.3.gz +%%PERL5_MAN3%%/APR::IpSubnet.3.gz +%%PERL5_MAN3%%/APR::OS.3.gz +%%PERL5_MAN3%%/APR::PerlIO.3.gz +%%PERL5_MAN3%%/APR::Pool.3.gz +%%PERL5_MAN3%%/APR::SockAddr.3.gz +%%PERL5_MAN3%%/APR::Socket.3.gz +%%PERL5_MAN3%%/APR::Status.3.gz +%%PERL5_MAN3%%/APR::String.3.gz +%%PERL5_MAN3%%/APR::Table.3.gz +%%PERL5_MAN3%%/APR::ThreadMutex.3.gz +%%PERL5_MAN3%%/APR::ThreadRWLock.3.gz +%%PERL5_MAN3%%/APR::URI.3.gz +%%PERL5_MAN3%%/APR::UUID.3.gz +%%PERL5_MAN3%%/APR::Util.3.gz +%%PERL5_MAN3%%/Apache2::Access.3.gz +%%PERL5_MAN3%%/Apache2::Build.3.gz +%%PERL5_MAN3%%/Apache2::CmdParms.3.gz +%%PERL5_MAN3%%/Apache2::Command.3.gz +%%PERL5_MAN3%%/Apache2::Connection.3.gz +%%PERL5_MAN3%%/Apache2::ConnectionUtil.3.gz +%%PERL5_MAN3%%/Apache2::Const.3.gz +%%PERL5_MAN3%%/Apache2::Directive.3.gz +%%PERL5_MAN3%%/Apache2::Filter.3.gz +%%PERL5_MAN3%%/Apache2::FilterRec.3.gz +%%PERL5_MAN3%%/Apache2::HookRun.3.gz +%%PERL5_MAN3%%/Apache2::Log.3.gz +%%PERL5_MAN3%%/Apache2::MPM.3.gz +%%PERL5_MAN3%%/Apache2::Module.3.gz +%%PERL5_MAN3%%/Apache2::PerlSections.3.gz +%%PERL5_MAN3%%/Apache2::Process.3.gz +%%PERL5_MAN3%%/Apache2::Reload.3.gz +%%PERL5_MAN3%%/Apache2::RequestIO.3.gz +%%PERL5_MAN3%%/Apache2::RequestRec.3.gz +%%PERL5_MAN3%%/Apache2::RequestUtil.3.gz +%%PERL5_MAN3%%/Apache2::Resource.3.gz +%%PERL5_MAN3%%/Apache2::Response.3.gz +%%PERL5_MAN3%%/Apache2::ServerRec.3.gz +%%PERL5_MAN3%%/Apache2::ServerUtil.3.gz +%%PERL5_MAN3%%/Apache2::SizeLimit.3.gz +%%PERL5_MAN3%%/Apache2::Status.3.gz +%%PERL5_MAN3%%/Apache2::SubProcess.3.gz +%%PERL5_MAN3%%/Apache2::SubRequest.3.gz +%%PERL5_MAN3%%/Apache2::URI.3.gz +%%PERL5_MAN3%%/Apache2::Util.3.gz +%%PERL5_MAN3%%/Apache2::compat.3.gz +%%PERL5_MAN3%%/Apache2::porting.3.gz +%%PERL5_MAN3%%/Apache::Reload.3.gz +%%PERL5_MAN3%%/Apache::SizeLimit.3.gz +%%PERL5_MAN3%%/Apache::SizeLimit::Core.3.gz +%%PERL5_MAN3%%/Apache::Test.3.gz +%%PERL5_MAN3%%/Apache::TestConfig.3.gz +%%PERL5_MAN3%%/Apache::TestHandler.3.gz +%%PERL5_MAN3%%/Apache::TestMB.3.gz +%%PERL5_MAN3%%/Apache::TestMM.3.gz +%%PERL5_MAN3%%/Apache::TestReport.3.gz +%%PERL5_MAN3%%/Apache::TestRequest.3.gz +%%PERL5_MAN3%%/Apache::TestRun.3.gz +%%PERL5_MAN3%%/Apache::TestRunPHP.3.gz +%%PERL5_MAN3%%/Apache::TestRunPerl.3.gz +%%PERL5_MAN3%%/Apache::TestServer.3.gz +%%PERL5_MAN3%%/Apache::TestSmoke.3.gz +%%PERL5_MAN3%%/Apache::TestTrace.3.gz +%%PERL5_MAN3%%/Apache::TestUtil.3.gz +%%PERL5_MAN3%%/Bundle::Apache2.3.gz +%%PERL5_MAN3%%/Bundle::ApacheTest.3.gz +%%PERL5_MAN3%%/ModPerl::BuildMM.3.gz +%%PERL5_MAN3%%/ModPerl::CScan.3.gz +%%PERL5_MAN3%%/ModPerl::Code.3.gz +%%PERL5_MAN3%%/ModPerl::Config.3.gz +%%PERL5_MAN3%%/ModPerl::Const.3.gz +%%PERL5_MAN3%%/ModPerl::Global.3.gz +%%PERL5_MAN3%%/ModPerl::MM.3.gz +%%PERL5_MAN3%%/ModPerl::MethodLookup.3.gz +%%PERL5_MAN3%%/ModPerl::PerlRun.3.gz +%%PERL5_MAN3%%/ModPerl::PerlRunPrefork.3.gz +%%PERL5_MAN3%%/ModPerl::Registry.3.gz +%%PERL5_MAN3%%/ModPerl::RegistryBB.3.gz +%%PERL5_MAN3%%/ModPerl::RegistryCooker.3.gz +%%PERL5_MAN3%%/ModPerl::RegistryLoader.3.gz +%%PERL5_MAN3%%/ModPerl::RegistryPrefork.3.gz +%%PERL5_MAN3%%/ModPerl::Util.3.gz +%%PERL5_MAN3%%/mod_perl2.3.gz %%SITE_PERL%%/%%PERL_ARCH%%/APR.pm %%SITE_PERL%%/%%PERL_ARCH%%/APR/Base64.pm %%SITE_PERL%%/%%PERL_ARCH%%/APR/Brigade.pm @@ -282,8 +374,10 @@ bin/mp2bug %%SITE_PERL%%/%%PERL_ARCH%%/auto/ModPerl/Util/Util.so %%SITE_PERL%%/%%PERL_ARCH%%/auto/mod_perl2/.packlist %%SITE_PERL%%/%%PERL_ARCH%%/mod_perl2.pm -%%APACHEMODDIR%%/mod_perl.so -@exec %D/sbin/apxs -e -A -n %%AP_NAME%% %D/%F +@unexec sed -i '' -E '/LoadModule[[:blank:]]+%%AP_NAME%%_module/d' %D/%%APACHEETCDIR%%/httpd.conf +@unexec echo "Don't forget to remove all mod_perl2-related directives in your httpd.conf" +%%APACHEMODDIR%%/%%AP_MODULE%% +@exec %D/sbin/apxs -e %%AP_MOD_EN%% -n %%AP_NAME%% %D/%F @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/mod_perl2 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/ModPerl/Util @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/ModPerl/Global @@ -350,5 +444,3 @@ bin/mp2bug @dirrm %%APACHEINCLUDEDIR%%/modules/perl @dirrmtry %%APACHEINCLUDEDIR%%/modules @dirrmtry %%APACHEINCLUDEDIR%% -@unexec sed -i '' -E '/LoadModule[[:blank:]]+%%AP_NAME%%_module/d' %D/%%APACHEETCDIR%%/httpd.conf -@unexec echo "Don't forget to remove all mod_perl2-related directives in your httpd.conf"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201311102311.rAANBxWS082943>