ECHO -> ECHO_MSG

(ECHO_CMD for deskutils/notebook)

PR:		ports/56767-56770,56772-56774,56776-56784
Submitted by:	KATO Tsuguru <tkato@prontomail.com>

18 files changed, 40 insertions, 40 deletions

diff --git a/audio/snack/Makefile b/audio/snack/Makefile
index c680b52b3812..c67d8dd20580 100644
--- a/audio/snack/Makefile
+++ b/audio/snack/Makefile
@@ -39,9 +39,9 @@ PLIST_SUB+=	VORBIS="@comment "
 
 pre-everything::
 .if !defined(WITH_VORBIS)
-	@${ECHO}
-	@${ECHO} 'Use "make WITH_VORBIS=yes" to build support for OGG Vorbis.'
-	@${ECHO}
+	@${ECHO_MSG}
+	@${ECHO_MSG} 'Use "make WITH_VORBIS=yes" to build support for OGG Vorbis.'
+	@${ECHO_MSG}
 .endif
 
 post-patch:
diff --git a/cad/astk-serveur/Makefile b/cad/astk-serveur/Makefile
index c96d8bedc004..ce183086c346 100644
--- a/cad/astk-serveur/Makefile
+++ b/cad/astk-serveur/Makefile
@@ -198,10 +198,10 @@ do-install:
 	${CP} -R ${WRKSRC} ${inst_dir}
 
 post-install:
-	@${ECHO}
+	@${ECHO_MSG}
 	@${CAT} ${PKGMESSAGE} | ${SED} -e "s#%%inst_dir%%#${inst_dir}#"		\
 			-e "s#%%tools_dir%%#${tools_dir}#"			\
 			-e "s#%%ASTER_VER%%#${vaster}#"
-	@${ECHO}
+	@${ECHO_MSG}
 
 .include <bsd.port.post.mk>
diff --git a/cad/gmsh/Makefile b/cad/gmsh/Makefile
index 3ccee45cf2d0..2cca00d692b7 100644
--- a/cad/gmsh/Makefile
+++ b/cad/gmsh/Makefile
@@ -28,7 +28,7 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 .ifndef USE_TRIANGLE
 pre-everything::
-	@${ECHO} "You can make with USE_TRIANGLE for faster 2d meshing"
+	@${ECHO_MSG} "You can make with USE_TRIANGLE for faster 2d meshing"
 .else
 NO_CDROM=	"Triangle must not be sold for profit"
 post-extract:
diff --git a/comms/qpage/Makefile b/comms/qpage/Makefile
index ba77b0f8a87e..60922993b28c 100644
--- a/comms/qpage/Makefile
+++ b/comms/qpage/Makefile
@@ -20,12 +20,12 @@ MAN1=		qpage.1
 
 post-install:
 	@if [ ! -f ${PREFIX}/etc/rc.d/qpage.sh ]; then \
-		${ECHO} "Install ${PREFIX}/etc/rc.d/qpage.sh startup file."; \
+		${ECHO_MSG} "Install ${PREFIX}/etc/rc.d/qpage.sh startup file."; \
 		${INSTALL_SCRIPT} -m 751 ${FILESDIR}/qpage.sh \
 			${PREFIX}/etc/rc.d/qpage.sh; \
 	fi
 	@if [ ! -f ${PREFIX}/etc/qpage-example.cf ]; then \
-		${ECHO} "Install ${PREFIX}/etc/qpage-example.cf file."; \
+		${ECHO_MSG} "Install ${PREFIX}/etc/qpage-example.cf file."; \
 		${INSTALL_SCRIPT} -m 640 ${WRKDIR}/${PORTNAME}-${PORTVERSION}/example.cf \
 			${PREFIX}/etc/qpage-example.cf; \
 	fi
diff --git a/comms/zmtx-zmrx/Makefile b/comms/zmtx-zmrx/Makefile
index 6215eb49d880..9135d16d759a 100644
--- a/comms/zmtx-zmrx/Makefile
+++ b/comms/zmtx-zmrx/Makefile
@@ -33,8 +33,8 @@ do-install:
 .endfor
 
 post-install:
-	@${ECHO} ""
+	@${ECHO_MSG} ""
 	@/usr/bin/more ${PKGMESSAGE}
-	@${ECHO} ""
+	@${ECHO_MSG} ""
 
 .include <bsd.port.mk>
diff --git a/databases/msql/Makefile b/databases/msql/Makefile
index cc5324ad1388..eebb17efb921 100644
--- a/databases/msql/Makefile
+++ b/databases/msql/Makefile
@@ -53,7 +53,7 @@ post-install:
 		@${CHOWN} -R msql:msql ${PREFIX}/etc/msql2/
 		@${MKDIR} ${PREFIX}/etc/rc.d
 		@if [ ! -f ${PREFIX}/etc/rc.d/msql2.sh ]; then \
-			${ECHO} "Installing ${PREFIX}/etc/rc.d/msql2.sh startup file."; \
+			${ECHO_MSG} "Installing ${PREFIX}/etc/rc.d/msql2.sh startup file."; \
 			${INSTALL_SCRIPT} -m 751 ${FILESDIR}/msql2.sh \
 				${PREFIX}/etc/rc.d/msql2.sh; \
 		fi
diff --git a/databases/msql3/Makefile b/databases/msql3/Makefile
index cc5324ad1388..eebb17efb921 100644
--- a/databases/msql3/Makefile
+++ b/databases/msql3/Makefile
@@ -53,7 +53,7 @@ post-install:
 		@${CHOWN} -R msql:msql ${PREFIX}/etc/msql2/
 		@${MKDIR} ${PREFIX}/etc/rc.d
 		@if [ ! -f ${PREFIX}/etc/rc.d/msql2.sh ]; then \
-			${ECHO} "Installing ${PREFIX}/etc/rc.d/msql2.sh startup file."; \
+			${ECHO_MSG} "Installing ${PREFIX}/etc/rc.d/msql2.sh startup file."; \
 			${INSTALL_SCRIPT} -m 751 ${FILESDIR}/msql2.sh \
 				${PREFIX}/etc/rc.d/msql2.sh; \
 		fi
diff --git a/deskutils/notebook/Makefile b/deskutils/notebook/Makefile
index 6dee75dda42b..84c97b4983f2 100644
--- a/deskutils/notebook/Makefile
+++ b/deskutils/notebook/Makefile
@@ -73,7 +73,7 @@ post-extract:
 .endfor
 
 post-patch:
-	@${ECHO} "SEARCHDIRS += ${PORTINCLUDES}" >> \
+	@${ECHO_CMD} "SEARCHDIRS += ${PORTINCLUDES}" >> \
 		${WRKSRC}/${EXTRALIBFILES_MAKE_WRKSRC}/jx_constants
 
 pre-build:
diff --git a/devel/bugzilla/Makefile b/devel/bugzilla/Makefile
index 1c0ebb4dbb9b..63a62f18c0aa 100644
--- a/devel/bugzilla/Makefile
+++ b/devel/bugzilla/Makefile
@@ -122,9 +122,9 @@ do-install:
 post-install:
 	@${SED} -e "s:%%PREFIX%%:${PREFIX}:g" pkg-message >${PKGMESSAGE}
 .if !defined(BATCH)
-	@${ECHO}
+	@${ECHO_MSG}
 	@${CAT} ${PKGMESSAGE}
-	@${ECHO}
+	@${ECHO_MSG}
 .endif
 
 .include <bsd.port.mk>
diff --git a/devel/bugzilla2/Makefile b/devel/bugzilla2/Makefile
index 1c0ebb4dbb9b..63a62f18c0aa 100644
--- a/devel/bugzilla2/Makefile
+++ b/devel/bugzilla2/Makefile
@@ -122,9 +122,9 @@ do-install:
 post-install:
 	@${SED} -e "s:%%PREFIX%%:${PREFIX}:g" pkg-message >${PKGMESSAGE}
 .if !defined(BATCH)
-	@${ECHO}
+	@${ECHO_MSG}
 	@${CAT} ${PKGMESSAGE}
-	@${ECHO}
+	@${ECHO_MSG}
 .endif
 
 .include <bsd.port.mk>
diff --git a/devel/bugzilla3/Makefile b/devel/bugzilla3/Makefile
index 1c0ebb4dbb9b..63a62f18c0aa 100644
--- a/devel/bugzilla3/Makefile
+++ b/devel/bugzilla3/Makefile
@@ -122,9 +122,9 @@ do-install:
 post-install:
 	@${SED} -e "s:%%PREFIX%%:${PREFIX}:g" pkg-message >${PKGMESSAGE}
 .if !defined(BATCH)
-	@${ECHO}
+	@${ECHO_MSG}
 	@${CAT} ${PKGMESSAGE}
-	@${ECHO}
+	@${ECHO_MSG}
 .endif
 
 .include <bsd.port.mk>
diff --git a/devel/linux_devtools-6/Makefile b/devel/linux_devtools-6/Makefile
index fbf7834e1c46..8070a34444fc 100644
--- a/devel/linux_devtools-6/Makefile
+++ b/devel/linux_devtools-6/Makefile
@@ -102,14 +102,14 @@ do-install:
 # Install all packages.
 #
 	@for R in ${DISTFILES}; do \
-		${ECHO} $$R; \
+		${ECHO_MSG} $$R; \
 		rpm -U ${RPMFLAGS} ${RPMDIR}/$$R; \
 	done
 #
 # Install updates
 #
 	@for R in ${PATCHFILES}; do \
-		${ECHO} $$R; \
+		${ECHO_MSG} $$R; \
 		rpm -U ${RPMFLAGS} ${RPMDIR}/$$R; \
 	done
 #
diff --git a/devel/linux_devtools-7/Makefile b/devel/linux_devtools-7/Makefile
index 244a04b5b735..489a71eb6b12 100644
--- a/devel/linux_devtools-7/Makefile
+++ b/devel/linux_devtools-7/Makefile
@@ -102,13 +102,13 @@ do-install:
 #
 # Install all packages.
 	@for R in ${DISTFILES}; do \
-		${ECHO} $$R; \
+		${ECHO_MSG} $$R; \
 		${RPM} -U ${RPMFLAGS} ${RPMDIR}/$$R; \
 	done
 #
 # Install updates
 	@for R in ${PATCHFILES}; do \
-		${ECHO} $$R; \
+		${ECHO_MSG} $$R; \
 		${RPM} -U ${RPMFLAGS} ${RPMDIR}/$$R; \
 	done
 #
diff --git a/devel/yacl/Makefile b/devel/yacl/Makefile
index 21bb2c17fa62..a20e752d882a 100644
--- a/devel/yacl/Makefile
+++ b/devel/yacl/Makefile
@@ -50,8 +50,8 @@ do-install:
 	${PREFIX}/share/yacl/apps
 	@( cd ${PREFIX}/share/yacl; ${LN} -s ${PREFIX}/lib/yacl lib; \
 	${LN} -s ${PREFIX}/include/yacl/io; ${LN} -s ${PREFIX}/include/yacl/ui )
-	@${ECHO} "Done. Don't forget to set your YACLPATH environment "
-	@${ECHO} "variable to ${PREFIX}/share/yacl!"
+	@${ECHO_MSG} "Done. Don't forget to set your YACLPATH environment "
+	@${ECHO_MSG} "variable to ${PREFIX}/share/yacl!"
 
 post-install:
 	@${STRIP_CMD} ${PREFIX}/share/yacl/apps/bmpview
diff --git a/emulators/linux_base-6/Makefile b/emulators/linux_base-6/Makefile
index 0e847e6a2783..6f319db12412 100644
--- a/emulators/linux_base-6/Makefile
+++ b/emulators/linux_base-6/Makefile
@@ -148,10 +148,10 @@ do-install:
 # like the Red Hat installer.
 #
 	@for R in ${RPM_SET1}; do \
-		${ECHO} $$R; \
+		${ECHO_MSG} $$R; \
 		${RPM} -U ${RPMFLAGS} ${RPMDIR}/$$R; \
 	done
-	@${ECHO} ${RPM_LDCONFIG}
+	@${ECHO_MSG} ${RPM_LDCONFIG}
 	@${RPM} -U ${RPMFLAGS} --noscripts ${RPMDIR}/${RPM_LDCONFIG}
 	@brandelf -t Linux ${LINUXBASE}/sbin/ldconfig
 	@${LINUXBASE}/sbin/ldconfig
@@ -160,21 +160,21 @@ do-install:
 		zlib-1.1.3-25.6.${MACHINE_ARCH}.rpm \
 		${RPM_SET2} \
 		XFree86-libs-3.3.6-29.${MACHINE_ARCH}.rpm; do \
-			${ECHO} $$R; \
+			${ECHO_MSG} $$R; \
 			${RPM} -U ${RPMFLAGS} ${RPMDIR}/$$R; \
 		done
-	@${ECHO} ${RPM_RPM}
+	@${ECHO_MSG} ${RPM_RPM}
 	@${RPM} -U ${RPMFLAGS} --noscripts ${RPMDIR}/${RPM_RPM}
 	@brandelf -t Linux ${LINUXBASE}/bin/rpm
 	@for R in ${RPM_SET3}; do \
-		${ECHO} $$R; \
+		${ECHO_MSG} $$R; \
 		${RPM} -U ${RPMFLAGS} ${RPMDIR}/$$R; \
 	done
 #
 # Install updates
 #
 	@for R in ${PATCHFILES}; do \
-		${ECHO} $$R; \
+		${ECHO_MSG} $$R; \
 		${RPM} -U ${RPMFLAGS} ${RPMDIR}/$$R; \
 	done
 #
@@ -200,8 +200,8 @@ post-install:
 # the quotacheck warning about unknown owners.
 	@${CHOWN} root:wheel ${LINUXBASE}/usr/man/man8/setserial.8
 	@${CHGRP} mail ${LINUXBASE}/var/spool/mail
-	@${ECHO} ''
+	@${ECHO_MSG} ''
 	@fmt ${PKGMESSAGE}
-	@${ECHO} ''
+	@${ECHO_MSG} ''
 
 .include <bsd.port.post.mk>
diff --git a/emulators/linux_base/Makefile b/emulators/linux_base/Makefile
index 22604be30d18..ec82972a2e14 100644
--- a/emulators/linux_base/Makefile
+++ b/emulators/linux_base/Makefile
@@ -140,7 +140,7 @@ do-install:
 # anything special to run staticly linked binaries.
 	@/sbin/sysctl -w ${FALLBACK_ELF_MIB}=${LINUX_ELF}
 	@for R in ${UPD_SET1} ${DISTFILES} ${UPD_SET2}; do \
-		${ECHO} $$R; \
+		${ECHO_MSG} $$R; \
 		${RPM} -U ${RPMFLAGS} ${RPMDIR}/$$R; \
 	done
 	@for F in ${BRAND_FILES}; do \
@@ -166,8 +166,8 @@ do-install:
 	@${LN} -sf /var/tmp ${LINUXBASE}/usr/tmp
 
 post-install:
-	@${ECHO} ''
+	@${ECHO_MSG} ''
 	@fmt ${PKGMESSAGE}
-	@${ECHO} ''
+	@${ECHO_MSG} ''
 
 .include <bsd.port.post.mk>
diff --git a/french/aster/Makefile b/french/aster/Makefile
index 6ee8c5cf40d4..6abadb19e03b 100644
--- a/french/aster/Makefile
+++ b/french/aster/Makefile
@@ -259,9 +259,9 @@ post-install:
 	${LN} -fs ${HOMARDDIR}/homard ${tools_dir}/
 	${LN} -fs ${HOMARDDIR}/aster_homard_py ${tools_dir}/
 .endif
-	@${ECHO}
+	@${ECHO_MSG}
 	@${CAT} ${PKGMESSAGE} | ${SED} -e "s#%%inst_dir%%#${inst_dir}#"
-	@${ECHO}
+	@${ECHO_MSG}
 
 .if defined(MAINTAINER_MODE)
 test:	install
diff --git a/french/homard/Makefile b/french/homard/Makefile
index c225c512e900..b9da41f240a2 100644
--- a/french/homard/Makefile
+++ b/french/homard/Makefile
@@ -67,8 +67,8 @@ do-install:
 	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${HOMARDDIR}
 
 post-install:
-	@${ECHO}
+	@${ECHO_MSG}
 	@${CAT} ${PKGMESSAGE}
-	@${ECHO}
+	@${ECHO_MSG}
 
 .include <bsd.port.post.mk>