o Fix for Perl5.

o Upgrade to v1.19.

No response for 24 hours from:	maintainer

(sorry, jfitz!)

4 files changed, 137 insertions, 62 deletions

diff --git a/www/p5-Apache/Makefile b/www/p5-Apache/Makefile
index 14d0e9c3e308..bd07b5390530 100644
--- a/www/p5-Apache/Makefile
+++ b/www/p5-Apache/Makefile
@@ -1,13 +1,13 @@
 # New ports collection makefile for:	p5-Apache
-# Version required:			1.07
+# Version required:			1.19
 # Date created:				April 26th 1997
 # Whom:	      				James FitzGibbon <jfitz@FreeBSD.org>
 #
-#   $Id: Makefile,v 1.11 1998/09/15 21:31:55 asami Exp $
+# $Id: Makefile,v 1.12 1999/02/20 06:26:04 asami Exp $
 #
 
-DISTNAME=	mod_perl-1.07
-PKGNAME=	p5-Apache-1.07
+DISTNAME=	mod_perl-1.19
+PKGNAME=	p5-Apache-1.19
 CATEGORIES=	www perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Apache
@@ -16,17 +16,23 @@ MAINTAINER=	jfitz@FreeBSD.ORG
 
 BUILD_DEPENDS=	/nonexistent:${PORTSDIR}/www/apache12:patch
 
-BROKEN=		perl5 upgrade
-
 USE_PERL5=	YES
-CONFIGURE_ENV=	APACHEDIR=${WRKDIRPREFIX}${.CURDIR}/../apache12/work INSTALL_PROGRAM="${INSTALL_PROGRAM}"
-MAN3=		Apache.3 Apache::Constants.3  Apache::Options.3 \
-		Apache::Registry.3  Apache::Status.3  Bundle::Apache.3 \
+CONFIGURE_ENV=	APACHEDIR=${WRKDIRPREFIX}${.CURDIR}/../apache12/work/ INSTALL_PROGRAM="${INSTALL_PROGRAM}"
+MAN3=		Apache.3 Apache::Constants.3  Apache::ExtUtils.3 \
+		Apache::FakeRequest.3 Apache::Leak.3 \
+		Apache::Log.3 Apache::Options.3 \
+		Apache::PerlRun.3 Apache::PerlRunXS.3 \
+		Apache::RedirectLogFix.3 \
+		Apache::Registry.3 Apache::SizeLimit.3 \
+		Apache::Status.3 Apache::Symbol.3 Apache::Symdump.3 \
+		Apache::Table.3 Apache::URI.3 Apache::Util.3 \
+		Apache::httpd_conf.3 Apache::src.3 Bundle::Apache.3 \
 		Apache::Debug.3 mod_perl.3 Apache::SIG.3 Apache::Resource.3 \
 		Apache::RegistryLoader.3 Apache::StatINC.3 Apache::Include.3 \
-		Apache::PerlSections.3 cgi_to_mod_perl.3 mod_perl_traps.3 \
+		Apache::PerlSections.3 cgi_to_mod_perl.3 \
+		mod_perl_cvs.3 mod_perl_method_handlers.3 mod_perl_traps.3 \
 		mod_perl_tuning.3
-MANPREFIX=	${PREFIX}/lib/perl5
+MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
 do-configure:
 		@ cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${CONFIGURE_ENV} ${PERL5} Makefile.PL
@@ -34,7 +40,7 @@ do-configure:
 post-install:
 		${MKDIR} ${PREFIX}/share/doc/mod_perl
 		${INSTALL_DATA} ${FILESDIR}/post-install-notes ${PREFIX}/share/doc/mod_perl
-		@ ${SETENV} ${MAKE_ENV} ${CONFIGURE_ENV} /usr/bin/perl ${SCRIPTDIR}/install_httpd
+		@ ${SETENV} ${MAKE_ENV} PORTSDIR=${PORTSDIR} ${CONFIGURE_ENV} /usr/bin/perl ${SCRIPTDIR}/install_httpd
 .if !defined(BATCH)
 		@ /usr/bin/more -e ${FILESDIR}/post-install-notes
 .endif
diff --git a/www/p5-Apache/distinfo b/www/p5-Apache/distinfo
index 64ac22b899a1..93638875862b 100644
--- a/www/p5-Apache/distinfo
+++ b/www/p5-Apache/distinfo
@@ -1 +1 @@
-MD5 (mod_perl-1.07.tar.gz) = fe58359304c370252d6a631f118ced3d
+MD5 (mod_perl-1.19.tar.gz) = 721fe5245aefdffecf5f54a9c29c5938
diff --git a/www/p5-Apache/files/patch-aa b/www/p5-Apache/files/patch-aa
index 964d721a841d..394f337bc4e9 100644
--- a/www/p5-Apache/files/patch-aa
+++ b/www/p5-Apache/files/patch-aa
@@ -1,14 +1,11 @@
---- Makefile.PL.orig	Tue Dec 30 11:03:22 1997
-+++ Makefile.PL	Tue Dec 30 11:08:37 1997
-@@ -32,15 +32,10 @@
- gen_script("t/net/perl/cgi.pl");
- gen_script("t/report");
+--- Makefile.PL~	Fri Jan 22 11:57:51 1999
++++ Makefile.PL	Sun May  9 19:41:55 1999
+@@ -67,12 +67,10 @@
+ sleep(1);
+ }
  
--unless ($Is_Win32) {
--    readline_setup();        
--}
--
--eval 'use Apache::MyConfig' ;
+-%Apache::MyConfig::Setup = ();
+-eval 'require Apache::MyConfig' ;
 -
 -$APACHE_SRC_DEFAULT = $@ ? 
 -    '../apache_x.x/src'  :
@@ -19,29 +16,30 @@
 +$APACHE_SRC_DEFAULT = "$ENV{APACHEDIR}" . $srcdir . "/src";
  
  my $PWD = cwd;
- my %SSL = (
-@@ -109,11 +104,11 @@
- $EVERYTHING = 0;
- $PERL_STATIC_EXTS = "";
- $Port = $PORT = 8529;
+ 
+@@ -157,12 +155,12 @@
+ }
+ $PORT ||= $Port;
+ $TARGET = "";
 -$DO_HTTPD = $ENV{DO_HTTPD} || 0;
 +$DO_HTTPD = 1;
  $NO_HTTPD = $ENV{NO_HTTPD} || 0;
+ $PREP_HTTPD = 0;
  $PERL_TRACE = 0;
  $ALL_HOOKS  = 0;
 -$APACHE_SRC = "";
 +$APACHE_SRC = $APACHE_SRC_DEFAULT;
+ $APACHE_PREFIX = "";
+ $APACHE_HEADER_INSTALL = 1;
  $PERL_SECTIONS = 0;
- $PERL_SSI = 0;
- $ADD_VERSION = 1;
-@@ -912,8 +907,8 @@
-     my $sro = 1 if $mmn >= 19970825;
-     my $inc;
+@@ -1570,8 +1568,8 @@
+     my $repl = "";
+     my @file = ();
      my $ccopts = ccopts();
 -    my $dssv = "-DSERVER_SUBVERSION";
--    my $ssv = qq{$dssv=\\"mod_perl/$VERSION\\" };
+-    my $ssv = qq($dssv=\\"mod_perl/$VERSION\\" );
 +    my $dssv = "\n-DSERVER_SUBVERSION";
-+    my $ssv = qq{$dssv=\\"mod_perl/$VERSION\\" \\};
-     $inc = " $ccopts -I. -I../.. -DUSE_PERL_SSI" if $PERL_SSI;
- #    $inc = qq{$dssv=\\"mod_perl/$VERSION\\" } if $ADD_VERSION;
- #    $inc .= " $ccopts -I. -I../.. -DUSE_PERL_SSI" if $PERL_SSI; 
++    my $ssv = qq($dssv=\\"mod_perl/$VERSION\\" \\);
+ 
+     my $inc = " $ccopts -I. -I../.. -DUSE_PERL_SSI" if $PERL_SSI;
+     $inc .= " -DAPACHE_SSL" if is_ssl() and $PERL_SSI;
diff --git a/www/p5-Apache/pkg-plist b/www/p5-Apache/pkg-plist
index 6c485c4195e7..66c5ac93431d 100644
--- a/www/p5-Apache/pkg-plist
+++ b/www/p5-Apache/pkg-plist
@@ -1,26 +1,97 @@
 sbin/httpd_modperl
 share/doc/mod_perl/post-install-notes
-lib/perl5/site_perl/Apache.pm
-lib/perl5/site_perl/Apache/Constants.pm
-lib/perl5/site_perl/Apache/Debug.pm
-lib/perl5/site_perl/Apache/FakeRequest.pm
-lib/perl5/site_perl/Apache/Include.pm
-lib/perl5/site_perl/Apache/MyConfig.pm
-lib/perl5/site_perl/Apache/Options.pm
-lib/perl5/site_perl/Apache/PerlSections.pm
-lib/perl5/site_perl/Apache/Registry.pm
-lib/perl5/site_perl/Apache/RegistryLoader.pm
-lib/perl5/site_perl/Apache/Resource.pm
-lib/perl5/site_perl/Apache/SIG.pm
-lib/perl5/site_perl/Apache/StatINC.pm
-lib/perl5/site_perl/Apache/Status.pm
-lib/perl5/site_perl/Apache/test.pm
-lib/perl5/site_perl/Bundle/Apache.pm
-lib/perl5/site_perl/mod_perl.pm
-lib/perl5/site_perl/mod_perl.pod
-lib/perl5/site_perl/mod_perl_traps.pod
-lib/perl5/site_perl/mod_perl_tuning.pod
-lib/perl5/site_perl/cgi_to_mod_perl.pod
-lib/perl5/site_perl/i386-freebsd/auto/mod_perl/.packlist
-@dirrm lib/perl5/site_perl/i386-freebsd/auto/mod_perl
-@dirrm lib/perl5/site_perl/Apache
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/Connection.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/Constants/Exports.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/Constants.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/Debug.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/ExtUtils.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/FakeRequest.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/File.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/Include.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/Leak.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/Log.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/ModuleConfig.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/MyConfig.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/Opcode.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/Options.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/PerlRun.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/PerlRunXS.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/PerlSections.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/RedirectLogFix.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/Registry.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/RegistryBB.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/RegistryNG.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/RegistryLoader.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/Resource.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/SIG.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/Server.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/SizeLimit.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/StatINC.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/Status.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/Symbol.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/Symdump.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/Table.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/URI.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/Util.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/httpd_conf.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/src.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/test.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Bundle/Apache.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/mod_perl.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/mod_perl.pod
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/mod_perl_cvs.pod
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/mod_perl_hooks.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/mod_perl_hooks.pm.PL
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/mod_perl_method_handlers.pod
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/mod_perl_traps.pod
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/mod_perl_tuning.pod
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/cgi_to_mod_perl.pod
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/mod_perl/.packlist
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/Leak/Leak.bs
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/Leak/Leak.so
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/Symbol/Symbol.bs
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/Symbol/Symbol.so
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/include/alloc.h
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/include/buff.h
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/include/conf.h
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/include/explain.h
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/include/http_conf_globals.h
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/include/http_config.h
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/include/http_core.h
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/include/http_log.h
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/include/http_main.h
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/include/http_protocol.h
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/include/http_request.h
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/include/httpd.h
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/include/md5.h
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/include/mod_rewrite.h
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/include/modules/perl/mod_perl.h
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/include/modules/perl/mod_perl_version.h
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/include/modules/perl/mod_perl_xs.h
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/include/modules/perl/perl_PL.h
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/include/modules/proxy/mod_proxy.h
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/include/regex/cclass.h
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/include/regex/cname.h
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/include/regex/regex.h
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/include/regex/regex2.h
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/include/regex/utils.h
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/include/rfc1413.h
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/include/scoreboard.h
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/include/util_date.h
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/include/util_md5.h
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/include/util_script.h
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/typemap
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/Leak
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/Symbol
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/include/modules/perl
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/include/modules/proxy
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/include/modules
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/include/regex
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/include
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/mod_perl
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/Constants
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Bundle
+@dirrm share/doc/mod_perl