diff options
| author | jlam <jlam> | 2001-11-15 07:12:17 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2001-11-15 07:12:17 +0000 |
| commit | 8d1bd6d5b792e0cb61f78e06666886fc8b17d1cd (patch) | |
| tree | 7c8a3aa6e4346dcf74dbbe85a17ae62c024a0f29 /www/apache6 | |
| parent | edf6bed7b73158748e03ee8663a6b928c8849ae4 (diff) | |
| download | pkgsrc-8d1bd6d5b792e0cb61f78e06666886fc8b17d1cd.tar.gz | |
Fix installation when an old config file exists.
Diffstat (limited to 'www/apache6')
| -rw-r--r-- | www/apache6/distinfo | 5 | ||||
| -rw-r--r-- | www/apache6/patches/patch-aa | 33 |
2 files changed, 33 insertions, 5 deletions
diff --git a/www/apache6/distinfo b/www/apache6/distinfo index 6e821718f5b..567e309353d 100644 --- a/www/apache6/distinfo +++ b/www/apache6/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.8 2001/10/22 18:10:28 jlam Exp $ +$NetBSD: distinfo,v 1.9 2001/11/15 07:12:17 jlam Exp $ SHA1 (apache_1.3.22.tar.gz) = 5b93c1f8c8cfb703e6082ffa2cd99ea017e1e05e Size (apache_1.3.22.tar.gz) = 2177983 bytes @@ -6,11 +6,12 @@ SHA1 (sitedrivenby.gif) = 7671e9a8ec2cad3961b268befd33c0920e07c658 Size (sitedrivenby.gif) = 8519 bytes SHA1 (apache-1.3.22-v6-20011017.diff.gz) = 11142085dc72175fe6230af33bf68008b47c2ecd Size (apache-1.3.22-v6-20011017.diff.gz) = 53584 bytes -SHA1 (patch-aa) = dbdaff40212075ee386d09674cde45bb96dfb4a5 +SHA1 (patch-aa) = f42556576f78c3f8e596184ffa4bf3c28d353432 SHA1 (patch-ab) = 7619dbf1cf584f9e92998fe25de0860bfbeb277e SHA1 (patch-ac) = d4dd4f5521a7c713a038dec2606dad14356d746f SHA1 (patch-ae) = 2e4e7aab1cff7ddc82697946eeb8d13cd3aa1df0 SHA1 (patch-af) = 8115ea5b59fc86e7354effd25dc22525e7627802 SHA1 (patch-ah) = 553f8f2bf4bf7278adb46ff8749be154f10e39d3 SHA1 (patch-ai) = 46d9a97fbc248a2bea97943b9f3b2f9f693f3695 +SHA1 (patch-aj) = 1cdd2f010d381ec9c13f59b31caab7d1f6f63100 SHA1 (patch-ak) = 8f790a692ed9b2dd6943be43fa1cf7629c673955 diff --git a/www/apache6/patches/patch-aa b/www/apache6/patches/patch-aa index 3cb8871fe29..983ed9ce5e1 100644 --- a/www/apache6/patches/patch-aa +++ b/www/apache6/patches/patch-aa @@ -1,7 +1,7 @@ -$NetBSD: patch-aa,v 1.5 2001/10/17 07:47:53 martti Exp $ +$NetBSD: patch-aa,v 1.6 2001/11/15 07:12:18 jlam Exp $ ---- Makefile.tmpl.orig Sat Oct 6 22:01:09 2001 -+++ Makefile.tmpl Tue Oct 16 22:34:00 2001 +--- Makefile.tmpl.orig Sat Oct 6 18:01:09 2001 ++++ Makefile.tmpl @@ -328,20 +328,7 @@ file=`echo $${mod} | sed -e 's;^.*/\([^/]*\);\1;'`; \ echo "$(INSTALL_DSO) $(TOP)/$(SRC)/$${mod} $(root)$(libexecdir)/$${file}"; \ @@ -23,6 +23,15 @@ $NetBSD: patch-aa,v 1.5 2001/10/17 07:47:53 martti Exp $ fi @echo "<=== [programs]" +@@ -457,7 +444,7 @@ + # icons and distributed CGI scripts. + install-data: + @echo "===> [data: Installing initial data files]" +- -@if [ -f $(root)$(htdocsdir)/index.html ] || [ -f $(root)$(htdocsdir)/index.html.en ]; then \ ++ -@if false; then \ + 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 ; \ @@ -52,3 +61,21 @@ $NetBSD: patch-aa,v 1.5 2001/10/17 07:47:53 martti 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 \ |