-update to 1.99.8.

 This makes it compile with apache-2.0.44.
-make doc installation more robust against reinstalls
-make apache dependency a "full" one -- I don't see what the buildlink
 files' default is good for...

3 files changed, 30 insertions, 20 deletions

diff --git a/www/ap2-perl/Makefile b/www/ap2-perl/Makefile
index 99f493bf316..69a1cf16f45 100644
--- a/www/ap2-perl/Makefile
+++ b/www/ap2-perl/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.3 2002/11/19 23:22:41 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2003/02/03 20:18:03 drochner Exp $
 #
 # NOTE: This package is *BETA*.  If it doesn't work, then check the
 #	modperl-2.0 mailing lists for help.
 
-DISTNAME=		mod_perl-1.99_07
-PKGNAME=		ap2-perl-1.99.7
+DISTNAME=		mod_perl-1.99_08
+PKGNAME=		ap2-perl-1.99.8
 CATEGORIES=		www perl5
 MASTER_SITES=		http://perl.apache.org/dist/
 
@@ -15,11 +15,15 @@ COMMENT=		Module that embeds a Perl interpreter into Apache
 USE_BUILDLINK2=		# defined
 PERL5_REQD=		5.6.0
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/mod_perl/.packlist
+BUILDLINK_DEPMETHOD.apache=	full
 
 MAKE_PARAMS+=		MP_APXS=${APXS}
 
+MODPERLDOCSDIR=	${PREFIX}/share/doc/html/mod_perl
+
 post-install:
-	${CP} -R ${WRKSRC}/docs ${PREFIX}/share/doc/html/mod_perl
+	${INSTALL_DATA_DIR} ${MODPERLDOCSDIR}
+	${CP} -R ${WRKSRC}/docs/* ${MODPERLDOCSDIR}
 
 .include "../../lang/perl5/module.mk"
 .include "../../www/apache2/buildlink2.mk"
diff --git a/www/ap2-perl/PLIST b/www/ap2-perl/PLIST
index 645aa2fb432..932116a1929 100644
--- a/www/ap2-perl/PLIST
+++ b/www/ap2-perl/PLIST
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.2 2002/11/19 23:22:41 jlam Exp $
+@comment $NetBSD: PLIST,v 1.3 2003/02/03 20:18:03 drochner Exp $
 lib/httpd/mod_perl.so
+lib/perl5/5.6.1/${MACHINE_ARCH}-${LOWER_OPSYS}/perllocal.pod
 share/doc/html/mod_perl/TODO
 share/doc/html/mod_perl/api/AUTOGENERATION
 share/doc/html/mod_perl/api/ModPerl-Registry/ModPerl/PerlRun.pod
@@ -24,23 +25,30 @@ share/doc/html/mod_perl/api/mod_perl-2.0/pm_to_blib
 share/doc/html/mod_perl/config.cfg
 share/doc/html/mod_perl/devel/Changes.pod
 share/doc/html/mod_perl/devel/config.cfg
-share/doc/html/mod_perl/devel/core_explained/core_explained.pod
-share/doc/html/mod_perl/devel/debug_c/debug_c.pod
-share/doc/html/mod_perl/devel/debug_perl/debug_perl.pod
+share/doc/html/mod_perl/devel/core/apache_integration.pod
+share/doc/html/mod_perl/devel/core/coding_style.pod
+share/doc/html/mod_perl/devel/core/explained.pod
+share/doc/html/mod_perl/devel/core/mpms.pod
+share/doc/html/mod_perl/devel/debug/c.pod
+share/doc/html/mod_perl/devel/debug/perl.pod
 share/doc/html/mod_perl/devel/help/help.pod
-share/doc/html/mod_perl/devel/modperl_style/modperl_style.pod
-share/doc/html/mod_perl/devel/perf_sizeof/perf_sizeof.pod
+share/doc/html/mod_perl/devel/performance/size_matters.pod
+share/doc/html/mod_perl/devel/performance/speed_matters.pod
 share/doc/html/mod_perl/devel/porting/porting.pod
 share/doc/html/mod_perl/os/config.cfg
 share/doc/html/mod_perl/os/win32/Changes.pod
 share/doc/html/mod_perl/os/win32/config.cfg
 share/doc/html/mod_perl/os/win32/config.pod
+share/doc/html/mod_perl/os/win32/distinstall
+share/doc/html/mod_perl/os/win32/faq.pod
 share/doc/html/mod_perl/os/win32/install.pod
+share/doc/html/mod_perl/os/win32/mpinstall
 share/doc/html/mod_perl/user/Changes.pod
 share/doc/html/mod_perl/user/coding/coding.pod
 share/doc/html/mod_perl/user/compat/compat.pod
 share/doc/html/mod_perl/user/config.cfg
 share/doc/html/mod_perl/user/config/config.pod
+share/doc/html/mod_perl/user/config/custom.pod
 share/doc/html/mod_perl/user/design/design.pod
 share/doc/html/mod_perl/user/handlers/bucket_brigades.dia
 share/doc/html/mod_perl/user/handlers/bucket_brigades.gif
@@ -49,6 +57,7 @@ share/doc/html/mod_perl/user/handlers/connection_cycle.dia
 share/doc/html/mod_perl/user/handlers/connection_cycle.gif
 share/doc/html/mod_perl/user/handlers/connection_cycle.png
 share/doc/html/mod_perl/user/handlers/filters.pod
+share/doc/html/mod_perl/user/handlers/general.pod
 share/doc/html/mod_perl/user/handlers/http.pod
 share/doc/html/mod_perl/user/handlers/http_cycle.dia
 share/doc/html/mod_perl/user/handlers/http_cycle.gif
@@ -61,11 +70,10 @@ share/doc/html/mod_perl/user/handlers/server_life_cycle.gif
 share/doc/html/mod_perl/user/handlers/server_life_cycle.png
 share/doc/html/mod_perl/user/help/help.pod
 share/doc/html/mod_perl/user/install/install.pod
+share/doc/html/mod_perl/user/intro/overview.pod
 share/doc/html/mod_perl/user/intro/start_fast.pod
-share/doc/html/mod_perl/user/overview/overview.pod
 share/doc/html/mod_perl/user/troubleshooting/troubleshooting.pod
 @dirrm share/doc/html/mod_perl/user/troubleshooting
-@dirrm share/doc/html/mod_perl/user/overview
 @dirrm share/doc/html/mod_perl/user/intro
 @dirrm share/doc/html/mod_perl/user/install
 @dirrm share/doc/html/mod_perl/user/help
@@ -78,12 +86,10 @@ share/doc/html/mod_perl/user/troubleshooting/troubleshooting.pod
 @dirrm share/doc/html/mod_perl/os/win32
 @dirrm share/doc/html/mod_perl/os
 @dirrm share/doc/html/mod_perl/devel/porting
-@dirrm share/doc/html/mod_perl/devel/perf_sizeof
-@dirrm share/doc/html/mod_perl/devel/modperl_style
+@dirrm share/doc/html/mod_perl/devel/performance
 @dirrm share/doc/html/mod_perl/devel/help
-@dirrm share/doc/html/mod_perl/devel/debug_perl
-@dirrm share/doc/html/mod_perl/devel/debug_c
-@dirrm share/doc/html/mod_perl/devel/core_explained
+@dirrm share/doc/html/mod_perl/devel/debug
+@dirrm share/doc/html/mod_perl/devel/core
 @dirrm share/doc/html/mod_perl/devel
 @dirrm share/doc/html/mod_perl/api/mod_perl-2.0/Apache
 @dirrm share/doc/html/mod_perl/api/mod_perl-2.0/APR
diff --git a/www/ap2-perl/distinfo b/www/ap2-perl/distinfo
index e644af955a8..f8656ad84b3 100644
--- a/www/ap2-perl/distinfo
+++ b/www/ap2-perl/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1 2002/11/19 23:23:11 jlam Exp $
+$NetBSD: distinfo,v 1.2 2003/02/03 20:18:03 drochner Exp $
 
-SHA1 (mod_perl-1.99_07.tar.gz) = fb39dbbc77577c220a5b9b9112a50e2cadefc90d
-Size (mod_perl-1.99_07.tar.gz) = 610901 bytes
+SHA1 (mod_perl-1.99_08.tar.gz) = 3789332cfe9625209a67aece7443aa37d6d4a61b
+Size (mod_perl-1.99_08.tar.gz) = 653469 bytes