echo -> ${ECHO} or ${ECHO_MSG} and in some cases, move echo stuff

to pkg/MESSAGE and use ${CAT} ${PKGMESSAGE}

6 files changed, 51 insertions, 51 deletions

diff --git a/lang/f77/Makefile b/lang/f77/Makefile
index 5b23f0cd6da4..5cd4cdcabbc3 100644
--- a/lang/f77/Makefile
+++ b/lang/f77/Makefile
@@ -37,7 +37,7 @@ MAN1=		${F77NAME}.1
 PLIST=		${WRKDIR}/PLIST
 
 do-install:
-	@echo 'bin/${F77NAME}' > ${PLIST}
+	@${ECHO} 'bin/${F77NAME}' > ${PLIST}
 	${INSTALL_PROGRAM} ${WRKSRC}/f77 ${PREFIX}/bin/${F77NAME}
 	@${SED} -e 's/F77/${F77NAME}/g' -e 's/f77/${F77NAME}/g' \
 	${WRKSRC}/f77.1  > ${WRKSRC}/${F77NAME}.1
diff --git a/lang/m3gdb/Makefile b/lang/m3gdb/Makefile
index 877c3c25654b..f6e66e2d2bd8 100644
--- a/lang/m3gdb/Makefile
+++ b/lang/m3gdb/Makefile
@@ -17,7 +17,7 @@ MANCOMPRESSED= yes
 
 pre-fetch:
 	@if [ ! -d /usr/src/contrib/gdb ]; then \
-	    echo "To build this port you must have the FreeBSD" \
+	    ${ECHO_MSG} "To build this port you must have the FreeBSD" \
 		"sources in \"/usr/src\"."; \
 	    exit 1; \
 	fi
diff --git a/lang/modula-3-lib/Makefile b/lang/modula-3-lib/Makefile
index f240de3fdd7b..4117d226ffc6 100644
--- a/lang/modula-3-lib/Makefile
+++ b/lang/modula-3-lib/Makefile
@@ -72,7 +72,7 @@ major=		6
 PLIST=		${WRKDIR}/PLIST.noX11
 .else
 pre-fetch:
-	@echo "To build this port without X11, define \"NO_X11\"."
+	@${ECHO_MSG} "To build this port without X11, define \"NO_X11\"."
 
 USE_XLIB=	yes
 PLIST=		${WRKDIR}/PLIST
@@ -80,12 +80,12 @@ PLIST=		${WRKDIR}/PLIST
 
 post-extract:
 .if !empty(have_boot)
-	@echo "Copying bootstrap modula-3 compiler from ${have_boot}"
+	@${ECHO_MSG} "Copying bootstrap modula-3 compiler from ${have_boot}"
 	@${SH} ${SCRIPTDIR}/copy_files ${FILESDIR}/T.boot installed \
 	    ${have_boot} ${WRKSRC}
 .endif
 .if !empty(have_gcc)
-	@echo "Copying gcc sources from ${have_gcc}"
+	@${ECHO_MSG} "Copying gcc sources from ${have_gcc}"
 	@${SH} ${SCRIPTDIR}/copy_files ${FILESDIR}/T.gcc m3cc \
 	    ${have_gcc} ${WRKSRC}
 .endif
@@ -97,14 +97,14 @@ do-build:
 	@test -d ${temp_prefix}/man/man1 || ${MKDIR} ${temp_prefix}/man/man1
 	@test -d ${temp_prefix}/lib/m3/pkg/m3build/templates || \
 	    ${MKDIR} ${temp_prefix}/lib/m3/pkg/m3build/templates
-	@echo "++++++++++ quake ++++++++++"
+	@${ECHO_MSG} "++++++++++ quake ++++++++++"
 	@test -d ${WRKSRC}/m3/quake/FreeBSD2 || \
 	    ${MKDIR} ${WRKSRC}/m3/quake/FreeBSD2
 	@cd ${WRKSRC}/m3/quake/FreeBSD2; \
 	    make -f ../src/makefile TARGET=FreeBSD2 COPT=-O CDEBUG= ; \
 	    ${CP} -p quake ${temp_prefix}/bin; \
 	    ${CP} -p ../src/quake.1 ${temp_prefix}/man/man1
-	@echo "++++++++++ m3build ++++++++++"
+	@${ECHO_MSG} "++++++++++ m3build ++++++++++"
 	@cd ${WRKSRC}/m3/m3build; \
 	    PATH=${temp_prefix}/bin:$$PATH ./build FreeBSD2; \
 	    ${CP} -p FreeBSD2/m3build FreeBSD2/m3ship FreeBSD2/m3where \
@@ -115,13 +115,13 @@ do-build:
 		${temp_prefix}/lib/m3/pkg/m3build/templates; \
 	    ${CP} -p FreeBSD2/m3build.1 FreeBSD2/m3ship.1 FreeBSD2/m3where.1 \
 		${temp_prefix}/man/man1
-	@echo "++++++++++ m3cc ++++++++++"
+	@${ECHO_MSG} "++++++++++ m3cc ++++++++++"
 	@test -d ${WRKSRC}/m3cc/FreeBSD2 || ${MKDIR} ${WRKSRC}/m3cc/FreeBSD2
 	@cd ${WRKSRC}/m3cc/FreeBSD2; \
 	    ../gcc/configure i486-unknown-freebsd; \
 	    make m3cgc1 CC="${CC}" CFLAGS="${CFLAGS}"; \
 	    ${CP} -p m3cgc1 ${temp_prefix}/${libdir}
-	@echo "++++++++++ everything else ++++++++++"
+	@${ECHO_MSG} "++++++++++ everything else ++++++++++"
 	@cd ${WRKSRC}/m3; \
 	    LD_LIBRARY_PATH=${temp_prefix}/${libdir}:$$LD_LIBRARY_PATH; \
 	    PATH=${temp_prefix}/bin:$$PATH; \
@@ -129,11 +129,11 @@ do-build:
 	    m3build
 
 pre-install:
-	@echo "Checking for conflicting shared libraries"
+	@${ECHO_MSG} "Checking for conflicting shared libraries"
 	@PREFIX=${PREFIX} ${SH} ${PKGDIR}/INSTALL ${PKGNAME} PRE-INSTALL
 
 do-install:
-	@echo "Installing shared libraries"
+	@${ECHO_MSG} "Installing shared libraries"
 	@cd ${temp_prefix}; \
 	    umask 022; \
 	    ${GREP} '^lib/m3/' ${PLIST}.real | \
@@ -142,7 +142,7 @@ do-install:
 	    ${GREP} '^lib/m3/' ${PLIST}.real | xargs ${CHMOD} go=u-w; \
 	    find -X lib/m3 -type d | xargs ${CHOWN} ${BINOWN}.${BINGRP}; \
 	    find -X lib/m3 -type d | xargs ${CHMOD} 755
-	@echo "Installing copyright notice"
+	@${ECHO_MSG} "Installing copyright notice"
 	@if [ ! -d ${PREFIX}/share/modula-3-lib ]; then \
 	    ${MKDIR} ${PREFIX}/share/modula-3-lib; \
 	    ${CHMOD} 755 ${PREFIX}/share/modula-3-lib; \
@@ -150,15 +150,15 @@ do-install:
 	@${INSTALL_DATA} ${WRKSRC}/m3/src/COPYRIGHT \
 	    ${PREFIX}/share/modula-3-lib
 	@if [ ! -f ${startup_script} ]; then \
-	    echo "Installing ${startup_script} file"; \
+	    ${ECHO_MSG} "Installing ${startup_script} file"; \
 	    test -d ${startup_dir} || ${MKDIR} ${startup_dir}; \
-	    echo "#!/bin/sh" > ${startup_script}; \
-	    echo "echo -n ' Modula-3'" >> ${startup_script}; \
-	    echo "${LDCONFIG} -m ${PREFIX}/lib/m3/FreeBSD2" \
+	    ${ECHO} "#!/bin/sh" > ${startup_script}; \
+	    ${ECHO} "${ECHO} -n ' Modula-3'" >> ${startup_script}; \
+	    ${ECHO} "${LDCONFIG} -m ${PREFIX}/lib/m3/FreeBSD2" \
 		>> ${startup_script}; \
 	    ${CHMOD} 755 ${startup_script}; \
 	fi
-	@echo "Running ldconfig"
+	@${ECHO_MSG} "Running ldconfig"
 	@${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib/m3/FreeBSD2
 
 .include <bsd.port.mk>
diff --git a/lang/modula-3-socks/Makefile b/lang/modula-3-socks/Makefile
index f1e2dee99a64..056ed664b2f8 100644
--- a/lang/modula-3-socks/Makefile
+++ b/lang/modula-3-socks/Makefile
@@ -44,9 +44,9 @@ pre-install:
 
 post-install:
 	@if [ ! -f ${PREFIX}/etc/m3socks.conf ]; then \
-	    echo -n "Please create a configuration file in "; \
-	    echo "${PREFIX}/etc/m3socks.conf"; \
-	    echo "Read m3socks.conf(5) for details"; \
+	    ${ECHO_MSG} -n "Please create a configuration file in "; \
+	    ${ECHO_MSG} "${PREFIX}/etc/m3socks.conf"; \
+	    ${ECHO_MSG} "Read m3socks.conf(5) for details"; \
 	fi
 
 .include <bsd.port.mk>
diff --git a/lang/modula-3/Makefile b/lang/modula-3/Makefile
index 54f2168123b3..7da87d67fc79 100644
--- a/lang/modula-3/Makefile
+++ b/lang/modula-3/Makefile
@@ -37,19 +37,19 @@ temp_prefix=	${WRKSRC}/installed
 PLIST=		${WRKDIR}/PLIST.noX11
 .else
 pre-fetch:
-	@echo "To build this port without X11, define \"NO_X11\"."
+	@${ECHO_MSG} "To build this port without X11, define \"NO_X11\"."
 
 PLIST=		${WRKDIR}/PLIST
 MAN1+=		formsedit.1 replayheap.1 showheap.1 shownew.1 showthread.1
 .endif
 
 do-install:
-	@echo "Deleting extraneous cruft"
+	@${ECHO_MSG} "Deleting extraneous cruft"
 	@cd ${temp_prefix}/lib/m3/pkg; \
 	    rm -rf m3 m3front m3middle m3linker
 	@cd ${temp_prefix}/lib/m3/FreeBSD2; \
 	    rm -f libm3front.so.*.* libm3link.so.*.* libm3middle.so.*.*
-	@echo "Installing files in \"${PREFIX}\""
+	@${ECHO_MSG} "Installing files in \"${PREFIX}\""
 	@cd ${temp_prefix}; \
 	    umask 022; \
 	    sed -e "/^@/d" -e "/m3build-/d" -e "s/\.gz$$//" \
@@ -59,9 +59,9 @@ do-install:
 	    umask 022; \
 	    ${ECHO} ${MAN1} | perl -pe 's/ /\n/g' | \
 		cpio -dump -R ${MANOWN}.${MANGRP} ${PREFIX}/man/man1
-	@echo "Fixing absolute pathnames in installed files"
+	@${ECHO_MSG} "Fixing absolute pathnames in installed files"
 	@${SH} ${SCRIPTDIR}/fix_pathnames ${temp_prefix} ${PREFIX}
-	@echo "Rebuilding and shipping m3build with correct pathnames"
+	@${ECHO_MSG} "Rebuilding and shipping m3build with correct pathnames"
 	@cd ${WRKSRC}/m3/m3build; \
 	    LD_LIBRARY_PATH=${PREFIX}/lib/m3/FreeBSD2:$$LD_LIBRARY_PATH; \
 	    PATH=${PREFIX}/bin:$$PATH; \
@@ -75,7 +75,7 @@ do-install:
 		${PREFIX}/lib/m3/pkg/m3build/templates/FreeBSD2 \
 		${WRKSRC}/m3/m3build/src/m3makefile; \
 	    ./m3ship
-	@echo "Rebuilding and shipping m3configvars with correct pathnames"
+	@${ECHO_MSG} "Rebuilding and shipping m3configvars with correct pathnames"
 	@cd ${WRKSRC}/m3/m3configvars; \
 	    LD_LIBRARY_PATH=${PREFIX}/lib/m3/FreeBSD2:$$LD_LIBRARY_PATH; \
 	    export LD_LIBRARY_PATH; \
@@ -85,20 +85,20 @@ do-install:
 	    rm -rf FreeBSD2; \
 	    m3build; \
 	    m3ship
-	@echo "Installing copyright notice"
+	@${ECHO_MSG} "Installing copyright notice"
 	@if [ ! -d ${PREFIX}/share/modula-3 ]; then \
 	    ${MKDIR} ${PREFIX}/share/modula-3; \
 	    ${CHMOD} 755 ${PREFIX}/share/modula-3; \
 	fi
 	@${INSTALL_DATA} ${WRKSRC}/m3/src/COPYRIGHT ${PREFIX}/share/modula-3
-	@echo "Stripping executables"
+	@${ECHO_MSG} "Stripping executables"
 	@cd ${temp_prefix}; \
 	    find bin -type f ! -name recordheap |\
 		(cd ${PREFIX}; xargs ${SH} ${SCRIPTDIR}/maybe-strip)
 	@cd ${PREFIX}/lib/m3/FreeBSD2; strip m3 m3cgc1 m3mkdir
 	@cd ${PREFIX}/bin; \
 	    ln -f m3build m3build-${major}
-	@echo "Fixing file permissions"
+	@${ECHO_MSG} "Fixing file permissions"
 	@cd ${PREFIX}; \
 	    sed -e "/^@/d" -e "s/\.gz$$//" ${PLIST}.real |\
 		xargs ${CHOWN} ${BINOWN}.${BINGRP}; \
@@ -106,7 +106,7 @@ do-install:
 		xargs ${CHMOD} go=u-w; \
 	    find -X lib/m3 -type d | xargs ${CHOWN} ${BINOWN}.${BINGRP}; \
 	    find -X lib/m3 -type d | xargs ${CHMOD} 755
-	@echo "Running ldconfig"
+	@${ECHO_MSG} "Running ldconfig"
 	@${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib/m3/FreeBSD2
 
 .include <bsd.port.mk>
diff --git a/lang/smalltalk/Makefile b/lang/smalltalk/Makefile
index f4cc676a9705..b38014b9105d 100644
--- a/lang/smalltalk/Makefile
+++ b/lang/smalltalk/Makefile
@@ -26,29 +26,29 @@ NO_PACKAGE=	"Installation requires interaction"
 CFLAGS+=	-I${X11BASE}/include
 
 do-install:
-	@echo "Installing method definitions..."
+	@${ECHO_MSG} "Installing method definitions..."
 	@ if [ ! -d ${PREFIX}/lib/smalltalk ]; then ${MKDIR} ${PREFIX}/lib/smalltalk; fi
 	@(cd ${WRKSRC}; ${CP} *.st ${PREFIX}/lib/smalltalk)
 	@(cd ${PREFIX}/lib/smalltalk ; ${CHMOD} +r *.st)
-	@echo
-	@echo "To complete the installation of GNU Smalltalk, do"
-	@echo "	cd ${WRKSRC};"
-	@echo "./gst -iV"
-	@echo "to test the interpreter and create the image."
-	@echo
-	@echo "When you are satisfied everything works, do Control-D to quit"
-	@echo "followed by"
-	@echo "cp gst ${PREFIX}/bin"
-	@echo "cp gst.im ${PREFIX}/lib/smalltalk"
-	@echo "to install the interpreter and image."
-	@echo
-	@echo "If Emacs is installed, you may also wish to copy the"
-	@echo "*st.el files to the Emacs Lisp directory. This will enable you"
-	@echo "to configure Emacs for Interactor mode."
-	@echo
-	@echo ">>Please read the file"
-	@echo "${WRKSRC}/info/gst.txi"
-	@echo "for more information.<<"
-	@echo
+	@${ECHO_MSG}
+	@${ECHO_MSG} "To complete the installation of GNU Smalltalk, do"
+	@${ECHO_MSG} "	cd ${WRKSRC};"
+	@${ECHO_MSG} "./gst -iV"
+	@${ECHO_MSG} "to test the interpreter and create the image."
+	@${ECHO_MSG}
+	@${ECHO_MSG} "When you are satisfied everything works, do Control-D to quit"
+	@${ECHO_MSG} "followed by"
+	@${ECHO_MSG} "cp gst ${PREFIX}/bin"
+	@${ECHO_MSG} "cp gst.im ${PREFIX}/lib/smalltalk"
+	@${ECHO_MSG} "to install the interpreter and image."
+	@${ECHO_MSG}
+	@${ECHO_MSG} "If Emacs is installed, you may also wish to copy the"
+	@${ECHO_MSG} "*st.el files to the Emacs Lisp directory. This will enable you"
+	@${ECHO_MSG} "to configure Emacs for Interactor mode."
+	@${ECHO_MSG}
+	@${ECHO_MSG} ">>Please read the file"
+	@${ECHO_MSG} "${WRKSRC}/info/gst.txi"
+	@${ECHO_MSG} "for more information.<<"
+	@${ECHO_MSG}
 
 .include <bsd.port.mk>