- ECHO -> ECHO_MSG

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

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

15 files changed, 63 insertions, 63 deletions

diff --git a/ftp/lukemftpd/Makefile b/ftp/lukemftpd/Makefile
index aa6c21216695..a9c061800749 100644
--- a/ftp/lukemftpd/Makefile
+++ b/ftp/lukemftpd/Makefile
@@ -54,14 +54,14 @@ do-install:
 .endif
 
 post-install:
-	@${ECHO} "================================================================================"
-	@${ECHO} "This port relies on a number of configuration files in ${PREFIX}/etc."
-	@${ECHO} "At the very least, create a ftpusers file with the usernams of users you don't"
-	@${ECHO} "want to connect (root, toor, etc.). This will allow non-listed users to log in."
-	@${ECHO} "Copying /etc/ftpusers to ${PREFIX}/etc/ftpusers should be sufficient."
-	@${ECHO}
-	@${ECHO} "See the man files for more information. The man- and configuration files for"
-	@${ECHO} "FreeBSD's built-in ftpd can also be of use as examples/additional info."
-	@${ECHO} "================================================================================"
+	@${ECHO_MSG} "================================================================================"
+	@${ECHO_MSG} "This port relies on a number of configuration files in ${PREFIX}/etc."
+	@${ECHO_MSG} "At the very least, create a ftpusers file with the usernams of users you don't"
+	@${ECHO_MSG} "want to connect (root, toor, etc.). This will allow non-listed users to log in."
+	@${ECHO_MSG} "Copying /etc/ftpusers to ${PREFIX}/etc/ftpusers should be sufficient."
+	@${ECHO_MSG}
+	@${ECHO_MSG} "See the man files for more information. The man- and configuration files for"
+	@${ECHO_MSG} "FreeBSD's built-in ftpd can also be of use as examples/additional info."
+	@${ECHO_MSG} "================================================================================"
 
 .include <bsd.port.mk>
diff --git a/ftp/oftpd/Makefile b/ftp/oftpd/Makefile
index 0d950c76bd01..b1f61b43ec6d 100644
--- a/ftp/oftpd/Makefile
+++ b/ftp/oftpd/Makefile
@@ -41,10 +41,10 @@ do-install:
 
 post-install:
 	@${INSTALL_MAN} ${WRKSRC}/man/oftpd.8 ${MANPREFIX}/man/man8
-	@${ECHO} "================================================================================"
-	@${ECHO} "oftpd only runs standalone, not from inetd."
-	@${ECHO} "Create a README file in the root anonymous FTP dir to have it displayed to"
-	@${ECHO} "users upon login."
-	@${ECHO} "================================================================================"
+	@${ECHO_MSG} "================================================================================"
+	@${ECHO_MSG} "oftpd only runs standalone, not from inetd."
+	@${ECHO_MSG} "Create a README file in the root anonymous FTP dir to have it displayed to"
+	@${ECHO_MSG} "users upon login."
+	@${ECHO_MSG} "================================================================================"
 
 .include <bsd.port.mk>
diff --git a/games/evilfinder/Makefile b/games/evilfinder/Makefile
index b349d7ffe192..cd97b740fd87 100644
--- a/games/evilfinder/Makefile
+++ b/games/evilfinder/Makefile
@@ -30,11 +30,11 @@ USE_REINPLACE=	yes
 
 pre-everything::
 .if !defined(WITHOUT_WRAPPER)
-	@${ECHO} "********************************************"
-	@${ECHO} "Define WITHOUT_WRAPPER to build without the"
-	@${ECHO} "\"evilfinder\" wrapper, which makes the port"
-	@${ECHO} "a web-oriented application."
-	@${ECHO} "********************************************"
+	@${ECHO_MSG} "********************************************"
+	@${ECHO_MSG} "Define WITHOUT_WRAPPER to build without the"
+	@${ECHO_MSG} "\"evilfinder\" wrapper, which makes the port"
+	@${ECHO_MSG} "a web-oriented application."
+	@${ECHO_MSG} "********************************************"
 .endif
 
 post-patch:
diff --git a/games/exult/Makefile b/games/exult/Makefile
index bd8545a45b75..3727ff419dc2 100644
--- a/games/exult/Makefile
+++ b/games/exult/Makefile
@@ -50,9 +50,9 @@ do-install:
 .endif
 
 post-install:
-	@${ECHO} "******************************************************************************"
-	@${ECHO} "* Original Ultima VII data is required to run Exult"
-	@${ECHO} "* Please, read ${DOCSDIR}/README for additional information"
-	@${ECHO} "******************************************************************************"
+	@${ECHO_MSG} "******************************************************************************"
+	@${ECHO_MSG} "* Original Ultima VII data is required to run Exult"
+	@${ECHO_MSG} "* Please, read ${DOCSDIR}/README for additional information"
+	@${ECHO_MSG} "******************************************************************************"
 
 .include <bsd.port.mk>
diff --git a/games/linux-nwserver/Makefile b/games/linux-nwserver/Makefile
index e3238f945bec..075afee873f1 100644
--- a/games/linux-nwserver/Makefile
+++ b/games/linux-nwserver/Makefile
@@ -34,13 +34,13 @@ do-install:
 .endif
 
 post-install:
-	@${ECHO} "*******************************************************************************"
-	@${ECHO} "Neverwinter Nights Dedicated Server requires original game data to run."
-	@${ECHO} "Consult ${DOCSDIR}/readme.linuxserver.txt"
-	@${ECHO} "for more information about required data directories."
-	@${ECHO} "From directory, where you will have installed game data you can run:"
-	@${ECHO} "${PREFIX}/bin/fixinstall - to check installation"
-	@${ECHO} "and ${PREFIX}/bin/nwserver - to start server"
-	@${ECHO} "*******************************************************************************"
+	@${ECHO_MSG} "*******************************************************************************"
+	@${ECHO_MSG} "Neverwinter Nights Dedicated Server requires original game data to run."
+	@${ECHO_MSG} "Consult ${DOCSDIR}/readme.linuxserver.txt"
+	@${ECHO_MSG} "for more information about required data directories."
+	@${ECHO_MSG} "From directory, where you will have installed game data you can run:"
+	@${ECHO_MSG} "${PREFIX}/bin/fixinstall - to check installation"
+	@${ECHO_MSG} "and ${PREFIX}/bin/nwserver - to start server"
+	@${ECHO_MSG} "*******************************************************************************"
 
 .include <bsd.port.mk>
diff --git a/games/wmshuffle/Makefile b/games/wmshuffle/Makefile
index e0c70f59252f..3885d4cb8c3b 100644
--- a/games/wmshuffle/Makefile
+++ b/games/wmshuffle/Makefile
@@ -21,6 +21,6 @@ USE_XPM=	yes
 post-install:
 	@${MKDIR} ${DATADIR}
 	@${CP} ${WRKSRC}/skin-*.xpm ${DATADIR}
-	@${ECHO} "===>   Run 'wmshuffle --help' for the available options"
+	@${ECHO_MSG} "===>   Run 'wmshuffle --help' for the available options"
 
 .include <bsd.port.mk>
diff --git a/graphics/epstool/Makefile b/graphics/epstool/Makefile
index c57fa3626490..32d0aafb9b33 100644
--- a/graphics/epstool/Makefile
+++ b/graphics/epstool/Makefile
@@ -26,12 +26,12 @@ MAKEFILE=	makefile
 MAKE_ARGS=	CC="${CC}" CDEBUG="${CFLAGS}" LINK="${CC}" EPSLIB=""
 ALL_TARGET=	${PORTNAME}
 
-pre-fetch:
+pre-everything::
 .if !defined(WITH_GHOSTSCRIPT_AFPL) || ${WITH_GHOSTSCRIPT_AFPL} != yes
-	@${ECHO} ""
-	@${ECHO} "      Define WITH_GHOSTSCRIPT_AFPL=yes to use"
-	@${ECHO} "      AFPL Postscript interpreter instead of GNU one"
-	@${ECHO} ""
+	@${ECHO_MSG} ""
+	@${ECHO_MSG} "      Define WITH_GHOSTSCRIPT_AFPL=yes to use"
+	@${ECHO_MSG} "      AFPL Postscript interpreter instead of GNU one"
+	@${ECHO_MSG} ""
 .endif
 
 post-extract:
diff --git a/graphics/gimp-manual-html/Makefile b/graphics/gimp-manual-html/Makefile
index 10f7dcf461e2..17d1d186c584 100644
--- a/graphics/gimp-manual-html/Makefile
+++ b/graphics/gimp-manual-html/Makefile
@@ -19,17 +19,17 @@ DOCFORMAT=HTML
 .else
 .if ${DOCFORMAT} != "HTML" && ${DOCFORMAT} != "PDF"
 .BEGIN:
-	@${ECHO} "ERROR: invalid value for DOCFORMAT: \"${DOCFORMAT}\""
-	@${ECHO} "Possible values are:  HTML, PDF."
+	@${ECHO_MSG} "ERROR: invalid value for DOCFORMAT: \"${DOCFORMAT}\""
+	@${ECHO_MSG} "Possible values are:  HTML, PDF."
 	@${FALSE}
 .endif
 .endif
 
 PLIST=		${PKGDIR}/pkg-plist_${DOCFORMAT}
 
-pre-fetch:
-	@${ECHO} "This manual is available in two formats: HTML and PDF."
-	@${ECHO} "Note that the manual is pretty darn big."
+pre-everything::
+	@${ECHO_MSG} "This manual is available in two formats: HTML and PDF."
+	@${ECHO_MSG} "Note that the manual is pretty darn big."
 
 PREFIX?=	${X11BASE}	# This port itself does not require Xlib
 EXTRACT_ONLY=	#empty
diff --git a/graphics/ocaml-images/Makefile b/graphics/ocaml-images/Makefile
index 6629140afa9f..840e16de274c 100644
--- a/graphics/ocaml-images/Makefile
+++ b/graphics/ocaml-images/Makefile
@@ -43,12 +43,12 @@ CONFIGURE_ENV=	\
 	LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
 USE_GMAKE=	yes
 
-pre-fetch:
+pre-everything::
 .if !defined(WITH_GHOSTSCRIPT_AFPL) || ${WITH_GHOSTSCRIPT_AFPL} != yes
-	@${ECHO} ""
-	@${ECHO} "      Define WITH_GHOSTSCRIPT_AFPL=yes to use"
-	@${ECHO} "      AFPL Postscript interpreter instead of GNU one"
-	@${ECHO} ""
+	@${ECHO_MSG} ""
+	@${ECHO_MSG} "      Define WITH_GHOSTSCRIPT_AFPL=yes to use"
+	@${ECHO_MSG} "      AFPL Postscript interpreter instead of GNU one"
+	@${ECHO_MSG} ""
 .endif
 
 .include <bsd.port.mk>
diff --git a/graphics/openrm/Makefile b/graphics/openrm/Makefile
index 2fc0392480f3..2fdef5c6c94a 100644
--- a/graphics/openrm/Makefile
+++ b/graphics/openrm/Makefile
@@ -48,9 +48,9 @@ PLIST_SUB=	WITH_DEMOS="@comment "
 PLIST_SUB=	WITH_DEMOS=""
 .endif
 
-.ifndef (WITH_DEMOS)
 pre-everything::
-	@${ECHO} "You can define WITH_DEMOS=yes to fetch and install available demos"
+.ifndef (WITH_DEMOS)
+	@${ECHO_MSG} "You can define WITH_DEMOS=yes to fetch and install available demos"
 .endif
 
 post-patch:
diff --git a/graphics/pstoedit/Makefile b/graphics/pstoedit/Makefile
index 41eaa89e9ac8..5095e3db679d 100644
--- a/graphics/pstoedit/Makefile
+++ b/graphics/pstoedit/Makefile
@@ -36,12 +36,12 @@ CPPFLAGS=	-I${LOCALBASE}/include/ming -I${LOCALBASE}/include \
 		-I${X11BASE}/include
 LDFLAGS=	-L${LOCALBASE}/lib -L${X11BASE}/lib
 
-pre-fetch:
+pre-everything::
 .if !defined(WITH_GHOSTSCRIPT_AFPL) || ${WITH_GHOSTSCRIPT_AFPL} != yes
-	@${ECHO} ""
-	@${ECHO} "      Define WITH_GHOSTSCRIPT_AFPL=yes to use"
-	@${ECHO} "      AFPL Postscript interpreter instead of GNU one"
-	@${ECHO} ""
+	@${ECHO_MSG} ""
+	@${ECHO_MSG} "      Define WITH_GHOSTSCRIPT_AFPL=yes to use"
+	@${ECHO_MSG} "      AFPL Postscript interpreter instead of GNU one"
+	@${ECHO_MSG} ""
 .endif
 
 post-install:
diff --git a/graphics/py-chart/Makefile b/graphics/py-chart/Makefile
index 5a6586238d74..a02ef19d0005 100644
--- a/graphics/py-chart/Makefile
+++ b/graphics/py-chart/Makefile
@@ -27,12 +27,12 @@ RUN_DEPENDS=	gs:${PORTSDIR}/${GSPORT}
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
 
-pre-fetch:
+pre-everything::
 .if !defined(WITH_GHOSTSCRIPT_AFPL) || ${WITH_GHOSTSCRIPT_AFPL} != yes
-	@${ECHO} ""
-	@${ECHO} "      Define WITH_GHOSTSCRIPT_AFPL=yes to use"
-	@${ECHO} "      AFPL Postscript interpreter instead of GNU one"
-	@${ECHO} ""
+	@${ECHO_MSG} ""
+	@${ECHO_MSG} "      Define WITH_GHOSTSCRIPT_AFPL=yes to use"
+	@${ECHO_MSG} "      AFPL Postscript interpreter instead of GNU one"
+	@${ECHO_MSG} ""
 .endif
 
 .include <bsd.port.mk>
diff --git a/graphics/renderpark/Makefile b/graphics/renderpark/Makefile
index 558128f04b16..00eeb1100523 100644
--- a/graphics/renderpark/Makefile
+++ b/graphics/renderpark/Makefile
@@ -45,10 +45,10 @@ PLIST_SUB=	WITH_SCENES=""
 
 pre-everything::
 .ifndef (WITH_XRML)
-	@${ECHO} "Defining WITH_XRML=yes will allow you to read XRML input files"
+	@${ECHO_MSG} "Defining WITH_XRML=yes will allow you to read XRML input files"
 .endif
 .ifndef (WITH_SCENES)
-	@${ECHO} "Define WITH_SCENES=yes to install additional scenes package"
+	@${ECHO_MSG} "Define WITH_SCENES=yes to install additional scenes package"
 .endif
 
 pre-patch:
diff --git a/graphics/xrml/Makefile b/graphics/xrml/Makefile
index 7bc474bda9b2..1948a180b0df 100644
--- a/graphics/xrml/Makefile
+++ b/graphics/xrml/Makefile
@@ -38,7 +38,7 @@ USE_GCC=2.95
 
 .ifndef (WITH_EXAMPLES)
 pre-everything::
-	@${ECHO} "You can define WITH_EXAMPLES=yes to install example VRML files"
+	@${ECHO_MSG} "You can define WITH_EXAMPLES=yes to install example VRML files"
 .endif
 
 pre-patch:
diff --git a/irc/irc/Makefile b/irc/irc/Makefile
index feaa40546213..671f2ebcec25 100644
--- a/irc/irc/Makefile
+++ b/irc/irc/Makefile
@@ -54,7 +54,7 @@ do-install:
 
 post-install:
 	@if [ ! -f ${STARTUP_SCRIPT} ]; then				\
-		${ECHO} "Installing ${STARTUP_SCRIPT} startup file.";	\
+		${ECHO_MSG} "Installing ${STARTUP_SCRIPT} startup file.";	\
 		${INSTALL_SCRIPT} ${WRKDIR}/ircd.sh ${STARTUP_SCRIPT};\
 	fi