diff options
| author | tv <tv> | 1998-12-03 17:23:51 +0000 |
|---|---|---|
| committer | tv <tv> | 1998-12-03 17:23:51 +0000 |
| commit | 62024dd728821dbcc814011369818daa2d20f167 (patch) | |
| tree | 1a63c97d57f302be17da5a4e1c2352a52c999f81 /www/apache/patches/patch-aa | |
| parent | 64836c4b848ec97425730233a73e952c48905acd (diff) | |
| download | pkgsrc-62024dd728821dbcc814011369818daa2d20f167.tar.gz | |
Update Apache and mod_ssl using new build layout (see post to tech-pkg for
details). No security fixes in Apache 1.3.3, so immediate upgrade from
1.3.2 is not necessary.
Diffstat (limited to 'www/apache/patches/patch-aa')
| -rw-r--r-- | www/apache/patches/patch-aa | 50 |
1 files changed, 50 insertions, 0 deletions
diff --git a/www/apache/patches/patch-aa b/www/apache/patches/patch-aa new file mode 100644 index 00000000000..5b2b98df384 --- /dev/null +++ b/www/apache/patches/patch-aa @@ -0,0 +1,50 @@ +$NetBSD: patch-aa,v 1.6 1998/12/03 17:23:52 tv Exp $ + +--- Makefile.tmpl.orig Thu Dec 3 07:42:35 1998 ++++ Makefile.tmpl Thu Dec 3 08:22:10 1998 +@@ -275,7 +275,7 @@ + $(MKDIR) $(root)$(sysconfdir)/ssl.key + $(MKDIR) $(root)$(datadir)/htdocs + $(MKDIR) $(root)$(datadir)/icons +- $(MKDIR) $(root)$(datadir)/cgi-bin ++ $(MKDIR) $(root)$(prefix)/libexec/cgi-bin + $(MKDIR) $(root)$(includedir) + $(MKDIR) $(root)$(runtimedir) + $(MKDIR) $(root)$(logfiledir) +@@ -352,6 +352,7 @@ + @echo "$(INSTALL_SCRIPT) $(TOP)/$(SRC)/support/apachectl[*] $(root)$(sbindir)/apachectl"; \ + sed -e 's;PIDFILE=.*;PIDFILE=$(runtimedir)/httpd.pid;' \ + -e 's;HTTPD=.*;HTTPD=$(sbindir)/httpd;' \ ++ -e 's;LD_LIBRARY_PATH=.*;LD_LIBRARY_PATH=/usr/lib:$(prefix)/lib:/usr/local/lib;' \ + < $(TOP)/$(SRC)/support/apachectl > $(TOP)/$(SRC)/.apaci.install.tmp && \ + $(INSTALL_SCRIPT) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(sbindir)/apachectl + $(INSTALL_DATA) $(TOP)/$(SRC)/support/apachectl.1 $(root)$(mandir)/man1/apachectl.1 +@@ -413,15 +414,15 @@ + find $(root)$(datadir)/htdocs/ -type d -exec chmod a+rx {} \; ; \ + find $(root)$(datadir)/htdocs/ -type f -exec chmod a+r {} \; ; \ + fi +- -@if [ -f $(root)$(datadir)/cgi-bin/printenv ]; then \ +- echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(datadir)/cgi-bin/]"; \ ++ -@if [ -f $(root)$(prefix)/libexec/cgi-bin/printenv ]; then \ ++ echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(prefix)/libexec/cgi-bin/]"; \ + else \ + for script in printenv test-cgi; do \ + cat $(TOP)/cgi-bin/$${script} |\ + sed -e 's;^#!/.*perl;#!$(PERL);' \ + > $(TOP)/$(SRC)/.apaci.install.tmp; \ +- echo "$(INSTALL_DATA) $(TOP)/conf/$${script}[*] $(root)$(datadir)/cgi-bin/$${script}"; \ +- $(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(datadir)/cgi-bin/$${script}; \ ++ echo "$(INSTALL_DATA) $(TOP)/conf/$${script}[*] $(root)$(prefix)/libexec/cgi-bin/$${script}"; \ ++ $(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(prefix)/libexec/cgi-bin/$${script}; \ + done; \ + fi + @echo "Copying tree $(TOP)/icons/ -> $(root)$(datadir)/icons/"; \ +@@ -450,7 +451,7 @@ + -e 's;@@ServerRoot@@/conf/ssl.key;$(sysconfdir)/ssl.key;' \ + -e 's;@@ServerRoot@@/htdocs;$(datadir)/htdocs;' \ + -e 's;@@ServerRoot@@/icons;$(datadir)/icons;' \ +- -e 's;@@ServerRoot@@/cgi-bin;$(datadir)/cgi-bin;' \ ++ -e 's;@@ServerRoot@@/cgi-bin;$(prefix)/libexec/cgi-bin;' \ + -e 's;@@ServerRoot@@/proxy;$(proxycachedir);' \ + -e 's;@@ServerRoot@@;$(prefix);' \ + -e 's;logs/accept.lock;$(runtimedir)/httpd.lock;' \ |