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

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

10 files changed, 22 insertions, 21 deletions

diff --git a/games/gnushogi/Makefile b/games/gnushogi/Makefile
index eb362131d541..8816d320f69d 100644
--- a/games/gnushogi/Makefile
+++ b/games/gnushogi/Makefile
@@ -19,8 +19,8 @@ DOCFILES= BOOKFILES CHANGES CONTRIB COPYING GENERAL INSTALL PORTING \
 MAN6=		gnushogi.6
 
 post-configure:
-	echo "DISTDIR=${WRKDIR}" >> ${WRKSRC}/src/${MAKEFILE}
-	echo "prefix=${PREFIX}" >> ${WRKSRC}/src/${MAKEFILE}
+	${ECHO} "DISTDIR=${WRKDIR}" >> ${WRKSRC}/src/${MAKEFILE}
+	${ECHO} "prefix=${PREFIX}" >> ${WRKSRC}/src/${MAKEFILE}
 
 do-build:
 	(cd ${WRKSRC}/src; \
diff --git a/games/imaze/Makefile b/games/imaze/Makefile
index d8209482e5f9..cde637c3655c 100644
--- a/games/imaze/Makefile
+++ b/games/imaze/Makefile
@@ -63,6 +63,6 @@ do-install:
 		do ${INSTALL_DATA} $$f ${PREFIX}/share/imaze/$$f.example;\
 		done; \
 		${INSTALL_DATA} README ${PREFIX}/share/imaze)
-	@echo "Please read the file \"README\" in \"${PREFIX}/share/imaze\"."
+	@${ECHO_MSG} "Please read the file \"README\" in \"${PREFIX}/share/imaze\"."
 
 .include <bsd.port.mk>
diff --git a/games/oneko-sakura/Makefile b/games/oneko-sakura/Makefile
index 5cd784482de5..b777da98100e 100644
--- a/games/oneko-sakura/Makefile
+++ b/games/oneko-sakura/Makefile
@@ -23,6 +23,6 @@ MAN6=		oneko.6
 NO_CDROM=	"Including a derivative from CARDCAPTOR SAKURA. See http://www.clamp.f-2.co.jp/"
 
 pre-configure:
-	@echo "MANSUFFIX=6" >>${WRKSRC}/Imakefile
+	@${ECHO} "MANSUFFIX=6" >>${WRKSRC}/Imakefile
 
 .include <bsd.port.mk>
diff --git a/games/oneko/Makefile b/games/oneko/Makefile
index 0330c7098886..ee1e09936273 100644
--- a/games/oneko/Makefile
+++ b/games/oneko/Makefile
@@ -17,6 +17,6 @@ USE_IMAKE=	yes
 MAN6=		oneko.6
 
 pre-configure:
-	@echo "MANSUFFIX=6" >>${WRKSRC}/Imakefile
+	@${ECHO} "MANSUFFIX=6" >>${WRKSRC}/Imakefile
 
 .include <bsd.port.mk>
diff --git a/games/quakeserver/Makefile b/games/quakeserver/Makefile
index b4586d62e803..80b600b78367 100644
--- a/games/quakeserver/Makefile
+++ b/games/quakeserver/Makefile
@@ -50,14 +50,14 @@ do-install:
 		/usr/bin/touch ${PREFIX}/quakeserver/quakeserver.log
 		@ ${CHMOD} 700 ${PREFIX}/quakeserver/quakeserver.in ${PREFIX}/quakeserver/quakeserver.log
 		@ ${CHOWN} -R nobody.nobody ${PREFIX}/quakeserver
-		@ echo "Installing ${PREFIX}/etc/rc.d/quakeserver.sh startup script"
-		@ echo "#!/bin/sh" > ${PREFIX}/etc/rc.d/quakeserver.sh
-		@ echo "#" >> ${PREFIX}/etc/rc.d/quakeserver.sh
-		@ echo "" >> ${PREFIX}/etc/rc.d/quakeserver.sh
-		@ echo "if [ -x ${PREFIX}/quakeserver/unixded ]" >> ${PREFIX}/etc/rc.d/quakeserver.sh
-		@ echo "then" >> ${PREFIX}/etc/rc.d/quakeserver.sh
-		@ echo "	su nobody -c ${PREFIX}/quakeserver/qserver.sh && echo -n ' quakeserver'" >> ${PREFIX}/etc/rc.d/quakeserver.sh
-		@ echo "fi" >> ${PREFIX}/etc/rc.d/quakeserver.sh
+		@ ${ECHO} "Installing ${PREFIX}/etc/rc.d/quakeserver.sh startup script"
+		@ ${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/quakeserver.sh
+		@ ${ECHO} "#" >> ${PREFIX}/etc/rc.d/quakeserver.sh
+		@ ${ECHO} "" >> ${PREFIX}/etc/rc.d/quakeserver.sh
+		@ ${ECHO} "if [ -x ${PREFIX}/quakeserver/unixded ]" >> ${PREFIX}/etc/rc.d/quakeserver.sh
+		@ ${ECHO} "then" >> ${PREFIX}/etc/rc.d/quakeserver.sh
+		@ ${ECHO} "	su nobody -c ${PREFIX}/quakeserver/qserver.sh && ${ECHO} -n ' quakeserver'" >> ${PREFIX}/etc/rc.d/quakeserver.sh
+		@ ${ECHO} "fi" >> ${PREFIX}/etc/rc.d/quakeserver.sh
 		@ ${CHMOD} 750 ${PREFIX}/etc/rc.d/quakeserver.sh
 .if !defined(BATCH)
 		@ /usr/bin/more -e ${PREFIX}/quakeserver/readme.port
diff --git a/games/uox3/Makefile b/games/uox3/Makefile
index 7e48482d4700..d176f45d0e19 100644
--- a/games/uox3/Makefile
+++ b/games/uox3/Makefile
@@ -39,9 +39,9 @@ do-install:
 	${INSTALL_DATA} ${WRKDIR}/WSC\ Changes.txt ${PREFIX}/uox3/wsc_changes.txt
 	${INSTALL_SCRIPT} ${FILESDIR}/uox3.sh ${PREFIX}/etc/rc.d/uox3.sh
 .ifdef NOPORTDOCS
-	@echo "==> Extra documentation WILL NOT be installed."
+	@${ECHO_MSG} "==> Extra documentation WILL NOT be installed."
 .else
-	@echo "==> Installing extra documentation..."
+	@${ECHO_MSG} "==> Installing extra documentation..."
 	${MKDIR} ${PREFIX}/uox3/docs
 	for FILE in ${WRKDIR}/docs/* ; do \
 		${INSTALL_DATA} $${FILE} ${PREFIX}/uox3/docs ;\
diff --git a/games/xquarto/Makefile b/games/xquarto/Makefile
index 6a14282f7428..c9dbe0665961 100644
--- a/games/xquarto/Makefile
+++ b/games/xquarto/Makefile
@@ -18,6 +18,6 @@ USE_IMAKE=	yes
 MAN6=		xquarto.6
 
 pre-configure:
-	@echo "MANSUFFIX=6" >>${WRKSRC}/src/Imakefile
+	@${ECHO} "MANSUFFIX=6" >>${WRKSRC}/src/Imakefile
 
 .include <bsd.port.mk>
diff --git a/games/xshogi/Makefile b/games/xshogi/Makefile
index 58a164918bc3..68691ba607aa 100644
--- a/games/xshogi/Makefile
+++ b/games/xshogi/Makefile
@@ -21,8 +21,8 @@ MAKEFILE=	Makefile.custom
 MAN6=		xshogi.6
 
 post-configure:
-	@echo "DISTDIR=${WRKDIR}" >> ${WRKSRC}/${MAKEFILE}
-	@echo "LOCALBASE=${LOCALBASE}" >> ${WRKSRC}/${MAKEFILE}
+	@${ECHO} "DISTDIR=${WRKDIR}" >> ${WRKSRC}/${MAKEFILE}
+	@${ECHO} "LOCALBASE=${LOCALBASE}" >> ${WRKSRC}/${MAKEFILE}
 
 post-install:
 	@strip ${PREFIX}/bin/xshogi
diff --git a/games/xsokoban/Makefile b/games/xsokoban/Makefile
index 4ac076c4692b..e2f182ab605c 100644
--- a/games/xsokoban/Makefile
+++ b/games/xsokoban/Makefile
@@ -29,8 +29,6 @@ post-install:
 	@${INSTALL_DATA} ${WRKSRC}/screens/* ${PREFIX}/lib/X11/xsokoban/screens
 	@${INSTALL_DATA} ${WRKSRC}/bitmaps/defaults/* \
 		${PREFIX}/lib/X11/xsokoban/bitmaps/defaults
-	@echo "First, type: 'xsokoban -c' to make score files."
-	@echo "You must be the superuser 'root', and enter password 'score'."
-	@echo
+	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/games/xsokoban/pkg-message b/games/xsokoban/pkg-message
new file mode 100644
index 000000000000..9786bd53a2f7
--- /dev/null
+++ b/games/xsokoban/pkg-message
@@ -0,0 +1,3 @@
+First, type: 'xsokoban -c' to make score files.
+You must be the superuser 'root', and enter password 'score'.
+