diff options
| author | jlam <jlam> | 2002-01-01 06:22:54 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2002-01-01 06:22:54 +0000 |
| commit | 148d5f01b8951c6891ed6839fbdee94ac13359de (patch) | |
| tree | abbd1f5f616612fb1d1f92750e6aef3d01cf6683 /www | |
| parent | f7b9860db819f89060fb490d979794056e7d16ca (diff) | |
| download | pkgsrc-148d5f01b8951c6891ed6839fbdee94ac13359de.tar.gz | |
Fix installation so that existing config files are preserved when building
from source instead of installing from a binary package (problem noted in
private email by George Coulouris <george@coulouris.org>.
Diffstat (limited to 'www')
| -rw-r--r-- | www/apache6/distinfo | 4 | ||||
| -rw-r--r-- | www/apache6/patches/patch-aa | 29 |
2 files changed, 4 insertions, 29 deletions
diff --git a/www/apache6/distinfo b/www/apache6/distinfo index 9aec1c40079..758939ce288 100644 --- a/www/apache6/distinfo +++ b/www/apache6/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.10 2001/11/23 10:52:21 martti Exp $ +$NetBSD: distinfo,v 1.11 2002/01/01 06:22:54 jlam Exp $ SHA1 (apache_1.3.22.tar.gz) = 5b93c1f8c8cfb703e6082ffa2cd99ea017e1e05e Size (apache_1.3.22.tar.gz) = 2177983 bytes @@ -6,7 +6,7 @@ SHA1 (sitedrivenby.gif) = 7671e9a8ec2cad3961b268befd33c0920e07c658 Size (sitedrivenby.gif) = 8519 bytes SHA1 (apache-1.3.22-v6-20011123.diff.gz) = aec9c4e8b918f176b6c73e3a85cde82e21a45776 Size (apache-1.3.22-v6-20011123.diff.gz) = 53755 bytes -SHA1 (patch-aa) = f42556576f78c3f8e596184ffa4bf3c28d353432 +SHA1 (patch-aa) = d8305a8a00d1d017a4e49f35329d5011c4d39ff8 SHA1 (patch-ab) = 7619dbf1cf584f9e92998fe25de0860bfbeb277e SHA1 (patch-ac) = d4dd4f5521a7c713a038dec2606dad14356d746f SHA1 (patch-ae) = 2e4e7aab1cff7ddc82697946eeb8d13cd3aa1df0 diff --git a/www/apache6/patches/patch-aa b/www/apache6/patches/patch-aa index 983ed9ce5e1..169871084e9 100644 --- a/www/apache6/patches/patch-aa +++ b/www/apache6/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.6 2001/11/15 07:12:18 jlam Exp $ +$NetBSD: patch-aa,v 1.7 2002/01/01 06:22:55 jlam Exp $ --- Makefile.tmpl.orig Sat Oct 6 18:01:09 2001 +++ Makefile.tmpl @@ -32,14 +32,7 @@ $NetBSD: patch-aa,v 1.6 2001/11/15 07:12:18 jlam Exp $ echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(htdocsdir)/]"; \ else \ echo "Copying tree $(TOP)/htdocs/ -> $(root)$(htdocsdir)/"; \ -@@ -473,15 +460,16 @@ - find $(root)$(manualdir)/ -type d -exec chmod a+rx {} \; ; \ - find $(root)$(manualdir)/ -type f -print | xargs chmod a+r ; \ - fi -- -@if [ -f $(root)$(cgidir)/printenv ]; then \ -+ -@if false; then \ - echo "[PRESERVING EXISTING CGI SUBDIR: $(root)$(cgidir)/]"; \ - else \ +@@ -479,9 +466,10 @@ for script in printenv test-cgi; do \ cat $(TOP)/cgi-bin/$${script} |\ sed -e 's;^#!/.*perl;#!$(PERL);' \ @@ -61,21 +54,3 @@ $NetBSD: patch-aa,v 1.6 2001/11/15 07:12:18 jlam Exp $ if [ .$$conf = .httpd.conf ]; then \ target_conf="$(TARGET).conf"; \ else \ -@@ -536,7 +524,7 @@ - > $(TOP)/$(SRC)/.apaci.install.tmp && \ - echo "$(INSTALL_DATA) $(TOP)/conf/$${conf}-dist[*] $(root)$(sysconfdir)/$${target_conf}.default"; \ - $(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(sysconfdir)/$${target_conf}.default; \ -- if [ ! -f "$(root)$(sysconfdir)/$${target_conf}" ]; then \ -+ if true; then \ - echo "$(INSTALL_DATA) $(TOP)/conf/$${conf}-dist[*] $(root)$(sysconfdir)/$${target_conf}"; \ - $(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(sysconfdir)/$${target_conf}; \ - else \ -@@ -546,7 +534,7 @@ - -@for conf in mime.types magic; do \ - echo "$(INSTALL_DATA) $(TOP)/conf/$${conf} $(root)$(sysconfdir)/$${conf}.default"; \ - $(INSTALL_DATA) $(TOP)/conf/$${conf} $(root)$(sysconfdir)/$${conf}.default; \ -- if [ ! -f "$(root)$(sysconfdir)/$${conf}" ]; then \ -+ if true; then \ - echo "$(INSTALL_DATA) $(TOP)/conf/$${conf} $(root)$(sysconfdir)/$${conf}"; \ - $(INSTALL_DATA) $(TOP)/conf/$${conf} $(root)$(sysconfdir)/$${conf}; \ - else \ |