- change ECHO -> ECHO_MSG

3 files changed, 53 insertions, 53 deletions

diff --git a/net/freebsd-uucp/Makefile b/net/freebsd-uucp/Makefile
index 9cf770c6ade9..73876da5c033 100644
--- a/net/freebsd-uucp/Makefile
+++ b/net/freebsd-uucp/Makefile
@@ -73,12 +73,12 @@ post-install:
 	${ECHO_CMD} "suucp           4031/tcp   #UUCP over SSL"; \
 	${ECHO_CMD} "suucp           4031/udp   #UUCP over SSL" ) \
 		> ${DESTDIR}/etc/services
-	@${ECHO} "Use the 'make upgrade' command to copy your old configuration"
-	@${ECHO} "files from /etc/uucp to the new location in ${PREFIX}/etc/uucp"
-	@${ECHO}
+	@${ECHO_MSG} "Use the 'make upgrade' command to copy your old configuration"
+	@${ECHO_MSG} "files from /etc/uucp to the new location in ${PREFIX}/etc/uucp"
+	@${ECHO_MSG}
 	@${CAT} ${PKGMESSAGE}
 .if defined(WITH_PAM)
-	@${ECHO} "Add this lines to your pam.conf:"
+	@${ECHO_MSG} "Add this lines to your pam.conf:"
 	@${CAT} ${FILESDIR}/uucp-pam.conf
 .endif
 .if exists(/usr/sbin/uuchk)
@@ -86,7 +86,7 @@ post-install:
 .endif
 
 upgrade:
-	@${ECHO} "Copying old configuration files from /etc/uucp to ${PREFIX}/etc/uucp"
+	@${ECHO_MSG} "Copying old configuration files from /etc/uucp to ${PREFIX}/etc/uucp"
 	@${CP} -rp /etc/uucp ${PREFIX}/etc/uucp
 
 base-package:
diff --git a/news/cnews/Makefile b/news/cnews/Makefile
index faba7625a918..0ef90d7b6c26 100644
--- a/news/cnews/Makefile
+++ b/news/cnews/Makefile
@@ -118,16 +118,16 @@ do-install:
 .for i in ${MAN8}
 	${INSTALL_MAN} ${WRKSRC}/man/${i} ${PREFIX}/man/man8
 .endfor
-	@${ECHO} ""
-	@${ECHO} "!!!!!!!!"
-	@${ECHO} "you MUST change the configuration of this news setup:"
-	@${ECHO} "	cd to ${NEWSCTL} and change the following files..."
-	@${ECHO} "mailname, whoami, organization, mailpaths, sys, readnews.ctl, postdefltgroup"
-	@${ECHO} "	to suit your local system and news topology."
-	@${ECHO} "check that you have vaild aliases in report.ctl,"
-	@${ECHO} "	so any problem can be reported."
-	@${ECHO} "!!!!!!!!"
-	@${ECHO} ""
+	@${ECHO_MSG} ""
+	@${ECHO_MSG} "!!!!!!!!"
+	@${ECHO_MSG} "you MUST change the configuration of this news setup:"
+	@${ECHO_MSG} "	cd to ${NEWSCTL} and change the following files..."
+	@${ECHO_MSG} "mailname, whoami, organization, mailpaths, sys, readnews.ctl, postdefltgroup"
+	@${ECHO_MSG} "	to suit your local system and news topology."
+	@${ECHO_MSG} "check that you have vaild aliases in report.ctl,"
+	@${ECHO_MSG} "	so any problem can be reported."
+	@${ECHO_MSG} "!!!!!!!!"
+	@${ECHO_MSG} ""
 
 test:
 	(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
diff --git a/www/apache13-modssl/Makefile b/www/apache13-modssl/Makefile
index c3ebc9fa9683..c211d38058e5 100644
--- a/www/apache13-modssl/Makefile
+++ b/www/apache13-modssl/Makefile
@@ -128,43 +128,43 @@ CRT=
 KEY=
 
 pre-fetch:
-	@${ECHO} ""
-	@${ECHO} "You may use the following build options:"
-	@${ECHO} ""
-	@${ECHO} "  WITH_APACHE_SUEXEC=yes	enable the suEXEC feature"
-	@${ECHO} "				[default is no]"
-	@${ECHO} "  APACHE_SUEXEC_CALLER=user	set the suEXEC username of the allowed caller"
-	@${ECHO} "				[default is www]"
-	@${ECHO} "  APACHE_SUEXEC_DOCROOT=dir	set the suEXEC root directory"
-	@${ECHO} "				[default is ${DOCUMENT_ROOT}]"
-	@${ECHO} "  APACHE_SUEXEC_LOG=file	set the suEXEC logfile"
-	@${ECHO} "				[default is /var/log/httpd-suexec.log]"
-	@${ECHO} "  APACHE_SUEXEC_USERDIR=dir	set the suEXEC user subdirectory"
-	@${ECHO} "				[default is public_html]"
-	@${ECHO} "  APACHE_SUEXEC_UIDMIN=uid	set the suEXEC minimal allowed UID"
-	@${ECHO} "				[default is 1000]"
-	@${ECHO} "  APACHE_SUEXEC_GIDMIN=gid	set the suEXEC minimal allowed GID"
-	@${ECHO} "				[default is 1000]"
-	@${ECHO} "  APACHE_SUEXEC_SAFE_PATH=path	set the suEXEC safe PATH"
-	@${ECHO} "				[default is /bin:/usr/bin:${PREFIX}/bin]"
-	@${ECHO} "  APACHE_SUEXEC_UMASK=umask	set the umask for the suEXEC'd script"
-	@${ECHO} "				[default is inherited from the Apache process]"
-	@${ECHO} ""
-	@${ECHO} "  APACHE_HARD_SERVER_LIMIT=nr	Maximum number of Apache processes."
-	@${ECHO} "				[default is 512]"
-	@${ECHO} "  APACHE_FD_SETSIZE=nr		Maximum number of descriptors."
-	@${ECHO} "				[default is 1024]"
-	@${ECHO} ""
-	@${ECHO} "  APACHE_BUFFERED_LOGS=yes	Log entries are buffered before writing."
-	@${ECHO} "				Writes may not be atomic, entries from multiple"
-	@${ECHO} "				children could become mixed together and your"
-	@${ECHO} "				web stats may be inaccurate."
-	@${ECHO} "				[default is no]"
-	@${ECHO} "  APACHE_PERF_TUNING=yes	CFLAGS optimization."
-	@${ECHO} "				This setting may produce broken code and thus"
-	@${ECHO} "				is not recommended for production servers."
-	@${ECHO} "				[default is no]"
-	@${ECHO} ""
+	@${ECHO_MSG} ""
+	@${ECHO_MSG} "You may use the following build options:"
+	@${ECHO_MSG} ""
+	@${ECHO_MSG} "  WITH_APACHE_SUEXEC=yes	enable the suEXEC feature"
+	@${ECHO_MSG} "				[default is no]"
+	@${ECHO_MSG} "  APACHE_SUEXEC_CALLER=user	set the suEXEC username of the allowed caller"
+	@${ECHO_MSG} "				[default is www]"
+	@${ECHO_MSG} "  APACHE_SUEXEC_DOCROOT=dir	set the suEXEC root directory"
+	@${ECHO_MSG} "				[default is ${DOCUMENT_ROOT}]"
+	@${ECHO_MSG} "  APACHE_SUEXEC_LOG=file	set the suEXEC logfile"
+	@${ECHO_MSG} "				[default is /var/log/httpd-suexec.log]"
+	@${ECHO_MSG} "  APACHE_SUEXEC_USERDIR=dir	set the suEXEC user subdirectory"
+	@${ECHO_MSG} "				[default is public_html]"
+	@${ECHO_MSG} "  APACHE_SUEXEC_UIDMIN=uid	set the suEXEC minimal allowed UID"
+	@${ECHO_MSG} "				[default is 1000]"
+	@${ECHO_MSG} "  APACHE_SUEXEC_GIDMIN=gid	set the suEXEC minimal allowed GID"
+	@${ECHO_MSG} "				[default is 1000]"
+	@${ECHO_MSG} "  APACHE_SUEXEC_SAFE_PATH=path	set the suEXEC safe PATH"
+	@${ECHO_MSG} "				[default is /bin:/usr/bin:${PREFIX}/bin]"
+	@${ECHO_MSG} "  APACHE_SUEXEC_UMASK=umask	set the umask for the suEXEC'd script"
+	@${ECHO_MSG} "				[default is inherited from the Apache process]"
+	@${ECHO_MSG} ""
+	@${ECHO_MSG} "  APACHE_HARD_SERVER_LIMIT=nr	Maximum number of Apache processes."
+	@${ECHO_MSG} "				[default is 512]"
+	@${ECHO_MSG} "  APACHE_FD_SETSIZE=nr		Maximum number of descriptors."
+	@${ECHO_MSG} "				[default is 1024]"
+	@${ECHO_MSG} ""
+	@${ECHO_MSG} "  APACHE_BUFFERED_LOGS=yes	Log entries are buffered before writing."
+	@${ECHO_MSG} "				Writes may not be atomic, entries from multiple"
+	@${ECHO_MSG} "				children could become mixed together and your"
+	@${ECHO_MSG} "				web stats may be inaccurate."
+	@${ECHO_MSG} "				[default is no]"
+	@${ECHO_MSG} "  APACHE_PERF_TUNING=yes	CFLAGS optimization."
+	@${ECHO_MSG} "				This setting may produce broken code and thus"
+	@${ECHO_MSG} "				is not recommended for production servers."
+	@${ECHO_MSG} "				[default is no]"
+	@${ECHO_MSG} ""
 
 post-extract:
 	@${SED} -e "s=%%PREFIX%%=${PREFIX}=g" ${FILESDIR}/apache.sh \
@@ -200,7 +200,7 @@ pre-install:
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/apache.sh ${PREFIX}/etc/rc.d/apache.sh-dist
 	@if [ ! -f ${PREFIX}/etc/rc.d/apache.sh ]; then \
-		${ECHO} "Installing ${PREFIX}/etc/rc.d/apache.sh startup file."; \
+		${ECHO_MSG} "Installing ${PREFIX}/etc/rc.d/apache.sh startup file."; \
 		${INSTALL_SCRIPT} ${WRKSRC}/apache.sh ${PREFIX}/etc/rc.d/apache.sh; \
 	fi