4 files changed, 70 insertions, 65 deletions

diff --git a/www/p5-Apache/Makefile b/www/p5-Apache/Makefile
index c99422b42f14..745c01cc869f 100644
--- a/www/p5-Apache/Makefile
+++ b/www/p5-Apache/Makefile
@@ -1,25 +1,27 @@
 # New ports collection makefile for:	p5-Apache
-# Version required:			1.00b2
+# Version required:			1.07
 # Date created:				April 26th 1997
 # Whom:	      				James FitzGibbon <jfitz@FreeBSD.org>
 #
-#   $Id: Makefile,v 1.6 1997/09/14 02:53:58 jfitz Exp $
+#   $Id: Makefile,v 1.7 1997/12/04 10:54:03 asami Exp $
 #
 
-DISTNAME=	mod_perl-1.00b2
-PKGNAME=	p5-Apache-1.00b2
+DISTNAME=	mod_perl-1.07
+PKGNAME=	p5-Apache-1.07
 CATEGORIES=	www perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Apache
 
 MAINTAINER=	jfitz@FreeBSD.ORG
 
-BROKEN=		fetch
 USE_PERL5=	YES
 CONFIGURE_ENV=	PORTSDIR=${PORTSDIR} INSTALL_PROGRAM="${INSTALL_PROGRAM}"
 MAN3=		Apache.3 Apache::Constants.3  Apache::Options.3 \
 		Apache::Registry.3  Apache::Status.3  Bundle::Apache.3 \
-		Apache::Debug.3 mod_perl.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 \
+		mod_perl_tuning.3
 MANPREFIX=	${PREFIX}/lib/perl5
 
 pre-configure:
@@ -29,7 +31,7 @@ do-configure:
 		@ cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${CONFIGURE_ENV} ${PREFIX}/bin/perl Makefile.PL
 
 post-install:
-		${MKDIR} -p ${PREFIX}/share/doc/mod_perl
+		${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
 .if !defined(BATCH)
diff --git a/www/p5-Apache/distinfo b/www/p5-Apache/distinfo
index 0f242013c0c2..64ac22b899a1 100644
--- a/www/p5-Apache/distinfo
+++ b/www/p5-Apache/distinfo
@@ -1 +1 @@
-MD5 (mod_perl-1.00b2.tar.gz) = 21f4e414e8fb40a5f190cf7996230c3d
+MD5 (mod_perl-1.07.tar.gz) = fe58359304c370252d6a631f118ced3d
diff --git a/www/p5-Apache/files/patch-aa b/www/p5-Apache/files/patch-aa
index b20285e12dd0..be5daab7feb3 100644
--- a/www/p5-Apache/files/patch-aa
+++ b/www/p5-Apache/files/patch-aa
@@ -1,57 +1,47 @@
---- Makefile.PL.orig	Fri May  2 14:24:41 1997
-+++ Makefile.PL	Sun May  4 20:31:33 1997
-@@ -18,14 +18,10 @@
- # Check if knwon config
- #
+--- 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");
  
+-unless ($Is_Win32) {
+-    readline_setup();        
+-}
+-
 -eval 'use Apache::MyConfig' ;
 -
--if ($@ eq '') { 
--    $APACHE_SRC_DEFAULT = $Apache::MyConfig::Setup{Apache_Src} ; 
--}
--else {
--    $APACHE_SRC_DEFAULT = '../apache_x.x/src' ;
--}
+-$APACHE_SRC_DEFAULT = $@ ? 
+-    '../apache_x.x/src'  :
+-    $Apache::MyConfig::Setup{Apache_Src} ; 
 +opendir( WRKDIR, "$ENV{PORTSDIR}/www/apache/work" ) || die( "Can't open $ENV{PORTSDIR}/www/apache/work: $!\n" );
 +( $srcdir ) = grep( /^apache/, readdir( WRKDIR ) );
 +closedir( WRKDIR );
 +$APACHE_SRC_DEFAULT = "$ENV{PORTSDIR}/www/apache/work/" . $srcdir . "/src";
  
  my $PWD = cwd;
- 
-@@ -132,7 +128,7 @@
-     print "Enter `q' to stop search\n";
-     while(1) {
-        print "Please tell me where I can find your apache src\n" ; 
--       $src_dir = _prompt "", $APACHE_SRC_DEFAULT;
-+       $src_dir = $APACHE_SRC_DEFAULT;
-        last if $src_dir eq "q";
- 	if(-d $src_dir) {
- 	    push(@adirs, $src_dir);
-@@ -150,6 +146,7 @@
-     $httpd_h = "$adir/httpd.h";
- 
-     if (-e $httpd_h) {
-+	$APACHE_SRC = $APACHE_SRC_DEFAULT;
- 	unless($APACHE_SRC) {
- 	    $ans = _prompt "Configure mod_perl with $adir ?", "y";
- 	    next unless $ans =~ /^y$/i;
-@@ -158,7 +155,8 @@
- 	$IsBenSSL = -e "$adir/apache_ssl.c";
- 	last unless(-e $conf || -e "$conf.tmpl"); #building from 'make offsite-tar' 
- 	unless ($NO_HTTPD) {
--	    $ans = _prompt "Shall I build httpd in $adir for you?", "y";
-+	    #$ans = _prompt "Shall I build httpd in $adir for you?", "y";
-+	    $ans = "y";
- 	    ++$NO_HTTPD unless $ans =~ /^y$/i;
- 	}
- 	last if $NO_HTTPD;
-@@ -199,7 +197,7 @@
- 		system $^X, "-pi", "-e",  
- 		q{next unless /EXTRA_CFLAGS\s*=/;}.
-  	        q{next if /mod_perl/; chomp; }.
--		qq{\$_ .= q: -DSERVER_SUBVERSION=\\"mod_perl/$VERSION\\"\n:;},
-+		qq{\$_ .= q: \n-DSERVER_SUBVERSION=\\"mod_perl/$VERSION\\" \\\n:;},
- 			$conf;
- 	    }
- 
+ my %SSL = (
+@@ -109,11 +104,11 @@
+ $EVERYTHING = 0;
+ $PERL_STATIC_EXTS = "";
+ $Port = $PORT = 8529;
+-$DO_HTTPD = $ENV{DO_HTTPD} || 0;
++$DO_HTTPD = 1;
+ $NO_HTTPD = $ENV{NO_HTTPD} || 0;
+ $PERL_TRACE = 0;
+ $ALL_HOOKS  = 0;
+-$APACHE_SRC = "";
++$APACHE_SRC = $APACHE_SRC_DEFAULT;
+ $PERL_SECTIONS = 0;
+ $PERL_SSI = 0;
+ $ADD_VERSION = 1;
+@@ -912,8 +907,8 @@
+     my $sro = 1 if $mmn >= 19970825;
+     my $inc;
+     my $ccopts = ccopts();
+-    my $dssv = "-DSERVER_SUBVERSION";
+-    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; 
diff --git a/www/p5-Apache/pkg-plist b/www/p5-Apache/pkg-plist
index dea219b5f07d..f4918ceba92a 100644
--- a/www/p5-Apache/pkg-plist
+++ b/www/p5-Apache/pkg-plist
@@ -1,30 +1,43 @@
 sbin/httpd_modperl
 share/doc/mod_perl/post-install-notes
-lib/perl5/man/man3/Apache::Debug.3.gz
 lib/perl5/man/man3/Apache.3.gz
+lib/perl5/man/man3/Apache::SIG.3.gz
 lib/perl5/man/man3/Apache::Constants.3.gz
+lib/perl5/man/man3/Apache::Debug.3.gz
+lib/perl5/man/man3/Apache::Include.3.gz
 lib/perl5/man/man3/Apache::Options.3.gz
+lib/perl5/man/man3/Apache::PerlSections.3.gz
 lib/perl5/man/man3/Apache::Registry.3.gz
+lib/perl5/man/man3/Apache::RegistryLoader.3.gz
+lib/perl5/man/man3/Apache::Resource.3.gz
+lib/perl5/man/man3/Apache::StatINC.3.gz
 lib/perl5/man/man3/Apache::Status.3.gz
 lib/perl5/man/man3/Bundle::Apache.3.gz
+lib/perl5/man/man3/cgi_to_mod_perl.3.gz
 lib/perl5/man/man3/mod_perl.3.gz
+lib/perl5/man/man3/mod_perl_traps.3.gz
+lib/perl5/man/man3/mod_perl_tuning.3.gz
 lib/perl5/site_perl/Apache.pm
-lib/perl5/site_perl/Apache/CGI.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/i386-freebsd/auto/Apache/Constants/Constants.bs
-lib/perl5/site_perl/i386-freebsd/auto/Apache/Constants/Constants.so
-lib/perl5/site_perl/i386-freebsd/auto/Apache/Apache.bs
-lib/perl5/site_perl/i386-freebsd/auto/Apache/Apache.so
+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/i386-freebsd/auto/Apache/Constants
-@dirrm lib/perl5/site_perl/i386-freebsd/auto/Apache
-@dirrm lib/perl5/site_perl/Bundle
 @dirrm lib/perl5/site_perl/Apache