Rename .default suffix to -dist, probably it will be less confusing

3 files changed, 58 insertions, 58 deletions

diff --git a/www/apache13/Makefile b/www/apache13/Makefile
index 09dc848b4659..0b3c20c75538 100644
--- a/www/apache13/Makefile
+++ b/www/apache13/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	apache
 PORTVERSION=    1.3.26
-PORTREVISION=   1
+PORTREVISION=   2
 CATEGORIES=	www
 MASTER_SITES=   http://www.apache.org/dist/httpd/ \
 		ftp://ftp.ccs.neu.edu/net/mirrors/ftp.apache.org/apache/dist/httpd/ \
@@ -117,7 +117,7 @@ pre-install:
 	PKG_PREFIX=${PREFIX} ${SH} pkg-install ${PKGNAME} PRE-INSTALL
 
 post-install:
-	${INSTALL_DATA} ${WRKSRC}/apache.sh ${PREFIX}/etc/rc.d/apache.sh.default
+	${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} ${WRKSRC}/apache.sh ${PREFIX}/etc/rc.d/apache.sh; \
diff --git a/www/apache13/files/patch-ab b/www/apache13/files/patch-ab
index a99bd7305990..d67722c8f400 100644
--- a/www/apache13/files/patch-ab
+++ b/www/apache13/files/patch-ab
@@ -5,11 +5,11 @@
  	$(MKDIR) $(root)$(mandir)/man8
  	$(MKDIR) $(root)$(sysconfdir)
 -	$(MKDIR) $(root)$(htdocsdir)
-+	$(MKDIR) $(root)$(htdocsdir).default
++	$(MKDIR) $(root)$(htdocsdir)-dist
  	$(MKDIR) $(root)$(manualdir)
  	$(MKDIR) $(root)$(iconsdir)
 -	$(MKDIR) $(root)$(cgidir)
-+	$(MKDIR) $(root)$(cgidir).default
++	$(MKDIR) $(root)$(cgidir)-dist
  	$(MKDIR) $(root)$(includedir)
  	$(MKDIR) $(root)$(includedir)/xml
  	$(MKDIR) $(root)$(runtimedir)
@@ -24,16 +24,16 @@
 +#        -@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 ; \
++		(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 ; \
 +#        fi
 +#        -@if [ -d $(TOP)/htdocs/manual ]; then \
  		echo "Copying tree $(TOP)/htdocs/manual -> $(root)/$(manualdir)/"; \
@@ -43,7 +43,7 @@
  		find $(root)$(manualdir)/ -type f -print | xargs chmod a+r ; \
 +#        fi
 +	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)/]"; \
@@ -57,13 +57,13 @@
  			> $(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}; \
++			echo "$(INSTALL_DATA) $(TOP)/conf/$${script}[*] $(root)$(cgidir)-dist/$${script}"; \
++			$(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(cgidir)-dist/$${script}; \
  		done; \
 -	fi
 +#        fi
 +	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) - *) |\
diff --git a/www/apache13/pkg-plist b/www/apache13/pkg-plist
index eb20be225f33..8b39a77499d7 100644
--- a/www/apache13/pkg-plist
+++ b/www/apache13/pkg-plist
@@ -3,23 +3,23 @@ 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
-@unexec if cmp -s %D/etc/rc.d/apache.sh %D/etc/rc.d/apache.sh.default; then rm -f %D/etc/rc.d/apache.sh; fi
-etc/rc.d/apache.sh.default
+@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
 @exec [ -f %B/apache.sh ] || ( cp %B/%f %B/apache.sh; chmod 755 %B/apache.sh )
 include/apache/ap.h
 include/apache/ap_alloc.h
@@ -106,37 +106,37 @@ sbin/httpd
 sbin/logresolve
 sbin/rotatelogs
 %%SUB_SUEXEC%%sbin/suexec
-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
@@ -412,9 +412,9 @@ share/doc/apache/win_service.html.html
 share/doc/apache/win_service.html.ja.jis
 share/doc/apache/windows.html.en
 share/doc/apache/windows.html.ja.jis
-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/a.png
@@ -648,8 +648,8 @@ www/icons/world2.png
 @dirrm share/doc/apache/search
 @dirrm share/doc/apache/vhosts
 @dirrm share/doc/apache
-@dirrm www/data.default
-@dirrm www/cgi-bin.default
+@dirrm www/data-dist
+@dirrm www/cgi-bin-dist
 @dirrm www/icons/small
 @dirrm www/icons
 @dirrm www/proxy