Update Apache pkg version number to 1.3.3.2, and fix PLIST/httpd.conf.add

a bit.

5 files changed, 30 insertions, 22 deletions

diff --git a/www/ap-perl/Makefile b/www/ap-perl/Makefile
index 33111e687d1..7d2fb0fd75e 100644
--- a/www/ap-perl/Makefile
+++ b/www/ap-perl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 1998/12/04 00:10:57 tv Exp $
+# $NetBSD: Makefile,v 1.2 1998/12/04 17:25:13 tv Exp $
 #
 
 DISTNAME=       	mod_perl-1.16
@@ -11,7 +11,8 @@ MAINTAINER=		tv@netbsd.org
 HOMEPAGE=		http://perl.apache.org/
 
 DEPENDS=		libperl-5.00404:../../lang/libperl \
-			apache-1.3.3.1:../../www/apache
+			apache-1.3.3.2:../../www/apache
+USE_PERL5=		yes
 
 post-extract:
 	@${LN} -sf ../../../Apache/typemap ${WRKSRC}/src/modules/perl/
@@ -32,13 +33,20 @@ post-build:
 		Apache.c Constants.c perlxsi.c && \
 	PERLLIBDIR=`${PREFIX}/bin/perl -MConfig -e 'print $$Config{archlibexp}'` && \
 	${PREFIX}/sbin/apxs -c -o mod_perl.so -I$$PERLLIBDIR/CORE -DMOD_PERL \
-		Apache.c Constants.c [mop]*.c $$PERLLIBDIR/DynaLoader_pic.o
+		-DPERL_TRACE Apache.c Constants.c [mop]*.c $$PERLLIBDIR/DynaLoader_pic.o
 
 post-install:
 	@cd ${WRKSRC}/src/modules/perl && ${PREFIX}/sbin/apxs -i mod_perl.so
 	${INSTALL_DATA} ${WRKSRC}/htdocs/manual/mod/mod_perl.html \
 		${PREFIX}/share/httpd/htdocs/manual/mod/
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/mod_perl
-	${INSTALL_DATA} ${FILESDIR}/httpd.conf.add ${PREFIX}/share/doc/mod_perl/
+.if exists(/usr/libexec/ld.elf_so)
+	${SED}	-e 's,@@MACHINE_ARCH@@,${MACHINE_ARCH},' \
+		-e 's,@@PERL_EXT@@,,' ${FILESDIR}/httpd.conf.add >${WRKSRC}/httpd.conf.add
+.else
+	${SED}	-e 's,@@MACHINE_ARCH@@,${MACHINE_ARCH},' \
+		-e 's,@@PERL_EXT@@,.4.4,' ${FILESDIR}/httpd.conf.add >${WRKSRC}/httpd.conf.add
+.endif
+	${INSTALL_DATA} ${WRKSRC}/httpd.conf.add ${PREFIX}/etc/httpd/httpd.conf.modperl
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/ap-perl/files/httpd.conf.add b/www/ap-perl/files/httpd.conf.add
index 806a313a0c6..9fc1a81ca6b 100644
--- a/www/ap-perl/files/httpd.conf.add
+++ b/www/ap-perl/files/httpd.conf.add
@@ -1,16 +1,16 @@
-# $NetBSD: httpd.conf.add,v 1.1.1.1 1998/12/04 00:10:57 tv Exp $
+# $NetBSD: httpd.conf.add,v 1.2 1998/12/04 17:25:13 tv Exp $
 #
 # The following should be added to the DSO (Dynamic Shared Object) portion
-# of your httpd.conf file.  Uncomment the appropriate libperl.so line, and
-# add to httpd.conf.  Starting the server should yield "mod_perl" in the
-# version string logged to error_log.
+# of your httpd.conf file.  Starting the server should yield "mod_perl" in
+# the version string logged to error_log.
+#
+# DO NOT "restart" the server when enabling or disabling mod_perl - "stop"
+# the server, and then "start" it manually.  mod_perl can cause httpd to
+# spin if httpd adds or removes mod_perl after server startup.
 #
 
-LoadFile !libm.so
-# for a.out systems:
-#LoadFile /usr/pkg/lib/perl5/alpha-netbsd/5.00404/CORE/libperl.so.4.4
-# for ELF systems:
-#LoadFile /usr/pkg/lib/perl5/alpha-netbsd/5.00404/CORE/libperl.so
+LoadFile !libm.so.0
+LoadFile /usr/pkg/lib/perl5/@@MACHINE_ARCH@@-netbsd/5.00404/CORE/libperl.so@@PERL_EXT@@
 LoadModule perl_module lib/httpd/mod_perl.so
 AddModule mod_perl.c
 
diff --git a/www/ap-perl/patches/patch-ab b/www/ap-perl/patches/patch-ab
index a0bac5685ee..30b0c44def6 100644
--- a/www/ap-perl/patches/patch-ab
+++ b/www/ap-perl/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.1.1.1 1998/12/04 00:10:57 tv Exp $
+$NetBSD: patch-ab,v 1.2 1998/12/04 17:25:13 tv Exp $
 
 --- src/modules/perl/mod_perl.c.orig	Wed Sep 30 23:13:14 1998
 +++ src/modules/perl/mod_perl.c	Thu Dec  3 17:30:09 1998
@@ -22,7 +22,7 @@ $NetBSD: patch-ab,v 1.1.1.1 1998/12/04 00:10:57 tv Exp $
 + * -Doug MacEachern
 + */
 +
-+static int handle_perl(FILE *in, request_rec *r, const char *error)
++static int handle_perl(FILE *in, request_rec *r, const char *error, const char *timefmt)
 +{
 +    char tag[MAX_STRING_LEN];
 +    char parsed_string[MAX_STRING_LEN];
diff --git a/www/ap-perl/pkg/MESSAGE b/www/ap-perl/pkg/MESSAGE
index 4c0bd9a3c14..49459938f19 100644
--- a/www/ap-perl/pkg/MESSAGE
+++ b/www/ap-perl/pkg/MESSAGE
@@ -1,10 +1,10 @@
 =============================================================================
-$NetBSD: MESSAGE,v 1.2 1998/12/04 13:21:35 tv Exp $
+$NetBSD: MESSAGE,v 1.3 1998/12/04 17:25:13 tv Exp $
 
 In order to enable mod_perl in your Apache installation, you need to refer
-to $PREFIX/share/doc/mod_perl/httpd.conf.add ($PREFIX is typically
-/usr/pkg), which must be added to your httpd.conf.  The directives in that
-file load and set up the Perl shared library and mod_perl module.
+to $PREFIX/etc/httpd/httpd.conf.modperl ($PREFIX is typically /usr/pkg),
+which must be added to your httpd.conf.  The directives in that file load
+and set up the Perl shared library and mod_perl module.
 
 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/ap-perl/pkg/PLIST b/www/ap-perl/pkg/PLIST
index e554491f174..e0d3274f682 100644
--- a/www/ap-perl/pkg/PLIST
+++ b/www/ap-perl/pkg/PLIST
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 1998/12/04 00:10:57 tv Exp $
+@comment $NetBSD: PLIST,v 1.2 1998/12/04 17:25:13 tv Exp $
+etc/httpd/httpd.conf.modperl
 lib/httpd/mod_perl.so
 lib/perl5/man/man3/Apache.3
 lib/perl5/man/man3/Apache::Constants.3
@@ -98,11 +99,10 @@ lib/perl5/site_perl/mod_perl_method_handlers.pod
 lib/perl5/site_perl/mod_perl_traps.pod
 lib/perl5/site_perl/mod_perl_tuning.pod
 share/httpd/htdocs/manual/mod/mod_perl.html
-share/doc/mod_perl/httpd.conf.add
+@dirrm lib/perl5/site_perl/Apache/Constants
 @dirrm lib/perl5/site_perl/Apache
 @dirrm lib/perl5/site_perl/Bundle
 @dirrm lib/perl5/site_perl/${MACHINE_ARCH}-netbsd/auto/Apache/Connection
-@dirrm lib/perl5/site_perl/${MACHINE_ARCH}-netbsd/auto/Apache/Constants
 @dirrm lib/perl5/site_perl/${MACHINE_ARCH}-netbsd/auto/Apache/File
 @dirrm lib/perl5/site_perl/${MACHINE_ARCH}-netbsd/auto/Apache/Log
 @dirrm lib/perl5/site_perl/${MACHINE_ARCH}-netbsd/auto/Apache/ModuleConfig