- ECHO -> ECHO_MSG

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

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

5 files changed, 29 insertions, 29 deletions

diff --git a/mail/drac/Makefile b/mail/drac/Makefile
index d0c6979f9942..87f35da038d5 100644
--- a/mail/drac/Makefile
+++ b/mail/drac/Makefile
@@ -34,17 +34,17 @@ MAKE_ARGS+=	-DWITH_TI_RPC
 .endif
 
 pre-everything::
-	@${ECHO} "============================================================="
-	@${ECHO} "For databases compatible with other MTAs than sendmail, use:"
-	@${ECHO}
-	@${ECHO} "WITH_POSTFIX=yes	(Postfix)"
-	@${ECHO} "WITH_POSTFIX_DB3=yes	(Postfix with DB3 database maps)"
-	@${ECHO} "WITH_EXIM=yes		(Exim)"
-	@${ECHO}
-	@${ECHO} "Define WITH_FOREGROUND to make the rpc.dracd daemon stay in"
-	@${ECHO} "foreground instead of detaching itself. This breaks the"
-	@${ECHO} "startup script."
-	@${ECHO} "============================================================="
+	@${ECHO_MSG} "============================================================="
+	@${ECHO_MSG} "For databases compatible with other MTAs than sendmail, use:"
+	@${ECHO_MSG}
+	@${ECHO_MSG} "WITH_POSTFIX=yes	(Postfix)"
+	@${ECHO_MSG} "WITH_POSTFIX_DB3=yes	(Postfix with DB3 database maps)"
+	@${ECHO_MSG} "WITH_EXIM=yes		(Exim)"
+	@${ECHO_MSG}
+	@${ECHO_MSG} "Define WITH_FOREGROUND to make the rpc.dracd daemon stay in"
+	@${ECHO_MSG} "foreground instead of detaching itself. This breaks the"
+	@${ECHO_MSG} "startup script."
+	@${ECHO_MSG} "============================================================="
 
 post-patch:
 	@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/rpc.dracd.1m
diff --git a/mail/p5-IMAP-Admin/Makefile b/mail/p5-IMAP-Admin/Makefile
index f4f858643feb..771032e54841 100644
--- a/mail/p5-IMAP-Admin/Makefile
+++ b/mail/p5-IMAP-Admin/Makefile
@@ -25,10 +25,10 @@ post-install:
 	@${INSTALL_DATA} ${WRKSRC}/examples/create.pl \
 		${WRKSRC}/examples/delete.pl \
 		${PREFIX}/share/examples/p5-IMAP-Admin
-	@${ECHO} ""
-	@${ECHO} "*******************************************************************************"
-	@${ECHO} "See ${PREFIX}/share/examples/p5-IMAP-Admin for some examples..."
-	@${ECHO} "*******************************************************************************"
-	@${ECHO} ""
+	@${ECHO_MSG} ""
+	@${ECHO_MSG} "*******************************************************************************"
+	@${ECHO_MSG} "See ${PREFIX}/share/examples/p5-IMAP-Admin for some examples..."
+	@${ECHO_MSG} "*******************************************************************************"
+	@${ECHO_MSG} ""
 
 .include <bsd.port.mk>
diff --git a/mail/postfix1/Makefile b/mail/postfix1/Makefile
index 1f1171973766..7fe520c7a765 100644
--- a/mail/postfix1/Makefile
+++ b/mail/postfix1/Makefile
@@ -71,7 +71,7 @@ pre-fetch:
 post-patch:
 	(cd ${WRKSRC} && ${MAKE} -f Makefile.init makefiles ${MAKEFILEFLAGS} \
 	CCARGS="${POSTFIX_CCARGS}" AUXLIBS="${POSTFIX_AUXLIBS}" && \
-	${ECHO} "all: default" >> Makefile)
+	${ECHO_CMD} "all: default" >> Makefile)
 
 pre-patch:
 .for file in ${MAN1}
diff --git a/mail/teapop-devel/Makefile b/mail/teapop-devel/Makefile
index c7a5b78d6f57..e8be2207a12c 100644
--- a/mail/teapop-devel/Makefile
+++ b/mail/teapop-devel/Makefile
@@ -79,11 +79,11 @@ show-options:
 	@${EGREP} '^##' ${.CURDIR}/Makefile | ${SED} 's/##//'
 
 post-install:
-	@${ECHO} ""
-	@${ECHO} "------------------------------------------------------------------------"
-	@${ECHO} "===> Be sure to copy ${LOCALBASE}/etc/teapop.passwd.sample to"
-	@${ECHO} "===> ${LOCALBASE}/etc/teapop.passwd before using teapop"
-	@${ECHO} "------------------------------------------------------------------------"
-	@${ECHO} ""
+	@${ECHO_MSG} ""
+	@${ECHO_MSG} "------------------------------------------------------------------------"
+	@${ECHO_MSG} "===> Be sure to copy ${LOCALBASE}/etc/teapop.passwd.sample to"
+	@${ECHO_MSG} "===> ${LOCALBASE}/etc/teapop.passwd before using teapop"
+	@${ECHO_MSG} "------------------------------------------------------------------------"
+	@${ECHO_MSG} ""
 
 .include <bsd.port.mk>
diff --git a/mail/teapop/Makefile b/mail/teapop/Makefile
index c7a5b78d6f57..e8be2207a12c 100644
--- a/mail/teapop/Makefile
+++ b/mail/teapop/Makefile
@@ -79,11 +79,11 @@ show-options:
 	@${EGREP} '^##' ${.CURDIR}/Makefile | ${SED} 's/##//'
 
 post-install:
-	@${ECHO} ""
-	@${ECHO} "------------------------------------------------------------------------"
-	@${ECHO} "===> Be sure to copy ${LOCALBASE}/etc/teapop.passwd.sample to"
-	@${ECHO} "===> ${LOCALBASE}/etc/teapop.passwd before using teapop"
-	@${ECHO} "------------------------------------------------------------------------"
-	@${ECHO} ""
+	@${ECHO_MSG} ""
+	@${ECHO_MSG} "------------------------------------------------------------------------"
+	@${ECHO_MSG} "===> Be sure to copy ${LOCALBASE}/etc/teapop.passwd.sample to"
+	@${ECHO_MSG} "===> ${LOCALBASE}/etc/teapop.passwd before using teapop"
+	@${ECHO_MSG} "------------------------------------------------------------------------"
+	@${ECHO_MSG} ""
 
 .include <bsd.port.mk>