- ECHO -> ECHO_MSG

for some ports:
- ECHO -> ECHO_CMD
- pre-fetch -> pre-everything

PR:		ports/56800-56819
Submitted by:	KATO Tsuguru <tkato@prontomail.com>

34 files changed, 109 insertions, 109 deletions

diff --git a/irc/tircproxy/Makefile b/irc/tircproxy/Makefile
index 5b4ef407160..ce0a6efd78f 100644
--- a/irc/tircproxy/Makefile
+++ b/irc/tircproxy/Makefile
@@ -22,7 +22,7 @@ do-install:
 
 post-install:
 .if !defined(NOPORTDOCS)
-	@${ECHO} "===>   Installing tircproxy docs in ${DOCSDIR}"
+	@${ECHO_MSG} "===>   Installing tircproxy docs in ${DOCSDIR}"
 	@${MKDIR} ${DOCSDIR}
 	@${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
 .endif
diff --git a/japanese/elvis/Makefile b/japanese/elvis/Makefile
index 36bf8291572..c44e5de07ad 100644
--- a/japanese/elvis/Makefile
+++ b/japanese/elvis/Makefile
@@ -35,7 +35,7 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/README.j18 ${PREFIX}/share/doc/ja-elvis
 	@${SH} ${PKGREQ} ${PKGNAME} INSTALL
 	@if [ ! -f ${STARTUP_SCRIPT} ]; then				\
-		${ECHO} "Installing ${STARTUP_SCRIPT} startup file.";	\
+		${ECHO_MSG} "Installing ${STARTUP_SCRIPT} startup file.";	\
 		${INSTALL_SCRIPT} ${FILESDIR}/ja-elvis.sh ${STARTUP_SCRIPT};\
 	fi
 
diff --git a/japanese/msdosfs/Makefile b/japanese/msdosfs/Makefile
index beec1e50e54..bb18b4ae7ef 100644
--- a/japanese/msdosfs/Makefile
+++ b/japanese/msdosfs/Makefile
@@ -43,10 +43,10 @@ post-extract:
 
 pre-build:
 	@if [ ! -d /sys -o ! -d /usr/src/sys ]; then \
-		${ECHO} "****************************************" ; \
-		${ECHO} " You need to extract kernel source tree" ; \
-		${ECHO} " before you build this package..." ; \
-		${ECHO} "****************************************" ; \
+		${ECHO_MSG} "****************************************" ; \
+		${ECHO_MSG} " You need to extract kernel source tree" ; \
+		${ECHO_MSG} " before you build this package..." ; \
+		${ECHO_MSG} "****************************************" ; \
 		${FALSE} ; \
 	fi
 
diff --git a/japanese/sj3-lib/Makefile b/japanese/sj3-lib/Makefile
index bc032c3f665..18ed43b0523 100644
--- a/japanese/sj3-lib/Makefile
+++ b/japanese/sj3-lib/Makefile
@@ -31,7 +31,7 @@ do-configure:
 
 post-install:
 	if [ ! -f ${STARTUP_SCRIPT} ]; then 				\
-		${ECHO} "Installing ${STARTUP_SCRIPT} startup file."; 	\
+		${ECHO_MSG} "Installing ${STARTUP_SCRIPT} startup file."; 	\
 		${INSTALL_SCRIPT} ${FILESDIR}/sj3.sh.in ${STARTUP_SCRIPT};	\
 	fi
 	${SETENV} PKG_PREFIX=${PREFIX} \
diff --git a/japanese/sj3-server/Makefile b/japanese/sj3-server/Makefile
index bc032c3f665..18ed43b0523 100644
--- a/japanese/sj3-server/Makefile
+++ b/japanese/sj3-server/Makefile
@@ -31,7 +31,7 @@ do-configure:
 
 post-install:
 	if [ ! -f ${STARTUP_SCRIPT} ]; then 				\
-		${ECHO} "Installing ${STARTUP_SCRIPT} startup file."; 	\
+		${ECHO_MSG} "Installing ${STARTUP_SCRIPT} startup file."; 	\
 		${INSTALL_SCRIPT} ${FILESDIR}/sj3.sh.in ${STARTUP_SCRIPT};	\
 	fi
 	${SETENV} PKG_PREFIX=${PREFIX} \
diff --git a/japanese/sj3/Makefile b/japanese/sj3/Makefile
index bc032c3f665..18ed43b0523 100644
--- a/japanese/sj3/Makefile
+++ b/japanese/sj3/Makefile
@@ -31,7 +31,7 @@ do-configure:
 
 post-install:
 	if [ ! -f ${STARTUP_SCRIPT} ]; then 				\
-		${ECHO} "Installing ${STARTUP_SCRIPT} startup file."; 	\
+		${ECHO_MSG} "Installing ${STARTUP_SCRIPT} startup file."; 	\
 		${INSTALL_SCRIPT} ${FILESDIR}/sj3.sh.in ${STARTUP_SCRIPT};	\
 	fi
 	${SETENV} PKG_PREFIX=${PREFIX} \
diff --git a/japanese/truetypefonts/Makefile b/japanese/truetypefonts/Makefile
index 05b5051715f..92a854903f2 100644
--- a/japanese/truetypefonts/Makefile
+++ b/japanese/truetypefonts/Makefile
@@ -26,10 +26,10 @@ PLIST_SUB=	FONTSDIR=${FONTSDIR}
 
 do-install:
 .if !exists(${PREFIX}/${FONTSDIR})
-	@${ECHO} "*********************************************************"
-	@${ECHO} "Please add ${PREFIX}/${FONTSDIR} to your font path"
-	@${ECHO} "in /etc/XF86Config."
-	@${ECHO} "*********************************************************"
+	@${ECHO_MSG} "*********************************************************"
+	@${ECHO_MSG} "Please add ${PREFIX}/${FONTSDIR} to your font path"
+	@${ECHO_MSG} "in /etc/XF86Config."
+	@${ECHO_MSG} "*********************************************************"
 	${MKDIR} ${PREFIX}/${FONTSDIR}
 .endif
 	${INSTALL_DATA} ${WRKSRC}/wadalab-gothic.ttf ${PREFIX}/${FONTSDIR}
diff --git a/lang/STk/Makefile b/lang/STk/Makefile
index 15703c4024d..4ec0761e52c 100644
--- a/lang/STk/Makefile
+++ b/lang/STk/Makefile
@@ -20,6 +20,6 @@ GNU_CONFIGURE=	yes
 
 PLIST_SUB=	STK_VERSION=${PORTVERSION} STK_ARCH=${STK_ARCH}
 
-STK_ARCH!=	${ECHO} "$$(uname)-$$(uname -r)-$$(uname -m)"
+STK_ARCH!=	${ECHO_CMD} "$$(uname)-$$(uname -r)-$$(uname -m)"
 
 .include <bsd.port.mk>
diff --git a/lang/compaq-cc/Makefile b/lang/compaq-cc/Makefile
index f3addb27622..d2f520ae637 100644
--- a/lang/compaq-cc/Makefile
+++ b/lang/compaq-cc/Makefile
@@ -46,10 +46,10 @@ USE_LINUX=		yes
 
 do-install:
 	@if [ -z "`kldstat -v | ${GREP} -E 'linux'`" ]; then \
-		${ECHO} 'AlphaLinux  mode is not enabled.\
+		${ECHO_MSG} 'AlphaLinux  mode is not enabled.\
 			Loading AlphaLinux kernel module...' | fmt; \
 		kldload linux || { \
-		${ECHO} 'The AlphaLinux kernel module could not be loaded.\
+		${ECHO_MSG} 'The AlphaLinux kernel module could not be loaded.\
 			Please manually load the module and retry.\
 			See "man linux" for details.' | fmt; \
 		${FALSE}; \
diff --git a/lang/gcc-ooo/Makefile b/lang/gcc-ooo/Makefile
index 2d7e2d1953f..bd9b1f99c33 100644
--- a/lang/gcc-ooo/Makefile
+++ b/lang/gcc-ooo/Makefile
@@ -90,8 +90,8 @@ MAN1=		cpp33.1 g++33.1 g77-33.1 gcc33.1 gcov33.1 \
 		rmic33.1 rmiregistry33.1
 MAN7=		fsf-funding.7 gfdl.7 gpl.7
 
-pre-fetch:
-	@${ECHO} "Making GCC ${DISTNAME:S/^gcc-//} for ${OPSYS} ${OSREL} ${PORTOBJFORMAT}	target ${CONFIGURE_TARGET}"
+pre-everything::
+	@${ECHO_MSG} "Making GCC ${DISTNAME:S/^gcc-//} for ${OPSYS} ${OSREL} ${PORTOBJFORMAT}	target ${CONFIGURE_TARGET}"
 .if !defined(WITH_BOUNDSCHECKING)
 	@${ECHO_MSG} "You can enable fine-grained bounds-checking support for compiled C programs"
 	@${ECHO_MSG} "by defining WITH_BOUNDSCHECKING.  Compile and link with \"-fbounds-checking\""
@@ -113,7 +113,7 @@ do-fetch:
 		${ECHO_MSG} ">> Attempting to CVS checkout from ${CVSROOT}." ;\
 		if ${CVS_CMD} -d ${CVSROOT} co -D "${CVS_DATE}" gcc ; \
 		then \
-			( ${ECHO} -n "${CVS_DATE}" > ${STAMPFILE} ) ; \
+			( ${ECHO_CMD} -n "${CVS_DATE}" > ${STAMPFILE} ) ; \
 			exit ; \
 		fi ; \
 		${ECHO_MSG} ">> Couldn't CVS checkout ${PKGNAME}." ; \
diff --git a/lang/gcc/Makefile b/lang/gcc/Makefile
index 2d7e2d1953f..bd9b1f99c33 100644
--- a/lang/gcc/Makefile
+++ b/lang/gcc/Makefile
@@ -90,8 +90,8 @@ MAN1=		cpp33.1 g++33.1 g77-33.1 gcc33.1 gcov33.1 \
 		rmic33.1 rmiregistry33.1
 MAN7=		fsf-funding.7 gfdl.7 gpl.7
 
-pre-fetch:
-	@${ECHO} "Making GCC ${DISTNAME:S/^gcc-//} for ${OPSYS} ${OSREL} ${PORTOBJFORMAT}	target ${CONFIGURE_TARGET}"
+pre-everything::
+	@${ECHO_MSG} "Making GCC ${DISTNAME:S/^gcc-//} for ${OPSYS} ${OSREL} ${PORTOBJFORMAT}	target ${CONFIGURE_TARGET}"
 .if !defined(WITH_BOUNDSCHECKING)
 	@${ECHO_MSG} "You can enable fine-grained bounds-checking support for compiled C programs"
 	@${ECHO_MSG} "by defining WITH_BOUNDSCHECKING.  Compile and link with \"-fbounds-checking\""
@@ -113,7 +113,7 @@ do-fetch:
 		${ECHO_MSG} ">> Attempting to CVS checkout from ${CVSROOT}." ;\
 		if ${CVS_CMD} -d ${CVSROOT} co -D "${CVS_DATE}" gcc ; \
 		then \
-			( ${ECHO} -n "${CVS_DATE}" > ${STAMPFILE} ) ; \
+			( ${ECHO_CMD} -n "${CVS_DATE}" > ${STAMPFILE} ) ; \
 			exit ; \
 		fi ; \
 		${ECHO_MSG} ">> Couldn't CVS checkout ${PKGNAME}." ; \
diff --git a/lang/gcc27/Makefile b/lang/gcc27/Makefile
index 7d05fcfd02d..e207177bdc7 100644
--- a/lang/gcc27/Makefile
+++ b/lang/gcc27/Makefile
@@ -40,8 +40,8 @@ USE_GMAKE=	yes
 ALL_TARGET=	bootstrap
 MAN1=		cccp27.1 g++27.1 gcc27.1
 
-pre-fetch:
-	@${ECHO} "GCC ${DISTNAME:S/^gcc-//} for ${OPSYS} ${OSREL} ${PORTOBJFORMAT}"
+pre-everything::
+	@${ECHO_MSG} "GCC ${DISTNAME:S/^gcc-//} for ${OPSYS} ${OSREL} ${PORTOBJFORMAT}"
 
 pre-patch:
 	@${MV} ${WRKSRC}/config/i386/freebsd.h ${WRKSRC}/config/i386/freebsd-aout.h
diff --git a/lang/gcc28/Makefile b/lang/gcc28/Makefile
index 19d67ed057f..bcd29827bb1 100644
--- a/lang/gcc28/Makefile
+++ b/lang/gcc28/Makefile
@@ -36,8 +36,8 @@ USE_REINPLACE=	yes
 ALL_TARGET=	bootstrap
 MAN1=		cccp28.1 g++28.1 gcc28.1
 
-pre-fetch:
-	@${ECHO} "GCC ${DISTNAME:S/^gcc-//} for ${OPSYS} ${OSREL} ${PORTOBJFORMAT}"
+pre-everything::
+	@${ECHO_MSG} "GCC ${DISTNAME:S/^gcc-//} for ${OPSYS} ${OSREL} ${PORTOBJFORMAT}"
 
 pre-patch:
 	@${MV} ${WRKSRC}/config/i386/freebsd.h ${WRKSRC}/config/i386/freebsd-aout.h
diff --git a/lang/gcc30/Makefile b/lang/gcc30/Makefile
index d14c757a205..1f95625f715 100644
--- a/lang/gcc30/Makefile
+++ b/lang/gcc30/Makefile
@@ -65,8 +65,8 @@ ALL_TARGET=	bootstrap
 MAN1=		cpp30.1 g++30.1 g77-30.1 gcc30.1 gcov30.1
 MAN7=		fsf-funding.7 gfdl.7 gpl.7
 
-pre-fetch:
-	@${ECHO} "Making GCC ${DISTNAME:S/^gcc-//} for ${OPSYS} ${OSREL} ${PORTOBJFORMAT}	target ${ARCH}-portbld-freebsd${OSREL}"
+pre-everything::
+	@${ECHO_MSG} "Making GCC ${DISTNAME:S/^gcc-//} for ${OPSYS} ${OSREL} ${PORTOBJFORMAT}	target ${ARCH}-portbld-freebsd${OSREL}"
 
 pre-configure:
 	@# Keep from running `autoconf' and `autoheader' since we modified
diff --git a/lang/gcc31/Makefile b/lang/gcc31/Makefile
index 20df6e04993..7ced6015ea0 100644
--- a/lang/gcc31/Makefile
+++ b/lang/gcc31/Makefile
@@ -84,8 +84,8 @@ MAN1=		cpp31.1 g++31.1 g77-31.1 gcc31.1 gcov31.1 \
 		jcf-dump31.1 jv-scan31.1 jv-convert.1
 MAN7=		fsf-funding.7 gfdl.7 gpl.7
 
-pre-fetch:
-	@${ECHO} "Making GCC ${DISTNAME:S/^gcc-//} for ${OPSYS} ${OSREL} ${PORTOBJFORMAT}	target ${CONFIGURE_TARGET}"
+pre-everything::
+	@${ECHO_MSG} "Making GCC ${DISTNAME:S/^gcc-//} for ${OPSYS} ${OSREL} ${PORTOBJFORMAT}	target ${CONFIGURE_TARGET}"
 
 pre-configure:
 	@# Keep from running `autoconf' and `autoheader' since we modified
diff --git a/lang/gcc33/Makefile b/lang/gcc33/Makefile
index 8694c5522ec..0a379627e07 100644
--- a/lang/gcc33/Makefile
+++ b/lang/gcc33/Makefile
@@ -91,8 +91,8 @@ MAN1=		cpp33.1 g++33.1 g77-33.1 gcc33.1 gcov33.1 \
 MAN7=		fsf-funding.7 gfdl.7 gpl.7
 INFO=		cpp cppinternals g77 gcc gccint gcj fastjar
 
-pre-fetch:
-	@${ECHO} "Making GCC ${DISTNAME:S/^gcc-//} for ${OPSYS} ${OSREL} ${PORTOBJFORMAT}	target ${CONFIGURE_TARGET}"
+pre-everything::
+	@${ECHO_MSG} "Making GCC ${DISTNAME:S/^gcc-//} for ${OPSYS} ${OSREL} ${PORTOBJFORMAT}	target ${CONFIGURE_TARGET}"
 .if !defined(WITH_BOUNDSCHECKING)
 	@${ECHO_MSG} "You can enable fine-grained bounds-checking support for compiled C programs"
 	@${ECHO_MSG} "by defining WITH_BOUNDSCHECKING.  Compile and link with \"-fbounds-checking\""
@@ -114,7 +114,7 @@ do-fetch:
 		${ECHO_MSG} ">> Attempting to CVS checkout from ${CVSROOT}." ;\
 		if ${CVS_CMD} -d ${CVSROOT} co -D "${CVS_DATE}" gcc ; \
 		then \
-			( ${ECHO} -n "${CVS_DATE}" > ${STAMPFILE} ) ; \
+			( ${ECHO_CMD} -n "${CVS_DATE}" > ${STAMPFILE} ) ; \
 			exit ; \
 		fi ; \
 		${ECHO_MSG} ">> Couldn't CVS checkout ${PKGNAME}." ; \
diff --git a/lang/gcc34/Makefile b/lang/gcc34/Makefile
index 2d7e2d1953f..bd9b1f99c33 100644
--- a/lang/gcc34/Makefile
+++ b/lang/gcc34/Makefile
@@ -90,8 +90,8 @@ MAN1=		cpp33.1 g++33.1 g77-33.1 gcc33.1 gcov33.1 \
 		rmic33.1 rmiregistry33.1
 MAN7=		fsf-funding.7 gfdl.7 gpl.7
 
-pre-fetch:
-	@${ECHO} "Making GCC ${DISTNAME:S/^gcc-//} for ${OPSYS} ${OSREL} ${PORTOBJFORMAT}	target ${CONFIGURE_TARGET}"
+pre-everything::
+	@${ECHO_MSG} "Making GCC ${DISTNAME:S/^gcc-//} for ${OPSYS} ${OSREL} ${PORTOBJFORMAT}	target ${CONFIGURE_TARGET}"
 .if !defined(WITH_BOUNDSCHECKING)
 	@${ECHO_MSG} "You can enable fine-grained bounds-checking support for compiled C programs"
 	@${ECHO_MSG} "by defining WITH_BOUNDSCHECKING.  Compile and link with \"-fbounds-checking\""
@@ -113,7 +113,7 @@ do-fetch:
 		${ECHO_MSG} ">> Attempting to CVS checkout from ${CVSROOT}." ;\
 		if ${CVS_CMD} -d ${CVSROOT} co -D "${CVS_DATE}" gcc ; \
 		then \
-			( ${ECHO} -n "${CVS_DATE}" > ${STAMPFILE} ) ; \
+			( ${ECHO_CMD} -n "${CVS_DATE}" > ${STAMPFILE} ) ; \
 			exit ; \
 		fi ; \
 		${ECHO_MSG} ">> Couldn't CVS checkout ${PKGNAME}." ; \
diff --git a/lang/gcc35/Makefile b/lang/gcc35/Makefile
index 2d7e2d1953f..bd9b1f99c33 100644
--- a/lang/gcc35/Makefile
+++ b/lang/gcc35/Makefile
@@ -90,8 +90,8 @@ MAN1=		cpp33.1 g++33.1 g77-33.1 gcc33.1 gcov33.1 \
 		rmic33.1 rmiregistry33.1
 MAN7=		fsf-funding.7 gfdl.7 gpl.7
 
-pre-fetch:
-	@${ECHO} "Making GCC ${DISTNAME:S/^gcc-//} for ${OPSYS} ${OSREL} ${PORTOBJFORMAT}	target ${CONFIGURE_TARGET}"
+pre-everything::
+	@${ECHO_MSG} "Making GCC ${DISTNAME:S/^gcc-//} for ${OPSYS} ${OSREL} ${PORTOBJFORMAT}	target ${CONFIGURE_TARGET}"
 .if !defined(WITH_BOUNDSCHECKING)
 	@${ECHO_MSG} "You can enable fine-grained bounds-checking support for compiled C programs"
 	@${ECHO_MSG} "by defining WITH_BOUNDSCHECKING.  Compile and link with \"-fbounds-checking\""
@@ -113,7 +113,7 @@ do-fetch:
 		${ECHO_MSG} ">> Attempting to CVS checkout from ${CVSROOT}." ;\
 		if ${CVS_CMD} -d ${CVSROOT} co -D "${CVS_DATE}" gcc ; \
 		then \
-			( ${ECHO} -n "${CVS_DATE}" > ${STAMPFILE} ) ; \
+			( ${ECHO_CMD} -n "${CVS_DATE}" > ${STAMPFILE} ) ; \
 			exit ; \
 		fi ; \
 		${ECHO_MSG} ">> Couldn't CVS checkout ${PKGNAME}." ; \
diff --git a/lang/gcc40/Makefile b/lang/gcc40/Makefile
index 2d7e2d1953f..bd9b1f99c33 100644
--- a/lang/gcc40/Makefile
+++ b/lang/gcc40/Makefile
@@ -90,8 +90,8 @@ MAN1=		cpp33.1 g++33.1 g77-33.1 gcc33.1 gcov33.1 \
 		rmic33.1 rmiregistry33.1
 MAN7=		fsf-funding.7 gfdl.7 gpl.7
 
-pre-fetch:
-	@${ECHO} "Making GCC ${DISTNAME:S/^gcc-//} for ${OPSYS} ${OSREL} ${PORTOBJFORMAT}	target ${CONFIGURE_TARGET}"
+pre-everything::
+	@${ECHO_MSG} "Making GCC ${DISTNAME:S/^gcc-//} for ${OPSYS} ${OSREL} ${PORTOBJFORMAT}	target ${CONFIGURE_TARGET}"
 .if !defined(WITH_BOUNDSCHECKING)
 	@${ECHO_MSG} "You can enable fine-grained bounds-checking support for compiled C programs"
 	@${ECHO_MSG} "by defining WITH_BOUNDSCHECKING.  Compile and link with \"-fbounds-checking\""
@@ -113,7 +113,7 @@ do-fetch:
 		${ECHO_MSG} ">> Attempting to CVS checkout from ${CVSROOT}." ;\
 		if ${CVS_CMD} -d ${CVSROOT} co -D "${CVS_DATE}" gcc ; \
 		then \
-			( ${ECHO} -n "${CVS_DATE}" > ${STAMPFILE} ) ; \
+			( ${ECHO_CMD} -n "${CVS_DATE}" > ${STAMPFILE} ) ; \
 			exit ; \
 		fi ; \
 		${ECHO_MSG} ">> Couldn't CVS checkout ${PKGNAME}." ; \
diff --git a/lang/gcc41/Makefile b/lang/gcc41/Makefile
index 2d7e2d1953f..bd9b1f99c33 100644
--- a/lang/gcc41/Makefile
+++ b/lang/gcc41/Makefile
@@ -90,8 +90,8 @@ MAN1=		cpp33.1 g++33.1 g77-33.1 gcc33.1 gcov33.1 \
 		rmic33.1 rmiregistry33.1
 MAN7=		fsf-funding.7 gfdl.7 gpl.7
 
-pre-fetch:
-	@${ECHO} "Making GCC ${DISTNAME:S/^gcc-//} for ${OPSYS} ${OSREL} ${PORTOBJFORMAT}	target ${CONFIGURE_TARGET}"
+pre-everything::
+	@${ECHO_MSG} "Making GCC ${DISTNAME:S/^gcc-//} for ${OPSYS} ${OSREL} ${PORTOBJFORMAT}	target ${CONFIGURE_TARGET}"
 .if !defined(WITH_BOUNDSCHECKING)
 	@${ECHO_MSG} "You can enable fine-grained bounds-checking support for compiled C programs"
 	@${ECHO_MSG} "by defining WITH_BOUNDSCHECKING.  Compile and link with \"-fbounds-checking\""
@@ -113,7 +113,7 @@ do-fetch:
 		${ECHO_MSG} ">> Attempting to CVS checkout from ${CVSROOT}." ;\
 		if ${CVS_CMD} -d ${CVSROOT} co -D "${CVS_DATE}" gcc ; \
 		then \
-			( ${ECHO} -n "${CVS_DATE}" > ${STAMPFILE} ) ; \
+			( ${ECHO_CMD} -n "${CVS_DATE}" > ${STAMPFILE} ) ; \
 			exit ; \
 		fi ; \
 		${ECHO_MSG} ">> Couldn't CVS checkout ${PKGNAME}." ; \
diff --git a/lang/gcc42/Makefile b/lang/gcc42/Makefile
index 2d7e2d1953f..bd9b1f99c33 100644
--- a/lang/gcc42/Makefile
+++ b/lang/gcc42/Makefile
@@ -90,8 +90,8 @@ MAN1=		cpp33.1 g++33.1 g77-33.1 gcc33.1 gcov33.1 \
 		rmic33.1 rmiregistry33.1
 MAN7=		fsf-funding.7 gfdl.7 gpl.7
 
-pre-fetch:
-	@${ECHO} "Making GCC ${DISTNAME:S/^gcc-//} for ${OPSYS} ${OSREL} ${PORTOBJFORMAT}	target ${CONFIGURE_TARGET}"
+pre-everything::
+	@${ECHO_MSG} "Making GCC ${DISTNAME:S/^gcc-//} for ${OPSYS} ${OSREL} ${PORTOBJFORMAT}	target ${CONFIGURE_TARGET}"
 .if !defined(WITH_BOUNDSCHECKING)
 	@${ECHO_MSG} "You can enable fine-grained bounds-checking support for compiled C programs"
 	@${ECHO_MSG} "by defining WITH_BOUNDSCHECKING.  Compile and link with \"-fbounds-checking\""
@@ -113,7 +113,7 @@ do-fetch:
 		${ECHO_MSG} ">> Attempting to CVS checkout from ${CVSROOT}." ;\
 		if ${CVS_CMD} -d ${CVSROOT} co -D "${CVS_DATE}" gcc ; \
 		then \
-			( ${ECHO} -n "${CVS_DATE}" > ${STAMPFILE} ) ; \
+			( ${ECHO_CMD} -n "${CVS_DATE}" > ${STAMPFILE} ) ; \
 			exit ; \
 		fi ; \
 		${ECHO_MSG} ">> Couldn't CVS checkout ${PKGNAME}." ; \
diff --git a/lang/gcc43/Makefile b/lang/gcc43/Makefile
index 2d7e2d1953f..bd9b1f99c33 100644
--- a/lang/gcc43/Makefile
+++ b/lang/gcc43/Makefile
@@ -90,8 +90,8 @@ MAN1=		cpp33.1 g++33.1 g77-33.1 gcc33.1 gcov33.1 \
 		rmic33.1 rmiregistry33.1
 MAN7=		fsf-funding.7 gfdl.7 gpl.7
 
-pre-fetch:
-	@${ECHO} "Making GCC ${DISTNAME:S/^gcc-//} for ${OPSYS} ${OSREL} ${PORTOBJFORMAT}	target ${CONFIGURE_TARGET}"
+pre-everything::
+	@${ECHO_MSG} "Making GCC ${DISTNAME:S/^gcc-//} for ${OPSYS} ${OSREL} ${PORTOBJFORMAT}	target ${CONFIGURE_TARGET}"
 .if !defined(WITH_BOUNDSCHECKING)
 	@${ECHO_MSG} "You can enable fine-grained bounds-checking support for compiled C programs"
 	@${ECHO_MSG} "by defining WITH_BOUNDSCHECKING.  Compile and link with \"-fbounds-checking\""
@@ -113,7 +113,7 @@ do-fetch:
 		${ECHO_MSG} ">> Attempting to CVS checkout from ${CVSROOT}." ;\
 		if ${CVS_CMD} -d ${CVSROOT} co -D "${CVS_DATE}" gcc ; \
 		then \
-			( ${ECHO} -n "${CVS_DATE}" > ${STAMPFILE} ) ; \
+			( ${ECHO_CMD} -n "${CVS_DATE}" > ${STAMPFILE} ) ; \
 			exit ; \
 		fi ; \
 		${ECHO_MSG} ">> Couldn't CVS checkout ${PKGNAME}." ; \
diff --git a/lang/gcc44/Makefile b/lang/gcc44/Makefile
index 2d7e2d1953f..bd9b1f99c33 100644
--- a/lang/gcc44/Makefile
+++ b/lang/gcc44/Makefile
@@ -90,8 +90,8 @@ MAN1=		cpp33.1 g++33.1 g77-33.1 gcc33.1 gcov33.1 \
 		rmic33.1 rmiregistry33.1
 MAN7=		fsf-funding.7 gfdl.7 gpl.7
 
-pre-fetch:
-	@${ECHO} "Making GCC ${DISTNAME:S/^gcc-//} for ${OPSYS} ${OSREL} ${PORTOBJFORMAT}	target ${CONFIGURE_TARGET}"
+pre-everything::
+	@${ECHO_MSG} "Making GCC ${DISTNAME:S/^gcc-//} for ${OPSYS} ${OSREL} ${PORTOBJFORMAT}	target ${CONFIGURE_TARGET}"
 .if !defined(WITH_BOUNDSCHECKING)
 	@${ECHO_MSG} "You can enable fine-grained bounds-checking support for compiled C programs"
 	@${ECHO_MSG} "by defining WITH_BOUNDSCHECKING.  Compile and link with \"-fbounds-checking\""
@@ -113,7 +113,7 @@ do-fetch:
 		${ECHO_MSG} ">> Attempting to CVS checkout from ${CVSROOT}." ;\
 		if ${CVS_CMD} -d ${CVSROOT} co -D "${CVS_DATE}" gcc ; \
 		then \
-			( ${ECHO} -n "${CVS_DATE}" > ${STAMPFILE} ) ; \
+			( ${ECHO_CMD} -n "${CVS_DATE}" > ${STAMPFILE} ) ; \
 			exit ; \
 		fi ; \
 		${ECHO_MSG} ">> Couldn't CVS checkout ${PKGNAME}." ; \
diff --git a/lang/gcc45/Makefile b/lang/gcc45/Makefile
index 2d7e2d1953f..bd9b1f99c33 100644
--- a/lang/gcc45/Makefile
+++ b/lang/gcc45/Makefile
@@ -90,8 +90,8 @@ MAN1=		cpp33.1 g++33.1 g77-33.1 gcc33.1 gcov33.1 \
 		rmic33.1 rmiregistry33.1
 MAN7=		fsf-funding.7 gfdl.7 gpl.7
 
-pre-fetch:
-	@${ECHO} "Making GCC ${DISTNAME:S/^gcc-//} for ${OPSYS} ${OSREL} ${PORTOBJFORMAT}	target ${CONFIGURE_TARGET}"
+pre-everything::
+	@${ECHO_MSG} "Making GCC ${DISTNAME:S/^gcc-//} for ${OPSYS} ${OSREL} ${PORTOBJFORMAT}	target ${CONFIGURE_TARGET}"
 .if !defined(WITH_BOUNDSCHECKING)
 	@${ECHO_MSG} "You can enable fine-grained bounds-checking support for compiled C programs"
 	@${ECHO_MSG} "by defining WITH_BOUNDSCHECKING.  Compile and link with \"-fbounds-checking\""
@@ -113,7 +113,7 @@ do-fetch:
 		${ECHO_MSG} ">> Attempting to CVS checkout from ${CVSROOT}." ;\
 		if ${CVS_CMD} -d ${CVSROOT} co -D "${CVS_DATE}" gcc ; \
 		then \
-			( ${ECHO} -n "${CVS_DATE}" > ${STAMPFILE} ) ; \
+			( ${ECHO_CMD} -n "${CVS_DATE}" > ${STAMPFILE} ) ; \
 			exit ; \
 		fi ; \
 		${ECHO_MSG} ">> Couldn't CVS checkout ${PKGNAME}." ; \
diff --git a/lang/gcc46/Makefile b/lang/gcc46/Makefile
index 2d7e2d1953f..bd9b1f99c33 100644
--- a/lang/gcc46/Makefile
+++ b/lang/gcc46/Makefile
@@ -90,8 +90,8 @@ MAN1=		cpp33.1 g++33.1 g77-33.1 gcc33.1 gcov33.1 \
 		rmic33.1 rmiregistry33.1
 MAN7=		fsf-funding.7 gfdl.7 gpl.7
 
-pre-fetch:
-	@${ECHO} "Making GCC ${DISTNAME:S/^gcc-//} for ${OPSYS} ${OSREL} ${PORTOBJFORMAT}	target ${CONFIGURE_TARGET}"
+pre-everything::
+	@${ECHO_MSG} "Making GCC ${DISTNAME:S/^gcc-//} for ${OPSYS} ${OSREL} ${PORTOBJFORMAT}	target ${CONFIGURE_TARGET}"
 .if !defined(WITH_BOUNDSCHECKING)
 	@${ECHO_MSG} "You can enable fine-grained bounds-checking support for compiled C programs"
 	@${ECHO_MSG} "by defining WITH_BOUNDSCHECKING.  Compile and link with \"-fbounds-checking\""
@@ -113,7 +113,7 @@ do-fetch:
 		${ECHO_MSG} ">> Attempting to CVS checkout from ${CVSROOT}." ;\
 		if ${CVS_CMD} -d ${CVSROOT} co -D "${CVS_DATE}" gcc ; \
 		then \
-			( ${ECHO} -n "${CVS_DATE}" > ${STAMPFILE} ) ; \
+			( ${ECHO_CMD} -n "${CVS_DATE}" > ${STAMPFILE} ) ; \
 			exit ; \
 		fi ; \
 		${ECHO_MSG} ">> Couldn't CVS checkout ${PKGNAME}." ; \
diff --git a/lang/gcc47/Makefile b/lang/gcc47/Makefile
index 2d7e2d1953f..bd9b1f99c33 100644
--- a/lang/gcc47/Makefile
+++ b/lang/gcc47/Makefile
@@ -90,8 +90,8 @@ MAN1=		cpp33.1 g++33.1 g77-33.1 gcc33.1 gcov33.1 \
 		rmic33.1 rmiregistry33.1
 MAN7=		fsf-funding.7 gfdl.7 gpl.7
 
-pre-fetch:
-	@${ECHO} "Making GCC ${DISTNAME:S/^gcc-//} for ${OPSYS} ${OSREL} ${PORTOBJFORMAT}	target ${CONFIGURE_TARGET}"
+pre-everything::
+	@${ECHO_MSG} "Making GCC ${DISTNAME:S/^gcc-//} for ${OPSYS} ${OSREL} ${PORTOBJFORMAT}	target ${CONFIGURE_TARGET}"
 .if !defined(WITH_BOUNDSCHECKING)
 	@${ECHO_MSG} "You can enable fine-grained bounds-checking support for compiled C programs"
 	@${ECHO_MSG} "by defining WITH_BOUNDSCHECKING.  Compile and link with \"-fbounds-checking\""
@@ -113,7 +113,7 @@ do-fetch:
 		${ECHO_MSG} ">> Attempting to CVS checkout from ${CVSROOT}." ;\
 		if ${CVS_CMD} -d ${CVSROOT} co -D "${CVS_DATE}" gcc ; \
 		then \
-			( ${ECHO} -n "${CVS_DATE}" > ${STAMPFILE} ) ; \
+			( ${ECHO_CMD} -n "${CVS_DATE}" > ${STAMPFILE} ) ; \
 			exit ; \
 		fi ; \
 		${ECHO_MSG} ">> Couldn't CVS checkout ${PKGNAME}." ; \
diff --git a/lang/gcc48/Makefile b/lang/gcc48/Makefile
index 2d7e2d1953f..bd9b1f99c33 100644
--- a/lang/gcc48/Makefile
+++ b/lang/gcc48/Makefile
@@ -90,8 +90,8 @@ MAN1=		cpp33.1 g++33.1 g77-33.1 gcc33.1 gcov33.1 \
 		rmic33.1 rmiregistry33.1
 MAN7=		fsf-funding.7 gfdl.7 gpl.7
 
-pre-fetch:
-	@${ECHO} "Making GCC ${DISTNAME:S/^gcc-//} for ${OPSYS} ${OSREL} ${PORTOBJFORMAT}	target ${CONFIGURE_TARGET}"
+pre-everything::
+	@${ECHO_MSG} "Making GCC ${DISTNAME:S/^gcc-//} for ${OPSYS} ${OSREL} ${PORTOBJFORMAT}	target ${CONFIGURE_TARGET}"
 .if !defined(WITH_BOUNDSCHECKING)
 	@${ECHO_MSG} "You can enable fine-grained bounds-checking support for compiled C programs"
 	@${ECHO_MSG} "by defining WITH_BOUNDSCHECKING.  Compile and link with \"-fbounds-checking\""
@@ -113,7 +113,7 @@ do-fetch:
 		${ECHO_MSG} ">> Attempting to CVS checkout from ${CVSROOT}." ;\
 		if ${CVS_CMD} -d ${CVSROOT} co -D "${CVS_DATE}" gcc ; \
 		then \
-			( ${ECHO} -n "${CVS_DATE}" > ${STAMPFILE} ) ; \
+			( ${ECHO_CMD} -n "${CVS_DATE}" > ${STAMPFILE} ) ; \
 			exit ; \
 		fi ; \
 		${ECHO_MSG} ">> Couldn't CVS checkout ${PKGNAME}." ; \
diff --git a/lang/logo/Makefile b/lang/logo/Makefile
index a337c7f06c1..6b4881abd4f 100644
--- a/lang/logo/Makefile
+++ b/lang/logo/Makefile
@@ -55,21 +55,21 @@ PLIST_SUB+=	EMACS_LOGO_MODE=""
 PLIST_SUB+=	EMACS_LOGO_MODE="@comment "
 .endif
 
-pre-fetch:
+pre-everything::
 .if !defined(EMACS_LOGO_MODE)
-	@${ECHO} ""
-	@${ECHO} "      Define EMACS_LOGO_MODE to build the emacs logo mode"
-	@${ECHO} ""
+	@${ECHO_MSG} ""
+	@${ECHO_MSG} "      Define EMACS_LOGO_MODE to build the emacs logo mode"
+	@${ECHO_MSG} ""
 .endif
 .if !defined(WITH_FULL_DOCS)
-	@${ECHO} ""
-	@${ECHO} "      Define WITH_FULL_DOCS to build ps, pdf and html docs"
-	@${ECHO} "      This requires teTeX and ghostscript !"
+	@${ECHO_MSG} ""
+	@${ECHO_MSG} "      Define WITH_FULL_DOCS to build ps, pdf and html docs"
+	@${ECHO_MSG} "      This requires teTeX and ghostscript !"
 .if !defined(WITH_GHOSTSCRIPT_AFPL) || ${WITH_GHOSTSCRIPT_AFPL} != yes
-	@${ECHO} "      Define WITH_GHOSTSCRIPT_AFPL=yes to use"
-	@${ECHO} "      AFPL Postscript interpreter instead of GNU one"
+	@${ECHO_MSG} "      Define WITH_GHOSTSCRIPT_AFPL=yes to use"
+	@${ECHO_MSG} "      AFPL Postscript interpreter instead of GNU one"
 .endif
-	@${ECHO} ""
+	@${ECHO_MSG} ""
 .endif
 
 do-install:
diff --git a/mail/drac/Makefile b/mail/drac/Makefile
index d0c6979f994..87f35da038d 100644
--- a/mail/drac/Makefile
+++ b/mail/drac/Makefile
@@ -34,17 +34,17 @@ MAKE_ARGS+=	-DWITH_TI_RPC
 .endif
 
 pre-everything::
-	@${ECHO} "============================================================="
-	@${ECHO} "For databases compatible with other MTAs than sendmail, use:"
-	@${ECHO}
-	@${ECHO} "WITH_POSTFIX=yes	(Postfix)"
-	@${ECHO} "WITH_POSTFIX_DB3=yes	(Postfix with DB3 database maps)"
-	@${ECHO} "WITH_EXIM=yes		(Exim)"
-	@${ECHO}
-	@${ECHO} "Define WITH_FOREGROUND to make the rpc.dracd daemon stay in"
-	@${ECHO} "foreground instead of detaching itself. This breaks the"
-	@${ECHO} "startup script."
-	@${ECHO} "============================================================="
+	@${ECHO_MSG} "============================================================="
+	@${ECHO_MSG} "For databases compatible with other MTAs than sendmail, use:"
+	@${ECHO_MSG}
+	@${ECHO_MSG} "WITH_POSTFIX=yes	(Postfix)"
+	@${ECHO_MSG} "WITH_POSTFIX_DB3=yes	(Postfix with DB3 database maps)"
+	@${ECHO_MSG} "WITH_EXIM=yes		(Exim)"
+	@${ECHO_MSG}
+	@${ECHO_MSG} "Define WITH_FOREGROUND to make the rpc.dracd daemon stay in"
+	@${ECHO_MSG} "foreground instead of detaching itself. This breaks the"
+	@${ECHO_MSG} "startup script."
+	@${ECHO_MSG} "============================================================="
 
 post-patch:
 	@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/rpc.dracd.1m
diff --git a/mail/p5-IMAP-Admin/Makefile b/mail/p5-IMAP-Admin/Makefile
index f4f858643fe..771032e5484 100644
--- a/mail/p5-IMAP-Admin/Makefile
+++ b/mail/p5-IMAP-Admin/Makefile
@@ -25,10 +25,10 @@ post-install:
 	@${INSTALL_DATA} ${WRKSRC}/examples/create.pl \
 		${WRKSRC}/examples/delete.pl \
 		${PREFIX}/share/examples/p5-IMAP-Admin
-	@${ECHO} ""
-	@${ECHO} "*******************************************************************************"
-	@${ECHO} "See ${PREFIX}/share/examples/p5-IMAP-Admin for some examples..."
-	@${ECHO} "*******************************************************************************"
-	@${ECHO} ""
+	@${ECHO_MSG} ""
+	@${ECHO_MSG} "*******************************************************************************"
+	@${ECHO_MSG} "See ${PREFIX}/share/examples/p5-IMAP-Admin for some examples..."
+	@${ECHO_MSG} "*******************************************************************************"
+	@${ECHO_MSG} ""
 
 .include <bsd.port.mk>
diff --git a/mail/postfix1/Makefile b/mail/postfix1/Makefile
index 1f117197376..7fe520c7a76 100644
--- a/mail/postfix1/Makefile
+++ b/mail/postfix1/Makefile
@@ -71,7 +71,7 @@ pre-fetch:
 post-patch:
 	(cd ${WRKSRC} && ${MAKE} -f Makefile.init makefiles ${MAKEFILEFLAGS} \
 	CCARGS="${POSTFIX_CCARGS}" AUXLIBS="${POSTFIX_AUXLIBS}" && \
-	${ECHO} "all: default" >> Makefile)
+	${ECHO_CMD} "all: default" >> Makefile)
 
 pre-patch:
 .for file in ${MAN1}
diff --git a/mail/teapop-devel/Makefile b/mail/teapop-devel/Makefile
index c7a5b78d6f5..e8be2207a12 100644
--- a/mail/teapop-devel/Makefile
+++ b/mail/teapop-devel/Makefile
@@ -79,11 +79,11 @@ show-options:
 	@${EGREP} '^##' ${.CURDIR}/Makefile | ${SED} 's/##//'
 
 post-install:
-	@${ECHO} ""
-	@${ECHO} "------------------------------------------------------------------------"
-	@${ECHO} "===> Be sure to copy ${LOCALBASE}/etc/teapop.passwd.sample to"
-	@${ECHO} "===> ${LOCALBASE}/etc/teapop.passwd before using teapop"
-	@${ECHO} "------------------------------------------------------------------------"
-	@${ECHO} ""
+	@${ECHO_MSG} ""
+	@${ECHO_MSG} "------------------------------------------------------------------------"
+	@${ECHO_MSG} "===> Be sure to copy ${LOCALBASE}/etc/teapop.passwd.sample to"
+	@${ECHO_MSG} "===> ${LOCALBASE}/etc/teapop.passwd before using teapop"
+	@${ECHO_MSG} "------------------------------------------------------------------------"
+	@${ECHO_MSG} ""
 
 .include <bsd.port.mk>
diff --git a/mail/teapop/Makefile b/mail/teapop/Makefile
index c7a5b78d6f5..e8be2207a12 100644
--- a/mail/teapop/Makefile
+++ b/mail/teapop/Makefile
@@ -79,11 +79,11 @@ show-options:
 	@${EGREP} '^##' ${.CURDIR}/Makefile | ${SED} 's/##//'
 
 post-install:
-	@${ECHO} ""
-	@${ECHO} "------------------------------------------------------------------------"
-	@${ECHO} "===> Be sure to copy ${LOCALBASE}/etc/teapop.passwd.sample to"
-	@${ECHO} "===> ${LOCALBASE}/etc/teapop.passwd before using teapop"
-	@${ECHO} "------------------------------------------------------------------------"
-	@${ECHO} ""
+	@${ECHO_MSG} ""
+	@${ECHO_MSG} "------------------------------------------------------------------------"
+	@${ECHO_MSG} "===> Be sure to copy ${LOCALBASE}/etc/teapop.passwd.sample to"
+	@${ECHO_MSG} "===> ${LOCALBASE}/etc/teapop.passwd before using teapop"
+	@${ECHO_MSG} "------------------------------------------------------------------------"
+	@${ECHO_MSG} ""
 
 .include <bsd.port.mk>
diff --git a/math/simpack/Makefile b/math/simpack/Makefile
index 7118c59b407..369f27d456e 100644
--- a/math/simpack/Makefile
+++ b/math/simpack/Makefile
@@ -89,7 +89,7 @@ do-install-doc:
 create-libs: create-lib-sim++ create-lib-queuing
 
 create-lib-sim++:
-	@${ECHO} libsim++.a
+	@${ECHO_MSG} libsim++.a
 	@${MKDIR} ${WRKDIR}/temp
 	@(cd ${WRKDIR}/temp;                            \
 	for i in `${CAT} ${FILESDIR}/FILES-SRC-SIMPP` ; do \
@@ -98,7 +98,7 @@ create-lib-sim++:
 	done;                                           \
 	${AR} cq libsim++.a `lorder *.o | tsort -q `;   \
 	${RM} *.o )
-	@${ECHO} libsim++.so.${VERSION}
+	@${ECHO_MSG} libsim++.so.${VERSION}
 	@(cd ${WRKDIR}/temp;                                   \
 	for i in `${CAT} ${FILESDIR}/FILES-SRC-SIMPP` ; do        \
 	  gcc -fpic -DPIC -I${WRKSRC}/func/event/include -c -O \
@@ -115,13 +115,13 @@ create-lib-sim++:
 	${RM} *.so )
 
 create-lib-queuing:
-	@${ECHO} libqueuing.a
+	@${ECHO_MSG} libqueuing.a
 	@(cd ${WRKDIR}/temp;                            \
 	gcc -I${WRKSRC}/func/queuing -c -O              \
 	      ${WRKSRC}/func/queuing/queuing.c;         \
 	${AR} cq libqueuing.a `lorder *.o | tsort -q `; \
 	${RM} *.o )
-	@${ECHO} libqueuing.so.${VERSION}
+	@${ECHO_MSG} libqueuing.so.${VERSION}
 	@(cd ${WRKDIR}/temp;                           \
 	gcc -fpic -DPIC -I${WRKSRC}/func/queuing -c -O \
 		 -o queuing.so                         \