[csw-devel] SF.net SVN: gar:[8515] csw/mgar/pkg/cpan/mod_perl/trunk
bensons at users.sourceforge.net
bensons at users.sourceforge.net
Fri Feb 12 12:51:21 CET 2010
Revision: 8515
http://gar.svn.sourceforge.net/gar/?rev=8515&view=rev
Author: bensons
Date: 2010-02-12 11:51:21 +0000 (Fri, 12 Feb 2010)
Log Message:
-----------
cpan mod_perl: bumped version, adjusted GAR recipe
Modified Paths:
--------------
csw/mgar/pkg/cpan/mod_perl/trunk/Makefile
csw/mgar/pkg/cpan/mod_perl/trunk/checksums
Added Paths:
-----------
csw/mgar/pkg/cpan/mod_perl/trunk/files/patch-apaci-Makefile.tmpl
Removed Paths:
-------------
csw/mgar/pkg/cpan/mod_perl/trunk/files/CSWmodperl.depend
csw/mgar/pkg/cpan/mod_perl/trunk/files/CSWmodperl.gspec
csw/mgar/pkg/cpan/mod_perl/trunk/files/CSWmodperl.postinstall
csw/mgar/pkg/cpan/mod_perl/trunk/files/CSWmodperl.preremove
csw/mgar/pkg/cpan/mod_perl/trunk/files/CSWmodperl.prototype
csw/mgar/pkg/cpan/mod_perl/trunk/files/CSWmodperl.space
csw/mgar/pkg/cpan/mod_perl/trunk/files/apxsinstall.diff
Modified: csw/mgar/pkg/cpan/mod_perl/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/mod_perl/trunk/Makefile 2010-02-12 11:17:18 UTC (rev 8514)
+++ csw/mgar/pkg/cpan/mod_perl/trunk/Makefile 2010-02-12 11:51:21 UTC (rev 8515)
@@ -1,5 +1,5 @@
GARNAME = mod_perl
-GARVERSION = 1.29
+GARVERSION = 1.31
CATEGORIES = cpan
AUTHOR = GOZER
@@ -12,12 +12,13 @@
an external interpreter and the penalty of Perl start-up time.
endef
-pkgfiles = prototype depend postinstall preremove space
-DISTFILES += $(call admfiles,CSWmodperl,$(pkgfiles))
-DISTFILES += test.pl README
+PACKAGES = CSWmodperl
+CATALOGNAME = mod_perl
+RUNTIME_DEP_PKGS = CSWapache CSWbdb
+
# Disable installation of module using apxs
-PATCHFILES += apxsinstall.diff
+PATCHFILES += patch-apaci-Makefile.tmpl
CONFIGURE_ARGS = USE_APXS=1
CONFIGURE_ARGS += WITH_APXS=$(prefix)/apache/bin/apxs
@@ -26,6 +27,7 @@
PERL_CONFIGURE_ARGS = INSTALLSITEARCH=$(prefix)/apache/lib/perl
PERL_CONFIGURE_ARGS += INSTALLSITEMAN3DIR=$(prefix)/apache/man/man3
+# PERL_CONFIGURE_ARGS += LIBS=-lpthread
INSTALL_SCRIPTS = custom
@@ -33,18 +35,14 @@
install-custom:
( cd $(WORKSRC) ; $(INSTALL_ENV) make install DESTDIR=$(DESTDIR) )
- @$(MAKECOOKIE)
-
-post-install:
- install -d $(DESTDIR)$(docdir)/mod_perl
- install -m 0644 \
- $(WORKDIR)/README $(DESTDIR)$(docdir)/mod_perl
- install -d $(DESTDIR)$(prefix)/apache/perl
- install -m 0755 \
- $(WORKDIR)/test.pl $(DESTDIR)$(prefix)/apache/perl
- install -d $(DESTDIR)$(prefix)/apache/libexec
+ ginstall -d $(DESTDIR)$(docdir)/mod_perl
+ ginstall -m 0644 \
+ $(FILEDIR)/README $(DESTDIR)$(docdir)/mod_perl
+ ginstall -d $(DESTDIR)$(prefix)/apache/perl
+ ginstall -m 0755 \
+ $(FILEDIR)/test.pl $(DESTDIR)$(prefix)/apache/perl
+ ginstall -d $(DESTDIR)$(prefix)/apache/libexec
strip $(WORKSRC)/apaci/libperl.so
- install -m 0755 \
+ ginstall -m 0755 \
$(WORKSRC)/apaci/libperl.so $(DESTDIR)$(prefix)/apache/libexec
@$(MAKECOOKIE)
-
Modified: csw/mgar/pkg/cpan/mod_perl/trunk/checksums
===================================================================
--- csw/mgar/pkg/cpan/mod_perl/trunk/checksums 2010-02-12 11:17:18 UTC (rev 8514)
+++ csw/mgar/pkg/cpan/mod_perl/trunk/checksums 2010-02-12 11:51:21 UTC (rev 8515)
@@ -1,10 +1,2 @@
-ca9fc075c55baa19a49c97e4083f4c0f download/CSWmodperl.gspec
-c8a2791741f027064eb34d9819eeff24 download/CSWmodperl.prototype
-c74adeeec1d3f5ecbae9418eff99768e download/CSWmodperl.depend
-50cbcbae4d19c84243acd5073a5f4f64 download/CSWmodperl.postinstall
-40fe2a410077319379155bdd75a8e5d9 download/CSWmodperl.preremove
-0dd379f20ceb32fc77bb3a9bf045097f download/CSWmodperl.space
-5fe7d67173c18f73424e47f00d9e97eb download/test.pl
-6541df2fd21f00a2e607e9e48687a0f5 download/README
-1491931790509b9af06fc037d02b0e7a download/mod_perl-1.29.tar.gz
-25626caea63515487503db7275ab6130 download/apxsinstall.diff
+d2188bf500e9f00cd78dc97c3fbf6b97 mod_perl-1.31.tar.gz
+26f984ee99ba623370d19335d9a6b9ac patch-apaci-Makefile.tmpl
Deleted: csw/mgar/pkg/cpan/mod_perl/trunk/files/CSWmodperl.depend
===================================================================
--- csw/mgar/pkg/cpan/mod_perl/trunk/files/CSWmodperl.depend 2010-02-12 11:17:18 UTC (rev 8514)
+++ csw/mgar/pkg/cpan/mod_perl/trunk/files/CSWmodperl.depend 2010-02-12 11:51:21 UTC (rev 8515)
@@ -1 +0,0 @@
-P CSWapache apache - apache webserver with mod_ssl included
Deleted: csw/mgar/pkg/cpan/mod_perl/trunk/files/CSWmodperl.gspec
===================================================================
--- csw/mgar/pkg/cpan/mod_perl/trunk/files/CSWmodperl.gspec 2010-02-12 11:17:18 UTC (rev 8514)
+++ csw/mgar/pkg/cpan/mod_perl/trunk/files/CSWmodperl.gspec 2010-02-12 11:51:21 UTC (rev 8515)
@@ -1,4 +0,0 @@
-%var bitname mod_perl
-%var pkgname CSWmodperl
-%include url file://%{PKGLIB}/csw_dyndepend.gspec
-%copyright url file://%{WORKSRC}/LICENSE
Deleted: csw/mgar/pkg/cpan/mod_perl/trunk/files/CSWmodperl.postinstall
===================================================================
--- csw/mgar/pkg/cpan/mod_perl/trunk/files/CSWmodperl.postinstall 2010-02-12 11:17:18 UTC (rev 8514)
+++ csw/mgar/pkg/cpan/mod_perl/trunk/files/CSWmodperl.postinstall 2010-02-12 11:51:21 UTC (rev 8515)
@@ -1,42 +0,0 @@
-#!/bin/sh
-
-AP_ROOT=$PKG_ROOT_DIR/opt/csw/apache
-AP_CONF=$AP_ROOT/conf/httpd.conf
-AP_LIBEXEC=$AP_ROOT/libexec
-APXS=$AP_ROOT/bin/apxs
-
-# Look for "AddModule perl_module" or some variant thereof
-[ -z "`grep perl_module $AP_CONF`" ] && exit 0
-
-# Back up the existing config
-cp $AP_CONF $AP_CONF.pre-perl
-
-# Enable the perl module
-chroot ${PKG_ROOT_DIR:-'/'} \
- $APXS -S LIBEXECDIR=$AP_LIBEXEC -e -a -n perl libperl.so
-
-cat >>$CONFFILE <<END
-
-# Added by $PKGINST
-<IfModule mod_perl.c>
- PerlModule Apache::Registry
- Alias /perl/ /opt/csw/apache/perl/
- <Location /perl>
- SetHandler perl-script
- PerlHandler Apache::Registry
- PerlSendHeader On
- Options +ExecCGI
- </Location>
-</IfModule>
-END
-
-# Finito
-cat <<END
-
-NOTICE: mod_perl is enabled in httpd.conf but the server was not restarted.
-Please examine your mod_perl configuration and restart apache.
-
-END
-
-exit 0
-
Deleted: csw/mgar/pkg/cpan/mod_perl/trunk/files/CSWmodperl.preremove
===================================================================
--- csw/mgar/pkg/cpan/mod_perl/trunk/files/CSWmodperl.preremove 2010-02-12 11:17:18 UTC (rev 8514)
+++ csw/mgar/pkg/cpan/mod_perl/trunk/files/CSWmodperl.preremove 2010-02-12 11:51:21 UTC (rev 8515)
@@ -1,21 +0,0 @@
-#!/bin/sh
-
-AP_ROOT=$PKG_ROOT_DIR/opt/csw/apache
-AP_CONF=$AP_ROOT/conf/httpd.conf
-AP_LIBEXEC=$AP_ROOT/libexec
-APXS=$AP_ROOT/bin/apxs
-
-# Enable the perl module
-chroot ${PKG_ROOT_DIR:-'/'} \
- $APXS -S LIBEXECDIR=$AP_LIBEXEC -e -A -n perl libperl.so
-
-# Finito
-cat <<END
-
-NOTICE: mod_perl is disabled in httpd.conf but the server was not restarted.
-Please examine your configuration and restart apache.
-
-END
-
-exit 0
-
Deleted: csw/mgar/pkg/cpan/mod_perl/trunk/files/CSWmodperl.prototype
===================================================================
--- csw/mgar/pkg/cpan/mod_perl/trunk/files/CSWmodperl.prototype 2010-02-12 11:17:18 UTC (rev 8514)
+++ csw/mgar/pkg/cpan/mod_perl/trunk/files/CSWmodperl.prototype 2010-02-12 11:51:21 UTC (rev 8515)
@@ -1,121 +0,0 @@
-d none /opt/csw/apache 0755 root bin
-d none /opt/csw/apache/lib 0755 root bin
-d none /opt/csw/apache/lib/perl 0755 root bin
-d none /opt/csw/apache/lib/perl/Apache 0755 root bin
-f none /opt/csw/apache/lib/perl/Apache.pm 0444 root bin
-f none /opt/csw/apache/lib/perl/Apache/Connection.pm 0444 root bin
-d none /opt/csw/apache/lib/perl/Apache/Constants 0755 root bin
-f none /opt/csw/apache/lib/perl/Apache/Constants.pm 0444 root bin
-f none /opt/csw/apache/lib/perl/Apache/Constants/Exports.pm 0444 root bin
-f none /opt/csw/apache/lib/perl/Apache/Debug.pm 0444 root bin
-f none /opt/csw/apache/lib/perl/Apache/ExtUtils.pm 0444 root bin
-f none /opt/csw/apache/lib/perl/Apache/FakeRequest.pm 0444 root bin
-f none /opt/csw/apache/lib/perl/Apache/File.pm 0444 root bin
-f none /opt/csw/apache/lib/perl/Apache/Include.pm 0444 root bin
-f none /opt/csw/apache/lib/perl/Apache/Leak.pm 0444 root bin
-f none /opt/csw/apache/lib/perl/Apache/Log.pm 0444 root bin
-f none /opt/csw/apache/lib/perl/Apache/ModuleConfig.pm 0444 root bin
-f none /opt/csw/apache/lib/perl/Apache/MyConfig.pm 0444 root bin
-f none /opt/csw/apache/lib/perl/Apache/Opcode.pm 0444 root bin
-f none /opt/csw/apache/lib/perl/Apache/Options.pm 0444 root bin
-f none /opt/csw/apache/lib/perl/Apache/PerlRun.pm 0444 root bin
-f none /opt/csw/apache/lib/perl/Apache/PerlRunXS.pm 0555 root bin
-f none /opt/csw/apache/lib/perl/Apache/PerlSections.pm 0444 root bin
-f none /opt/csw/apache/lib/perl/Apache/RedirectLogFix.pm 0444 root bin
-f none /opt/csw/apache/lib/perl/Apache/Registry.pm 0444 root bin
-f none /opt/csw/apache/lib/perl/Apache/RegistryBB.pm 0444 root bin
-f none /opt/csw/apache/lib/perl/Apache/RegistryLoader.pm 0444 root bin
-f none /opt/csw/apache/lib/perl/Apache/RegistryNG.pm 0444 root bin
-f none /opt/csw/apache/lib/perl/Apache/Resource.pm 0444 root bin
-f none /opt/csw/apache/lib/perl/Apache/SIG.pm 0444 root bin
-f none /opt/csw/apache/lib/perl/Apache/Server.pm 0444 root bin
-f none /opt/csw/apache/lib/perl/Apache/SizeLimit.pm 0444 root bin
-f none /opt/csw/apache/lib/perl/Apache/StatINC.pm 0444 root bin
-f none /opt/csw/apache/lib/perl/Apache/Status.pm 0444 root bin
-f none /opt/csw/apache/lib/perl/Apache/Symbol.pm 0444 root bin
-f none /opt/csw/apache/lib/perl/Apache/Symdump.pm 0444 root bin
-f none /opt/csw/apache/lib/perl/Apache/Table.pm 0444 root bin
-f none /opt/csw/apache/lib/perl/Apache/URI.pm 0444 root bin
-f none /opt/csw/apache/lib/perl/Apache/Util.pm 0444 root bin
-f none /opt/csw/apache/lib/perl/Apache/httpd_conf.pm 0444 root bin
-f none /opt/csw/apache/lib/perl/Apache/src.pm 0444 root bin
-f none /opt/csw/apache/lib/perl/Apache/testold.pm 0444 root bin
-d none /opt/csw/apache/lib/perl/Bundle 0755 root bin
-f none /opt/csw/apache/lib/perl/Bundle/Apache.pm 0444 root bin
-d none /opt/csw/apache/lib/perl/auto 0755 root bin
-d none /opt/csw/apache/lib/perl/auto/Apache 0755 root bin
-d none /opt/csw/apache/lib/perl/auto/Apache/Leak 0755 root bin
-f none /opt/csw/apache/lib/perl/auto/Apache/Leak/Leak.bs 0444 root bin
-f none /opt/csw/apache/lib/perl/auto/Apache/Leak/Leak.so 0555 root bin
-d none /opt/csw/apache/lib/perl/auto/Apache/Symbol 0755 root bin
-f none /opt/csw/apache/lib/perl/auto/Apache/Symbol/Symbol.bs 0444 root bin
-f none /opt/csw/apache/lib/perl/auto/Apache/Symbol/Symbol.so 0555 root bin
-d none /opt/csw/apache/lib/perl/auto/Apache/include 0755 root bin
-f none /opt/csw/apache/lib/perl/auto/Apache/include/ap_config_auto.h 0444 root bin
-d none /opt/csw/apache/lib/perl/auto/Apache/include/modules 0755 root bin
-d none /opt/csw/apache/lib/perl/auto/Apache/include/modules/perl 0755 root bin
-f none /opt/csw/apache/lib/perl/auto/Apache/include/modules/perl/apache_inc.h 0444 root bin
-f none /opt/csw/apache/lib/perl/auto/Apache/include/modules/perl/mod_perl.h 0444 root bin
-f none /opt/csw/apache/lib/perl/auto/Apache/include/modules/perl/mod_perl_version.h 0444 root bin
-f none /opt/csw/apache/lib/perl/auto/Apache/include/modules/perl/mod_perl_xs.h 0444 root bin
-f none /opt/csw/apache/lib/perl/auto/Apache/include/modules/perl/perl_PL.h 0444 root bin
-f none /opt/csw/apache/lib/perl/auto/Apache/mod_perl.exp 0444 root bin
-f none /opt/csw/apache/lib/perl/auto/Apache/typemap 0444 root bin
-d none /opt/csw/apache/lib/perl/auto/mod_perl 0755 root bin
-f none /opt/csw/apache/lib/perl/auto/mod_perl/.packlist 0644 root bin
-f none /opt/csw/apache/lib/perl/cgi_to_mod_perl.pod 0444 root bin
-f none /opt/csw/apache/lib/perl/mod_perl.pm 0444 root bin
-f none /opt/csw/apache/lib/perl/mod_perl.pod 0444 root bin
-f none /opt/csw/apache/lib/perl/mod_perl_cvs.pod 0444 root bin
-f none /opt/csw/apache/lib/perl/mod_perl_hooks.pm.PL 0444 root bin
-f none /opt/csw/apache/lib/perl/mod_perl_hooks.pm 0444 root bin
-f none /opt/csw/apache/lib/perl/mod_perl_method_handlers.pod 0444 root bin
-f none /opt/csw/apache/lib/perl/mod_perl_traps.pod 0444 root bin
-f none /opt/csw/apache/lib/perl/mod_perl_tuning.pod 0444 root bin
-d none /opt/csw/apache/libexec 0755 root bin
-f none /opt/csw/apache/libexec/libperl.so 0755 root bin
-d none /opt/csw/apache/man 0755 root bin
-d none /opt/csw/apache/man/man3 0755 root bin
-f none /opt/csw/apache/man/man3/Apache.3perl 0444 root bin
-f none /opt/csw/apache/man/man3/Apache::Constants.3perl 0444 root bin
-f none /opt/csw/apache/man/man3/Apache::Debug.3perl 0444 root bin
-f none /opt/csw/apache/man/man3/Apache::ExtUtils.3perl 0444 root bin
-f none /opt/csw/apache/man/man3/Apache::FakeRequest.3perl 0444 root bin
-f none /opt/csw/apache/man/man3/Apache::File.3perl 0444 root bin
-f none /opt/csw/apache/man/man3/Apache::Include.3perl 0444 root bin
-f none /opt/csw/apache/man/man3/Apache::Leak.3perl 0444 root bin
-f none /opt/csw/apache/man/man3/Apache::Log.3perl 0444 root bin
-f none /opt/csw/apache/man/man3/Apache::MyConfig.3perl 0444 root bin
-f none /opt/csw/apache/man/man3/Apache::Options.3perl 0444 root bin
-f none /opt/csw/apache/man/man3/Apache::PerlRun.3perl 0444 root bin
-f none /opt/csw/apache/man/man3/Apache::PerlRunXS.3perl 0444 root bin
-f none /opt/csw/apache/man/man3/Apache::PerlSections.3perl 0444 root bin
-f none /opt/csw/apache/man/man3/Apache::RedirectLogFix.3perl 0444 root bin
-f none /opt/csw/apache/man/man3/Apache::Registry.3perl 0444 root bin
-f none /opt/csw/apache/man/man3/Apache::RegistryLoader.3perl 0444 root bin
-f none /opt/csw/apache/man/man3/Apache::Resource.3perl 0444 root bin
-f none /opt/csw/apache/man/man3/Apache::SIG.3perl 0444 root bin
-f none /opt/csw/apache/man/man3/Apache::SizeLimit.3perl 0444 root bin
-f none /opt/csw/apache/man/man3/Apache::StatINC.3perl 0444 root bin
-f none /opt/csw/apache/man/man3/Apache::Status.3perl 0444 root bin
-f none /opt/csw/apache/man/man3/Apache::Symbol.3perl 0444 root bin
-f none /opt/csw/apache/man/man3/Apache::Symdump.3perl 0444 root bin
-f none /opt/csw/apache/man/man3/Apache::Table.3perl 0444 root bin
-f none /opt/csw/apache/man/man3/Apache::URI.3perl 0444 root bin
-f none /opt/csw/apache/man/man3/Apache::Util.3perl 0444 root bin
-f none /opt/csw/apache/man/man3/Apache::httpd_conf.3perl 0444 root bin
-f none /opt/csw/apache/man/man3/Apache::src.3perl 0444 root bin
-f none /opt/csw/apache/man/man3/Apache::testold.3perl 0444 root bin
-f none /opt/csw/apache/man/man3/Bundle::Apache.3perl 0444 root bin
-f none /opt/csw/apache/man/man3/cgi_to_mod_perl.3perl 0444 root bin
-f none /opt/csw/apache/man/man3/mod_perl.3perl 0444 root bin
-f none /opt/csw/apache/man/man3/mod_perl_cvs.3perl 0444 root bin
-f none /opt/csw/apache/man/man3/mod_perl_method_handlers.3perl 0444 root bin
-f none /opt/csw/apache/man/man3/mod_perl_traps.3perl 0444 root bin
-f none /opt/csw/apache/man/man3/mod_perl_tuning.3perl 0444 root bin
-d none /opt/csw/apache/perl 0755 root bin
-f none /opt/csw/apache/perl/test.pl 0755 root bin
-d none /opt/csw/share 0755 root bin
-d none /opt/csw/share/doc 0755 root bin
-d none /opt/csw/share/doc/mod_perl 0755 root bin
-f none /opt/csw/share/doc/mod_perl/README 0644 root bin
Deleted: csw/mgar/pkg/cpan/mod_perl/trunk/files/CSWmodperl.space
===================================================================
--- csw/mgar/pkg/cpan/mod_perl/trunk/files/CSWmodperl.space 2010-02-12 11:17:18 UTC (rev 8514)
+++ csw/mgar/pkg/cpan/mod_perl/trunk/files/CSWmodperl.space 2010-02-12 11:51:21 UTC (rev 8515)
@@ -1 +0,0 @@
-$BASEDIR 4
Deleted: csw/mgar/pkg/cpan/mod_perl/trunk/files/apxsinstall.diff
===================================================================
--- csw/mgar/pkg/cpan/mod_perl/trunk/files/apxsinstall.diff 2010-02-12 11:17:18 UTC (rev 8514)
+++ csw/mgar/pkg/cpan/mod_perl/trunk/files/apxsinstall.diff 2010-02-12 11:51:21 UTC (rev 8515)
@@ -1,14 +0,0 @@
-diff --speed-large-files --minimal -Nru mod_perl-1.29.orig/apaci/Makefile.tmpl mod_perl-1.29/apaci/Makefile.tmpl
---- mod_perl-1.29.orig/apaci/Makefile.tmpl 2006-02-14 12:22:21.132759000 -0500
-+++ mod_perl-1.29/apaci/Makefile.tmpl 2006-02-14 12:22:09.239018000 -0500
-@@ -93,8 +93,8 @@
- $(MP_RM) $(MP_DISTCLEAN_FILES)
-
- # FOR STAND-ALONE BUILDING ONLY
--install:
-- $(APXS) -i -a -n perl libperl.so
-+install:
-+# $(APXS) -i -a -n perl libperl.so
-
- depend:
- cp Makefile.tmpl Makefile.tmpl.bak \
Added: csw/mgar/pkg/cpan/mod_perl/trunk/files/patch-apaci-Makefile.tmpl
===================================================================
--- csw/mgar/pkg/cpan/mod_perl/trunk/files/patch-apaci-Makefile.tmpl (rev 0)
+++ csw/mgar/pkg/cpan/mod_perl/trunk/files/patch-apaci-Makefile.tmpl 2010-02-12 11:51:21 UTC (rev 8515)
@@ -0,0 +1,11 @@
+--- mod_perl-1.31.orig/apaci/Makefile.tmpl 2008-02-26 09:43:35.000000000 +0100
++++ mod_perl-1.31/apaci/Makefile.tmpl 2010-02-12 12:09:05.448774019 +0100
+@@ -94,7 +94,7 @@
+
+ # FOR STAND-ALONE BUILDING ONLY
+ install:
+- $(APXS) -i -a -n perl libperl.$(LIBEXT)
++ # $(APXS) -i -a -n perl libperl.$(LIBEXT)
+
+ depend:
+ cp Makefile.tmpl Makefile.tmpl.bak \
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list