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>

8 files changed, 53 insertions, 53 deletions

diff --git a/www/MT/Makefile b/www/MT/Makefile
index 2f13790523f1..2cebeaa611aa 100644
--- a/www/MT/Makefile
+++ b/www/MT/Makefile
@@ -50,7 +50,7 @@ run make again.\n
 
 do-install:
 	@cd ${WRKSRC} && ${FIND} * -name "*.orig" -delete
-	@${ECHO} "Installing cgi ${PREFIX}/${CGIDIR}"
+	@${ECHO_MSG} "Installing cgi ${PREFIX}/${CGIDIR}"
 	@${MKDIR} ${PREFIX}/${CGIDIR}
 	@cd ${WRKSRC} && ${CP} -R *.cgi lib extlib tmpl search_templates \
 	  ${PREFIX}/${CGIDIR}
@@ -59,7 +59,7 @@ do-install:
 	  -e 's#path/to/static-files#mt#g' \
 	  -e 's/# NoHTMLEntities 1/NoHTMLEntities 1/g' \
 	  ${WRKSRC}/mt.cfg > ${PREFIX}/${CGIDIR}/mt.cfg
-	@${ECHO} "Installing data ${PREFIX}/${DATADIR}"
+	@${ECHO_MSG} "Installing data ${PREFIX}/${DATADIR}"
 	@${MKDIR} ${PREFIX}/${DATADIR}
 	@cd ${WRKSRC} && ${CP} -R LICENSE LICENSE-COMMERCIAL docs images \
 	  index.html plugins schemas styles.css \
@@ -72,6 +72,6 @@ do-install:
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
-	@${ECHO} "Please read the docs to initialize a blog DB in ${DB_DIR}"
+	@${ECHO_MSG} "Please read the docs to initialize a blog DB in ${DB_DIR}"
 
 .include <bsd.port.post.mk>
diff --git a/www/geeklog/Makefile b/www/geeklog/Makefile
index 4a75ff141a8b..fcc815966379 100644
--- a/www/geeklog/Makefile
+++ b/www/geeklog/Makefile
@@ -28,14 +28,14 @@ do-install:
 	${CHMOD} -R 775 ${APACHEDIR}/geeklog/public_html/images/articles
 	${CHMOD} -R 775 ${APACHEDIR}/geeklog/public_html/images/userphotos
 	${CHMOD} -R 775 ${APACHEDIR}/geeklog/public_html/backend
-	@${ECHO} ""
-	@${ECHO} "***********************************************************************"
-	@${ECHO} "* You now need to create the database that you want GeekLog           *"
-	@${ECHO} "* to reside in.                                                       *"
-	@${ECHO} "* Then edit the config.php file to your needs.                        *"
-	@${ECHO} "* Once you have done that, the goto                                   *"
-	@${ECHO} "* http://<your_website>/geeklog/public_html/admin/install/install.php *"
-	@${ECHO} "* And follow the instructions, then you are done!!                    *"
-	@${ECHO} "***********************************************************************"
+	@${ECHO_MSG} ""
+	@${ECHO_MSG} "***********************************************************************"
+	@${ECHO_MSG} "* You now need to create the database that you want GeekLog           *"
+	@${ECHO_MSG} "* to reside in.                                                       *"
+	@${ECHO_MSG} "* Then edit the config.php file to your needs.                        *"
+	@${ECHO_MSG} "* Once you have done that, the goto                                   *"
+	@${ECHO_MSG} "* http://<your_website>/geeklog/public_html/admin/install/install.php *"
+	@${ECHO_MSG} "* And follow the instructions, then you are done!!                    *"
+	@${ECHO_MSG} "***********************************************************************"
 
 .include <bsd.port.mk>
diff --git a/www/gn/Makefile b/www/gn/Makefile
index 8e8889c8e7bd..23a260ff8160 100644
--- a/www/gn/Makefile
+++ b/www/gn/Makefile
@@ -39,12 +39,12 @@ post-install:
 	@cd ${PREFIX}; \
 	  [ -s etc/gn_mime.types ] && \
 	  if ! cmp -s etc/gn_mime.types ${WRKSRC}/etc/gn_mime.types; then \
-		${ECHO} ${MV} etc/gn_mime.types etc/gn_mime.types.old; \
+		${ECHO_MSG} ${MV} etc/gn_mime.types etc/gn_mime.types.old; \
 		${MV} etc/gn_mime.types etc/gn_mime.types.old; \
 	  fi; \
 	  [ -s gnroot/menu ] && \
 	  if ! cmp -s gnroot/menu ${WRKSRC}/gnroot/menu; then \
-		${ECHO} ${MV} gnroot/menu gnroot/menu.old; \
+		${ECHO_MSG} ${MV} gnroot/menu gnroot/menu.old; \
 		${MV} gnroot/menu gnroot/menu.old; \
 	  fi; \
 	  tar -cf - -C ${WRKSRC} gnroot libexec bin etc | tar xpf - && \
diff --git a/www/grail/Makefile b/www/grail/Makefile
index 62dfeddd7720..39781cc106d8 100644
--- a/www/grail/Makefile
+++ b/www/grail/Makefile
@@ -32,17 +32,17 @@ do-build:
 	${PYTHON} -u -c 'from compileall import compile_dir; compile_dir("${WRKSRC}")'
 
 do-install:
-	@${ECHO} === Creating directories...
+	@${ECHO_MSG} === Creating directories...
 	@for dir in `${DIRS_CMD}`; do                                  \
-		${ECHO} ${PREFIX}/$$dir;                               \
+		${ECHO_MSG} ${PREFIX}/$$dir;                               \
 		${MKDIR} ${PREFIX}/$$dir;                              \
 	done
-	@${ECHO} === Installing grail files ...
+	@${ECHO_MSG} === Installing grail files ...
 	@for file in `${FILES_CMD}`; do                                \
-		${ECHO} ${GRAILDIR}/$$file;                            \
+		${ECHO_MSG} ${GRAILDIR}/$$file;                            \
 		${INSTALL_DATA} ${WRKSRC}/$$file ${GRAILDIR}/$$file;   \
 	done
-	@${ECHO} === Installing grail script...
+	@${ECHO_MSG} === Installing grail script...
 	@${SED} 's,%%GRAILDIR%%,${GRAILDIR},g' <${FILESDIR}/grail >    \
 		${WRKDIR}/grail.tmp
 	@${INSTALL_SCRIPT} ${WRKDIR}/grail.tmp ${PREFIX}/bin/grail
diff --git a/www/mod_blowchunks/Makefile b/www/mod_blowchunks/Makefile
index d184e37bd680..f5958f79cd4c 100644
--- a/www/mod_blowchunks/Makefile
+++ b/www/mod_blowchunks/Makefile
@@ -33,18 +33,18 @@ do-extract:
 
 do-build:
 .if !defined(WITHOUT_BLOWCHUNK_LOG)
-	@${ECHO} "================================================================================"
-	@${ECHO} "If you do not want to log chunked requests, rebuild with WITHOUT_BLOWCHUNK_LOG"
-	@${ECHO} "defined."
-	@${ECHO} "================================================================================"
+	@${ECHO_MSG} "================================================================================"
+	@${ECHO_MSG} "If you do not want to log chunked requests, rebuild with WITHOUT_BLOWCHUNK_LOG"
+	@${ECHO_MSG} "defined."
+	@${ECHO_MSG} "================================================================================"
 .endif
 	cd ${WRKSRC} && ${MV} ${PKGNAME}.c ${PORTNAME}.c && \
 	${APXS} ${APXSFLAGS} -c ${PORTNAME}.c
 
 do-install:
 	cd ${WRKSRC} && ${APXS} -A -i ${PORTNAME}.so
-	@${ECHO} "================================================================================"
-	@${ECHO} "Enable mod_blowchunks in Apache's config manually."
-	@${ECHO} "================================================================================"
+	@${ECHO_MSG} "================================================================================"
+	@${ECHO_MSG} "Enable mod_blowchunks in Apache's config manually."
+	@${ECHO_MSG} "================================================================================"
 
 .include <bsd.port.mk>
diff --git a/www/mod_python/Makefile b/www/mod_python/Makefile
index 0a5a025cc148..5962854a71c6 100644
--- a/www/mod_python/Makefile
+++ b/www/mod_python/Makefile
@@ -34,12 +34,12 @@ PLIST_SUB+=	PYTHON_SITELIBDIR=${PYTHON_SITELIBDIR:S/^${LOCALBASE}\///g}
 
 STRIP_CMD?=	strip
 
-pre-fetch:
-	@${ECHO} ""
-	@${ECHO} "You may use the following build option:"
-	@${ECHO} ""
-	@${ECHO} "  WANT_EAPI=yes  build as apache EAPI module (for apache13-modssl)"
-	@${ECHO} ""
+pre-everything::
+	@${ECHO_MSG} ""
+	@${ECHO_MSG} "You may use the following build option:"
+	@${ECHO_MSG} ""
+	@${ECHO_MSG} "  WANT_EAPI=yes  build as apache EAPI module (for apache13-modssl)"
+	@${ECHO_MSG} ""
 
 pre-patch:
 .if defined(WANT_EAPI)
diff --git a/www/rt2/Makefile b/www/rt2/Makefile
index afe003bb9081..91f58655ec8c 100644
--- a/www/rt2/Makefile
+++ b/www/rt2/Makefile
@@ -111,18 +111,18 @@ MAN3=		RT::Links.3 \
 		RT::ACL.3 \
 		RT::Attachments.3
 
-pre-fetch:
-	@${ECHO} ""
-	@${ECHO} "You may use the following build options:"
-	@${ECHO} ""
-	@${ECHO} "	DB_DBA_PASSWORD=password	Your password of MySQL root ();"
-	@${ECHO} "	DB_HOST=hostname		Where MySQL resident (localhost);"
-	@${ECHO} "	DB_RT_PASS=password		Your password of MySQL RT user (rt_pass);"
-	@${ECHO} "	DB_TYPE=type			Pg for postgresql, mysql for MySQL (mysql);"
-	@${ECHO} "	INSTALL_NEW			Install a fresh port, otherwise just upgrade;"
-	@${ECHO} ""
-	@${ECHO} "IMPORTANT!!! If you want to install a fresh new port, define INSTALL_NEW to do so, otherwise this port just do a upgrade."
-	@${ECHO} ""
+pre-everything::
+	@${ECHO_MSG} ""
+	@${ECHO_MSG} "You may use the following build options:"
+	@${ECHO_MSG} ""
+	@${ECHO_MSG} "	DB_DBA_PASSWORD=password	Your password of MySQL root ();"
+	@${ECHO_MSG} "	DB_HOST=hostname		Where MySQL resident (localhost);"
+	@${ECHO_MSG} "	DB_RT_PASS=password		Your password of MySQL RT user (rt_pass);"
+	@${ECHO_MSG} "	DB_TYPE=type			Pg for postgresql, mysql for MySQL (mysql);"
+	@${ECHO_MSG} "	INSTALL_NEW			Install a fresh port, otherwise just upgrade;"
+	@${ECHO_MSG} ""
+	@${ECHO_MSG} "IMPORTANT!!! If you want to install a fresh new port, define INSTALL_NEW to do so, otherwise this port just do a upgrade."
+	@${ECHO_MSG} ""
 
 post-patch:
 .for _FILE in tools/testdeps
diff --git a/www/udmsearch/Makefile b/www/udmsearch/Makefile
index 4e703a277ea3..22d4598504d8 100644
--- a/www/udmsearch/Makefile
+++ b/www/udmsearch/Makefile
@@ -40,15 +40,15 @@ CONFIGURE_ARGS+=	--with-msql=${LOCALBASE}
 USE_MYSQL=		YES
 CONFIGURE_ARGS+=	--with-mysql=${LOCALBASE}
 
+pre-everything::
 .if !defined(WITH_MYSQL)
-pre-fetch:
-	@${ECHO}
-	@${ECHO} "Defaulting to udmsearch with mysql support."
-	@${ECHO}
-	@${ECHO} "You may alternately build udmsearch with either msql or"
-	@${ECHO} "postgresql support by invoking make with WITH_MSQL=yes or"
-	@${ECHO} "WITH_PGSQL=yes respectively."
-	@${ECHO}
+	@${ECHO_MSG}
+	@${ECHO_MSG} "Defaulting to udmsearch with mysql support."
+	@${ECHO_MSG}
+	@${ECHO_MSG} "You may alternately build udmsearch with either msql or"
+	@${ECHO_MSG} "postgresql support by invoking make with WITH_MSQL=yes or"
+	@${ECHO_MSG} "WITH_PGSQL=yes respectively."
+	@${ECHO_MSG}
 .endif
 
 .endif
@@ -61,7 +61,7 @@ post-install:
 	@${INSTALL_DATA} ${WRKSRC}/INSTALL ${PREFIX}/share/doc/udmsearch
 	@${STRIP_CMD} ${PREFIX}/sbin/indexer
 	@${STRIP_CMD} ${PREFIX}/share/udmsearch/search.cgi
-	@${ECHO}
+	@${ECHO_MSG}
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>