- ECHO -> ECHO_MSG

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

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

21 files changed, 63 insertions, 63 deletions

diff --git a/lang/STk/Makefile b/lang/STk/Makefile
index 15703c4..4ec0761 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 f3addb2..d2f520a 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 2d7e2d1..bd9b1f9 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 2d7e2d1..bd9b1f9 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 7d05fcf..e207177 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 19d67ed..bcd2982 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 d14c757..1f95625 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 20df6e0..7ced601 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 8694c55..0a37962 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 2d7e2d1..bd9b1f9 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 2d7e2d1..bd9b1f9 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 2d7e2d1..bd9b1f9 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 2d7e2d1..bd9b1f9 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 2d7e2d1..bd9b1f9 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 2d7e2d1..bd9b1f9 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 2d7e2d1..bd9b1f9 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 2d7e2d1..bd9b1f9 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 2d7e2d1..bd9b1f9 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 2d7e2d1..bd9b1f9 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 2d7e2d1..bd9b1f9 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 a337c7f..6b4881a 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: