Update www/ap2-perl to 1.99.7. Changes from version 1.99.5 include:

* Using a stable distfile instead of the daily snapshot.
* add $r->add_config method to add dynamic configuration at request time
* add Apache::DIR_MAGIC_TYPE constant
* add support for directive handlers
* add Apache::Server->add_config method to add dynamic configuration at
  server startup time
* add Apache::Directive->to_string method
* add support for pluggable <Perl> sections
* fix the filehandle leak in APR::PerlIO
* fix compilation if apache/apr do not have thread support

4 files changed, 117 insertions, 31 deletions

diff --git a/www/ap2-perl/MESSAGE b/www/ap2-perl/MESSAGE
index 781921cbc3f..95fe4898e31 100644
--- a/www/ap2-perl/MESSAGE
+++ b/www/ap2-perl/MESSAGE
@@ -1,10 +1,18 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.2 2002/09/24 12:30:51 wiz Exp $
+$NetBSD: MESSAGE,v 1.3 2002/11/19 23:22:40 jlam Exp $
 
 In order to enable mod_perl in your Apache installation, you need to add
 the following to your httpd.conf file:
 
-  LoadModule perl_module lib/httpd/mod_perl.so
+	LoadModule perl_module lib/httpd/mod_perl.so
+
+To enable the mod_perl-1.0 compatibility API, you will also need:
+
+	PerlModule Apache::compat
+
+Please also refer to the documentation in:
+
+	${PREFIX}/share/doc/html/mod_perl/user/compat
 
 If switching to/from a server with and without mod_perl enabled, you
 should NOT use "apachectl restart" - instead, fully stop and then start
diff --git a/www/ap2-perl/Makefile b/www/ap2-perl/Makefile
index a9fe1d68e64..99f493bf316 100644
--- a/www/ap2-perl/Makefile
+++ b/www/ap2-perl/Makefile
@@ -1,45 +1,27 @@
-# $NetBSD: Makefile,v 1.2 2002/07/17 10:31:38 martti Exp $
-#
-# This package tracks a snapshot of modperl-2.0 that is updated every 6
-# hours.  To update to the latest snapshot, simply change DISTNAME to
-# point to the correct distfile at ${MASTER_SITES}.  The PKGNAME is taken
-# from ${WRKSRC}/STATUS.
+# $NetBSD: Makefile,v 1.3 2002/11/19 23:22:41 jlam Exp $
 #
 # NOTE: This package is *BETA*.  If it doesn't work, then check the
 #	modperl-2.0 mailing lists for help.
 
-DISTNAME=		modperl-2.0_20020717042359
-PKGNAME=		ap2-perl-1.99.5
-WRKSRC=			${WRKDIR}/modperl-2.0
+DISTNAME=		mod_perl-1.99_07
+PKGNAME=		ap2-perl-1.99.7
 CATEGORIES=		www perl5
-MASTER_SITES=		http://cvs.apache.org/snapshots/modperl-2.0/
+MASTER_SITES=		http://perl.apache.org/dist/
 
 MAINTAINER=		jlam@netbsd.org
 HOMEPAGE=		http://perl.apache.org/
 COMMENT=		Module that embeds a Perl interpreter into Apache
 
-DEPENDS+=		apache>=2.0.39:../../www/apache2
-
-# This section should be removed when modperl-2.0 is released.
-RESTRICTED=		"Changes frequently; fetch from master site."
-NO_SRC_ON_FTP=		${RESTRICTED}
-NO_CHECKSUM=		# defined
-
-USE_BUILDLINK_ONLY=	# defined
-USE_PERL5=		# defined
+USE_BUILDLINK2=		# defined
 PERL5_REQD=		5.6.0
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/mod_perl/.packlist
 
-MAKE_PARAMS+=		MP_APXS=${LOCALBASE}/sbin/apxs
+MAKE_PARAMS+=		MP_APXS=${APXS}
 
-do-configure:
-	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL ${MAKE_PARAMS}
+post-install:
+	${CP} -R ${WRKSRC}/docs ${PREFIX}/share/doc/html/mod_perl
 
-post-configure:
-	for file in ${WRKSRC}/xs/modperl_xs_typedefs.h; do		\
-		${MV} -f $${file} $${file}.orig;			\
-		${GREP}	-v "apr_thread_mutex_t"				\
-			$${file}.orig > $${file};			\
-	done
+.include "../../lang/perl5/module.mk"
+.include "../../www/apache2/buildlink2.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/ap2-perl/PLIST b/www/ap2-perl/PLIST
index 4339a9bafe2..645aa2fb432 100644
--- a/www/ap2-perl/PLIST
+++ b/www/ap2-perl/PLIST
@@ -1,2 +1,94 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/06/28 07:40:29 jlam Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/11/19 23:22:41 jlam Exp $
 lib/httpd/mod_perl.so
+share/doc/html/mod_perl/TODO
+share/doc/html/mod_perl/api/AUTOGENERATION
+share/doc/html/mod_perl/api/ModPerl-Registry/ModPerl/PerlRun.pod
+share/doc/html/mod_perl/api/ModPerl-Registry/ModPerl/Registry.pod
+share/doc/html/mod_perl/api/ModPerl-Registry/ModPerl/RegistryBB.pod
+share/doc/html/mod_perl/api/ModPerl-Registry/ModPerl/RegistryCooker.pod
+share/doc/html/mod_perl/api/ModPerl-Registry/ModPerl/RegistryLoader.pod
+share/doc/html/mod_perl/api/README
+share/doc/html/mod_perl/api/config.cfg
+share/doc/html/mod_perl/api/index_bot.html
+share/doc/html/mod_perl/api/mod_perl-2.0/APR/PerlIO.pod
+share/doc/html/mod_perl/api/mod_perl-2.0/APR/Table.pod
+share/doc/html/mod_perl/api/mod_perl-2.0/Apache/Log.pod
+share/doc/html/mod_perl/api/mod_perl-2.0/Apache/Reload.pod
+share/doc/html/mod_perl/api/mod_perl-2.0/Apache/RequestRec.pod
+share/doc/html/mod_perl/api/mod_perl-2.0/Apache/ServerUtil.pod
+share/doc/html/mod_perl/api/mod_perl-2.0/Apache/SubProcess.pod
+share/doc/html/mod_perl/api/mod_perl-2.0/Apache/compat.pod
+share/doc/html/mod_perl/api/mod_perl-2.0/Makefile
+share/doc/html/mod_perl/api/mod_perl-2.0/Makefile.PL
+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/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/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/install.pod
+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/design/design.pod
+share/doc/html/mod_perl/user/handlers/bucket_brigades.dia
+share/doc/html/mod_perl/user/handlers/bucket_brigades.gif
+share/doc/html/mod_perl/user/handlers/bucket_brigades.png
+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/http.pod
+share/doc/html/mod_perl/user/handlers/http_cycle.dia
+share/doc/html/mod_perl/user/handlers/http_cycle.gif
+share/doc/html/mod_perl/user/handlers/http_cycle.png
+share/doc/html/mod_perl/user/handlers/intro.pod
+share/doc/html/mod_perl/user/handlers/protocols.pod
+share/doc/html/mod_perl/user/handlers/server.pod
+share/doc/html/mod_perl/user/handlers/server_life_cycle.dia
+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/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
+@dirrm share/doc/html/mod_perl/user/handlers
+@dirrm share/doc/html/mod_perl/user/design
+@dirrm share/doc/html/mod_perl/user/config
+@dirrm share/doc/html/mod_perl/user/compat
+@dirrm share/doc/html/mod_perl/user/coding
+@dirrm share/doc/html/mod_perl/user
+@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/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
+@dirrm share/doc/html/mod_perl/api/mod_perl-2.0/Apache
+@dirrm share/doc/html/mod_perl/api/mod_perl-2.0/APR
+@dirrm share/doc/html/mod_perl/api/mod_perl-2.0
+@dirrm share/doc/html/mod_perl/api/ModPerl-Registry/ModPerl
+@dirrm share/doc/html/mod_perl/api/ModPerl-Registry
+@dirrm share/doc/html/mod_perl/api
+@dirrm share/doc/html/mod_perl
diff --git a/www/ap2-perl/distinfo b/www/ap2-perl/distinfo
new file mode 100644
index 00000000000..e644af955a8
--- /dev/null
+++ b/www/ap2-perl/distinfo
@@ -0,0 +1,4 @@
+$NetBSD: distinfo,v 1.1 2002/11/19 23:23:11 jlam Exp $
+
+SHA1 (mod_perl-1.99_07.tar.gz) = fb39dbbc77577c220a5b9b9112a50e2cadefc90d
+Size (mod_perl-1.99_07.tar.gz) = 610901 bytes