From owner-svn-ports-head@FreeBSD.ORG Sun Dec 7 19:19:18 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 55272A7F; Sun, 7 Dec 2014 19:19:18 +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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 40139876; Sun, 7 Dec 2014 19:19:18 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sB7JJIGB069551; Sun, 7 Dec 2014 19:19:18 GMT (envelope-from ohauer@FreeBSD.org) Received: (from ohauer@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sB7JJH7P069545; Sun, 7 Dec 2014 19:19:17 GMT (envelope-from ohauer@FreeBSD.org) Message-Id: <201412071919.sB7JJH7P069545@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ohauer set sender to ohauer@FreeBSD.org using -f From: Olli Hauer Date: Sun, 7 Dec 2014 19:19:17 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r374222 - head/www/mod_perl2 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.18-1 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: Sun, 07 Dec 2014 19:19:18 -0000 Author: ohauer Date: Sun Dec 7 19:19:16 2014 New Revision: 374222 URL: https://svnweb.freebsd.org/changeset/ports/374222 QAT: https://qat.redports.org/buildarchive/r374222/ Log: - update apache24 patch to upstream r1638352 - sort pkg-plist to match new makeplist output - cleanup dirrm in pkg-plist Changes: - Don't call modperl_threaded_mpm() et al. from XS code #765174. Modified: head/www/mod_perl2/Makefile head/www/mod_perl2/distinfo head/www/mod_perl2/pkg-plist Modified: head/www/mod_perl2/Makefile ============================================================================== --- head/www/mod_perl2/Makefile Sun Dec 7 18:58:05 2014 (r374221) +++ head/www/mod_perl2/Makefile Sun Dec 7 19:19:16 2014 (r374222) @@ -3,7 +3,7 @@ PORTNAME= mod_perl PORTVERSION= 2.0.8 -PORTREVISION= 3 +PORTREVISION= 4 PORTEPOCH= 3 CATEGORIES= www perl5 MASTER_SITES= APACHE/perl @@ -35,7 +35,7 @@ USE_CSTD= gnu89 .if ${APACHE_VERSION} > 22 # patch shaped against upstream mod_perl # Last Changed Rev: 1602105 -PATCHREV= 1618150 +PATCHREV= 1638352 PATCHFILES+= ${PORTNAME}-${PORTVERSION}-r${PATCHREV}.diff.gz PLIST_SUB+= AP24="" PMSED= 's/%AP24%//' Modified: head/www/mod_perl2/distinfo ============================================================================== --- head/www/mod_perl2/distinfo Sun Dec 7 18:58:05 2014 (r374221) +++ head/www/mod_perl2/distinfo Sun Dec 7 19:19:16 2014 (r374222) @@ -1,4 +1,4 @@ SHA256 (mod_perl-2.0.8.tar.gz) = 35dc1b7a40a90a395ce88bba2df84f22289975f34d1757de6d715560c20a20e6 SIZE (mod_perl-2.0.8.tar.gz) = 3790026 -SHA256 (mod_perl-2.0.8-r1618150.diff.gz) = 7ce5f40a72f8779e09465aba7328947c3490976a6269783d4d6cf95830d2b350 -SIZE (mod_perl-2.0.8-r1618150.diff.gz) = 142858 +SHA256 (mod_perl-2.0.8-r1638352.diff.gz) = abb4dfe56939759c2466f268ae6425e305b80d60528bce03de8fe2745349835f +SIZE (mod_perl-2.0.8-r1638352.diff.gz) = 146749 Modified: head/www/mod_perl2/pkg-plist ============================================================================== --- head/www/mod_perl2/pkg-plist Sun Dec 7 18:58:05 2014 (r374221) +++ head/www/mod_perl2/pkg-plist Sun Dec 7 19:19:16 2014 (r374222) @@ -51,99 +51,6 @@ 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 -%%AP24%%%%PERL5_MAN3%%/MyTest::Util.3.gz -%%PERL5_MAN3%%/mod_perl2.3.gz %%SITE_ARCH%%/APR.pm %%SITE_ARCH%%/APR/Base64.pm %%SITE_ARCH%%/APR/Brigade.pm @@ -334,9 +241,100 @@ bin/mp2bug %%AP24%%%%SITE_ARCH%%/auto/ModPerl/TiPoolConfig/TiPoolConfig.so %%SITE_ARCH%%/auto/ModPerl/Util/Util.so %%SITE_ARCH%%/mod_perl2.pm +%%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 +%%AP24%%%%PERL5_MAN3%%/MyTest::Util.3.gz +%%PERL5_MAN3%%/mod_perl2.3.gz @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 %%APACHEINCLUDEDIR%%/modules/perl -@dirrmtry %%APACHEINCLUDEDIR%%/modules