KATO mega patch

- ECHO -> ECHO_MSG

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

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

4 files changed, 27 insertions, 27 deletions

diff --git a/net/cricket/Makefile b/net/cricket/Makefile
index e805b6ef90a0..488fa0239f8a 100644
--- a/net/cricket/Makefile
+++ b/net/cricket/Makefile
@@ -43,14 +43,14 @@ do-install:
 		-name \*.bak | ${XARGS} ${RM} -f
 	${CHOWN} -R ${CRICKET_USER}:${CRICKET_GROUP} ${PREFIX}/cricket
 	@if [ -L ${PREFIX}/cricket/cricket ]; then \
-		${ECHO} "Updating ${PREFIX}/cricket/cricket symbolic link" ; \
+		${ECHO_MSG} "Updating ${PREFIX}/cricket/cricket symbolic link" ; \
 		${RM} ${PREFIX}/cricket/cricket ; \
 	fi
 	${LN} -s ${PREFIX}/cricket/cricket-${PORTVERSION} \
 		${PREFIX}/cricket/cricket
 	@if [ -f ${LOCALBASE}/cricket/compile ] ; then \
-		${ECHO} "You should migrate manually to use new cricket" ; \
-		${ECHO} "installation scheme." ; \
+		${ECHO_MSG} "You should migrate manually to use new cricket" ; \
+		${ECHO_MSG} "installation scheme." ; \
 	fi
 
 post-install:
diff --git a/net/delegate/Makefile b/net/delegate/Makefile
index bc1b5ff0251e..30952aee934b 100644
--- a/net/delegate/Makefile
+++ b/net/delegate/Makefile
@@ -19,29 +19,29 @@ USE_BZIP2=	YES
 NO_PACKAGE=	"Insecure program."
 IS_INTERACTIVE=	YES
 
-pre-fetch:
+pre-everything::
 .if !defined(FORCE_BUILD) || ${FORCE_BUILD}!="YES"
-	@${ECHO} "*********************************************************************"
-	@${ECHO} "*   WARNING!     WARNING!     WARNING!     WARNING!     WARNING!    *"
-	@${ECHO} "* This program has known security problems which may allow a remote  *"
-	@${ECHO} "* attacker to take control of your machine.                         *"
-	@${ECHO} "* See FreeBSD security advisory 00:04 for more information.         *"
-	@${ECHO} "*                                                                   *"
-	@${ECHO} "* It is strongly recommended that you avoid using this program.     *"
-	@${ECHO} "*                                                                   *"
-	@${ECHO} "* If you would like to use this program despite the danger, run     *"
-	@${ECHO} "* make with ``FORCE_BUILD=YES''                                     *"
-	@${ECHO} "*   WARNING!     WARNING!     WARNING!     WARNING!     WARNING!    *"
-	@${ECHO} "*********************************************************************"
+	@${ECHO_MSG} "*********************************************************************"
+	@${ECHO_MSG} "*   WARNING!     WARNING!     WARNING!     WARNING!     WARNING!    *"
+	@${ECHO_MSG} "* This program has known security problems which may allow a remote  *"
+	@${ECHO_MSG} "* attacker to take control of your machine.                         *"
+	@${ECHO_MSG} "* See FreeBSD security advisory 00:04 for more information.         *"
+	@${ECHO_MSG} "*                                                                   *"
+	@${ECHO_MSG} "* It is strongly recommended that you avoid using this program.     *"
+	@${ECHO_MSG} "*                                                                   *"
+	@${ECHO_MSG} "* If you would like to use this program despite the danger, run     *"
+	@${ECHO_MSG} "* make with ``FORCE_BUILD=YES''                                     *"
+	@${ECHO_MSG} "*   WARNING!     WARNING!     WARNING!     WARNING!     WARNING!    *"
+	@${ECHO_MSG} "*********************************************************************"
 	@${FALSE}
 .else
-	@${ECHO} "*********************************************************************"
-	@${ECHO} "*   WARNING!     WARNING!     WARNING!     WARNING!     WARNING!    *"
-	@${ECHO} "* You have chosen to build an insecure program.                     *"
-	@${ECHO} "* This program has known security problems which may allow a remote  *"
-	@${ECHO} "* attacker to take control of your machine.                         *"
-	@${ECHO} "* See FreeBSD security advisory 00:04 for more information.         *"
-	@${ECHO} "*********************************************************************"
+	@${ECHO_MSG} "*********************************************************************"
+	@${ECHO_MSG} "*   WARNING!     WARNING!     WARNING!     WARNING!     WARNING!    *"
+	@${ECHO_MSG} "* You have chosen to build an insecure program.                     *"
+	@${ECHO_MSG} "* This program has known security problems which may allow a remote  *"
+	@${ECHO_MSG} "* attacker to take control of your machine.                         *"
+	@${ECHO_MSG} "* See FreeBSD security advisory 00:04 for more information.         *"
+	@${ECHO_MSG} "*********************************************************************"
 .endif
 
 do-install:
diff --git a/net/jarl/Makefile b/net/jarl/Makefile
index 4443db666019..b107cbc7f607 100644
--- a/net/jarl/Makefile
+++ b/net/jarl/Makefile
@@ -24,7 +24,7 @@ USE_REINPLACE=	yes
 USE_PERL5=	yes
 
 makeplist:
-	${ECHO} bin/jarl > ${PLIST}
+	${ECHO_CMD} bin/jarl > ${PLIST}
 	${FIND} ${PREFIX}/share/jarl -type f -print | ${CUT} -d/ -f4- >> \
 		${PLIST}
 	${FIND} ${PREFIX}/share/jarl -type d -print | ${CUT} -d/ -f4- | \
diff --git a/net/nicotine/Makefile b/net/nicotine/Makefile
index a0f8fdb06b7d..c809fb3f3531 100644
--- a/net/nicotine/Makefile
+++ b/net/nicotine/Makefile
@@ -25,9 +25,9 @@ USE_PYDISTUTILS=	yes
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/ogg/vorbismodule.so:${PORTSDIR}/audio/py-vorbis
 .else
 pre-everything::
-	@${ECHO} ""
-	@${ECHO} "Define WITH_VORBIS=yes to enable OGG/Vorbis support"
-	@${ECHO} ""
+	@${ECHO_MSG} ""
+	@${ECHO_MSG} "Define WITH_VORBIS=yes to enable OGG/Vorbis support"
+	@${ECHO_MSG} ""
 .endif
 
 .if !defined(NOPORTDOCS)