diff options
author | Cy Schubert <cy@FreeBSD.org> | 2002-05-09 03:55:18 +0000 |
---|---|---|
committer | Cy Schubert <cy@FreeBSD.org> | 2002-05-09 03:55:18 +0000 |
commit | 90cd8b73d73c0fac38dd1142b0af1c63e3abf8ae (patch) | |
tree | 3e60c050af84b71355662e8daf9cbb280524e50d /www/apache21/files/patch-Makefile.in | |
parent | Update to 1.0.1. (diff) |
1. Upgrade 2.0.35 --> 2.0.36
2. Port printed message to "pw userdel www" if port removed permanently.
However master.passwd 1.25.2.5 has user www by default, so this is no
longer correct advice. Removed pkg-deinstall to correct this.
PR: 37849 and 36907
Approved by: MAINTAINER: Hye-Shik Chang <perky@fallin.lv>
Notes
Notes:
svn path=/head/; revision=58782
Diffstat (limited to 'www/apache21/files/patch-Makefile.in')
-rw-r--r-- | www/apache21/files/patch-Makefile.in | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/www/apache21/files/patch-Makefile.in b/www/apache21/files/patch-Makefile.in index 5c784ddc3807..5d49a5d426a9 100644 --- a/www/apache21/files/patch-Makefile.in +++ b/www/apache21/files/patch-Makefile.in @@ -1,6 +1,6 @@ ---- Makefile.in.orig Sat Apr 6 04:36:06 2002 -+++ Makefile.in Thu Apr 18 09:22:29 2002 -@@ -33,23 +33,28 @@ +--- Makefile.in.orig Sun Apr 28 16:41:25 2002 ++++ Makefile.in Tue May 7 19:05:12 2002 +@@ -33,23 +33,27 @@ @test -d $(sysconfdir) || $(MKINSTALLDIRS) $(sysconfdir) @cd $(top_srcdir)/docs/conf; \ for i in mime.types magic; do \ @@ -11,8 +11,8 @@ done; \ for j in $(top_srcdir)/docs/conf $(top_builddir)/docs/conf ; do \ cd $$j ; \ - for i in *-std* ssl.conf; do \ - [ -f $$i ] || continue; \ + for i in *-std*.conf ssl.conf; do \ +- [ -f $$i ] || continue; \ + [ -f `echo "$$i"|sed 's,\.in$$,_nonex,g'` ] || continue; \ ( \ n_lm=`awk 'BEGIN {n=0} /@@LoadModule@@/ {n+=1} END {print n}' < $$i`; \ @@ -30,7 +30,7 @@ -e 'p' \ < $$i; \ for j in $(DSO_MODULES) "^EOL^"; do \ -@@ -57,7 +62,7 @@ +@@ -57,7 +61,7 @@ echo "<IfDefine SSL>"; \ fi; \ if test $$j != "^EOL^"; then \ @@ -39,7 +39,7 @@ fi; \ if test "x$$j" = "xssl"; then \ echo "</IfDefine>"; \ -@@ -106,11 +111,14 @@ +@@ -106,12 +110,14 @@ install-htdocs: @echo Installing HTML documents @@ -52,12 +52,13 @@ @test -d $(manualdir) || $(MKINSTALLDIRS) $(manualdir) @test -d $(top_srcdir)/docs/manual && (cd $(top_srcdir)/docs/manual && cp -rp * $(manualdir)) - @test "x$(htdocsdir)" != "x" && cd $(htdocsdir) && find . -name "CVS" -print | xargs rm -rf {} \; +- +.endif + @test "x$(htdocsdir)" != "x" && cd $(htdocsdir).default && find . -name "CVS" -print | xargs rm -rf {} \; - install-error: @echo Installing error documents -@@ -126,9 +134,10 @@ + @test -d $(errordir) || $(MKINSTALLDIRS) $(errordir) +@@ -126,9 +132,10 @@ install-cgi: @echo Installing CGIs |