25 files changed, 121 insertions, 130 deletions

diff --git a/www/apache13/Makefile b/www/apache13/Makefile
index 35c8ae114e83..864f40bb1e51 100644
--- a/www/apache13/Makefile
+++ b/www/apache13/Makefile
@@ -3,7 +3,7 @@
 # Date created:         Fri Aug 25 16:42:36 CDT 1995
 # Whom:                 ache@nagual.pp.ru
 #
-# $Id: Makefile,v 1.71 1999/06/25 21:53:06 sada Exp $
+# $Id: Makefile,v 1.72 1999/08/22 19:00:30 mharo Exp $
 #
 
 DISTNAME=       apache_1.3.6
@@ -69,9 +69,9 @@ MAN8= ab.8 apachectl.8 apxs.8 httpd.8 logresolve.8 rotatelogs.8
 
 post-install:
 	@if [ ! -f ${PREFIX}/etc/rc.d/apache.sh ]; then \
-		echo "Installing ${PREFIX}/etc/rc.d/apache.sh startup file."; \
-		echo "#!/bin/sh" > ${PREFIX}/etc/rc.d/apache.sh; \
-		echo "[ -x ${PREFIX}/sbin/apachectl ] && ${PREFIX}/sbin/apachectl start > /dev/null && echo -n ' apache'" >> ${PREFIX}/etc/rc.d/apache.sh; \
+		${ECHO} "Installing ${PREFIX}/etc/rc.d/apache.sh startup file."; \
+		${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/apache.sh; \
+		${ECHO} "[ -x ${PREFIX}/sbin/apachectl ] && ${PREFIX}/sbin/apachectl start > /dev/null && ${ECHO} -n ' apache'" >> ${PREFIX}/etc/rc.d/apache.sh; \
 		${CHMOD} 751 ${PREFIX}/etc/rc.d/apache.sh; \
 	fi
 
diff --git a/www/apache2/Makefile b/www/apache2/Makefile
index 35c8ae114e83..864f40bb1e51 100644
--- a/www/apache2/Makefile
+++ b/www/apache2/Makefile
@@ -3,7 +3,7 @@
 # Date created:         Fri Aug 25 16:42:36 CDT 1995
 # Whom:                 ache@nagual.pp.ru
 #
-# $Id: Makefile,v 1.71 1999/06/25 21:53:06 sada Exp $
+# $Id: Makefile,v 1.72 1999/08/22 19:00:30 mharo Exp $
 #
 
 DISTNAME=       apache_1.3.6
@@ -69,9 +69,9 @@ MAN8= ab.8 apachectl.8 apxs.8 httpd.8 logresolve.8 rotatelogs.8
 
 post-install:
 	@if [ ! -f ${PREFIX}/etc/rc.d/apache.sh ]; then \
-		echo "Installing ${PREFIX}/etc/rc.d/apache.sh startup file."; \
-		echo "#!/bin/sh" > ${PREFIX}/etc/rc.d/apache.sh; \
-		echo "[ -x ${PREFIX}/sbin/apachectl ] && ${PREFIX}/sbin/apachectl start > /dev/null && echo -n ' apache'" >> ${PREFIX}/etc/rc.d/apache.sh; \
+		${ECHO} "Installing ${PREFIX}/etc/rc.d/apache.sh startup file."; \
+		${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/apache.sh; \
+		${ECHO} "[ -x ${PREFIX}/sbin/apachectl ] && ${PREFIX}/sbin/apachectl start > /dev/null && ${ECHO} -n ' apache'" >> ${PREFIX}/etc/rc.d/apache.sh; \
 		${CHMOD} 751 ${PREFIX}/etc/rc.d/apache.sh; \
 	fi
 
diff --git a/www/apache20/Makefile b/www/apache20/Makefile
index 35c8ae114e83..864f40bb1e51 100644
--- a/www/apache20/Makefile
+++ b/www/apache20/Makefile
@@ -3,7 +3,7 @@
 # Date created:         Fri Aug 25 16:42:36 CDT 1995
 # Whom:                 ache@nagual.pp.ru
 #
-# $Id: Makefile,v 1.71 1999/06/25 21:53:06 sada Exp $
+# $Id: Makefile,v 1.72 1999/08/22 19:00:30 mharo Exp $
 #
 
 DISTNAME=       apache_1.3.6
@@ -69,9 +69,9 @@ MAN8= ab.8 apachectl.8 apxs.8 httpd.8 logresolve.8 rotatelogs.8
 
 post-install:
 	@if [ ! -f ${PREFIX}/etc/rc.d/apache.sh ]; then \
-		echo "Installing ${PREFIX}/etc/rc.d/apache.sh startup file."; \
-		echo "#!/bin/sh" > ${PREFIX}/etc/rc.d/apache.sh; \
-		echo "[ -x ${PREFIX}/sbin/apachectl ] && ${PREFIX}/sbin/apachectl start > /dev/null && echo -n ' apache'" >> ${PREFIX}/etc/rc.d/apache.sh; \
+		${ECHO} "Installing ${PREFIX}/etc/rc.d/apache.sh startup file."; \
+		${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/apache.sh; \
+		${ECHO} "[ -x ${PREFIX}/sbin/apachectl ] && ${PREFIX}/sbin/apachectl start > /dev/null && ${ECHO} -n ' apache'" >> ${PREFIX}/etc/rc.d/apache.sh; \
 		${CHMOD} 751 ${PREFIX}/etc/rc.d/apache.sh; \
 	fi
 
diff --git a/www/apache21/Makefile b/www/apache21/Makefile
index 35c8ae114e83..864f40bb1e51 100644
--- a/www/apache21/Makefile
+++ b/www/apache21/Makefile
@@ -3,7 +3,7 @@
 # Date created:         Fri Aug 25 16:42:36 CDT 1995
 # Whom:                 ache@nagual.pp.ru
 #
-# $Id: Makefile,v 1.71 1999/06/25 21:53:06 sada Exp $
+# $Id: Makefile,v 1.72 1999/08/22 19:00:30 mharo Exp $
 #
 
 DISTNAME=       apache_1.3.6
@@ -69,9 +69,9 @@ MAN8= ab.8 apachectl.8 apxs.8 httpd.8 logresolve.8 rotatelogs.8
 
 post-install:
 	@if [ ! -f ${PREFIX}/etc/rc.d/apache.sh ]; then \
-		echo "Installing ${PREFIX}/etc/rc.d/apache.sh startup file."; \
-		echo "#!/bin/sh" > ${PREFIX}/etc/rc.d/apache.sh; \
-		echo "[ -x ${PREFIX}/sbin/apachectl ] && ${PREFIX}/sbin/apachectl start > /dev/null && echo -n ' apache'" >> ${PREFIX}/etc/rc.d/apache.sh; \
+		${ECHO} "Installing ${PREFIX}/etc/rc.d/apache.sh startup file."; \
+		${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/apache.sh; \
+		${ECHO} "[ -x ${PREFIX}/sbin/apachectl ] && ${PREFIX}/sbin/apachectl start > /dev/null && ${ECHO} -n ' apache'" >> ${PREFIX}/etc/rc.d/apache.sh; \
 		${CHMOD} 751 ${PREFIX}/etc/rc.d/apache.sh; \
 	fi
 
diff --git a/www/apache22/Makefile b/www/apache22/Makefile
index 35c8ae114e83..864f40bb1e51 100644
--- a/www/apache22/Makefile
+++ b/www/apache22/Makefile
@@ -3,7 +3,7 @@
 # Date created:         Fri Aug 25 16:42:36 CDT 1995
 # Whom:                 ache@nagual.pp.ru
 #
-# $Id: Makefile,v 1.71 1999/06/25 21:53:06 sada Exp $
+# $Id: Makefile,v 1.72 1999/08/22 19:00:30 mharo Exp $
 #
 
 DISTNAME=       apache_1.3.6
@@ -69,9 +69,9 @@ MAN8= ab.8 apachectl.8 apxs.8 httpd.8 logresolve.8 rotatelogs.8
 
 post-install:
 	@if [ ! -f ${PREFIX}/etc/rc.d/apache.sh ]; then \
-		echo "Installing ${PREFIX}/etc/rc.d/apache.sh startup file."; \
-		echo "#!/bin/sh" > ${PREFIX}/etc/rc.d/apache.sh; \
-		echo "[ -x ${PREFIX}/sbin/apachectl ] && ${PREFIX}/sbin/apachectl start > /dev/null && echo -n ' apache'" >> ${PREFIX}/etc/rc.d/apache.sh; \
+		${ECHO} "Installing ${PREFIX}/etc/rc.d/apache.sh startup file."; \
+		${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/apache.sh; \
+		${ECHO} "[ -x ${PREFIX}/sbin/apachectl ] && ${PREFIX}/sbin/apachectl start > /dev/null && ${ECHO} -n ' apache'" >> ${PREFIX}/etc/rc.d/apache.sh; \
 		${CHMOD} 751 ${PREFIX}/etc/rc.d/apache.sh; \
 	fi
 
diff --git a/www/g-gcl/Makefile b/www/g-gcl/Makefile
index b4857556cdf5..d57b6e2aca87 100644
--- a/www/g-gcl/Makefile
+++ b/www/g-gcl/Makefile
@@ -3,7 +3,7 @@
 # Date created:				21 Jun 1999
 # Whom:					G. Adam Stanislav <adam@whizkidtech.net>
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1999/06/22 06:23:45 cpiazza Exp $
 #
 
 DISTNAME=	g-gcl-1.10
@@ -31,10 +31,6 @@ do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/space.gcl.sample ${PREFIX}/share/examples/gracula
 	${INSTALL_SCRIPT} ${WRKSRC}/sec2000.gcl.sample ${PREFIX}/share/examples/gracula
 	${INSTALL_SCRIPT} ${WRKSRC}/tri.gcl.sample ${PREFIX}/share/examples/gracula
-	@echo
-	@echo "    Sample scripts installed in the"
-	@echo "    ${PREFIX}/share/examples/gracula/"
-	@echo "    directory."
-	@echo
+	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/www/g-gcl/pkg-message b/www/g-gcl/pkg-message
new file mode 100644
index 000000000000..67c534f70dd8
--- /dev/null
+++ b/www/g-gcl/pkg-message
@@ -0,0 +1,5 @@
+
+   Sample scripts installed in the
+   ${PREFIX}/share/examples/gracula/
+   directory.
+
diff --git a/www/gn/Makefile b/www/gn/Makefile
index 9817eb605668..f9c5e1effd46 100644
--- a/www/gn/Makefile
+++ b/www/gn/Makefile
@@ -3,7 +3,7 @@
 # Date created:         20 Sep 1994
 # Whom:                 adam
 #
-# $Id: Makefile,v 1.20 1999/06/26 21:56:51 mharo Exp $
+# $Id: Makefile,v 1.21 1999/08/22 23:33:28 mharo Exp $
 #
 
 DISTNAME=       gn-2.24
@@ -35,18 +35,18 @@ post-install:
 	@cd ${PREFIX}; \
 	  [ -s etc/gn_mime.types ] && \
 	  if ! cmp -s etc/gn_mime.types ${WRKSRC}/etc/gn_mime.types; then \
-		echo mv etc/gn_mime.types etc/gn_mime.types.old; \
+		${ECHO} mv etc/gn_mime.types etc/gn_mime.types.old; \
 		mv etc/gn_mime.types etc/gn_mime.types.old; \
   	  fi; \
 	  [ -s gnroot/menu ] && \
 	  if ! cmp -s gnroot/menu ${WRKSRC}/gnroot/menu; then \
-		echo mv gnroot/menu gnroot/menu.old; \
+		${ECHO} mv gnroot/menu gnroot/menu.old; \
 		mv gnroot/menu gnroot/menu.old; \
 	  fi; \
 	  tar -cf - -C ${WRKSRC} gnroot libexec bin etc | tar xpf - && \
 		(cd gnroot; ${WRKSRC}/bin/mkcache -r); \
 	  ${AWK} '$$1 ~ /#*gopher/ && $$6 == "${PREFIX}/libexec/gn" { exit 1 }' \
-		${INETD_CONF} || { \ echo '#'gopher${CONF} >>${INETD_CONF}
+		${INETD_CONF} || { \ ${ECHO} '#'gopher${CONF} >>${INETD_CONF}
 	  }
 
 .include <bsd.port.mk>
diff --git a/www/mapedit/Makefile b/www/mapedit/Makefile
index 3a6b0e31e18c..f438f815487a 100644
--- a/www/mapedit/Makefile
+++ b/www/mapedit/Makefile
@@ -3,7 +3,7 @@
 # Date created:		Fr   4 Apr 1997 17:45:31 MET DST
 # Whom:			Andreas Klemm <andreas@klemm.gtn.com>
 #
-# $Id: Makefile,v 1.10 1999/06/28 19:29:03 billf Exp $
+# $Id: Makefile,v 1.11 1999/08/22 23:33:30 mharo Exp $
 #
 
 DISTNAME=	mapedit2.3
@@ -19,7 +19,7 @@ NO_BUILD=	yes
 
 pre-install:
 	@${CAT} ${WRKSRC}/README.TXT
-	@echo ""
+	@${ECHO_MSG} ""
 
 do-install:
 	${MKDIR} ${PREFIX}/lib/mapedit
diff --git a/www/marc-search/Makefile b/www/marc-search/Makefile
index 860a3b9736cd..d3cdd19c328e 100644
--- a/www/marc-search/Makefile
+++ b/www/marc-search/Makefile
@@ -3,7 +3,7 @@
 # Date created:		25 November 1998
 # Whom:			Sheldon Hearn <axl@iafrica.com>
 #
-# $Id: Makefile,v 1.2 1999/06/21 11:07:15 sheldonh Exp $
+# $Id: Makefile,v 1.3 1999/08/23 04:23:55 mharo Exp $
 #
 
 DISTNAME=	marc-search.4.3
@@ -31,8 +31,8 @@ MARC_LIBS= 	Marc.pm Marc/Form.pm Marc/Search.pm
 
 do-configure:
 .if !defined(PUB_HTML) || !defined(DOCROOT) || !defined(SCRIPTDIR)
-	@echo "You must tailor the port Makefile and set PUB_HTML, DOCROOT,"
-	@echo "and SCRIPTDIR to match your site configuration."
+	@${ECHO_MSG} "You must tailor the port Makefile and set PUB_HTML, DOCROOT,"
+	@${ECHO_MSG} "and SCRIPTDIR to match your site configuration."
 	@${FALSE}
 .else
 	${CP} ${FILESDIR}/marc-search.conf ${WRKSRC}/
diff --git a/www/roxen/Makefile b/www/roxen/Makefile
index f68df679a1e8..9a8b21cf11cc 100644
--- a/www/roxen/Makefile
+++ b/www/roxen/Makefile
@@ -3,7 +3,7 @@
 # Date created:		26 February 1999
 # Whom:			Kai Voigt (k@123.org)
 #
-# $Id: Makefile,v 1.1.1.1 1999/05/04 16:14:19 flathill Exp $
+# $Id: Makefile,v 1.2 1999/08/22 23:33:31 mharo Exp $
 #
 
 DISTNAME=	Roxen_1.2final-int
@@ -23,16 +23,6 @@ pre-build:
 
 post-install:
 	@${CP} ${FILESDIR}/roxen.sh ${PREFIX}/etc/rc.d/
-	@echo "Installation of Roxen Challenger finished!"
-	@echo ""
-	@echo "Now perform the following steps to initialize"
-	@echo "the webserver."
-	@echo ""
-	@echo "% cd ${PREFIX}/roxen/server/"
-	@echo "% ./install"
-	@echo ""
-	@echo "Then follow the instructions.  For further"
-	@echo "documentation read http://roxen.com/documentation/"
-	@echo ""
+	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/www/squid/Makefile b/www/squid/Makefile
index 774a81d2b7c5..76d84cd3adf7 100644
--- a/www/squid/Makefile
+++ b/www/squid/Makefile
@@ -3,7 +3,7 @@
 # Date created:		Thu Nov  7 00:53:18 WST 1996
 # Whom:			Peter Wemm <peter@freebsd.org>
 #
-# $Id: Makefile,v 1.58 1999/08/08 13:53:34 peter Exp $
+# $Id: Makefile,v 1.59 1999/08/22 19:00:55 mharo Exp $
 #
 
 DISTNAME=	squid-2.2.STABLE4
@@ -94,11 +94,11 @@ post-install:
 	${MKDIR} ${PREFIX}/squid/logs
 	${MKDIR} ${PREFIX}/squid/cache
 	@if [ ! -f ${PREFIX}/etc/rc.d/squid.sh ]; then \
-		echo "Installing ${PREFIX}/etc/rc.d/squid.sh startup file."; \
-		echo "#!/bin/sh" > ${PREFIX}/etc/rc.d/squid.sh; \
-		echo "if [ -x ${PREFIX}/sbin/RunCache -a -f ${PREFIX}/etc/squid/squid.conf ]; then" >> ${PREFIX}/etc/rc.d/squid.sh; \
-		echo "	(cd /tmp; ${PREFIX}/sbin/RunCache >/dev/null 2>&1 &) ; echo -n ' squid'" >> ${PREFIX}/etc/rc.d/squid.sh; \
-		echo "fi" >> ${PREFIX}/etc/rc.d/squid.sh; \
+		${ECHO} "Installing ${PREFIX}/etc/rc.d/squid.sh startup file."; \
+		${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/squid.sh; \
+		${ECHO} "if [ -x ${PREFIX}/sbin/RunCache -a -f ${PREFIX}/etc/squid/squid.conf ]; then" >> ${PREFIX}/etc/rc.d/squid.sh; \
+		${ECHO} "	(cd /tmp; ${PREFIX}/sbin/RunCache >/dev/null 2>&1 &) ; ${ECHO} -n ' squid'" >> ${PREFIX}/etc/rc.d/squid.sh; \
+		${ECHO} "fi" >> ${PREFIX}/etc/rc.d/squid.sh; \
 		${CHMOD} 751 ${PREFIX}/etc/rc.d/squid.sh; \
 	fi
 
diff --git a/www/squid22/Makefile b/www/squid22/Makefile
index 774a81d2b7c5..76d84cd3adf7 100644
--- a/www/squid22/Makefile
+++ b/www/squid22/Makefile
@@ -3,7 +3,7 @@
 # Date created:		Thu Nov  7 00:53:18 WST 1996
 # Whom:			Peter Wemm <peter@freebsd.org>
 #
-# $Id: Makefile,v 1.58 1999/08/08 13:53:34 peter Exp $
+# $Id: Makefile,v 1.59 1999/08/22 19:00:55 mharo Exp $
 #
 
 DISTNAME=	squid-2.2.STABLE4
@@ -94,11 +94,11 @@ post-install:
 	${MKDIR} ${PREFIX}/squid/logs
 	${MKDIR} ${PREFIX}/squid/cache
 	@if [ ! -f ${PREFIX}/etc/rc.d/squid.sh ]; then \
-		echo "Installing ${PREFIX}/etc/rc.d/squid.sh startup file."; \
-		echo "#!/bin/sh" > ${PREFIX}/etc/rc.d/squid.sh; \
-		echo "if [ -x ${PREFIX}/sbin/RunCache -a -f ${PREFIX}/etc/squid/squid.conf ]; then" >> ${PREFIX}/etc/rc.d/squid.sh; \
-		echo "	(cd /tmp; ${PREFIX}/sbin/RunCache >/dev/null 2>&1 &) ; echo -n ' squid'" >> ${PREFIX}/etc/rc.d/squid.sh; \
-		echo "fi" >> ${PREFIX}/etc/rc.d/squid.sh; \
+		${ECHO} "Installing ${PREFIX}/etc/rc.d/squid.sh startup file."; \
+		${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/squid.sh; \
+		${ECHO} "if [ -x ${PREFIX}/sbin/RunCache -a -f ${PREFIX}/etc/squid/squid.conf ]; then" >> ${PREFIX}/etc/rc.d/squid.sh; \
+		${ECHO} "	(cd /tmp; ${PREFIX}/sbin/RunCache >/dev/null 2>&1 &) ; ${ECHO} -n ' squid'" >> ${PREFIX}/etc/rc.d/squid.sh; \
+		${ECHO} "fi" >> ${PREFIX}/etc/rc.d/squid.sh; \
 		${CHMOD} 751 ${PREFIX}/etc/rc.d/squid.sh; \
 	fi
 
diff --git a/www/squid23/Makefile b/www/squid23/Makefile
index 774a81d2b7c5..76d84cd3adf7 100644
--- a/www/squid23/Makefile
+++ b/www/squid23/Makefile
@@ -3,7 +3,7 @@
 # Date created:		Thu Nov  7 00:53:18 WST 1996
 # Whom:			Peter Wemm <peter@freebsd.org>
 #
-# $Id: Makefile,v 1.58 1999/08/08 13:53:34 peter Exp $
+# $Id: Makefile,v 1.59 1999/08/22 19:00:55 mharo Exp $
 #
 
 DISTNAME=	squid-2.2.STABLE4
@@ -94,11 +94,11 @@ post-install:
 	${MKDIR} ${PREFIX}/squid/logs
 	${MKDIR} ${PREFIX}/squid/cache
 	@if [ ! -f ${PREFIX}/etc/rc.d/squid.sh ]; then \
-		echo "Installing ${PREFIX}/etc/rc.d/squid.sh startup file."; \
-		echo "#!/bin/sh" > ${PREFIX}/etc/rc.d/squid.sh; \
-		echo "if [ -x ${PREFIX}/sbin/RunCache -a -f ${PREFIX}/etc/squid/squid.conf ]; then" >> ${PREFIX}/etc/rc.d/squid.sh; \
-		echo "	(cd /tmp; ${PREFIX}/sbin/RunCache >/dev/null 2>&1 &) ; echo -n ' squid'" >> ${PREFIX}/etc/rc.d/squid.sh; \
-		echo "fi" >> ${PREFIX}/etc/rc.d/squid.sh; \
+		${ECHO} "Installing ${PREFIX}/etc/rc.d/squid.sh startup file."; \
+		${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/squid.sh; \
+		${ECHO} "if [ -x ${PREFIX}/sbin/RunCache -a -f ${PREFIX}/etc/squid/squid.conf ]; then" >> ${PREFIX}/etc/rc.d/squid.sh; \
+		${ECHO} "	(cd /tmp; ${PREFIX}/sbin/RunCache >/dev/null 2>&1 &) ; ${ECHO} -n ' squid'" >> ${PREFIX}/etc/rc.d/squid.sh; \
+		${ECHO} "fi" >> ${PREFIX}/etc/rc.d/squid.sh; \
 		${CHMOD} 751 ${PREFIX}/etc/rc.d/squid.sh; \
 	fi
 
diff --git a/www/squid24/Makefile b/www/squid24/Makefile
index 774a81d2b7c5..76d84cd3adf7 100644
--- a/www/squid24/Makefile
+++ b/www/squid24/Makefile
@@ -3,7 +3,7 @@
 # Date created:		Thu Nov  7 00:53:18 WST 1996
 # Whom:			Peter Wemm <peter@freebsd.org>
 #
-# $Id: Makefile,v 1.58 1999/08/08 13:53:34 peter Exp $
+# $Id: Makefile,v 1.59 1999/08/22 19:00:55 mharo Exp $
 #
 
 DISTNAME=	squid-2.2.STABLE4
@@ -94,11 +94,11 @@ post-install:
 	${MKDIR} ${PREFIX}/squid/logs
 	${MKDIR} ${PREFIX}/squid/cache
 	@if [ ! -f ${PREFIX}/etc/rc.d/squid.sh ]; then \
-		echo "Installing ${PREFIX}/etc/rc.d/squid.sh startup file."; \
-		echo "#!/bin/sh" > ${PREFIX}/etc/rc.d/squid.sh; \
-		echo "if [ -x ${PREFIX}/sbin/RunCache -a -f ${PREFIX}/etc/squid/squid.conf ]; then" >> ${PREFIX}/etc/rc.d/squid.sh; \
-		echo "	(cd /tmp; ${PREFIX}/sbin/RunCache >/dev/null 2>&1 &) ; echo -n ' squid'" >> ${PREFIX}/etc/rc.d/squid.sh; \
-		echo "fi" >> ${PREFIX}/etc/rc.d/squid.sh; \
+		${ECHO} "Installing ${PREFIX}/etc/rc.d/squid.sh startup file."; \
+		${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/squid.sh; \
+		${ECHO} "if [ -x ${PREFIX}/sbin/RunCache -a -f ${PREFIX}/etc/squid/squid.conf ]; then" >> ${PREFIX}/etc/rc.d/squid.sh; \
+		${ECHO} "	(cd /tmp; ${PREFIX}/sbin/RunCache >/dev/null 2>&1 &) ; ${ECHO} -n ' squid'" >> ${PREFIX}/etc/rc.d/squid.sh; \
+		${ECHO} "fi" >> ${PREFIX}/etc/rc.d/squid.sh; \
 		${CHMOD} 751 ${PREFIX}/etc/rc.d/squid.sh; \
 	fi
 
diff --git a/www/squid25/Makefile b/www/squid25/Makefile
index 774a81d2b7c5..76d84cd3adf7 100644
--- a/www/squid25/Makefile
+++ b/www/squid25/Makefile
@@ -3,7 +3,7 @@
 # Date created:		Thu Nov  7 00:53:18 WST 1996
 # Whom:			Peter Wemm <peter@freebsd.org>
 #
-# $Id: Makefile,v 1.58 1999/08/08 13:53:34 peter Exp $
+# $Id: Makefile,v 1.59 1999/08/22 19:00:55 mharo Exp $
 #
 
 DISTNAME=	squid-2.2.STABLE4
@@ -94,11 +94,11 @@ post-install:
 	${MKDIR} ${PREFIX}/squid/logs
 	${MKDIR} ${PREFIX}/squid/cache
 	@if [ ! -f ${PREFIX}/etc/rc.d/squid.sh ]; then \
-		echo "Installing ${PREFIX}/etc/rc.d/squid.sh startup file."; \
-		echo "#!/bin/sh" > ${PREFIX}/etc/rc.d/squid.sh; \
-		echo "if [ -x ${PREFIX}/sbin/RunCache -a -f ${PREFIX}/etc/squid/squid.conf ]; then" >> ${PREFIX}/etc/rc.d/squid.sh; \
-		echo "	(cd /tmp; ${PREFIX}/sbin/RunCache >/dev/null 2>&1 &) ; echo -n ' squid'" >> ${PREFIX}/etc/rc.d/squid.sh; \
-		echo "fi" >> ${PREFIX}/etc/rc.d/squid.sh; \
+		${ECHO} "Installing ${PREFIX}/etc/rc.d/squid.sh startup file."; \
+		${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/squid.sh; \
+		${ECHO} "if [ -x ${PREFIX}/sbin/RunCache -a -f ${PREFIX}/etc/squid/squid.conf ]; then" >> ${PREFIX}/etc/rc.d/squid.sh; \
+		${ECHO} "	(cd /tmp; ${PREFIX}/sbin/RunCache >/dev/null 2>&1 &) ; ${ECHO} -n ' squid'" >> ${PREFIX}/etc/rc.d/squid.sh; \
+		${ECHO} "fi" >> ${PREFIX}/etc/rc.d/squid.sh; \
 		${CHMOD} 751 ${PREFIX}/etc/rc.d/squid.sh; \
 	fi
 
diff --git a/www/squid26/Makefile b/www/squid26/Makefile
index 774a81d2b7c5..76d84cd3adf7 100644
--- a/www/squid26/Makefile
+++ b/www/squid26/Makefile
@@ -3,7 +3,7 @@
 # Date created:		Thu Nov  7 00:53:18 WST 1996
 # Whom:			Peter Wemm <peter@freebsd.org>
 #
-# $Id: Makefile,v 1.58 1999/08/08 13:53:34 peter Exp $
+# $Id: Makefile,v 1.59 1999/08/22 19:00:55 mharo Exp $
 #
 
 DISTNAME=	squid-2.2.STABLE4
@@ -94,11 +94,11 @@ post-install:
 	${MKDIR} ${PREFIX}/squid/logs
 	${MKDIR} ${PREFIX}/squid/cache
 	@if [ ! -f ${PREFIX}/etc/rc.d/squid.sh ]; then \
-		echo "Installing ${PREFIX}/etc/rc.d/squid.sh startup file."; \
-		echo "#!/bin/sh" > ${PREFIX}/etc/rc.d/squid.sh; \
-		echo "if [ -x ${PREFIX}/sbin/RunCache -a -f ${PREFIX}/etc/squid/squid.conf ]; then" >> ${PREFIX}/etc/rc.d/squid.sh; \
-		echo "	(cd /tmp; ${PREFIX}/sbin/RunCache >/dev/null 2>&1 &) ; echo -n ' squid'" >> ${PREFIX}/etc/rc.d/squid.sh; \
-		echo "fi" >> ${PREFIX}/etc/rc.d/squid.sh; \
+		${ECHO} "Installing ${PREFIX}/etc/rc.d/squid.sh startup file."; \
+		${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/squid.sh; \
+		${ECHO} "if [ -x ${PREFIX}/sbin/RunCache -a -f ${PREFIX}/etc/squid/squid.conf ]; then" >> ${PREFIX}/etc/rc.d/squid.sh; \
+		${ECHO} "	(cd /tmp; ${PREFIX}/sbin/RunCache >/dev/null 2>&1 &) ; ${ECHO} -n ' squid'" >> ${PREFIX}/etc/rc.d/squid.sh; \
+		${ECHO} "fi" >> ${PREFIX}/etc/rc.d/squid.sh; \
 		${CHMOD} 751 ${PREFIX}/etc/rc.d/squid.sh; \
 	fi
 
diff --git a/www/squid27/Makefile b/www/squid27/Makefile
index 774a81d2b7c5..76d84cd3adf7 100644
--- a/www/squid27/Makefile
+++ b/www/squid27/Makefile
@@ -3,7 +3,7 @@
 # Date created:		Thu Nov  7 00:53:18 WST 1996
 # Whom:			Peter Wemm <peter@freebsd.org>
 #
-# $Id: Makefile,v 1.58 1999/08/08 13:53:34 peter Exp $
+# $Id: Makefile,v 1.59 1999/08/22 19:00:55 mharo Exp $
 #
 
 DISTNAME=	squid-2.2.STABLE4
@@ -94,11 +94,11 @@ post-install:
 	${MKDIR} ${PREFIX}/squid/logs
 	${MKDIR} ${PREFIX}/squid/cache
 	@if [ ! -f ${PREFIX}/etc/rc.d/squid.sh ]; then \
-		echo "Installing ${PREFIX}/etc/rc.d/squid.sh startup file."; \
-		echo "#!/bin/sh" > ${PREFIX}/etc/rc.d/squid.sh; \
-		echo "if [ -x ${PREFIX}/sbin/RunCache -a -f ${PREFIX}/etc/squid/squid.conf ]; then" >> ${PREFIX}/etc/rc.d/squid.sh; \
-		echo "	(cd /tmp; ${PREFIX}/sbin/RunCache >/dev/null 2>&1 &) ; echo -n ' squid'" >> ${PREFIX}/etc/rc.d/squid.sh; \
-		echo "fi" >> ${PREFIX}/etc/rc.d/squid.sh; \
+		${ECHO} "Installing ${PREFIX}/etc/rc.d/squid.sh startup file."; \
+		${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/squid.sh; \
+		${ECHO} "if [ -x ${PREFIX}/sbin/RunCache -a -f ${PREFIX}/etc/squid/squid.conf ]; then" >> ${PREFIX}/etc/rc.d/squid.sh; \
+		${ECHO} "	(cd /tmp; ${PREFIX}/sbin/RunCache >/dev/null 2>&1 &) ; ${ECHO} -n ' squid'" >> ${PREFIX}/etc/rc.d/squid.sh; \
+		${ECHO} "fi" >> ${PREFIX}/etc/rc.d/squid.sh; \
 		${CHMOD} 751 ${PREFIX}/etc/rc.d/squid.sh; \
 	fi
 
diff --git a/www/squid30/Makefile b/www/squid30/Makefile
index 774a81d2b7c5..76d84cd3adf7 100644
--- a/www/squid30/Makefile
+++ b/www/squid30/Makefile
@@ -3,7 +3,7 @@
 # Date created:		Thu Nov  7 00:53:18 WST 1996
 # Whom:			Peter Wemm <peter@freebsd.org>
 #
-# $Id: Makefile,v 1.58 1999/08/08 13:53:34 peter Exp $
+# $Id: Makefile,v 1.59 1999/08/22 19:00:55 mharo Exp $
 #
 
 DISTNAME=	squid-2.2.STABLE4
@@ -94,11 +94,11 @@ post-install:
 	${MKDIR} ${PREFIX}/squid/logs
 	${MKDIR} ${PREFIX}/squid/cache
 	@if [ ! -f ${PREFIX}/etc/rc.d/squid.sh ]; then \
-		echo "Installing ${PREFIX}/etc/rc.d/squid.sh startup file."; \
-		echo "#!/bin/sh" > ${PREFIX}/etc/rc.d/squid.sh; \
-		echo "if [ -x ${PREFIX}/sbin/RunCache -a -f ${PREFIX}/etc/squid/squid.conf ]; then" >> ${PREFIX}/etc/rc.d/squid.sh; \
-		echo "	(cd /tmp; ${PREFIX}/sbin/RunCache >/dev/null 2>&1 &) ; echo -n ' squid'" >> ${PREFIX}/etc/rc.d/squid.sh; \
-		echo "fi" >> ${PREFIX}/etc/rc.d/squid.sh; \
+		${ECHO} "Installing ${PREFIX}/etc/rc.d/squid.sh startup file."; \
+		${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/squid.sh; \
+		${ECHO} "if [ -x ${PREFIX}/sbin/RunCache -a -f ${PREFIX}/etc/squid/squid.conf ]; then" >> ${PREFIX}/etc/rc.d/squid.sh; \
+		${ECHO} "	(cd /tmp; ${PREFIX}/sbin/RunCache >/dev/null 2>&1 &) ; ${ECHO} -n ' squid'" >> ${PREFIX}/etc/rc.d/squid.sh; \
+		${ECHO} "fi" >> ${PREFIX}/etc/rc.d/squid.sh; \
 		${CHMOD} 751 ${PREFIX}/etc/rc.d/squid.sh; \
 	fi
 
diff --git a/www/squid31/Makefile b/www/squid31/Makefile
index 774a81d2b7c5..76d84cd3adf7 100644
--- a/www/squid31/Makefile
+++ b/www/squid31/Makefile
@@ -3,7 +3,7 @@
 # Date created:		Thu Nov  7 00:53:18 WST 1996
 # Whom:			Peter Wemm <peter@freebsd.org>
 #
-# $Id: Makefile,v 1.58 1999/08/08 13:53:34 peter Exp $
+# $Id: Makefile,v 1.59 1999/08/22 19:00:55 mharo Exp $
 #
 
 DISTNAME=	squid-2.2.STABLE4
@@ -94,11 +94,11 @@ post-install:
 	${MKDIR} ${PREFIX}/squid/logs
 	${MKDIR} ${PREFIX}/squid/cache
 	@if [ ! -f ${PREFIX}/etc/rc.d/squid.sh ]; then \
-		echo "Installing ${PREFIX}/etc/rc.d/squid.sh startup file."; \
-		echo "#!/bin/sh" > ${PREFIX}/etc/rc.d/squid.sh; \
-		echo "if [ -x ${PREFIX}/sbin/RunCache -a -f ${PREFIX}/etc/squid/squid.conf ]; then" >> ${PREFIX}/etc/rc.d/squid.sh; \
-		echo "	(cd /tmp; ${PREFIX}/sbin/RunCache >/dev/null 2>&1 &) ; echo -n ' squid'" >> ${PREFIX}/etc/rc.d/squid.sh; \
-		echo "fi" >> ${PREFIX}/etc/rc.d/squid.sh; \
+		${ECHO} "Installing ${PREFIX}/etc/rc.d/squid.sh startup file."; \
+		${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/squid.sh; \
+		${ECHO} "if [ -x ${PREFIX}/sbin/RunCache -a -f ${PREFIX}/etc/squid/squid.conf ]; then" >> ${PREFIX}/etc/rc.d/squid.sh; \
+		${ECHO} "	(cd /tmp; ${PREFIX}/sbin/RunCache >/dev/null 2>&1 &) ; ${ECHO} -n ' squid'" >> ${PREFIX}/etc/rc.d/squid.sh; \
+		${ECHO} "fi" >> ${PREFIX}/etc/rc.d/squid.sh; \
 		${CHMOD} 751 ${PREFIX}/etc/rc.d/squid.sh; \
 	fi
 
diff --git a/www/squirm/Makefile b/www/squirm/Makefile
index caa30ac29fa5..b76c2ad7614b 100644
--- a/www/squirm/Makefile
+++ b/www/squirm/Makefile
@@ -3,7 +3,7 @@
 # Date created:     24 May 1999
 # Whom:             Maxim Sobolev <sobomax@altavista.net>
 #
-# $Id: Makefile,v 1.2 1999/06/30 19:27:17 steve Exp $
+# $Id: Makefile,v 1.3 1999/08/23 04:23:59 mharo Exp $
 #
 
 DISTNAME=	squirm-1.0betaB
@@ -26,26 +26,26 @@ post-patch:
 pre-install:
 .if defined(SQUID_UID) && defined(SQUID_GID)
 .if (${SQUID_UID} == "nobody") || (${SQUID_GID} == "nogroup")
-	@echo
-	@echo	'WARNING! You are going to install squirm files with either nobody owner or'
-	@echo	'nogroup group, which may be insecure.'
-	@echo
+	@${ECHO_MSG}
+	@${ECHO_MSG}	'WARNING! You are going to install squirm files with either nobody owner or'
+	@${ECHO_MSG}	'nogroup group, which may be insecure.'
+	@${ECHO_MSG}
 .endif
 .else
-	@echo
-	@echo 	'You should set SQUID_UID and SQUID_GID variables to your squid effective'
-	@echo	'user/group. For example: SQUID_UID=squid SQUID_GID=squid.'
-	@echo
+	@${ECHO_MSG}
+	@${ECHO_MSG} 	'You should set SQUID_UID and SQUID_GID variables to your squid effective'
+	@${ECHO_MSG}	'user/group. For example: SQUID_UID=squid SQUID_GID=squid.'
+	@${ECHO_MSG}
 	@${FALSE}
 .endif
 
 post-install:
-	@echo
-	@echo ' +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++'
-	@echo '  You have to manually add "redirect_program ${PREFIX}/bin/squirm"'
-	@echo '  into your squid.conf file.'
-	@echo '  For help on configuring squirm try http://www.senet.com.au/squirm/'
-	@echo ' +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++'
-	@echo
+	@${ECHO_MSG}
+	@${ECHO_MSG} ' +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++'
+	@${ECHO_MSG} '  You have to manually add "redirect_program ${PREFIX}/bin/squirm"'
+	@${ECHO_MSG} '  into your squid.conf file.'
+	@${ECHO_MSG} '  For help on configuring squirm try http://www.senet.com.au/squirm/'
+	@${ECHO_MSG} ' +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++'
+	@${ECHO_MSG}
 
 .include <bsd.port.mk>
diff --git a/www/tidy-devel/Makefile b/www/tidy-devel/Makefile
index bd7f43251da2..6795964fbcf9 100644
--- a/www/tidy-devel/Makefile
+++ b/www/tidy-devel/Makefile
@@ -3,7 +3,7 @@
 # Date created:		27 Oct 1998
 # Whom:			Abel Chow <achow@transoft.net>
 #
-# $Id: Makefile,v 1.8 1999/07/06 01:07:35 cpiazza Exp $
+# $Id: Makefile,v 1.9 1999/07/11 02:28:34 cpiazza Exp $
 #
 
 DISTNAME=	tidy7jul99
@@ -21,7 +21,7 @@ DOCFILES=	Overview.html tidy.gif release-notes.html grid.gif config.txt
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/tidy ${PREFIX}/bin/tidy
 .if !defined(NOPORTDOCS)
-	@echo "===>   Installing documentation for ${PKGNAME}"
+	@${ECHO_MSG} "===>   Installing documentation for ${PKGNAME}"
 	@${MKDIR} ${PREFIX}/share/doc/tidy
 .for docfile in ${DOCFILES}
 	@${INSTALL_DATA} ${WRKSRC}/${docfile} ${PREFIX}/share/doc/tidy
diff --git a/www/tidy/Makefile b/www/tidy/Makefile
index bd7f43251da2..6795964fbcf9 100644
--- a/www/tidy/Makefile
+++ b/www/tidy/Makefile
@@ -3,7 +3,7 @@
 # Date created:		27 Oct 1998
 # Whom:			Abel Chow <achow@transoft.net>
 #
-# $Id: Makefile,v 1.8 1999/07/06 01:07:35 cpiazza Exp $
+# $Id: Makefile,v 1.9 1999/07/11 02:28:34 cpiazza Exp $
 #
 
 DISTNAME=	tidy7jul99
@@ -21,7 +21,7 @@ DOCFILES=	Overview.html tidy.gif release-notes.html grid.gif config.txt
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/tidy ${PREFIX}/bin/tidy
 .if !defined(NOPORTDOCS)
-	@echo "===>   Installing documentation for ${PKGNAME}"
+	@${ECHO_MSG} "===>   Installing documentation for ${PKGNAME}"
 	@${MKDIR} ${PREFIX}/share/doc/tidy
 .for docfile in ${DOCFILES}
 	@${INSTALL_DATA} ${WRKSRC}/${docfile} ${PREFIX}/share/doc/tidy
diff --git a/www/w3c-httpd/Makefile b/www/w3c-httpd/Makefile
index b4488be8d30f..e56094cec7c5 100644
--- a/www/w3c-httpd/Makefile
+++ b/www/w3c-httpd/Makefile
@@ -3,7 +3,7 @@
 # Date created:		29 October 1994
 # Whom:			pst (orig)
 #
-# $Id: Makefile,v 1.20 1999/05/10 04:05:14 steve Exp $
+# $Id: Makefile,v 1.21 1999/05/10 20:00:22 steve Exp $
 #
 
 DISTNAME=	w3c-httpd-3.0A
@@ -21,12 +21,12 @@ MAKE_ENV+=	PORTSDIR=${PORTSDIR}
 
 pre-configure:
 .if !defined(MD5_PW)
-	@echo ""
-	@echo "Defaulting to DES encrypted passwords."
-	@echo "Set the environment variable MD5_PW if you want MD5 encrypted passwords."
-	@echo ""
+	@${ECHO_MSG} ""
+	@${ECHO_MSG} "Defaulting to DES encrypted passwords."
+	@${ECHO_MSG} "Set the environment variable MD5_PW if you want MD5 encrypted passwords."
+	@${ECHO_MSG} ""
 .else
-	@echo "CFLAGS += -DMD5_PW" >> ${WRKDIR}/All/${OSNAME}/Makefile.include
+	@${ECHO} "CFLAGS += -DMD5_PW" >> ${WRKDIR}/All/${OSNAME}/Makefile.include
 .endif
 
 do-install:
diff --git a/www/wn/Makefile b/www/wn/Makefile
index c1305e562094..c7a37e2a5136 100644
--- a/www/wn/Makefile
+++ b/www/wn/Makefile
@@ -3,7 +3,7 @@
 # Date created:         4 May 1995
 # Whom:                 adam
 #
-# $Id: Makefile,v 1.28 1998/12/02 09:48:36 obrien Exp $
+# $Id: Makefile,v 1.29 1999/08/22 23:33:35 mharo Exp $
 #
 
 DISTNAME=       wn-1.18.6
@@ -31,7 +31,7 @@ post-install:
 	@install -c -o bin -g bin  ${WRKSRC}/bin/authwn ${PREFIX}/wn/bin
 	@if [ -s ${PREFIX}/etc/wn_mime.types ]; then \
 	    cmp -s ${PREFIX}/etc/wn_mime.types ${WRKSRC}/lib/mime.types || { \
-		echo Warning: new mime.types installed as ${PREFIX}/etc/wn_mime.types-dist; \
+		${ECHO_MSG} Warning: new mime.types installed as ${PREFIX}/etc/wn_mime.types-dist; \
 		install -c -o bin -g bin -m 644 ${WRKSRC}/lib/mime.types \
 					${PREFIX}/etc/wn_mime.types-dist; } \
 	else \
@@ -40,7 +40,7 @@ post-install:
 	fi
 	@if [ -s ${PREFIX}/wn/index ]; then \
 	    cmp -s ${PREFIX}/wn/index ${WRKDIR}/index || { \
-		echo Warning: new index installed as ${PREFIX}/wn/index-dist; \
+		${ECHO_MSG} Warning: new index installed as ${PREFIX}/wn/index-dist; \
 		install -c -o bin -g bin -m 644 ${WRKDIR}/index ${PREFIX}/wn/index-dist; } \
 	else \
 	    install -c -o bin -g bin -m 644 ${WRKDIR}/index ${PREFIX}/wn; \