updated for Apache2

7 files changed, 98 insertions, 30 deletions

diff --git a/dev-perl/mod_perl/ChangeLog b/dev-perl/mod_perl/ChangeLog
index df2be1283170..51884c0c5ecc 100644
--- a/dev-perl/mod_perl/ChangeLog
+++ b/dev-perl/mod_perl/ChangeLog
@@ -1,23 +1,24 @@
-# ChangeLog for dev-perlmod_perlChangeLog/
+# ChangeLog for dev-perl/mod_perl
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/mod_perl/ChangeLog,v 1.9 2002/10/30 07:20:41 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/mod_perl/ChangeLog,v 1.10 2002/11/29 11:22:37 woodchip Exp $
 
-  29 Oct 2002; Seemant Kulleen <seemant@gentoo.org> ChangeLog  :
+*mod_perl-1.99.07 (29 Nov 2002)
+
+  29 Nov 2002; Donny Davies <woodchip@gentoo.org> :
+  New development version for Apache2.
 
+  29 Oct 2002; Seemant Kulleen <seemant@gentoo.org> ChangeLog  :
   forced version bump to install into correct locations
-# ChangeLog for dev-perl/mod_perl
 
 *mod_perl-1.27 (20 Jun 2002)
 
   15 Sep 2002; Ryan Phillips <rphillips@gentoo.org> mod_perl-1.27.ebuild :
-
   Added libwww-perl depedency... Hopefully fixes #7867
 
   9 Sep 2002; <mcummings@gentoo.org> mod_perl-1.27.ebuild :
   Corrected build syntax
 
   1 Aug 2002; Calum Selkirk <cselkirk@gentoo.org> mod_perl-1.27.ebuild :
-
   Added ppc to KEYWORDS.
 
   20 Jun 2002; Thilo Bangert <bangert@gentoo.org> mod_perl-1.27.ebuild :
@@ -25,25 +26,12 @@
 
 *mod_perl-1.26 (7 May 2002)
 
-
 *mod_perl-1.25-r2 (9 Apr 2002)
 
   9 Apr 2002; Donny Davies <woodchip@gentoo.org> :
-
   Small updates to fit in with the reworked apache package.
 
 *mod_perl-1.25-r1 (27 Mar 2002)
 
   27 Mar 2002; Seemant Kulleen <seemant@gentoo.org> mod_perl-1.25-r1.ebuild :
-
   Updated the ebuild to new syntax, and ungzipped HTML documentation.
-
-*mod_perl-1.25 (1 Feb 2002)
-
-  1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
-  
-  Added initial ChangeLog which should be updated whenever the package is
-  updated in any way. This changelog is targetted to users. This means that the
-  comments should well explained and written in clean English. The details about
-  writing correct changelogs are explained in the skel.ChangeLog file which you
-  can find in the root directory of the portage repository.
diff --git a/dev-perl/mod_perl/files/75_mod_perl.conf b/dev-perl/mod_perl/files/75_mod_perl.conf
new file mode 100644
index 000000000000..4933e9af9fef
--- /dev/null
+++ b/dev-perl/mod_perl/files/75_mod_perl.conf
@@ -0,0 +1,11 @@
+<IfDefine PERL>
+  <IfModule !mod_perl.c>
+    LoadModule perl_module    extramodules/mod_perl.so
+  </IfModule>
+</IfDefine>
+
+<IfModule mod_perl.c>
+  #PerlTrace all
+  PerlRequire "/etc/apache2/conf/modules.d/apache2-mod_perl-startup.pl"
+</ifModule>
+
diff --git a/dev-perl/mod_perl/files/apache2-mod_perl-startup.pl b/dev-perl/mod_perl/files/apache2-mod_perl-startup.pl
new file mode 100644
index 000000000000..8e8fca3b24f5
--- /dev/null
+++ b/dev-perl/mod_perl/files/apache2-mod_perl-startup.pl
@@ -0,0 +1,26 @@
+use Apache2 ();
+
+use lib qw(/home/httpd/perl);
+
+# enable if the mod_perl 1.0 compatibility is needed
+#use Apache::compat ();
+
+use ModPerl::Util (); #for CORE::GLOBAL::exit
+
+use Apache::RequestRec ();
+use Apache::RequestIO ();
+use Apache::RequestUtil ();
+
+use Apache::Server ();
+use Apache::ServerUtil ();
+use Apache::Connection ();
+use Apache::Log ();
+
+use APR::Table ();
+
+use ModPerl::Registry ();
+
+use Apache::Const -compile => ':common';
+use APR::Const -compile => ':common';
+
+1;
diff --git a/dev-perl/mod_perl/files/digest-mod_perl-1.99.07 b/dev-perl/mod_perl/files/digest-mod_perl-1.99.07
new file mode 100644
index 000000000000..637a088a1473
--- /dev/null
+++ b/dev-perl/mod_perl/files/digest-mod_perl-1.99.07
@@ -0,0 +1 @@
+MD5 cef4f00716487e2ccdb23a5dea4b46e1 mod_perl-1.99_07.tar.bz2 524555
diff --git a/dev-perl/mod_perl/mod_perl-1.27-r1.ebuild b/dev-perl/mod_perl/mod_perl-1.27-r1.ebuild
index 2e64cb92feaf..39f30563770c 100644
--- a/dev-perl/mod_perl/mod_perl-1.27-r1.ebuild
+++ b/dev-perl/mod_perl/mod_perl-1.27-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/mod_perl/mod_perl-1.27-r1.ebuild,v 1.1 2002/10/30 07:20:41 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/mod_perl/mod_perl-1.27-r1.ebuild,v 1.2 2002/11/29 11:22:37 woodchip Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="A Perl Module for Apache"
@@ -11,9 +11,7 @@ SLOT="0"
 LICENSE="Apache-1.1 as-is"
 KEYWORDS="x86 ppc sparc sparc64 alpha"
 
-DEPEND="sys-devel/perl
-		dev-perl/libwww-perl
-		>=net-www/apache-1.3.24-r1"
+DEPEND="sys-devel/perl dev-perl/libwww-perl =net-www/apache-1*"
 
 src_compile() {
 	perl Makefile.PL USE_APXS=1 \
@@ -42,7 +40,7 @@ src_install () {
 
 pkg_postinst() {
 	einfo
-	einfo "Execute ebuild /var/db/pkg/${CATEGORY}/${PF}/${PF}.ebuild config"
+	einfo "Execute \"ebuild /var/db/pkg/${CATEGORY}/${PF}/${PF}.ebuild config\""
 	einfo "to have your apache.conf auto-updated for use with this module."
 	einfo "You should then edit your /etc/conf.d/apache file to suit."
 	einfo
@@ -53,6 +51,5 @@ pkg_config() {
 		${ROOT}/etc/apache/conf/apache.conf \
 		extramodules/libperl.so mod_perl.c perl_module \
 		define=PERL
-
 	:;
 }
diff --git a/dev-perl/mod_perl/mod_perl-1.27.ebuild b/dev-perl/mod_perl/mod_perl-1.27.ebuild
index b7d26df51385..67bf2e632472 100644
--- a/dev-perl/mod_perl/mod_perl-1.27.ebuild
+++ b/dev-perl/mod_perl/mod_perl-1.27.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/mod_perl/mod_perl-1.27.ebuild,v 1.10 2002/10/17 16:43:15 bjb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/mod_perl/mod_perl-1.27.ebuild,v 1.11 2002/11/29 11:22:37 woodchip Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="A Perl Module for Apache"
@@ -10,10 +10,7 @@ HOMEPAGE="http://perl.apache.org"
 SLOT="0"
 LICENSE="Apache-1.1 as-is"
 KEYWORDS="x86 ppc sparc sparc64 alpha"
-
-DEPEND="sys-devel/perl
-		dev-perl/libwww-perl
-		>=net-www/apache-1.3.24-r1"
+DEPEND="sys-devel/perl dev-perl/libwww-perl =net-www/apache-1*"
 
 src_compile() {
 	perl Makefile.PL USE_APXS=1 \
diff --git a/dev-perl/mod_perl/mod_perl-1.99.07.ebuild b/dev-perl/mod_perl/mod_perl-1.99.07.ebuild
new file mode 100644
index 000000000000..82b200a821cb
--- /dev/null
+++ b/dev-perl/mod_perl/mod_perl-1.99.07.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/mod_perl/mod_perl-1.99.07.ebuild,v 1.1 2002/11/29 11:22:37 woodchip Exp $
+
+DESCRIPTION="An embedded Perl interpreter for Apache2"
+HOMEPAGE="http://perl.apache.org/"
+
+NEWP="${PN}-1.99_07"
+S=${WORKDIR}/${NEWP}
+SRC_URI="mirror://gentoo/${NEWP}.tar.bz2"
+DEPEND="sys-devel/perl =net-www/apache-2*"
+LICENSE="GPL-2"
+KEYWORDS="~x86"
+IUSE=""
+SLOT="0"
+
+src_compile() {
+	perl Makefile.PL \
+		PREFIX=${D}/usr \
+		MP_TRACE=1 \
+		MP_DEBUG=1 \
+		MP_AP_PREFIX=/usr \
+		MP_USE_DSO=1 \
+		MP_INST_APACHE2=1 \
+		MP_APXS=/usr/sbin/apxs2  \
+		CCFLAGS="${CFLAGS} -fPIC" \
+		INSTALLDIRS=vendor </dev/null || die
+
+	emake || die
+	#make test
+}
+
+src_install() {
+	dodir /usr/lib/apache2-extramodules
+	make install \
+		MODPERL_AP_LIBEXECDIR=${D}/usr/lib/apache2-extramodules \
+		MP_INST_APACHE2=1 \
+		INSTALLDIRS=vendor || die
+
+	insinto /etc/apache2/conf/modules.d
+	doins ${FILESDIR}/75_mod_perl.conf \
+		${FILESDIR}/apache2-mod_perl-startup.pl
+
+	dodoc ${FILESDIR}/75_mod_perl.conf Changes \
+		INSTALL LICENSE README STATUS
+	cp -a docs ${D}/usr/share/doc/${PF}
+	cp -a todo ${D}/usr/share/doc/${PF}
+}