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

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

7 files changed, 25 insertions, 25 deletions

diff --git a/japanese/cdrom2/Makefile b/japanese/cdrom2/Makefile
index 84711c837e4..1d5b1494db4 100644
--- a/japanese/cdrom2/Makefile
+++ b/japanese/cdrom2/Makefile
@@ -20,7 +20,7 @@ DOCS=		errata.doc gaiji.txt index.doc install.doc kekka.txt \
 		ruigo.doc x_option.doc
 
 do-configure:
-	@echo "Copying custom Makefile."
+	@${ECHO_MSG} "Copying custom Makefile."
 	@${CP} ${FILESDIR}/Makefile ${WRKSRC}
 
 .if !defined(NOPORTDOCS)
diff --git a/japanese/elvis/Makefile b/japanese/elvis/Makefile
index 0b64c11d384..0bf3c1e03b9 100644
--- a/japanese/elvis/Makefile
+++ b/japanese/elvis/Makefile
@@ -33,21 +33,21 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/README.j18 ${PREFIX}/share/doc/ja-elvis
 	@${SH} ${PKGDIR}/REQ ${PKGNAME} INSTALL
 	@if [ ! -f ${STARTUP_SCRIPT} ]; then				\
-		echo "Installing ${STARTUP_SCRIPT} startup file.";	\
-		echo '#!/bin/sh' > ${STARTUP_SCRIPT};			\
-		echo 'virecovery=`echo /var/tmp/elv_*`'			\
+		${ECHO} "Installing ${STARTUP_SCRIPT} startup file.";	\
+		${ECHO} '#!/bin/sh' > ${STARTUP_SCRIPT};			\
+		${ECHO} 'virecovery=`${ECHO} /var/tmp/elv_*`'			\
 			>> ${STARTUP_SCRIPT};				\
-		echo 'if [ "$$virecovery" != '"'/var/tmp/elv_*' ]; then"	\
+		${ECHO} 'if [ "$$virecovery" != '"'/var/tmp/elv_*' ]; then"	\
 			>> ${STARTUP_SCRIPT};				\
-		echo "	echo 'Recovering ja-elvis editor sessions'"	\
+		${ECHO} "	${ECHO} 'Recovering ja-elvis editor sessions'"	\
 			>> ${STARTUP_SCRIPT};				\
-		echo '	for i in $$virecovery; do'			\
+		${ECHO} '	for i in $$virecovery; do'			\
 			>> ${STARTUP_SCRIPT};				\
-		echo "		${PREFIX}/bin/elvprsv "'$$i'		\
+		${ECHO} "		${PREFIX}/bin/elvprsv "'$$i'		\
 			>> ${STARTUP_SCRIPT};				\
-		echo '	done'						\
+		${ECHO} '	done'						\
 			>> ${STARTUP_SCRIPT};				\
-		echo 'fi' >> ${STARTUP_SCRIPT};				\
+		${ECHO} 'fi' >> ${STARTUP_SCRIPT};				\
 		${CHMOD} 755 ${STARTUP_SCRIPT};				\
 		${CHOWN} bin.bin ${STARTUP_SCRIPT};                        \
 	fi
diff --git a/japanese/magicpoint/Makefile b/japanese/magicpoint/Makefile
index d2a1198c6f8..675ff0f0304 100644
--- a/japanese/magicpoint/Makefile
+++ b/japanese/magicpoint/Makefile
@@ -20,5 +20,5 @@ CATEGORIES=	japanese misc
 MAINTAINER=	itojun@itojun.org
 
 # dirty, but this is required for version independent-ness
-CONFIGURE_ARGS=		--with-vfontcap=`echo ${LOCALBASE}/share/VFlib/*/vfontcap | tail -1`
+CONFIGURE_ARGS=		--with-vfontcap=`${ECHO} ${LOCALBASE}/share/VFlib/*/vfontcap | tail -1`
 CONFIGURE_ARGS+=	--enable-freetype-charset16
diff --git a/japanese/p5-manual/Makefile b/japanese/p5-manual/Makefile
index 4735e36dd5c..ae0c9216530 100644
--- a/japanese/p5-manual/Makefile
+++ b/japanese/p5-manual/Makefile
@@ -48,9 +48,9 @@ do-install:
 .include <bsd.port.mk>
 
 plist:
-	@echo -n >${PLIST}
+	@${ECHO} -n >${PLIST}
 .for item in 1 3
 .for file in ${CAT${item}}
-	@echo man/ja/cat${item}/${file}.gz >>${PLIST}
+	@${ECHO} man/ja/cat${item}/${file}.gz >>${PLIST}
 .endfor
 .endfor
diff --git a/japanese/skk-jisyo/Makefile b/japanese/skk-jisyo/Makefile
index 04993630d85..ffc83d51194 100644
--- a/japanese/skk-jisyo/Makefile
+++ b/japanese/skk-jisyo/Makefile
@@ -31,8 +31,8 @@ PLIST_SUB=	JISYONAME=${SKKJISYO}
 
 pre-fetch:
 .if defined(SKKJISYO_SIZE_INVALID)
-	@echo "Error: invalid SKKJISYO_SIZE: ${SKKJISYO_SIZE}"
-	@echo "SKKJISYO_SIZE should be L, M, or S."
+	@${ECHO_MSG} "Error: invalid SKKJISYO_SIZE: ${SKKJISYO_SIZE}"
+	@${ECHO_MSG} "SKKJISYO_SIZE should be L, M, or S."
 	@${FALSE}
 .endif
 
diff --git a/japanese/skkserv/Makefile b/japanese/skkserv/Makefile
index 3868c388918..52c63721944 100644
--- a/japanese/skkserv/Makefile
+++ b/japanese/skkserv/Makefile
@@ -32,14 +32,14 @@ post-install:
 		${ECHO} "start)" >> ${STARTUP_SCRIPT}; \
 		${ECHO} "	if [ -f ${PREFIX}/sbin/skkserv ]; then" >> \
 			${STARTUP_SCRIPT}; \
-		${ECHO} "		echo -n ' skkserv'; ${PREFIX}/sbin/skkserv" >> \
+		${ECHO} "		${ECHO} -n ' skkserv'; ${PREFIX}/sbin/skkserv" >> \
 			${STARTUP_SCRIPT}; \
 		${ECHO} "	fi" >> ${STARTUP_SCRIPT}; \
 		${ECHO} "	;;" >> ${STARTUP_SCRIPT}; \
 		${ECHO} "stop)" >> ${STARTUP_SCRIPT}; \
 		${ECHO} "	;;" >> ${STARTUP_SCRIPT}; \
 		${ECHO} "*)" >> ${STARTUP_SCRIPT}; \
-		${ECHO} '	echo "usage: $$0 {start|stop}" 1>&2' >> ${STARTUP_SCRIPT}; \
+		${ECHO} '	${ECHO} "usage: $$0 {start|stop}" 1>&2' >> ${STARTUP_SCRIPT}; \
 		${ECHO} "	;;" >> ${STARTUP_SCRIPT}; \
 		${ECHO} 'esac' >> ${STARTUP_SCRIPT}; \
 		${CHMOD} ${BINMODE} ${STARTUP_SCRIPT}; \
diff --git a/japanese/tk42/Makefile b/japanese/tk42/Makefile
index b2ed72d3434..1589ffa5d87 100644
--- a/japanese/tk42/Makefile
+++ b/japanese/tk42/Makefile
@@ -55,14 +55,14 @@ post-install:
 .if ${PORTOBJFORMAT} == "aout"
 	${LN} -sf libtk42jp.so.1.0 ${PREFIX}/lib/libtk42jp.so
 .endif
-	@echo "**********"
-	@echo "IMPORTANT:"
-	@echo "**********"
-	@echo "We've installed:"
-	@echo "tkConfig.sh in $(PREFIX)/lib/tk$(VERSION)/tkConfig.sh"
-	@echo "tk.h        in $(PREFIX)/include/tk$(VERSION)/tk.h"
-	@echo "These are NOT the default place, but good place to avoid"
-	@echo "conflicting with another version of Tcl/Tks."
+	@${ECHO_MSG} "**********"
+	@${ECHO_MSG} "IMPORTANT:"
+	@${ECHO_MSG} "**********"
+	@${ECHO_MSG} "We've installed:"
+	@${ECHO_MSG} "tkConfig.sh in $(PREFIX)/lib/tk$(VERSION)/tkConfig.sh"
+	@${ECHO_MSG} "tk.h        in $(PREFIX)/include/tk$(VERSION)/tk.h"
+	@${ECHO_MSG} "These are NOT the default place, but good place to avoid"
+	@${ECHO_MSG} "conflicting with another version of Tcl/Tks."
 
 test:
 	cd ${WRKSRC}; ${SETENV} PORTOBJFORMAT=${PORTOBJFORMAT} ${MAKE} test