diff options
| author | tv <tv@pkgsrc.org> | 1999-05-07 13:46:43 +0000 |
|---|---|---|
| committer | tv <tv@pkgsrc.org> | 1999-05-07 13:46:43 +0000 |
| commit | ac8956d19256f512d5e2b60c2512130a3d53616b (patch) | |
| tree | ea507a97d6ab418bb1bafec331df08a1c510d93e /www/apache/patches | |
| parent | 84d76269b6b8012a1a6e742ec3416327914afd98 (diff) | |
| download | pkgsrc-ac8956d19256f512d5e2b60c2512130a3d53616b.tar.gz | |
Do this the right way; it wasn't installing the shared modules after the
last fix.
Diffstat (limited to 'www/apache/patches')
| -rw-r--r-- | www/apache/patches/patch-aa | 52 |
1 files changed, 39 insertions, 13 deletions
diff --git a/www/apache/patches/patch-aa b/www/apache/patches/patch-aa index 54d63abcce9..ebeb3fe22fe 100644 --- a/www/apache/patches/patch-aa +++ b/www/apache/patches/patch-aa @@ -1,7 +1,7 @@ -$NetBSD: patch-aa,v 1.9 1999/05/02 21:13:08 tv Exp $ +$NetBSD: patch-aa,v 1.10 1999/05/07 13:46:43 tv Exp $ ---- Makefile.tmpl.orig Sun May 2 17:09:00 1999 -+++ Makefile.tmpl Sun May 2 17:12:32 1999 +--- Makefile.tmpl.orig Fri May 7 09:49:05 1999 ++++ Makefile.tmpl Fri May 7 09:52:16 1999 @@ -114,7 +114,7 @@ datadir = @datadir@ iconsdir = $(datadir)/icons @@ -11,16 +11,42 @@ $NetBSD: patch-aa,v 1.9 1999/05/02 21:13:08 tv Exp $ includedir = @includedir@ localstatedir = @localstatedir@ runtimedir = @runtimedir@ -@@ -338,7 +338,7 @@ - fi - $(INSTALL_DATA) $(TOP)/$(SRC)/support/httpd.8 $(root)$(mandir)/man8/$(TARGET).8 - -@$(RM) $(SRC)/.apaci.install.conf; touch $(SRC)/.apaci.install.conf -- -@if [ ".`grep '^[ ]*SharedModule' $(TOP)/$(SRC)/Configuration.apaci`" != . ]; then \ -+ -@if false; then \ - for mod in `egrep '^[ ]*SharedModule' $(TOP)/$(SRC)/Configuration.apaci |\ - sed -e 's/^[ ]*SharedModule[ ]*//'`; do \ +@@ -344,34 +344,6 @@ file=`echo $${mod} | sed -e 's;^.*/\([^/]*\);\1;'`; \ -@@ -453,12 +453,13 @@ + echo "$(INSTALL_DSO) $(TOP)/$(SRC)/$${mod} $(root)$(libexecdir)/$${file}"; \ + $(INSTALL_DSO) $(TOP)/$(SRC)/$${mod} $(root)$(libexecdir)/$${file}; \ +- name=`$(TOP)/$(AUX)/fmn.sh $(TOP)/$(SRC)/$${mod}`; \ +- if [ ".$$name" = .ssl_module ]; then \ +- echo "<IfDefine SSL>" >>$(SRC)/.apaci.install.conf; \ +- fi; \ +- echo dummy | awk '{ printf("LoadModule %-18s %s\n", modname, modpath); }' \ +- modname="$${name}" modpath="$(libexecdir_relative)$${file}" >>$(SRC)/.apaci.install.conf; \ +- if [ ".$$name" = .ssl_module ]; then \ +- echo "</IfDefine>" >>$(SRC)/.apaci.install.conf; \ +- fi; \ +- done; \ +- echo "" >>$(SRC)/.apaci.install.conf; \ +- echo "# Reconstruction of the complete module list from all available modules" >>$(SRC)/.apaci.install.conf; \ +- echo "# (static and shared ones) to achieve correct module execution order." >>$(SRC)/.apaci.install.conf; \ +- echo "# [WHENEVER YOU CHANGE THE LOADMODULE SECTION ABOVE UPDATE THIS, TOO]" >>$(SRC)/.apaci.install.conf; \ +- echo "ClearModuleList" >>$(SRC)/.apaci.install.conf; \ +- for mod in `egrep "^[ ]*(Add|Shared)Module" $(SRC)/Configuration.apaci |\ +- sed -e 's:[ ]*SharedModule::' \ +- -e 's:[ ]*AddModule::' \ +- -e 's:modules/[^/]*/::' \ +- -e 's:[ ]lib: mod_:' \ +- -e 's:\.[soam]*$$:.c:'`; do \ +- if [ ".$$mod" = .mod_ssl.c ]; then \ +- echo "<IfDefine SSL>" >>$(SRC)/.apaci.install.conf; \ +- fi; \ +- echo "AddModule $$mod" >>$(SRC)/.apaci.install.conf; \ +- if [ ".$$mod" = .mod_ssl.c ]; then \ +- echo "</IfDefine>" >>$(SRC)/.apaci.install.conf; \ +- fi; \ + done; \ + fi + @echo "<=== [programs]" +@@ -453,12 +425,13 @@ find $(root)$(htdocsdir)/ -type d -exec chmod a+rx {} \; ; \ find $(root)$(htdocsdir)/ -type f -exec chmod a+r {} \; ; \ fi @@ -35,7 +61,7 @@ $NetBSD: patch-aa,v 1.9 1999/05/02 21:13:08 tv Exp $ > $(TOP)/$(SRC)/.apaci.install.tmp; \ echo "$(INSTALL_DATA) $(TOP)/conf/$${script}[*] $(root)$(cgidir)/$${script}"; \ $(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(cgidir)/$${script}; \ -@@ -475,7 +476,7 @@ +@@ -475,7 +448,7 @@ # and initial config files while preserving existing ones. install-config: @echo "===> [config: Installing Apache configuration files]" |