diff options
author | tv <tv> | 1999-05-04 20:16:35 +0000 |
---|---|---|
committer | tv <tv> | 1999-05-04 20:16:35 +0000 |
commit | 430b19c24a77f9e58362e869bdd6e620d2959f17 (patch) | |
tree | 6c4a5533aa604035c76ecb3618d8efc3809c3af2 | |
parent | 8423804a506996730edc0bb61932dfe3083e330d (diff) | |
download | pkgsrc-430b19c24a77f9e58362e869bdd6e620d2959f17.tar.gz |
Clean up the build; now dynamically loads libperl and libm, so only the
LoadModule and AddModule lines are necessary.
-rw-r--r-- | www/ap-perl/Makefile | 10 | ||||
-rw-r--r-- | www/ap-perl/files/httpd.conf.add | 19 | ||||
-rw-r--r-- | www/ap-perl/patches/patch-aa | 4 | ||||
-rw-r--r-- | www/ap-perl/pkg/MESSAGE | 11 | ||||
-rw-r--r-- | www/ap-perl/pkg/PLIST | 3 |
5 files changed, 10 insertions, 37 deletions
diff --git a/www/ap-perl/Makefile b/www/ap-perl/Makefile index f1a3b1d9832..9c36902d1c1 100644 --- a/www/ap-perl/Makefile +++ b/www/ap-perl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 1999/05/01 00:42:29 tv Exp $ +# $NetBSD: Makefile,v 1.6 1999/05/04 20:16:35 tv Exp $ # DISTNAME= mod_perl-1.19 @@ -22,13 +22,5 @@ do-configure: post-install: ${INSTALL_DATA} ${WRKSRC}/htdocs/manual/mod/mod_perl.html \ ${PREFIX}/share/httpd/htdocs/manual/mod/ -.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 deleted file mode 100644 index 9fc1a81ca6b..00000000000 --- a/www/ap-perl/files/httpd.conf.add +++ /dev/null @@ -1,19 +0,0 @@ -# $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. 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.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 - -# -# End mod_perl added section -# diff --git a/www/ap-perl/patches/patch-aa b/www/ap-perl/patches/patch-aa index e2a5baf8741..e48ea7ec225 100644 --- a/www/ap-perl/patches/patch-aa +++ b/www/ap-perl/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.3 1999/05/01 00:42:30 tv Exp $ +$NetBSD: patch-aa,v 1.4 1999/05/04 20:16:36 tv Exp $ --- apaci/Makefile.tmpl.orig Tue Nov 24 11:38:52 1998 +++ apaci/Makefile.tmpl Fri Apr 30 20:36:05 1999 @@ -16,7 +16,7 @@ $NetBSD: patch-aa,v 1.3 1999/05/01 00:42:30 tv Exp $ libperl.so: $(MP_OBJS_PIC) $(MP_RM) $@ - $(MP_LD) $(MP_LDFLAGS_SHLIB) -o $@ $(MP_OBJS_PIC) $(MP_LIBS) -+ $(MP_LD) $(MP_LDFLAGS_SHLIB) -o $@ $(MP_OBJS_PIC) ++ ld $(MP_LDFLAGS_SHLIB) -o $@ $(MP_OBJS_PIC) $(MP_LIBS:S/-Wl,//:N*.a) .SUFFIXES: .xs .c .o .lo diff --git a/www/ap-perl/pkg/MESSAGE b/www/ap-perl/pkg/MESSAGE index 49459938f19..218eb63b00d 100644 --- a/www/ap-perl/pkg/MESSAGE +++ b/www/ap-perl/pkg/MESSAGE @@ -1,10 +1,11 @@ ============================================================================= -$NetBSD: MESSAGE,v 1.3 1998/12/04 17:25:13 tv Exp $ +$NetBSD: MESSAGE,v 1.4 1999/05/04 20:16:37 tv Exp $ -In order to enable mod_perl in your Apache installation, you need to refer -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. +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 + AddModule mod_perl.c 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 401eb2dfc5c..03b2685040a 100644 --- a/www/ap-perl/pkg/PLIST +++ b/www/ap-perl/pkg/PLIST @@ -1,5 +1,4 @@ -@comment $NetBSD: PLIST,v 1.5 1999/05/01 00:41:47 tv Exp $ -etc/httpd/httpd.conf.modperl +@comment $NetBSD: PLIST,v 1.6 1999/05/04 20:16:37 tv Exp $ lib/httpd/mod_perl.so lib/perl5/man/man3/Apache.3 lib/perl5/man/man3/Apache::Constants.3 |