11 files changed, 50 insertions, 50 deletions

diff --git a/editors/mule-common/Makefile b/editors/mule-common/Makefile
index 48d4c71eeba3..577bdb1b8599 100644
--- a/editors/mule-common/Makefile
+++ b/editors/mule-common/Makefile
@@ -148,7 +148,7 @@ post-install:
 	if [ ! -f ${STARTUP_SCRIPT} ]; then \
 		${ECHO} "Installing ${STARTUP_SCRIPT} startup file."; \
 		${ECHO} '#!/bin/sh' > ${STARTUP_SCRIPT}; \
-		${ECHO} '#echo -n " Mule"' >> ${STARTUP_SCRIPT}; \
+		${ECHO} '#${ECHO} -n " Mule"' >> ${STARTUP_SCRIPT}; \
 		${ECHO} 'if [ -d /var/run/emacs/lock ]; then' >> ${STARTUP_SCRIPT}; \
 		${ECHO} '     rm -f /var/run/emacs/lock/*' >> ${STARTUP_SCRIPT}; \
 		${ECHO} "else" >> ${STARTUP_SCRIPT}; \
diff --git a/editors/vile/Makefile b/editors/vile/Makefile
index a6a85272b4d1..ba74013a6b3a 100644
--- a/editors/vile/Makefile
+++ b/editors/vile/Makefile
@@ -27,8 +27,8 @@ USE_PERL5=	yes
 
 pre-configure:
 .if ! defined(USE_PERL)
-	@echo "Define USE_PERL if you want to make a vile which includes"
-	@echo "PERL functionality"
+	@${ECHO_MSG} "Define USE_PERL if you want to make a vile which includes"
+	@${ECHO_MSG} "PERL functionality"
 .endif
 
 post-install:
@@ -42,7 +42,7 @@ post-install:
 .if defined(USE_PERL)
 	${INSTALL_DATA} ${WRKSRC}/*.doc ${PREFIX}/share/doc/vile
 .endif
-	@echo "Look in ${PREFIX}/share/doc/vile for documentation."
-	@echo "Look in ${PREFIX}/share/vile/macros for macros."
+	@${ECHO_MSG} "Look in ${PREFIX}/share/doc/vile for documentation."
+	@${ECHO_MSG} "Look in ${PREFIX}/share/vile/macros for macros."
 
 .include <bsd.port.mk>
diff --git a/editors/xemacs-comm-packages/Makefile b/editors/xemacs-comm-packages/Makefile
index 0b90603b472c..eefdf9150899 100644
--- a/editors/xemacs-comm-packages/Makefile
+++ b/editors/xemacs-comm-packages/Makefile
@@ -39,7 +39,7 @@ NO_WRKSUBDIR=	yes
 # Have
 .if !defined(USE_MULE)
 pre-fetch:
-	@echo "To install the MULE support files, set the environment variable USE_MULE"
+	@${ECHO_MSG} "To install the MULE support files, set the environment variable USE_MULE"
 .endif
 
 do-install:
@@ -47,10 +47,10 @@ do-install:
 		${CP} -Rp ${WRKDIR}/* ${PREFIX}/lib/xemacs/xemacs-packages
 
 post-install:
-	@echo "This is only a subset of the available packages for xemacs."
-	@echo "You can install additional packages yourself from within xemacs by"
-	@echo "running it as root and using the 'Manage Packes' menu within"
-	@echo "the 'Options' menu of the menubar."
+	@${ECHO_MSG} "This is only a subset of the available packages for xemacs."
+	@${ECHO_MSG} "You can install additional packages yourself from within xemacs by"
+	@${ECHO_MSG} "running it as root and using the 'Manage Packes' menu within"
+	@${ECHO_MSG} "the 'Options' menu of the menubar."
 
 .if defined(USE_MULE)
 MULEDISTFILES=	mule-base-1.30-pkg.tar.gz
diff --git a/editors/xemacs-games-packages/Makefile b/editors/xemacs-games-packages/Makefile
index 0b90603b472c..eefdf9150899 100644
--- a/editors/xemacs-games-packages/Makefile
+++ b/editors/xemacs-games-packages/Makefile
@@ -39,7 +39,7 @@ NO_WRKSUBDIR=	yes
 # Have
 .if !defined(USE_MULE)
 pre-fetch:
-	@echo "To install the MULE support files, set the environment variable USE_MULE"
+	@${ECHO_MSG} "To install the MULE support files, set the environment variable USE_MULE"
 .endif
 
 do-install:
@@ -47,10 +47,10 @@ do-install:
 		${CP} -Rp ${WRKDIR}/* ${PREFIX}/lib/xemacs/xemacs-packages
 
 post-install:
-	@echo "This is only a subset of the available packages for xemacs."
-	@echo "You can install additional packages yourself from within xemacs by"
-	@echo "running it as root and using the 'Manage Packes' menu within"
-	@echo "the 'Options' menu of the menubar."
+	@${ECHO_MSG} "This is only a subset of the available packages for xemacs."
+	@${ECHO_MSG} "You can install additional packages yourself from within xemacs by"
+	@${ECHO_MSG} "running it as root and using the 'Manage Packes' menu within"
+	@${ECHO_MSG} "the 'Options' menu of the menubar."
 
 .if defined(USE_MULE)
 MULEDISTFILES=	mule-base-1.30-pkg.tar.gz
diff --git a/editors/xemacs-libs-packages/Makefile b/editors/xemacs-libs-packages/Makefile
index 0b90603b472c..eefdf9150899 100644
--- a/editors/xemacs-libs-packages/Makefile
+++ b/editors/xemacs-libs-packages/Makefile
@@ -39,7 +39,7 @@ NO_WRKSUBDIR=	yes
 # Have
 .if !defined(USE_MULE)
 pre-fetch:
-	@echo "To install the MULE support files, set the environment variable USE_MULE"
+	@${ECHO_MSG} "To install the MULE support files, set the environment variable USE_MULE"
 .endif
 
 do-install:
@@ -47,10 +47,10 @@ do-install:
 		${CP} -Rp ${WRKDIR}/* ${PREFIX}/lib/xemacs/xemacs-packages
 
 post-install:
-	@echo "This is only a subset of the available packages for xemacs."
-	@echo "You can install additional packages yourself from within xemacs by"
-	@echo "running it as root and using the 'Manage Packes' menu within"
-	@echo "the 'Options' menu of the menubar."
+	@${ECHO_MSG} "This is only a subset of the available packages for xemacs."
+	@${ECHO_MSG} "You can install additional packages yourself from within xemacs by"
+	@${ECHO_MSG} "running it as root and using the 'Manage Packes' menu within"
+	@${ECHO_MSG} "the 'Options' menu of the menubar."
 
 .if defined(USE_MULE)
 MULEDISTFILES=	mule-base-1.30-pkg.tar.gz
diff --git a/editors/xemacs-oa-packages/Makefile b/editors/xemacs-oa-packages/Makefile
index 0b90603b472c..eefdf9150899 100644
--- a/editors/xemacs-oa-packages/Makefile
+++ b/editors/xemacs-oa-packages/Makefile
@@ -39,7 +39,7 @@ NO_WRKSUBDIR=	yes
 # Have
 .if !defined(USE_MULE)
 pre-fetch:
-	@echo "To install the MULE support files, set the environment variable USE_MULE"
+	@${ECHO_MSG} "To install the MULE support files, set the environment variable USE_MULE"
 .endif
 
 do-install:
@@ -47,10 +47,10 @@ do-install:
 		${CP} -Rp ${WRKDIR}/* ${PREFIX}/lib/xemacs/xemacs-packages
 
 post-install:
-	@echo "This is only a subset of the available packages for xemacs."
-	@echo "You can install additional packages yourself from within xemacs by"
-	@echo "running it as root and using the 'Manage Packes' menu within"
-	@echo "the 'Options' menu of the menubar."
+	@${ECHO_MSG} "This is only a subset of the available packages for xemacs."
+	@${ECHO_MSG} "You can install additional packages yourself from within xemacs by"
+	@${ECHO_MSG} "running it as root and using the 'Manage Packes' menu within"
+	@${ECHO_MSG} "the 'Options' menu of the menubar."
 
 .if defined(USE_MULE)
 MULEDISTFILES=	mule-base-1.30-pkg.tar.gz
diff --git a/editors/xemacs-packages/Makefile b/editors/xemacs-packages/Makefile
index 0b90603b472c..eefdf9150899 100644
--- a/editors/xemacs-packages/Makefile
+++ b/editors/xemacs-packages/Makefile
@@ -39,7 +39,7 @@ NO_WRKSUBDIR=	yes
 # Have
 .if !defined(USE_MULE)
 pre-fetch:
-	@echo "To install the MULE support files, set the environment variable USE_MULE"
+	@${ECHO_MSG} "To install the MULE support files, set the environment variable USE_MULE"
 .endif
 
 do-install:
@@ -47,10 +47,10 @@ do-install:
 		${CP} -Rp ${WRKDIR}/* ${PREFIX}/lib/xemacs/xemacs-packages
 
 post-install:
-	@echo "This is only a subset of the available packages for xemacs."
-	@echo "You can install additional packages yourself from within xemacs by"
-	@echo "running it as root and using the 'Manage Packes' menu within"
-	@echo "the 'Options' menu of the menubar."
+	@${ECHO_MSG} "This is only a subset of the available packages for xemacs."
+	@${ECHO_MSG} "You can install additional packages yourself from within xemacs by"
+	@${ECHO_MSG} "running it as root and using the 'Manage Packes' menu within"
+	@${ECHO_MSG} "the 'Options' menu of the menubar."
 
 .if defined(USE_MULE)
 MULEDISTFILES=	mule-base-1.30-pkg.tar.gz
diff --git a/editors/xemacs-prog-packages/Makefile b/editors/xemacs-prog-packages/Makefile
index 0b90603b472c..eefdf9150899 100644
--- a/editors/xemacs-prog-packages/Makefile
+++ b/editors/xemacs-prog-packages/Makefile
@@ -39,7 +39,7 @@ NO_WRKSUBDIR=	yes
 # Have
 .if !defined(USE_MULE)
 pre-fetch:
-	@echo "To install the MULE support files, set the environment variable USE_MULE"
+	@${ECHO_MSG} "To install the MULE support files, set the environment variable USE_MULE"
 .endif
 
 do-install:
@@ -47,10 +47,10 @@ do-install:
 		${CP} -Rp ${WRKDIR}/* ${PREFIX}/lib/xemacs/xemacs-packages
 
 post-install:
-	@echo "This is only a subset of the available packages for xemacs."
-	@echo "You can install additional packages yourself from within xemacs by"
-	@echo "running it as root and using the 'Manage Packes' menu within"
-	@echo "the 'Options' menu of the menubar."
+	@${ECHO_MSG} "This is only a subset of the available packages for xemacs."
+	@${ECHO_MSG} "You can install additional packages yourself from within xemacs by"
+	@${ECHO_MSG} "running it as root and using the 'Manage Packes' menu within"
+	@${ECHO_MSG} "the 'Options' menu of the menubar."
 
 .if defined(USE_MULE)
 MULEDISTFILES=	mule-base-1.30-pkg.tar.gz
diff --git a/editors/xemacs-wp-packages/Makefile b/editors/xemacs-wp-packages/Makefile
index 0b90603b472c..eefdf9150899 100644
--- a/editors/xemacs-wp-packages/Makefile
+++ b/editors/xemacs-wp-packages/Makefile
@@ -39,7 +39,7 @@ NO_WRKSUBDIR=	yes
 # Have
 .if !defined(USE_MULE)
 pre-fetch:
-	@echo "To install the MULE support files, set the environment variable USE_MULE"
+	@${ECHO_MSG} "To install the MULE support files, set the environment variable USE_MULE"
 .endif
 
 do-install:
@@ -47,10 +47,10 @@ do-install:
 		${CP} -Rp ${WRKDIR}/* ${PREFIX}/lib/xemacs/xemacs-packages
 
 post-install:
-	@echo "This is only a subset of the available packages for xemacs."
-	@echo "You can install additional packages yourself from within xemacs by"
-	@echo "running it as root and using the 'Manage Packes' menu within"
-	@echo "the 'Options' menu of the menubar."
+	@${ECHO_MSG} "This is only a subset of the available packages for xemacs."
+	@${ECHO_MSG} "You can install additional packages yourself from within xemacs by"
+	@${ECHO_MSG} "running it as root and using the 'Manage Packes' menu within"
+	@${ECHO_MSG} "the 'Options' menu of the menubar."
 
 .if defined(USE_MULE)
 MULEDISTFILES=	mule-base-1.30-pkg.tar.gz
diff --git a/editors/xemacs20/Makefile b/editors/xemacs20/Makefile
index 325133204834..671ac1e11816 100644
--- a/editors/xemacs20/Makefile
+++ b/editors/xemacs20/Makefile
@@ -42,13 +42,13 @@ PLIST_SUB=	XEMACS_VER=20.4 XEMACS_ARCH=${XEMACS_ARCH}
 
 # Have
 pre-configure:
-	@echo "To compile in the MULE features, set the environment variable USE_MULE"
+	@${ECHO_MSG} "To compile in the MULE features, set the environment variable USE_MULE"
 .if defined(HAVE_MOTIF)
-	@echo ""
-	@echo "If your MOTIF library is actually lesstif, you might occasionally"
-	@echo "experience locked-up frames."
-	@echo "In this case, set the environment variable MOTIF_STATIC and recompile, "
-	@echo "which will force the use of athena widgets for dialogs."
+	@${ECHO_MSG} ""
+	@${ECHO_MSG} "If your MOTIF library is actually lesstif, you might occasionally"
+	@${ECHO_MSG} "experience locked-up frames."
+	@${ECHO_MSG} "In this case, set the environment variable MOTIF_STATIC and recompile, "
+	@${ECHO_MSG} "which will force the use of athena widgets for dialogs."
 .endif
 
 .if defined(USE_MULE)
diff --git a/editors/xvile/Makefile b/editors/xvile/Makefile
index 895f712bf577..2d52711b3b0c 100644
--- a/editors/xvile/Makefile
+++ b/editors/xvile/Makefile
@@ -24,10 +24,10 @@ MAN1=		xvile.1
 
 pre-configure:
 .if ! defined(USE_MENUS)
-	@echo "To use xvile with menus, set the environment variable USE_MENUS"
+	@${ECHO_MSG} "To use xvile with menus, set the environment variable USE_MENUS"
 .endif
 .if ! defined(USE_PERL)
-	@echo "To use xvile with PERL, set the environment variable USE_PERL"
+	@${ECHO_MSG} "To use xvile with PERL, set the environment variable USE_PERL"
 .endif
 
 .if defined(USE_MENUS)
@@ -53,7 +53,7 @@ post-install:
 .if defined(USE_PERL)
 	${INSTALL_DATA} ${WRKSRC}/*.doc ${PREFIX}/share/doc/vile
 .endif
-	@echo "Look in ${PREFIX}/share/doc/vile for documentation."
-	@echo "Look in ${PREFIX}/share/vile/macros for macros."
+	@${ECHO_MSG} "Look in ${PREFIX}/share/doc/vile for documentation."
+	@${ECHO_MSG} "Look in ${PREFIX}/share/vile/macros for macros."
 
 .include <bsd.port.mk>