- Sync with www/apache13 a bit

- Fix clobbering ${PREFIX}/www on install and warnings coughing up
  on deinstall when ${PREFIX}/www is not empty
- Remove pkg-deinstall

PR:		ports/39645, ports/36804
Submitted by:	Charles Sprickman <freebsd@fasttrackmonkey.com>,
		Peter C. Lai <sirmoo@cowbert.2y.net>

4 files changed, 90 insertions, 92 deletions

diff --git a/www/apache13-modssl/Makefile b/www/apache13-modssl/Makefile
index d3b0d02..eb3bcaf 100644
--- a/www/apache13-modssl/Makefile
+++ b/www/apache13-modssl/Makefile
@@ -133,9 +133,10 @@ pre-install:
 	PKG_PREFIX=${PREFIX} ${SH} pkg-install ${PKGNAME} PRE-INSTALL
 
 post-install:
+	${INSTALL_DATA} ${WRKSRC}/apache.sh ${PREFIX}/etc/rc.d/apache.sh-dist
 	@if [ ! -f ${PREFIX}/etc/rc.d/apache.sh ]; then \
 		${ECHO} "Installing ${PREFIX}/etc/rc.d/apache.sh startup file."; \
-		${INSTALL_SCRIPT} -m 751 ${WRKSRC}/apache.sh ${PREFIX}/etc/rc.d/apache.sh; \
+		${INSTALL_SCRIPT} ${WRKSRC}/apache.sh ${PREFIX}/etc/rc.d/apache.sh; \
 	fi
 
 .include <bsd.port.post.mk>
diff --git a/www/apache13-modssl/files/patch-ab b/www/apache13-modssl/files/patch-ab
index 73a7547..1fcc20c 100644
--- a/www/apache13-modssl/files/patch-ab
+++ b/www/apache13-modssl/files/patch-ab
@@ -1,21 +1,19 @@
---- Makefile.tmpl.orig	Thu Feb  7 23:46:03 2002
-+++ Makefile.tmpl	Thu Feb  7 23:47:53 2002
-@@ -329,10 +329,12 @@
+--- Makefile.tmpl.orig	Sat Jun 22 12:55:54 2002
++++ Makefile.tmpl	Sat Jun 22 12:59:10 2002
+@@ -329,10 +329,10 @@
  	$(MKDIR) $(root)$(sysconfdir)/ssl.csr
  	$(MKDIR) $(root)$(sysconfdir)/ssl.key
  	$(MKDIR) $(root)$(sysconfdir)/ssl.prm
 -	$(MKDIR) $(root)$(htdocsdir)
-+	$(RM) -rf $(root)$(htdocsdir).default
-+	$(MKDIR) $(root)$(htdocsdir).default
++	$(MKDIR) $(root)$(htdocsdir)-dist
  	$(MKDIR) $(root)$(manualdir)
  	$(MKDIR) $(root)$(iconsdir)
 -	$(MKDIR) $(root)$(cgidir)
-+	$(RM) -rf $(root)$(cgidir).default
-+	$(MKDIR) $(root)$(cgidir).default
++	$(MKDIR) $(root)$(cgidir)-dist
  	$(MKDIR) $(root)$(includedir)
  	$(MKDIR) $(root)$(includedir)/xml
  	$(MKDIR) $(root)$(runtimedir)
-@@ -533,33 +535,40 @@
+@@ -533,33 +533,29 @@
  #   icons and distributed CGI scripts.
  install-data:
  	@echo "===> [data: Installing initial data files]"
@@ -23,55 +21,46 @@
 -		echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(htdocsdir)/]"; \
 -	else \
 -		echo "Copying tree $(TOP)/htdocs/ -> $(root)$(htdocsdir)/"; \
-+#        -@if [ -f $(root)$(htdocsdir)/index.html ] || [ -f $(root)$(htdocsdir)/index.html.en ]; then \
-+#                echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(htdocsdir)/]"; \
-+#        else \
-+		echo "Copying tree $(TOP)/htdocs/ -> $(root)$(htdocsdir).default/"; \
++		echo "Copying tree $(TOP)/htdocs/ -> $(root)$(htdocsdir)-dist/"; \
  		(cd $(TOP)/htdocs/ && $(TAR) $(TAROPT) - index* apache_pb.* ) |\
 -		(cd $(root)$(htdocsdir)/ && $(TAR) -xf -); \
 -		find $(root)$(htdocsdir)/ -type d -exec chmod a+rx {} \; ; \
 -		find $(root)$(htdocsdir)/ -type f -print | xargs chmod a+r ; \
 -	fi
 -	-@if [ -d $(TOP)/htdocs/manual ]; then \
-+		(cd $(root)$(htdocsdir).default/ && $(TAR) -xf -); \
-+		find $(root)$(htdocsdir).default/ -type d -exec chmod a+rx {} \; ; \
-+		find $(root)$(htdocsdir).default/ -type f -print | xargs chmod a+r ; \
-+#        fi
-+#        -@if [ -d $(TOP)/htdocs/manual ]; then \
++		(cd $(root)$(htdocsdir)-dist/ && $(TAR) -xf -); \
++		find $(root)$(htdocsdir)-dist/ -type d -exec chmod a+rx {} \; ; \
++		find $(root)$(htdocsdir)-dist/ -type f -print | xargs chmod a+r ;
  		echo "Copying tree $(TOP)/htdocs/manual -> $(root)/$(manualdir)/"; \
  		(cd $(TOP)/htdocs/manual/ && $(TAR) $(TAROPT) - *) |\
  		(cd $(root)$(manualdir)/ && $(TAR) -xf -); \
  		find $(root)$(manualdir)/ -type d -exec chmod a+rx {} \; ; \
- 		find $(root)$(manualdir)/ -type f -print | xargs chmod a+r ; \
-+#        fi
-+#	$(LN) -sf $(root)$(manualdir) $(root)$(htdocsdir).default/manual
+-		find $(root)$(manualdir)/ -type f -print | xargs chmod a+r ; \
++		find $(root)$(manualdir)/ -type f -print | xargs chmod a+r ;
 +	if [ ! -d $(root)$(htdocsdir)/ ]; then \
-+		$(LN) -sf $(root)$(htdocsdir).default $(root)$(htdocsdir); \
++		$(LN) -sf $(root)$(htdocsdir)-dist $(root)$(htdocsdir); \
  	fi
 -	-@if [ -f $(root)$(cgidir)/printenv ]; then \
 -		echo "[PRESERVING EXISTING CGI SUBDIR: $(root)$(cgidir)/]"; \
 -	else \
-+#        -@if [ -f $(root)$(cgidir)/printenv ]; then \
-+#                echo "[PRESERVING EXISTING CGI SUBDIR: $(root)$(cgidir)/]"; \
-+#        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)$(cgidir)/$${script}"; \
 -			$(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(cgidir)/$${script}; \
-+			echo "$(INSTALL_DATA) $(TOP)/conf/$${script}[*] $(root)$(cgidir).default/$${script}"; \
-+			$(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(cgidir).default/$${script}; \
- 		done; \
+-		done; \
 -	fi
-+#        fi
++			echo "$(INSTALL_DATA) $(TOP)/conf/$${script}[*] $(root)$(cgidir)-dist/$${script}"; \
++			$(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(cgidir)-dist/$${script}; \
++		done;
 +	if [ ! -d $(root)$(cgidir)/ ]; then \
-+		$(LN) -sf $(root)$(cgidir).default $(root)$(cgidir); \
++		$(LN) -sf $(root)$(cgidir)-dist $(root)$(cgidir); \
 +  	fi
  	@echo "Copying tree $(TOP)/icons/ -> $(root)$(iconsdir)/"; \
  	(cd $(TOP)/icons/ && $(TAR) $(TAROPT) - *) |\
  	(cd $(root)$(iconsdir)/ && $(TAR) -xf -); \
-@@ -607,10 +616,10 @@
+@@ -607,10 +603,10 @@
  			-e 's;logs/accept\.lock;$(runtimedir)/$(TARGET).lock;' \
  			-e 's;logs/apache_runtime_status;$(runtimedir)/$(TARGET).scoreboard;' \
  			-e 's;logs/httpd\.pid;$(runtimedir)/$(TARGET).pid;' \
@@ -86,3 +75,25 @@
  			-e 's;conf/magic;$(sysconfdir)/magic;' \
  			-e 's;conf/mime\.types;$(sysconfdir)/mime.types;' \
  			-e 's;User nobody;User $(conf_user);' \
+@@ -623,8 +619,8 @@
+ 			-e 's;ServerName new.host.name;ServerName $(conf_servername);' \
+ 			-e 's;VirtualHost _default_:443;VirtualHost _default_:$(conf_port_ssl);' \
+         	> $(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; \
++		echo "$(INSTALL_DATA) $(TOP)/conf/$${conf}-dist[*] $(root)$(sysconfdir)/$${target_conf}-dist"; \
++		$(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(sysconfdir)/$${target_conf}-dist; \
+ 		if [ ! -f "$(root)$(sysconfdir)/$${target_conf}" ]; then \
+ 			echo "$(INSTALL_DATA) $(TOP)/conf/$${conf}-dist[*] $(root)$(sysconfdir)/$${target_conf}"; \
+ 			$(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(sysconfdir)/$${target_conf}; \
+@@ -633,8 +629,8 @@
+ 		fi; \
+ 	done
+ 	-@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; \
++		echo "$(INSTALL_DATA) $(TOP)/conf/$${conf} $(root)$(sysconfdir)/$${conf}-dist"; \
++		$(INSTALL_DATA) $(TOP)/conf/$${conf} $(root)$(sysconfdir)/$${conf}-dist; \
+ 		if [ ! -f "$(root)$(sysconfdir)/$${conf}" ]; then \
+ 			echo "$(INSTALL_DATA) $(TOP)/conf/$${conf} $(root)$(sysconfdir)/$${conf}"; \
+ 			$(INSTALL_DATA) $(TOP)/conf/$${conf} $(root)$(sysconfdir)/$${conf}; \
diff --git a/www/apache13-modssl/pkg-deinstall b/www/apache13-modssl/pkg-deinstall
deleted file mode 100644
index b652ce4..0000000
--- a/www/apache13-modssl/pkg-deinstall
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-# $FreeBSD: /tmp/pcvs/ports/www/apache13-modssl/Attic/pkg-deinstall,v 1.2 2001-12-07 23:12:32 ache Exp $
-#
-
-if [ "$2" != "POST-DEINSTALL" ]; then
-    exit 0
-fi
-
-USER=www
-
-if pw usershow "${USER}" 2>/dev/null 1>&2; then
-	echo "To delete Apache user permanently, use 'pw userdel ${USER}'"
-fi
-
-exit 0
diff --git a/www/apache13-modssl/pkg-plist b/www/apache13-modssl/pkg-plist
index a196c9d..e691902 100644
--- a/www/apache13-modssl/pkg-plist
+++ b/www/apache13-modssl/pkg-plist
@@ -2,20 +2,20 @@ bin/checkgid
 bin/dbmmanage
 bin/htdigest
 bin/htpasswd
-@unexec if cmp -s %D/etc/apache/access.conf %D/etc/apache/access.conf.default; then rm -f %D/etc/apache/access.conf; fi
-etc/apache/access.conf.default
+@unexec if cmp -s %D/etc/apache/access.conf %D/etc/apache/access.conf-dist; then rm -f %D/etc/apache/access.conf; fi
+etc/apache/access.conf-dist
 @exec [ ! -f %B/access.conf ] && cp %B/%f %B/access.conf
-@unexec if cmp -s %D/etc/apache/httpd.conf %D/etc/apache/httpd.conf.default; then rm -f %D/etc/apache/httpd.conf; fi
-etc/apache/httpd.conf.default
+@unexec if cmp -s %D/etc/apache/httpd.conf %D/etc/apache/httpd.conf-dist; then rm -f %D/etc/apache/httpd.conf; fi
+etc/apache/httpd.conf-dist
 @exec [ ! -f %B/httpd.conf ] && cp %B/%f %B/httpd.conf
-@unexec if cmp -s %D/etc/apache/magic %D/etc/apache/magic.default; then rm -f %D/etc/apache/magic; fi
-etc/apache/magic.default
+@unexec if cmp -s %D/etc/apache/magic %D/etc/apache/magic-dist; then rm -f %D/etc/apache/magic; fi
+etc/apache/magic-dist
 @exec [ ! -f %B/magic ] && cp %B/%f %B/magic
-@unexec if cmp -s %D/etc/apache/mime.types %D/etc/apache/mime.types.default; then rm -f %D/etc/apache/mime.types; fi
-etc/apache/mime.types.default
+@unexec if cmp -s %D/etc/apache/mime.types %D/etc/apache/mime.types-dist; then rm -f %D/etc/apache/mime.types; fi
+etc/apache/mime.types-dist
 @exec [ ! -f %B/mime.types ] && cp %B/%f %B/mime.types
-@unexec if cmp -s %D/etc/apache/srm.conf %D/etc/apache/srm.conf.default; then rm -f %D/etc/apache/srm.conf; fi
-etc/apache/srm.conf.default
+@unexec if cmp -s %D/etc/apache/srm.conf %D/etc/apache/srm.conf-dist; then rm -f %D/etc/apache/srm.conf; fi
+etc/apache/srm.conf-dist
 @exec [ ! -f %B/srm.conf ] && cp %B/%f %B/srm.conf
 etc/apache/ssl.crl/Makefile
 etc/apache/ssl.crl/README.CRL
@@ -38,7 +38,8 @@ etc/apache/ssl.key/snakeoil-rsa.key
 etc/apache/ssl.prm/README.PRM
 etc/apache/ssl.prm/snakeoil-ca-dsa.prm
 etc/apache/ssl.prm/snakeoil-dsa.prm
-etc/rc.d/apache.sh
+@unexec if cmp -s %D/etc/rc.d/apache.sh %D/etc/rc.d/apache.sh-dist; then rm -f %D/etc/rc.d/apache.sh; fi
+etc/rc.d/apache.sh-dist
 include/apache/ap.h
 include/apache/ap_alloc.h
 include/apache/ap_compat.h
@@ -128,37 +129,37 @@ sbin/apxs
 sbin/httpd
 sbin/logresolve
 sbin/rotatelogs
-www/data.default/apache_pb.gif
+www/data-dist/apache_pb.gif
 @exec [ -d %D/www/data/ ] || ln -fs %B %D/www/data
-www/data.default/index.html.ca
-www/data.default/index.html.cz
-www/data.default/index.html.de
-www/data.default/index.html.dk
-www/data.default/index.html.ee
-www/data.default/index.html.el
-www/data.default/index.html.en
-www/data.default/index.html.es
-www/data.default/index.html.fr
-www/data.default/index.html.he.iso8859-8
-www/data.default/index.html.it
-www/data.default/index.html.ja.jis
-www/data.default/index.html.kr.iso-kr
-www/data.default/index.html.lb.utf8
-www/data.default/index.html.nl
-www/data.default/index.html.nn
-www/data.default/index.html.no
-www/data.default/index.html.po.iso-pl
-www/data.default/index.html.pt
-www/data.default/index.html.pt-br
-www/data.default/index.html.ru.cp-1251
-www/data.default/index.html.ru.cp866
-www/data.default/index.html.ru.iso-ru
-www/data.default/index.html.ru.koi8-r
-www/data.default/index.html.ru.ucs2
-www/data.default/index.html.ru.ucs4
-www/data.default/index.html.ru.utf8
-www/data.default/index.html.se
-www/data.default/index.html.zh
+www/data-dist/index.html.ca
+www/data-dist/index.html.cz
+www/data-dist/index.html.de
+www/data-dist/index.html.dk
+www/data-dist/index.html.ee
+www/data-dist/index.html.el
+www/data-dist/index.html.en
+www/data-dist/index.html.es
+www/data-dist/index.html.fr
+www/data-dist/index.html.he.iso8859-8
+www/data-dist/index.html.it
+www/data-dist/index.html.ja.jis
+www/data-dist/index.html.kr.iso-kr
+www/data-dist/index.html.lb.utf8
+www/data-dist/index.html.nl
+www/data-dist/index.html.nn
+www/data-dist/index.html.no
+www/data-dist/index.html.po.iso-pl
+www/data-dist/index.html.pt
+www/data-dist/index.html.pt-br
+www/data-dist/index.html.ru.cp-1251
+www/data-dist/index.html.ru.cp866
+www/data-dist/index.html.ru.iso-ru
+www/data-dist/index.html.ru.koi8-r
+www/data-dist/index.html.ru.ucs2
+www/data-dist/index.html.ru.ucs4
+www/data-dist/index.html.ru.utf8
+www/data-dist/index.html.se
+www/data-dist/index.html.zh
 share/doc/apache/LICENSE
 share/doc/apache/bind.html.en
 share/doc/apache/bind.html.fr
@@ -493,9 +494,9 @@ share/doc/apache/howto/ssi.html.html
 share/doc/apache/howto/ssi.html.ja.jis
 share/doc/apache/urlmapping.html
 share/doc/apache/vhosts/index.html.html
-www/cgi-bin.default/printenv
+www/cgi-bin-dist/printenv
 @exec [ -d %D/www/cgi-bin/ ] || ln -fs %B %D/www/cgi-bin
-www/cgi-bin.default/test-cgi
+www/cgi-bin-dist/test-cgi
 www/icons/README
 www/icons/a.gif
 www/icons/alert.black.gif
@@ -737,9 +738,9 @@ www/icons/world2.png
 @dirrm share/doc/apache/howto
 @dirrm share/doc/apache/programs
 @dirrm share/doc/apache
-@dirrm www/data.default
-@dirrm www/cgi-bin.default
+@unexec rmdir %D/www/data-dist 2>/dev/null || true
+@unexec rmdir %D/www/cgi-bin-dist 2>/dev/null || true
 @dirrm www/icons/small
 @dirrm www/icons
 @dirrm www/proxy
-@dirrm www
+@unexec rmdir %D/www 2>/dev/null || true