echo -> ${ECHO} or ${ECHO_MSG} and in some cases, move echo stuff

to pkg/MESSAGE and use ${CAT} ${PKGMESSAGE}

12 files changed, 70 insertions, 68 deletions

diff --git a/net/SSLtelnet/Makefile b/net/SSLtelnet/Makefile
index 647e8b8..1b72463 100644
--- a/net/SSLtelnet/Makefile
+++ b/net/SSLtelnet/Makefile
@@ -3,7 +3,7 @@
 # Date created:		Mar 29, 1998
 # Whom:			issei@jp.FreeBSD.ORG
 #
-# $Id: Makefile,v 1.8 1999/08/05 08:00:18 dirk Exp $
+# $Id: Makefile,v 1.9 1999/08/23 04:23:52 mharo Exp $
 
 DISTNAME=		SSLtelnet-0.13
 CATEGORIES=		net security
@@ -13,10 +13,10 @@ MAINTAINER=		issei@jp.FreeBSD.ORG
 
 .if defined(USA_RESIDENT) && ${USA_RESIDENT} != YES && ${USA_RESIDENT} != NO
 pre-fetch:
-	@echo
-	@echo You must set variable USA_RESIDENT to YES, if you are USA resident
-	@echo or to NO, if you aren\'t USA resident to build this package.
-	@echo You must also have installed RSAREF if you are USA resident.
+	@${ECHO_MSG}
+	@${ECHO_MSG} You must set variable USA_RESIDENT to YES, if you are USA resident
+	@${ECHO_MSG} or to NO, if you aren\'t USA resident to build this package.
+	@${ECHO_MSG} You must also have installed RSAREF if you are USA resident.
 	@${FALSE}
 .elif defined(USA_RESIDENT)
 .if ${USA_RESIDENT} == YES
diff --git a/net/bb/Makefile b/net/bb/Makefile
index 0df82cd..32bcae94 100644
--- a/net/bb/Makefile
+++ b/net/bb/Makefile
@@ -3,7 +3,7 @@
 # Date created:         So  17 Nov 1996 16:59:23 MET
 # Whom:                 Andreas Klemm <andreas@klemm.gtn.com>
 #
-# $Id: Makefile,v 1.31 1999/06/26 12:01:23 andreas Exp $
+# $Id: Makefile,v 1.32 1999/06/27 14:22:46 andreas Exp $
 #
 
 DISTNAME=	bb-1.2a
@@ -20,12 +20,12 @@ MAINTAINER=	andreas@FreeBSD.ORG
 WRKSRC=		${WRKDIR}/bb
 
 pre-configure:
-	@echo "==================================================="
-	@echo "You need to install a WWW Server to use this port"
-	@echo "For example: - apache13 or "
-	@echo "             - apache13-modssl
-	@echo "port."
-	@echo "==================================================="
+	@${ECHO_MSG} "==================================================="
+	@${ECHO_MSG} "You need to install a WWW Server to use this port"
+	@${ECHO_MSG} "For example: - apache13 or "
+	@${ECHO_MSG} "             - apache13-modssl
+	@${ECHO_MSG} "port."
+	@${ECHO_MSG} "==================================================="
 
 post-configure:
 	( cd ${WRKSRC}/doc; ${SH} bbconfig freebsd )
@@ -47,22 +47,6 @@ do-install:
 	@${RM} ${PREFIX}/bb/README
 	@${RM} ${PREFIX}/bb/README.CHANGES
 	@${RM} ${PREFIX}/bb/README.INSTALL
-	@echo ""
-	@echo "================================================================"
-	@echo "==== Configuration Notes:                                    ==="
-	@echo "================================================================"
-	@echo ""
-	@echo "a) your hosts 'full qualified domain name' and IP-address"
-	@echo "b) 'watched' hosts 'full qualified domain name' and IP-address"
-	@echo "go here -> ${PREFIX}/bb/etc/bb-hosts"
-	@echo "c) configure -> ${PREFIX}/bb/etc/bbdef.sh"
-	@echo "d) configure -> ${PREFIX}/bb/etc/bbinc.sh"
-	@echo "e) You need to have a running WWW server (apache)"
-	@echo "f) You need kermit or qpage for pager functionality"
-	@echo "After that, you can startup the big brother service by typing"
-	@echo "        ${PREFIX}/bb/runbb.sh &"
-	@echo "and watching your systems status by viewing this URL with"
-	@echo "Netscape or another WWW browser"
-	@echo "        http://localhost/bb"
+	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/net/bb/pkg-message b/net/bb/pkg-message
new file mode 100644
index 0000000..52240c9
--- /dev/null
+++ b/net/bb/pkg-message
@@ -0,0 +1,18 @@
+
+================================================================
+==== Configuration Notes:                                    ===
+================================================================
+
+a) your hosts 'full qualified domain name' and IP-address
+b) 'watched' hosts 'full qualified domain name' and IP-address
+go here -> /usr/local/bb/etc/bb-hosts
+c) configure -> /usr/local/bb/etc/bbdef.sh
+d) configure -> /usr/local/bb/etc/bbinc.sh
+e) You need to have a running WWW server (apache)
+f) You need kermit or qpage for pager functionality
+After that, you can startup the big brother service by typing
+        /usr/local/bb/runbb.sh &
+and watching your systems status by viewing this URL with
+Netscape or another WWW browser
+        http://localhost/bb
+
diff --git a/net/cvsup-mirror/Makefile b/net/cvsup-mirror/Makefile
index eb1d7d2..f833596 100644
--- a/net/cvsup-mirror/Makefile
+++ b/net/cvsup-mirror/Makefile
@@ -3,7 +3,7 @@
 # Date created:		01 February 1997
 # Whom:			jdp
 #
-# $Id: Makefile,v 1.4 1998/06/27 05:19:58 asami Exp $
+# $Id: Makefile,v 1.5 1999/08/22 23:33:09 mharo Exp $
 #
 
 DISTNAME=	cvsup-mirror-1.0
@@ -28,7 +28,7 @@ do-extract:
 	@test -d ${WRKSRC} || ${MKDIR} ${WRKSRC}
 
 do-install:
-	@echo "Installing files"
+	@${ECHO_MSG} "Installing files"
 	@test -d ${base} || ${MKDIR} ${base}
 	@test -d ${rc} || ${MKDIR} ${rc}
 	@${INSTALL_DATA} ${WRKSRC}/config.sh ${base}
diff --git a/net/cvsup/Makefile b/net/cvsup/Makefile
index 4c798c7..8bc45d2 100644
--- a/net/cvsup/Makefile
+++ b/net/cvsup/Makefile
@@ -3,7 +3,7 @@
 # Date created:		7 August 1996
 # Whom:			asami
 #
-# $Id: Makefile,v 1.31 1999/01/28 05:39:14 jdp Exp $
+# $Id: Makefile,v 1.32 1999/02/10 02:47:55 jdp Exp $
 #
 
 DISTNAME=	cvsup-16.0
@@ -24,8 +24,8 @@ MAN8=		cvsupd.8
 M3FLAGS+=	-DNOGUI
 .else
 pre-fetch:
-	@echo -n "To build this port without X11 (and without the GUI),"
-	@echo " define \"NO_X11\"."
+	@${ECHO_MSG} -n "To build this port without X11 (and without the GUI),"
+	@${ECHO_MSG} " define \"NO_X11\"."
 
 .endif
 
diff --git a/net/delegate/Makefile b/net/delegate/Makefile
index 17107fa..739435b 100644
--- a/net/delegate/Makefile
+++ b/net/delegate/Makefile
@@ -3,7 +3,7 @@
 # Date created:			26 Jan 1997
 # Whom:				Masafumi NAKANE <max@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.15 1999/04/18 06:31:27 max Exp $
+# $Id: Makefile,v 1.16 1999/08/02 21:02:25 max Exp $
 #
 
 DISTNAME=	delegate5.9.3
@@ -17,7 +17,7 @@ MAKE_ENV=	PATH=$${PATH}:.
 
 .if defined(BATCH)
 pre-build:
-	@echo "MANAGER=root@localhost" >> ${WRKSRC}/DELEGATE_CONF
+	@${ECHO} "MANAGER=root@localhost" >> ${WRKSRC}/DELEGATE_CONF
 .endif
 
 do-install:
diff --git a/net/gnu-finger/Makefile b/net/gnu-finger/Makefile
index b1991db..88e5b90 100644
--- a/net/gnu-finger/Makefile
+++ b/net/gnu-finger/Makefile
@@ -3,7 +3,7 @@
 # Date created:         20 June 1996
 # Whom:                 Yoshiro MIHIRA <sanpei@yy.cs.keio.ac.jp>
 #
-# $Id: Makefile,v 1.6 1997/01/06 07:24:39 max Exp $
+# $Id: Makefile,v 1.7 1999/01/27 07:41:25 fenner Exp $
 #
 
 DISTNAME=       finger-1.37
@@ -23,7 +23,7 @@ post-install:
 	@${CP} ${WRKSRC}/support/ttylocs ${PREFIX}/etc/fingerdir/ttylocs.sample
 	@${CP} ${FILESDIR}/clients.sample ${PREFIX}/etc/fingerdir/clients.sample
 	@${INSTALL} ${COPY} -m 744 -o root ${FILESDIR}/fingerd.sh.sample ${PREFIX}/etc/rc.d/fingerd.sh.sample
-	@echo "GNU.finger.server.hotname" > ${PREFIX}/etc/fingerdir/serverhost.sample
-	@echo "mail.spool.server.hostname" > ${PREFIX}/etc/fingerdir/mailhost.sample
+	@${ECHO} "GNU.finger.server.hotname" > ${PREFIX}/etc/fingerdir/serverhost.sample
+	@${ECHO} "mail.spool.server.hostname" > ${PREFIX}/etc/fingerdir/mailhost.sample
 
 .include <bsd.port.mk>
diff --git a/net/netatalk-asun/Makefile b/net/netatalk-asun/Makefile
index 782d23b..3bd124c 100644
--- a/net/netatalk-asun/Makefile
+++ b/net/netatalk-asun/Makefile
@@ -3,7 +3,7 @@
 # Date created:         07 Sep 1998
 # Whom:                 stb@freebsd.org
 #
-# $Id: Makefile,v 1.7 1999/05/17 08:17:57 stb Exp $
+# $Id: Makefile,v 1.8 1999/06/21 12:43:07 sheldonh Exp $
 #
 
 DISTNAME=       netatalk-1.4b2+asun2.1.3
@@ -37,15 +37,15 @@ pre-build:
 ## sendfile(2) support seems to be broken in this version, but go ahead an try
 ## to fix it!
 .if defined(USE_SENDFILE) && ${OSVERSION} < 310000
-	@echo "***   sendfile(2) support is available only with FreeBSD 3.1-RELEASE"
-	@echo "      or newer.  This port probably won't compile."
+	@${ECHO_MSG} "***   sendfile(2) support is available only with FreeBSD 3.1-RELEASE"
+	@${ECHO_MSG} "      or newer.  This port probably won't compile."
 .endif
 .if ${OSVERSION} >= 310000
 .if defined(USE_SENDFILE)
-	@echo "***   sendfile(2) support is experimental and will likely cause"
-	@echo "      undesired behaviour!"
+	@${ECHO_MSG} "***   sendfile(2) support is experimental and will likely cause"
+	@${ECHO_MSG} "      undesired behaviour!"
 .else
-#	@echo "***   Use -DUSE_SENDFILE to enable the experimental sendfile(2) support."
+#	@${ECHO_MSG} "***   Use -DUSE_SENDFILE to enable the experimental sendfile(2) support."
 .endif
 .endif
 
diff --git a/net/rwhois/Makefile b/net/rwhois/Makefile
index ed5c57e..1fc3bfb 100644
--- a/net/rwhois/Makefile
+++ b/net/rwhois/Makefile
@@ -3,7 +3,7 @@
 # Date created:				May 9th 1997
 # Whom:	      				James FitzGibbon <jfitz@FreeBSD.org>
 #
-#   $Id: Makefile,v 1.6 1999/06/26 22:58:41 mharo Exp $
+#   $Id: Makefile,v 1.7 1999/08/22 18:59:30 mharo Exp $
 #
 
 DISTNAME=	rwhois-1.0B9.2
@@ -28,14 +28,14 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/doc/* ${PREFIX}/share/doc/rwhois
 	${MV} ${PREFIX}/share/doc/rwhois/rmkdbindex.8 ${PREFIX}/man/man8	
 	${MV} ${PREFIX}/share/doc/rwhois/rwhoisd.8 ${PREFIX}/man/man8	
-	@ echo "Installing ${PREFIX}/etc/rc.d/rwhoisd.sh startup file..."
-	@ echo "#!/bin/sh" > ${PREFIX}/etc/rc.d/rwhoisd.sh
-	@ echo "#" >> ${PREFIX}/etc/rc.d/rwhoisd.sh
-	@ echo "" >> ${PREFIX}/etc/rc.d/rwhoisd.sh
-	@ echo "# remove or comment the following line and uncomment the one below it once you have" >> ${PREFIX}/etc/rc.d/rwhoisd.sh
-	@ echo "# configured your server's data" >> ${PREFIX}/etc/rc.d/rwhoisd.sh
-	@ echo "echo \"rwhoisd not started; sample data still in place.   See ${PREFIX}/share/doc/rwhois for details.\"" >> ${PREFIX}/etc/rc.d/rwhoisd.sh 
-	@ echo "#[ -x ${PREFIX}/lib/rwhois/sbin/rwhoisd ] && ${PREFIX}/lib/rwhois/sbin/rwhoisd -c ${PREFIX}/lib/rwhois/rwhois.conf & && echo -n ' rwhoisd'" >> ${PREFIX}/etc/rc.d/rwhoisd.sh
+	@ ${ECHO_MSG} "Installing ${PREFIX}/etc/rc.d/rwhoisd.sh startup file..."
+	@ ${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/rwhoisd.sh
+	@ ${ECHO} "#" >> ${PREFIX}/etc/rc.d/rwhoisd.sh
+	@ ${ECHO} "" >> ${PREFIX}/etc/rc.d/rwhoisd.sh
+	@ ${ECHO} "# remove or comment the following line and uncomment the one below it once you have" >> ${PREFIX}/etc/rc.d/rwhoisd.sh
+	@ ${ECHO} "# configured your server's data" >> ${PREFIX}/etc/rc.d/rwhoisd.sh
+	@ ${ECHO} "${ECHO} \"rwhoisd not started; sample data still in place.   See ${PREFIX}/share/doc/rwhois for details.\"" >> ${PREFIX}/etc/rc.d/rwhoisd.sh 
+	@ ${ECHO} "#[ -x ${PREFIX}/lib/rwhois/sbin/rwhoisd ] && ${PREFIX}/lib/rwhois/sbin/rwhoisd -c ${PREFIX}/lib/rwhois/rwhois.conf & && ${ECHO} -n ' rwhoisd'" >> ${PREFIX}/etc/rc.d/rwhoisd.sh
 	${CHMOD} 751 ${PREFIX}/etc/rc.d/rwhoisd.sh
 
 .include <bsd.port.mk>
diff --git a/net/rwhoisd/Makefile b/net/rwhoisd/Makefile
index ed5c57e..1fc3bfb 100644
--- a/net/rwhoisd/Makefile
+++ b/net/rwhoisd/Makefile
@@ -3,7 +3,7 @@
 # Date created:				May 9th 1997
 # Whom:	      				James FitzGibbon <jfitz@FreeBSD.org>
 #
-#   $Id: Makefile,v 1.6 1999/06/26 22:58:41 mharo Exp $
+#   $Id: Makefile,v 1.7 1999/08/22 18:59:30 mharo Exp $
 #
 
 DISTNAME=	rwhois-1.0B9.2
@@ -28,14 +28,14 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/doc/* ${PREFIX}/share/doc/rwhois
 	${MV} ${PREFIX}/share/doc/rwhois/rmkdbindex.8 ${PREFIX}/man/man8	
 	${MV} ${PREFIX}/share/doc/rwhois/rwhoisd.8 ${PREFIX}/man/man8	
-	@ echo "Installing ${PREFIX}/etc/rc.d/rwhoisd.sh startup file..."
-	@ echo "#!/bin/sh" > ${PREFIX}/etc/rc.d/rwhoisd.sh
-	@ echo "#" >> ${PREFIX}/etc/rc.d/rwhoisd.sh
-	@ echo "" >> ${PREFIX}/etc/rc.d/rwhoisd.sh
-	@ echo "# remove or comment the following line and uncomment the one below it once you have" >> ${PREFIX}/etc/rc.d/rwhoisd.sh
-	@ echo "# configured your server's data" >> ${PREFIX}/etc/rc.d/rwhoisd.sh
-	@ echo "echo \"rwhoisd not started; sample data still in place.   See ${PREFIX}/share/doc/rwhois for details.\"" >> ${PREFIX}/etc/rc.d/rwhoisd.sh 
-	@ echo "#[ -x ${PREFIX}/lib/rwhois/sbin/rwhoisd ] && ${PREFIX}/lib/rwhois/sbin/rwhoisd -c ${PREFIX}/lib/rwhois/rwhois.conf & && echo -n ' rwhoisd'" >> ${PREFIX}/etc/rc.d/rwhoisd.sh
+	@ ${ECHO_MSG} "Installing ${PREFIX}/etc/rc.d/rwhoisd.sh startup file..."
+	@ ${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/rwhoisd.sh
+	@ ${ECHO} "#" >> ${PREFIX}/etc/rc.d/rwhoisd.sh
+	@ ${ECHO} "" >> ${PREFIX}/etc/rc.d/rwhoisd.sh
+	@ ${ECHO} "# remove or comment the following line and uncomment the one below it once you have" >> ${PREFIX}/etc/rc.d/rwhoisd.sh
+	@ ${ECHO} "# configured your server's data" >> ${PREFIX}/etc/rc.d/rwhoisd.sh
+	@ ${ECHO} "${ECHO} \"rwhoisd not started; sample data still in place.   See ${PREFIX}/share/doc/rwhois for details.\"" >> ${PREFIX}/etc/rc.d/rwhoisd.sh 
+	@ ${ECHO} "#[ -x ${PREFIX}/lib/rwhois/sbin/rwhoisd ] && ${PREFIX}/lib/rwhois/sbin/rwhoisd -c ${PREFIX}/lib/rwhois/rwhois.conf & && ${ECHO} -n ' rwhoisd'" >> ${PREFIX}/etc/rc.d/rwhoisd.sh
 	${CHMOD} 751 ${PREFIX}/etc/rc.d/rwhoisd.sh
 
 .include <bsd.port.mk>
diff --git a/net/tac_plus4/Makefile b/net/tac_plus4/Makefile
index 5edf6af..9aa40af 100644
--- a/net/tac_plus4/Makefile
+++ b/net/tac_plus4/Makefile
@@ -3,7 +3,7 @@
 # Date created:		4 Mar 1997
 # Whom:			Igor Vinokurov <igor@zynaps.ru>
 #
-# $Id: Makefile,v 1.4 1999/02/03 11:11:56 asami Exp $
+# $Id: Makefile,v 1.5 1999/08/22 18:59:32 mharo Exp $
 #
 
 DISTNAME=	tac_plus.2.1
@@ -34,8 +34,8 @@ do-install:
 	${INSTALL_DATA} ${FILESDIR}/tac_plus.conf.example ${PREFIX}/etc/
 	@if [ ! -f ${PREFIX}/etc/rc.d/tac_plus.sh ]; then \
 		${ECHO} "Installing ${PREFIX}/etc/rc.d/tac_plus.sh startup file."; \
-		echo "#!/bin/sh" > ${PREFIX}/etc/rc.d/tac_plus.sh; \
-		echo "[ -x ${PREFIX}/sbin/tac_plus -a -f ${PREFIX}/etc/tac_plus.conf ] && ${PREFIX}/sbin/tac_plus -C ${PREFIX}/etc/tac_plus.conf && echo -n ' tac_plus'" >> ${PREFIX}/etc/rc.d/tac_plus.sh; \
+		${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/tac_plus.sh; \
+		${ECHO} "[ -x ${PREFIX}/sbin/tac_plus -a -f ${PREFIX}/etc/tac_plus.conf ] && ${PREFIX}/sbin/tac_plus -C ${PREFIX}/etc/tac_plus.conf && ${ECHO} -n ' tac_plus'" >> ${PREFIX}/etc/rc.d/tac_plus.sh; \
 		${CHMOD} 751 ${PREFIX}/etc/rc.d/tac_plus.sh; \
 	fi
 .if !defined(NOPORTDOCS)
diff --git a/net/tdetect/Makefile b/net/tdetect/Makefile
index 56d5301..c101fb7 100644
--- a/net/tdetect/Makefile
+++ b/net/tdetect/Makefile
@@ -4,7 +4,7 @@
 # Date created:			  Sun Jan 31, 1997
 # Whom:               		  shipley@dis.org
 #
-# $Id: Makefile,v 1.2 1999/07/04 19:18:49 obrien Exp $
+# $Id: Makefile,v 1.3 1999/08/22 18:59:33 mharo Exp $
 #
 
 DISTNAME=	tdetect-0.2
@@ -27,7 +27,7 @@ post-install:
 		${ECHO} "Installing ${PREFIX}/etc/rc.d/tdetect.sh startup file."; \
 		${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/tdetect.sh; \
 		${ECHO} "ETHERNETDEV=ed0" >> ${PREFIX}/etc/rc.d/tdetect.sh; \
-		${ECHO} '[ -x ${PREFIX}/sbin/tdetect ] && ${PREFIX}/sbin/tdetect \$ETHERNETDEV && echo -n " tdetect"' >> ${PREFIX}/etc/rc.d/tdetect.sh; \
+		${ECHO} '[ -x ${PREFIX}/sbin/tdetect ] && ${PREFIX}/sbin/tdetect \$ETHERNETDEV && ${ECHO} -n " tdetect"' >> ${PREFIX}/etc/rc.d/tdetect.sh; \
 		${CHMOD} 750 ${PREFIX}/etc/rc.d/tdetect.sh; \
 		${ECHO} ''; \
 		${ECHO} 'IMPORTANT edit ${PREFIX}/etc/rc.d/tdetect.sh and set "ETHERNETDEV" to'; \