From 58942bab6dbee58f4bff47b5f7888deb6d9b99ac Mon Sep 17 00:00:00 2001 From: Michael Haro Date: Fri, 27 Aug 1999 21:14:04 +0000 Subject: echo -> ${ECHO} or ${ECHO_MSG} and in some cases, move echo stuff to pkg/MESSAGE and use ${CAT} ${PKGMESSAGE} --- astro/ephem/Makefile | 2 +- astro/luna/Makefile | 2 +- audio/linux-realplayer/Makefile | 24 ++++++++++++------------ audio/mpg123/Makefile | 10 +++++----- biology/molden/Makefile | 16 ++++++++-------- chinese/bg5ps/Makefile | 5 +---- chinese/bg5ps/pkg-message | 5 +++++ chinese/big5con/Makefile | 7 +------ chinese/big5con/pkg-message | 6 ++++++ comms/qpage/Makefile | 2 +- converters/uulib/Makefile | 2 +- databases/db/Makefile | 18 +++++++++--------- databases/db2/Makefile | 18 +++++++++--------- databases/db3/Makefile | 18 +++++++++--------- databases/db33/Makefile | 18 +++++++++--------- databases/db4/Makefile | 18 +++++++++--------- databases/db41/Makefile | 18 +++++++++--------- databases/db42/Makefile | 18 +++++++++--------- databases/db43/Makefile | 18 +++++++++--------- databases/db44/Makefile | 18 +++++++++--------- databases/db45/Makefile | 18 +++++++++--------- databases/db46/Makefile | 18 +++++++++--------- databases/db47/Makefile | 18 +++++++++--------- databases/msql/Makefile | 2 +- databases/msql3/Makefile | 2 +- deskutils/xmdiary/Makefile | 4 ++-- deskutils/zorro/Makefile | 6 +++--- devel/cscope/Makefile | 2 +- editors/mule-common/Makefile | 2 +- editors/vile/Makefile | 8 ++++---- editors/xemacs-comm-packages/Makefile | 10 +++++----- editors/xemacs-games-packages/Makefile | 10 +++++----- editors/xemacs-libs-packages/Makefile | 10 +++++----- editors/xemacs-oa-packages/Makefile | 10 +++++----- editors/xemacs-packages/Makefile | 10 +++++----- editors/xemacs-prog-packages/Makefile | 10 +++++----- editors/xemacs-wp-packages/Makefile | 10 +++++----- editors/xemacs20/Makefile | 12 ++++++------ editors/xvile/Makefile | 8 ++++---- emulators/xmame/Makefile | 4 ++-- games/gnushogi/Makefile | 4 ++-- games/imaze/Makefile | 2 +- games/oneko-sakura/Makefile | 2 +- games/oneko/Makefile | 2 +- games/quakeserver/Makefile | 16 ++++++++-------- games/uox3/Makefile | 4 ++-- games/xquarto/Makefile | 2 +- games/xshogi/Makefile | 4 ++-- games/xsokoban/Makefile | 4 +--- games/xsokoban/pkg-message | 3 +++ graphics/gracula/Makefile | 14 +------------- graphics/gracula/pkg-message | 12 ++++++++++++ graphics/hdf/Makefile | 4 ++-- graphics/hdf5/Makefile | 4 ++-- multimedia/linux-realplayer/Makefile | 24 ++++++++++++------------ science/hdf/Makefile | 4 ++-- science/hdf5-18/Makefile | 4 ++-- science/hdf5/Makefile | 4 ++-- textproc/coco/Makefile | 2 +- 59 files changed, 268 insertions(+), 264 deletions(-) create mode 100644 chinese/bg5ps/pkg-message create mode 100644 chinese/big5con/pkg-message create mode 100644 games/xsokoban/pkg-message create mode 100644 graphics/gracula/pkg-message diff --git a/astro/ephem/Makefile b/astro/ephem/Makefile index affa4155ff62..1fa41e967391 100644 --- a/astro/ephem/Makefile +++ b/astro/ephem/Makefile @@ -27,6 +27,6 @@ do-install: [ ! -f ${PREFIX}/share/ephem/ephem.cfg ] && ${INSTALL_DATA} ephem.cfg ${PREFIX}/share/ephem/ post-install: - @echo Don\'t forget to edit ${PREFIX}/share/ephem/ephem.cfg! + @${ECHO_MSG} Don\'t forget to edit ${PREFIX}/share/ephem/ephem.cfg! .include diff --git a/astro/luna/Makefile b/astro/luna/Makefile index 66c9799fbd6d..6903b8dd8e6d 100644 --- a/astro/luna/Makefile +++ b/astro/luna/Makefile @@ -22,7 +22,7 @@ EXTRACT_AFTER_ARGS= # empty PATCH_STRIP= -p1 post-extract: - @echo "===> Removing object files for ${DISTNAME}" + @${ECHO_MSG} "===> Removing object files for ${DISTNAME}" @(cd ${WRKDIR}/luna19/iprintf; ${RM} -fr *.o) .include diff --git a/audio/linux-realplayer/Makefile b/audio/linux-realplayer/Makefile index 0308980f5bfc..1499348f19ab 100644 --- a/audio/linux-realplayer/Makefile +++ b/audio/linux-realplayer/Makefile @@ -62,17 +62,17 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/welcome.rm ${PREFIX}/share/rvplayer5.0/ - @echo --------------------------------------------------------------- - @echo You must add ${PREFIX}/lib/rvplayer5.0 to your - @echo LD_LIBRARY_PATH environment variable to use RealPlayer 5.0. - @echo - @echo To use the Netscape plugin, you must have a Linux version of - @echo netscape \(e.g., ${PORTSDIR}/www/linux-netscape4/\) - see - @echo ${PREFIX}/share/doc/rvplayer5.0/plugin.html for instructions. - @echo - @echo To use rvplayer as an external helper app for Netscape \(any - @echo version\), follow the instructions in - @echo ${PREFIX}/share/doc/rvplayer5.0/browser.htm. - @echo --------------------------------------------------------------- + @${ECHO_MSG} --------------------------------------------------------------- + @${ECHO_MSG} You must add ${PREFIX}/lib/rvplayer5.0 to your + @${ECHO_MSG} LD_LIBRARY_PATH environment variable to use RealPlayer 5.0. + @${ECHO_MSG} + @${ECHO_MSG} To use the Netscape plugin, you must have a Linux version of + @${ECHO_MSG} netscape \(e.g., ${PORTSDIR}/www/linux-netscape4/\) - see + @${ECHO_MSG} ${PREFIX}/share/doc/rvplayer5.0/plugin.html for instructions. + @${ECHO_MSG} + @${ECHO_MSG} To use rvplayer as an external helper app for Netscape \(any + @${ECHO_MSG} version\), follow the instructions in + @${ECHO_MSG} ${PREFIX}/share/doc/rvplayer5.0/browser.htm. + @${ECHO_MSG} --------------------------------------------------------------- .include diff --git a/audio/mpg123/Makefile b/audio/mpg123/Makefile index 2309abf5fa6d..3352da88f298 100644 --- a/audio/mpg123/Makefile +++ b/audio/mpg123/Makefile @@ -24,14 +24,14 @@ ALL_TARGET= freebsd pre-configure: .if $(MACHINE_ARCH) == "i386" .if !defined(OPT_ARCH) || (($(OPT_ARCH) != "i486") && ($(OPT_ARCH) != "i586")) - @echo "+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++" - @echo "Note: you can set OPT_ARCH to optimize for your hardware. (Eg:- make OPT_ARCH=i486)" + @${ECHO_MSG} "+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++" + @${ECHO_MSG} "Note: you can set OPT_ARCH to optimize for your hardware. (Eg:- make OPT_ARCH=i486)" .if $(PORTOBJFORMAT) == "elf" - @echo "Valid values are: i486, i586" + @${ECHO_MSG} "Valid values are: i486, i586" .else - @echo "Valid values are: i486" + @${ECHO_MSG} "Valid values are: i486" .endif - @echo "+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++" + @${ECHO_MSG} "+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++" .endif .endif diff --git a/biology/molden/Makefile b/biology/molden/Makefile index de4ab218068b..12ec04371cd0 100644 --- a/biology/molden/Makefile +++ b/biology/molden/Makefile @@ -26,15 +26,15 @@ pre-build: .if defined(DONOTUSE_ORIGINALBINARY) (cd ${WRKSRC}; ${CP} makefile Makefile) (cd ${WRKSRC}; ./change_parameter) - @echo "********************" - @echo "** re-build with customizations" - @echo "** maxorb: 256 -> 1024" - @echo "** maxatm: 150 -> 300" - @echo "********************" + @${ECHO_MSG} "********************" + @${ECHO_MSG} "** re-build with customizations" + @${ECHO_MSG} "** maxorb: 256 -> 1024" + @${ECHO_MSG} "** maxatm: 150 -> 300" + @${ECHO_MSG} "********************" .else - @echo "********************" - @echo "** using original binary" - @echo "********************" + @${ECHO_MSG} "********************" + @${ECHO_MSG} "** using original binary" + @${ECHO_MSG} "********************" .endif do-build: diff --git a/chinese/bg5ps/Makefile b/chinese/bg5ps/Makefile index 92accf70dfdf..1d1862c77305 100644 --- a/chinese/bg5ps/Makefile +++ b/chinese/bg5ps/Makefile @@ -27,9 +27,6 @@ do-install: .endfor post-install: - @echo ----------------------------------------------------------- - @echo Copy ${PREFIX}/share/doc/bg5ps/bg5ps.conf to ~/.bg5ps.conf. - @echo Then run "bg5ps -h" for help. - @echo ----------------------------------------------------------- + @${CAT} ${PKGMESSAGE} .include diff --git a/chinese/bg5ps/pkg-message b/chinese/bg5ps/pkg-message new file mode 100644 index 000000000000..2d7a61b1cfe0 --- /dev/null +++ b/chinese/bg5ps/pkg-message @@ -0,0 +1,5 @@ +----------------------------------------------------------- +Copy ${PREFIX}/share/doc/bg5ps/bg5ps.conf to ~/.bg5ps.conf. +Then run "bg5ps -h" for help. +----------------------------------------------------------- + diff --git a/chinese/big5con/Makefile b/chinese/big5con/Makefile index 59750a0e7677..125bc0b15fb9 100644 --- a/chinese/big5con/Makefile +++ b/chinese/big5con/Makefile @@ -37,11 +37,6 @@ pre-install: fi post-install: - @echo - @echo "---------------------------------------------------------------" - @echo "You need to add a line 'options SYSVSHM' to your kernel config." - @echo "Use 'b5c' to run the big5 console." - @echo "---------------------------------------------------------------" - @echo + @${CAT} ${PKGMESSAGE} .include diff --git a/chinese/big5con/pkg-message b/chinese/big5con/pkg-message new file mode 100644 index 000000000000..b89f178814f7 --- /dev/null +++ b/chinese/big5con/pkg-message @@ -0,0 +1,6 @@ + +--------------------------------------------------------------- +You need to add a line 'options SYSVSHM' to your kernel config. +Use 'b5c' to run the big5 console. +--------------------------------------------------------------- + diff --git a/comms/qpage/Makefile b/comms/qpage/Makefile index 04dfd1c2afec..0159318cd514 100644 --- a/comms/qpage/Makefile +++ b/comms/qpage/Makefile @@ -20,7 +20,7 @@ post-install: @if [ ! -f ${PREFIX}/etc/rc.d/qpage.sh ]; then \ ${ECHO} "Install ${PREFIX}/etc/rc.d/qpage.sh startup file."; \ ${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/qpage.sh; \ - ${ECHO} "[ -x ${PREFIX}/bin/qpage ] && ${PREFIX}/bin/qpage -q10 && echo -n ' qpage'" >> ${PREFIX}/etc/rc.d/qpage.sh; \ + ${ECHO} "[ -x ${PREFIX}/bin/qpage ] && ${PREFIX}/bin/qpage -q10 && ${ECHO} -n ' qpage'" >> ${PREFIX}/etc/rc.d/qpage.sh; \ ${CHMOD} 751 ${PREFIX}/etc/rc.d/qpage.sh; \ fi diff --git a/converters/uulib/Makefile b/converters/uulib/Makefile index e1b3e790c29e..52308a672722 100644 --- a/converters/uulib/Makefile +++ b/converters/uulib/Makefile @@ -42,7 +42,7 @@ do-install: ${INSTALL_MAN} ${FILESDIR}/uulib.3 ${PREFIX}/man/man3 perl -pi -e '$$a = '\''${PREFIX}/'\''; $$a =~ s/([^\w\/])/\\$$1/g; s/FUNKYTOKENHERE/$$a/' ${PREFIX}/man/man3/uulib.3 .if !defined(NOPORTDOCS) - @echo "===> Installing documentation for ${PKGNAME}" + @${ECHO_MSG} "===> Installing documentation for ${PKGNAME}" @${MKDIR} ${PREFIX}/share/doc/uulib @${INSTALL_MAN} ${FILESDIR}/porting.notes ${PREFIX}/share/doc/uulib .for docfile in ${DOCFILES} diff --git a/databases/db/Makefile b/databases/db/Makefile index c5953e8adebd..bf20bc912207 100644 --- a/databases/db/Makefile +++ b/databases/db/Makefile @@ -27,14 +27,14 @@ post-install: cd ${WRKSRC}/..; \ tar -cf - --exclude tags examples/ examples_cxx/ examples_java/ | \ ( cd ${PREFIX}/share/examples/db2; tar xf - ) - @echo "" - @echo "Java support for ${PKGNAME} is *not* built by default, and requires that you" - @echo "have a working copy of the JDK (v1.1) installed." - @echo "" - @echo "To build java support, please read:" - @echo "" - @echo "${WRKDIR}/${DISTNAME}/java/README" - @echo "" - @echo "and follow the directions therein." + @${ECHO_MSG} "" + @${ECHO_MSG} "Java support for ${PKGNAME} is *not* built by default, and requires that you" + @${ECHO_MSG} "have a working copy of the JDK (v1.1) installed." + @${ECHO_MSG} "" + @${ECHO_MSG} "To build java support, please read:" + @${ECHO_MSG} "" + @${ECHO_MSG} "${WRKDIR}/${DISTNAME}/java/README" + @${ECHO_MSG} "" + @${ECHO_MSG} "and follow the directions therein." .include diff --git a/databases/db2/Makefile b/databases/db2/Makefile index c5953e8adebd..bf20bc912207 100644 --- a/databases/db2/Makefile +++ b/databases/db2/Makefile @@ -27,14 +27,14 @@ post-install: cd ${WRKSRC}/..; \ tar -cf - --exclude tags examples/ examples_cxx/ examples_java/ | \ ( cd ${PREFIX}/share/examples/db2; tar xf - ) - @echo "" - @echo "Java support for ${PKGNAME} is *not* built by default, and requires that you" - @echo "have a working copy of the JDK (v1.1) installed." - @echo "" - @echo "To build java support, please read:" - @echo "" - @echo "${WRKDIR}/${DISTNAME}/java/README" - @echo "" - @echo "and follow the directions therein." + @${ECHO_MSG} "" + @${ECHO_MSG} "Java support for ${PKGNAME} is *not* built by default, and requires that you" + @${ECHO_MSG} "have a working copy of the JDK (v1.1) installed." + @${ECHO_MSG} "" + @${ECHO_MSG} "To build java support, please read:" + @${ECHO_MSG} "" + @${ECHO_MSG} "${WRKDIR}/${DISTNAME}/java/README" + @${ECHO_MSG} "" + @${ECHO_MSG} "and follow the directions therein." .include diff --git a/databases/db3/Makefile b/databases/db3/Makefile index c5953e8adebd..bf20bc912207 100644 --- a/databases/db3/Makefile +++ b/databases/db3/Makefile @@ -27,14 +27,14 @@ post-install: cd ${WRKSRC}/..; \ tar -cf - --exclude tags examples/ examples_cxx/ examples_java/ | \ ( cd ${PREFIX}/share/examples/db2; tar xf - ) - @echo "" - @echo "Java support for ${PKGNAME} is *not* built by default, and requires that you" - @echo "have a working copy of the JDK (v1.1) installed." - @echo "" - @echo "To build java support, please read:" - @echo "" - @echo "${WRKDIR}/${DISTNAME}/java/README" - @echo "" - @echo "and follow the directions therein." + @${ECHO_MSG} "" + @${ECHO_MSG} "Java support for ${PKGNAME} is *not* built by default, and requires that you" + @${ECHO_MSG} "have a working copy of the JDK (v1.1) installed." + @${ECHO_MSG} "" + @${ECHO_MSG} "To build java support, please read:" + @${ECHO_MSG} "" + @${ECHO_MSG} "${WRKDIR}/${DISTNAME}/java/README" + @${ECHO_MSG} "" + @${ECHO_MSG} "and follow the directions therein." .include diff --git a/databases/db33/Makefile b/databases/db33/Makefile index c5953e8adebd..bf20bc912207 100644 --- a/databases/db33/Makefile +++ b/databases/db33/Makefile @@ -27,14 +27,14 @@ post-install: cd ${WRKSRC}/..; \ tar -cf - --exclude tags examples/ examples_cxx/ examples_java/ | \ ( cd ${PREFIX}/share/examples/db2; tar xf - ) - @echo "" - @echo "Java support for ${PKGNAME} is *not* built by default, and requires that you" - @echo "have a working copy of the JDK (v1.1) installed." - @echo "" - @echo "To build java support, please read:" - @echo "" - @echo "${WRKDIR}/${DISTNAME}/java/README" - @echo "" - @echo "and follow the directions therein." + @${ECHO_MSG} "" + @${ECHO_MSG} "Java support for ${PKGNAME} is *not* built by default, and requires that you" + @${ECHO_MSG} "have a working copy of the JDK (v1.1) installed." + @${ECHO_MSG} "" + @${ECHO_MSG} "To build java support, please read:" + @${ECHO_MSG} "" + @${ECHO_MSG} "${WRKDIR}/${DISTNAME}/java/README" + @${ECHO_MSG} "" + @${ECHO_MSG} "and follow the directions therein." .include diff --git a/databases/db4/Makefile b/databases/db4/Makefile index c5953e8adebd..bf20bc912207 100644 --- a/databases/db4/Makefile +++ b/databases/db4/Makefile @@ -27,14 +27,14 @@ post-install: cd ${WRKSRC}/..; \ tar -cf - --exclude tags examples/ examples_cxx/ examples_java/ | \ ( cd ${PREFIX}/share/examples/db2; tar xf - ) - @echo "" - @echo "Java support for ${PKGNAME} is *not* built by default, and requires that you" - @echo "have a working copy of the JDK (v1.1) installed." - @echo "" - @echo "To build java support, please read:" - @echo "" - @echo "${WRKDIR}/${DISTNAME}/java/README" - @echo "" - @echo "and follow the directions therein." + @${ECHO_MSG} "" + @${ECHO_MSG} "Java support for ${PKGNAME} is *not* built by default, and requires that you" + @${ECHO_MSG} "have a working copy of the JDK (v1.1) installed." + @${ECHO_MSG} "" + @${ECHO_MSG} "To build java support, please read:" + @${ECHO_MSG} "" + @${ECHO_MSG} "${WRKDIR}/${DISTNAME}/java/README" + @${ECHO_MSG} "" + @${ECHO_MSG} "and follow the directions therein." .include diff --git a/databases/db41/Makefile b/databases/db41/Makefile index c5953e8adebd..bf20bc912207 100644 --- a/databases/db41/Makefile +++ b/databases/db41/Makefile @@ -27,14 +27,14 @@ post-install: cd ${WRKSRC}/..; \ tar -cf - --exclude tags examples/ examples_cxx/ examples_java/ | \ ( cd ${PREFIX}/share/examples/db2; tar xf - ) - @echo "" - @echo "Java support for ${PKGNAME} is *not* built by default, and requires that you" - @echo "have a working copy of the JDK (v1.1) installed." - @echo "" - @echo "To build java support, please read:" - @echo "" - @echo "${WRKDIR}/${DISTNAME}/java/README" - @echo "" - @echo "and follow the directions therein." + @${ECHO_MSG} "" + @${ECHO_MSG} "Java support for ${PKGNAME} is *not* built by default, and requires that you" + @${ECHO_MSG} "have a working copy of the JDK (v1.1) installed." + @${ECHO_MSG} "" + @${ECHO_MSG} "To build java support, please read:" + @${ECHO_MSG} "" + @${ECHO_MSG} "${WRKDIR}/${DISTNAME}/java/README" + @${ECHO_MSG} "" + @${ECHO_MSG} "and follow the directions therein." .include diff --git a/databases/db42/Makefile b/databases/db42/Makefile index c5953e8adebd..bf20bc912207 100644 --- a/databases/db42/Makefile +++ b/databases/db42/Makefile @@ -27,14 +27,14 @@ post-install: cd ${WRKSRC}/..; \ tar -cf - --exclude tags examples/ examples_cxx/ examples_java/ | \ ( cd ${PREFIX}/share/examples/db2; tar xf - ) - @echo "" - @echo "Java support for ${PKGNAME} is *not* built by default, and requires that you" - @echo "have a working copy of the JDK (v1.1) installed." - @echo "" - @echo "To build java support, please read:" - @echo "" - @echo "${WRKDIR}/${DISTNAME}/java/README" - @echo "" - @echo "and follow the directions therein." + @${ECHO_MSG} "" + @${ECHO_MSG} "Java support for ${PKGNAME} is *not* built by default, and requires that you" + @${ECHO_MSG} "have a working copy of the JDK (v1.1) installed." + @${ECHO_MSG} "" + @${ECHO_MSG} "To build java support, please read:" + @${ECHO_MSG} "" + @${ECHO_MSG} "${WRKDIR}/${DISTNAME}/java/README" + @${ECHO_MSG} "" + @${ECHO_MSG} "and follow the directions therein." .include diff --git a/databases/db43/Makefile b/databases/db43/Makefile index c5953e8adebd..bf20bc912207 100644 --- a/databases/db43/Makefile +++ b/databases/db43/Makefile @@ -27,14 +27,14 @@ post-install: cd ${WRKSRC}/..; \ tar -cf - --exclude tags examples/ examples_cxx/ examples_java/ | \ ( cd ${PREFIX}/share/examples/db2; tar xf - ) - @echo "" - @echo "Java support for ${PKGNAME} is *not* built by default, and requires that you" - @echo "have a working copy of the JDK (v1.1) installed." - @echo "" - @echo "To build java support, please read:" - @echo "" - @echo "${WRKDIR}/${DISTNAME}/java/README" - @echo "" - @echo "and follow the directions therein." + @${ECHO_MSG} "" + @${ECHO_MSG} "Java support for ${PKGNAME} is *not* built by default, and requires that you" + @${ECHO_MSG} "have a working copy of the JDK (v1.1) installed." + @${ECHO_MSG} "" + @${ECHO_MSG} "To build java support, please read:" + @${ECHO_MSG} "" + @${ECHO_MSG} "${WRKDIR}/${DISTNAME}/java/README" + @${ECHO_MSG} "" + @${ECHO_MSG} "and follow the directions therein." .include diff --git a/databases/db44/Makefile b/databases/db44/Makefile index c5953e8adebd..bf20bc912207 100644 --- a/databases/db44/Makefile +++ b/databases/db44/Makefile @@ -27,14 +27,14 @@ post-install: cd ${WRKSRC}/..; \ tar -cf - --exclude tags examples/ examples_cxx/ examples_java/ | \ ( cd ${PREFIX}/share/examples/db2; tar xf - ) - @echo "" - @echo "Java support for ${PKGNAME} is *not* built by default, and requires that you" - @echo "have a working copy of the JDK (v1.1) installed." - @echo "" - @echo "To build java support, please read:" - @echo "" - @echo "${WRKDIR}/${DISTNAME}/java/README" - @echo "" - @echo "and follow the directions therein." + @${ECHO_MSG} "" + @${ECHO_MSG} "Java support for ${PKGNAME} is *not* built by default, and requires that you" + @${ECHO_MSG} "have a working copy of the JDK (v1.1) installed." + @${ECHO_MSG} "" + @${ECHO_MSG} "To build java support, please read:" + @${ECHO_MSG} "" + @${ECHO_MSG} "${WRKDIR}/${DISTNAME}/java/README" + @${ECHO_MSG} "" + @${ECHO_MSG} "and follow the directions therein." .include diff --git a/databases/db45/Makefile b/databases/db45/Makefile index c5953e8adebd..bf20bc912207 100644 --- a/databases/db45/Makefile +++ b/databases/db45/Makefile @@ -27,14 +27,14 @@ post-install: cd ${WRKSRC}/..; \ tar -cf - --exclude tags examples/ examples_cxx/ examples_java/ | \ ( cd ${PREFIX}/share/examples/db2; tar xf - ) - @echo "" - @echo "Java support for ${PKGNAME} is *not* built by default, and requires that you" - @echo "have a working copy of the JDK (v1.1) installed." - @echo "" - @echo "To build java support, please read:" - @echo "" - @echo "${WRKDIR}/${DISTNAME}/java/README" - @echo "" - @echo "and follow the directions therein." + @${ECHO_MSG} "" + @${ECHO_MSG} "Java support for ${PKGNAME} is *not* built by default, and requires that you" + @${ECHO_MSG} "have a working copy of the JDK (v1.1) installed." + @${ECHO_MSG} "" + @${ECHO_MSG} "To build java support, please read:" + @${ECHO_MSG} "" + @${ECHO_MSG} "${WRKDIR}/${DISTNAME}/java/README" + @${ECHO_MSG} "" + @${ECHO_MSG} "and follow the directions therein." .include diff --git a/databases/db46/Makefile b/databases/db46/Makefile index c5953e8adebd..bf20bc912207 100644 --- a/databases/db46/Makefile +++ b/databases/db46/Makefile @@ -27,14 +27,14 @@ post-install: cd ${WRKSRC}/..; \ tar -cf - --exclude tags examples/ examples_cxx/ examples_java/ | \ ( cd ${PREFIX}/share/examples/db2; tar xf - ) - @echo "" - @echo "Java support for ${PKGNAME} is *not* built by default, and requires that you" - @echo "have a working copy of the JDK (v1.1) installed." - @echo "" - @echo "To build java support, please read:" - @echo "" - @echo "${WRKDIR}/${DISTNAME}/java/README" - @echo "" - @echo "and follow the directions therein." + @${ECHO_MSG} "" + @${ECHO_MSG} "Java support for ${PKGNAME} is *not* built by default, and requires that you" + @${ECHO_MSG} "have a working copy of the JDK (v1.1) installed." + @${ECHO_MSG} "" + @${ECHO_MSG} "To build java support, please read:" + @${ECHO_MSG} "" + @${ECHO_MSG} "${WRKDIR}/${DISTNAME}/java/README" + @${ECHO_MSG} "" + @${ECHO_MSG} "and follow the directions therein." .include diff --git a/databases/db47/Makefile b/databases/db47/Makefile index c5953e8adebd..bf20bc912207 100644 --- a/databases/db47/Makefile +++ b/databases/db47/Makefile @@ -27,14 +27,14 @@ post-install: cd ${WRKSRC}/..; \ tar -cf - --exclude tags examples/ examples_cxx/ examples_java/ | \ ( cd ${PREFIX}/share/examples/db2; tar xf - ) - @echo "" - @echo "Java support for ${PKGNAME} is *not* built by default, and requires that you" - @echo "have a working copy of the JDK (v1.1) installed." - @echo "" - @echo "To build java support, please read:" - @echo "" - @echo "${WRKDIR}/${DISTNAME}/java/README" - @echo "" - @echo "and follow the directions therein." + @${ECHO_MSG} "" + @${ECHO_MSG} "Java support for ${PKGNAME} is *not* built by default, and requires that you" + @${ECHO_MSG} "have a working copy of the JDK (v1.1) installed." + @${ECHO_MSG} "" + @${ECHO_MSG} "To build java support, please read:" + @${ECHO_MSG} "" + @${ECHO_MSG} "${WRKDIR}/${DISTNAME}/java/README" + @${ECHO_MSG} "" + @${ECHO_MSG} "and follow the directions therein." .include diff --git a/databases/msql/Makefile b/databases/msql/Makefile index 94a542219370..e35a85a3293c 100644 --- a/databases/msql/Makefile +++ b/databases/msql/Makefile @@ -45,7 +45,7 @@ post-install: @if [ ! -f ${PREFIX}/etc/rc.d/msql2.sh ]; then \ ${ECHO} "Installing ${PREFIX}/etc/rc.d/msql2.sh startup file."; \ ${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/msql2.sh; \ - ${ECHO} "[ -x ${PREFIX}/bin/msql2d ] && su -l msql -c 'exec ${PREFIX}/bin/msql2d' > /dev/null 2>&1 & && echo -n ' msql2'" >> ${PREFIX}/etc/rc.d/msql2.sh; \ + ${ECHO} "[ -x ${PREFIX}/bin/msql2d ] && su -l msql -c 'exec ${PREFIX}/bin/msql2d' > /dev/null 2>&1 & && ${ECHO} -n ' msql2'" >> ${PREFIX}/etc/rc.d/msql2.sh; \ ${CHMOD} 751 ${PREFIX}/etc/rc.d/msql2.sh; \ fi .if !defined(BATCH) diff --git a/databases/msql3/Makefile b/databases/msql3/Makefile index 94a542219370..e35a85a3293c 100644 --- a/databases/msql3/Makefile +++ b/databases/msql3/Makefile @@ -45,7 +45,7 @@ post-install: @if [ ! -f ${PREFIX}/etc/rc.d/msql2.sh ]; then \ ${ECHO} "Installing ${PREFIX}/etc/rc.d/msql2.sh startup file."; \ ${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/msql2.sh; \ - ${ECHO} "[ -x ${PREFIX}/bin/msql2d ] && su -l msql -c 'exec ${PREFIX}/bin/msql2d' > /dev/null 2>&1 & && echo -n ' msql2'" >> ${PREFIX}/etc/rc.d/msql2.sh; \ + ${ECHO} "[ -x ${PREFIX}/bin/msql2d ] && su -l msql -c 'exec ${PREFIX}/bin/msql2d' > /dev/null 2>&1 & && ${ECHO} -n ' msql2'" >> ${PREFIX}/etc/rc.d/msql2.sh; \ ${CHMOD} 751 ${PREFIX}/etc/rc.d/msql2.sh; \ fi .if !defined(BATCH) diff --git a/deskutils/xmdiary/Makefile b/deskutils/xmdiary/Makefile index 59bfd325de80..e77cf44c0eb3 100644 --- a/deskutils/xmdiary/Makefile +++ b/deskutils/xmdiary/Makefile @@ -30,9 +30,9 @@ pre-patch: cd $(WRKSRC) && tar xzpf ${DISTDIR}/xmdfix.gz post-patch: - @echo removing the "malloc.h" includes + @${ECHO_MSG} removing the "malloc.h" includes ${SCRIPTDIR}/nomalloc $(WRKSRC) 2>&1 > /dev/zero - @echo removing unneccessary DependTarget from Imakefile-s + @${ECHO_MSG} removing unneccessary DependTarget from Imakefile-s ${SCRIPTDIR}/noextradepend $(WRKSRC) 2>&1 > /dev/zero .include diff --git a/deskutils/zorro/Makefile b/deskutils/zorro/Makefile index c1f9eebfe057..8e24b8e48334 100644 --- a/deskutils/zorro/Makefile +++ b/deskutils/zorro/Makefile @@ -21,8 +21,8 @@ do-install: ${INSTALL_SCRIPT} ${WRKSRC}/zorro ${PREFIX}/bin/zorro ${MKDIR} ${PREFIX}/share/zorro ${INSTALL_DATA} ${WRKSRC}/DOTzorrorc ${PREFIX}/share/zorro - @echo "" - @echo "Take a look at ${PREFIX}/share/zorro/DOTzorrorc" - @echo "" + @${ECHO_MSG} "" + @${ECHO_MSG} "Take a look at ${PREFIX}/share/zorro/DOTzorrorc" + @${ECHO_MSG} "" .include diff --git a/devel/cscope/Makefile b/devel/cscope/Makefile index 06875c7f1c7f..8b0475680897 100644 --- a/devel/cscope/Makefile +++ b/devel/cscope/Makefile @@ -60,7 +60,7 @@ post-extract: @(${CHMOD} +w ${WRKSRC}) @(for file in ${WRKSRC}/* ; do ${TR} -d '\015' < $$file > $$file.x ; ${MV} -f $$file.x $$file ; done) @(for file in ${TRUNCATED_NAMES} ; do \ - x=`echo $$file | ${SED} -e 's/^\(......\).*/\1/'` ; \ + x=`${ECHO} $$file | ${SED} -e 's/^\(......\).*/\1/'` ; \ y=$${file#*.} ; \ ${MV} ${WRKSRC}/$${x}*.$${y} ${WRKSRC}/$$file; \ done) 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 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 diff --git a/emulators/xmame/Makefile b/emulators/xmame/Makefile index 9c0207e250f8..0a76c1861f15 100644 --- a/emulators/xmame/Makefile +++ b/emulators/xmame/Makefile @@ -22,9 +22,9 @@ MAN6= xmame.6 post-install: .ifdef NOPORTDOCS - @echo "==> Extra documentation WILL NOT be installed." + @${ECHO_MSG} "==> Extra documentation WILL NOT be installed." .else - @echo "==> Installing extra documentation..." + @${ECHO_MSG} "==> Installing extra documentation..." ${MKDIR} ${PREFIX}/lib/mame for DOC in CHEAT.DOC Changes MailList.notes README.unix mamelist.txt readme.dos whatsnew.txt; do ${INSTALL} -c -o bin -g bin -m 444 ${WRKSRC}/doc/$${DOC} ${PREFIX}/lib/mame/$${DOC}; done .endif diff --git a/games/gnushogi/Makefile b/games/gnushogi/Makefile index eb362131d541..8816d320f69d 100644 --- a/games/gnushogi/Makefile +++ b/games/gnushogi/Makefile @@ -19,8 +19,8 @@ DOCFILES= BOOKFILES CHANGES CONTRIB COPYING GENERAL INSTALL PORTING \ MAN6= gnushogi.6 post-configure: - echo "DISTDIR=${WRKDIR}" >> ${WRKSRC}/src/${MAKEFILE} - echo "prefix=${PREFIX}" >> ${WRKSRC}/src/${MAKEFILE} + ${ECHO} "DISTDIR=${WRKDIR}" >> ${WRKSRC}/src/${MAKEFILE} + ${ECHO} "prefix=${PREFIX}" >> ${WRKSRC}/src/${MAKEFILE} do-build: (cd ${WRKSRC}/src; \ diff --git a/games/imaze/Makefile b/games/imaze/Makefile index d8209482e5f9..cde637c3655c 100644 --- a/games/imaze/Makefile +++ b/games/imaze/Makefile @@ -63,6 +63,6 @@ do-install: do ${INSTALL_DATA} $$f ${PREFIX}/share/imaze/$$f.example;\ done; \ ${INSTALL_DATA} README ${PREFIX}/share/imaze) - @echo "Please read the file \"README\" in \"${PREFIX}/share/imaze\"." + @${ECHO_MSG} "Please read the file \"README\" in \"${PREFIX}/share/imaze\"." .include diff --git a/games/oneko-sakura/Makefile b/games/oneko-sakura/Makefile index 5cd784482de5..b777da98100e 100644 --- a/games/oneko-sakura/Makefile +++ b/games/oneko-sakura/Makefile @@ -23,6 +23,6 @@ MAN6= oneko.6 NO_CDROM= "Including a derivative from CARDCAPTOR SAKURA. See http://www.clamp.f-2.co.jp/" pre-configure: - @echo "MANSUFFIX=6" >>${WRKSRC}/Imakefile + @${ECHO} "MANSUFFIX=6" >>${WRKSRC}/Imakefile .include diff --git a/games/oneko/Makefile b/games/oneko/Makefile index 0330c7098886..ee1e09936273 100644 --- a/games/oneko/Makefile +++ b/games/oneko/Makefile @@ -17,6 +17,6 @@ USE_IMAKE= yes MAN6= oneko.6 pre-configure: - @echo "MANSUFFIX=6" >>${WRKSRC}/Imakefile + @${ECHO} "MANSUFFIX=6" >>${WRKSRC}/Imakefile .include diff --git a/games/quakeserver/Makefile b/games/quakeserver/Makefile index b4586d62e803..80b600b78367 100644 --- a/games/quakeserver/Makefile +++ b/games/quakeserver/Makefile @@ -50,14 +50,14 @@ do-install: /usr/bin/touch ${PREFIX}/quakeserver/quakeserver.log @ ${CHMOD} 700 ${PREFIX}/quakeserver/quakeserver.in ${PREFIX}/quakeserver/quakeserver.log @ ${CHOWN} -R nobody.nobody ${PREFIX}/quakeserver - @ echo "Installing ${PREFIX}/etc/rc.d/quakeserver.sh startup script" - @ echo "#!/bin/sh" > ${PREFIX}/etc/rc.d/quakeserver.sh - @ echo "#" >> ${PREFIX}/etc/rc.d/quakeserver.sh - @ echo "" >> ${PREFIX}/etc/rc.d/quakeserver.sh - @ echo "if [ -x ${PREFIX}/quakeserver/unixded ]" >> ${PREFIX}/etc/rc.d/quakeserver.sh - @ echo "then" >> ${PREFIX}/etc/rc.d/quakeserver.sh - @ echo " su nobody -c ${PREFIX}/quakeserver/qserver.sh && echo -n ' quakeserver'" >> ${PREFIX}/etc/rc.d/quakeserver.sh - @ echo "fi" >> ${PREFIX}/etc/rc.d/quakeserver.sh + @ ${ECHO} "Installing ${PREFIX}/etc/rc.d/quakeserver.sh startup script" + @ ${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/quakeserver.sh + @ ${ECHO} "#" >> ${PREFIX}/etc/rc.d/quakeserver.sh + @ ${ECHO} "" >> ${PREFIX}/etc/rc.d/quakeserver.sh + @ ${ECHO} "if [ -x ${PREFIX}/quakeserver/unixded ]" >> ${PREFIX}/etc/rc.d/quakeserver.sh + @ ${ECHO} "then" >> ${PREFIX}/etc/rc.d/quakeserver.sh + @ ${ECHO} " su nobody -c ${PREFIX}/quakeserver/qserver.sh && ${ECHO} -n ' quakeserver'" >> ${PREFIX}/etc/rc.d/quakeserver.sh + @ ${ECHO} "fi" >> ${PREFIX}/etc/rc.d/quakeserver.sh @ ${CHMOD} 750 ${PREFIX}/etc/rc.d/quakeserver.sh .if !defined(BATCH) @ /usr/bin/more -e ${PREFIX}/quakeserver/readme.port diff --git a/games/uox3/Makefile b/games/uox3/Makefile index 7e48482d4700..d176f45d0e19 100644 --- a/games/uox3/Makefile +++ b/games/uox3/Makefile @@ -39,9 +39,9 @@ do-install: ${INSTALL_DATA} ${WRKDIR}/WSC\ Changes.txt ${PREFIX}/uox3/wsc_changes.txt ${INSTALL_SCRIPT} ${FILESDIR}/uox3.sh ${PREFIX}/etc/rc.d/uox3.sh .ifdef NOPORTDOCS - @echo "==> Extra documentation WILL NOT be installed." + @${ECHO_MSG} "==> Extra documentation WILL NOT be installed." .else - @echo "==> Installing extra documentation..." + @${ECHO_MSG} "==> Installing extra documentation..." ${MKDIR} ${PREFIX}/uox3/docs for FILE in ${WRKDIR}/docs/* ; do \ ${INSTALL_DATA} $${FILE} ${PREFIX}/uox3/docs ;\ diff --git a/games/xquarto/Makefile b/games/xquarto/Makefile index 6a14282f7428..c9dbe0665961 100644 --- a/games/xquarto/Makefile +++ b/games/xquarto/Makefile @@ -18,6 +18,6 @@ USE_IMAKE= yes MAN6= xquarto.6 pre-configure: - @echo "MANSUFFIX=6" >>${WRKSRC}/src/Imakefile + @${ECHO} "MANSUFFIX=6" >>${WRKSRC}/src/Imakefile .include diff --git a/games/xshogi/Makefile b/games/xshogi/Makefile index 58a164918bc3..68691ba607aa 100644 --- a/games/xshogi/Makefile +++ b/games/xshogi/Makefile @@ -21,8 +21,8 @@ MAKEFILE= Makefile.custom MAN6= xshogi.6 post-configure: - @echo "DISTDIR=${WRKDIR}" >> ${WRKSRC}/${MAKEFILE} - @echo "LOCALBASE=${LOCALBASE}" >> ${WRKSRC}/${MAKEFILE} + @${ECHO} "DISTDIR=${WRKDIR}" >> ${WRKSRC}/${MAKEFILE} + @${ECHO} "LOCALBASE=${LOCALBASE}" >> ${WRKSRC}/${MAKEFILE} post-install: @strip ${PREFIX}/bin/xshogi diff --git a/games/xsokoban/Makefile b/games/xsokoban/Makefile index 4ac076c4692b..e2f182ab605c 100644 --- a/games/xsokoban/Makefile +++ b/games/xsokoban/Makefile @@ -29,8 +29,6 @@ post-install: @${INSTALL_DATA} ${WRKSRC}/screens/* ${PREFIX}/lib/X11/xsokoban/screens @${INSTALL_DATA} ${WRKSRC}/bitmaps/defaults/* \ ${PREFIX}/lib/X11/xsokoban/bitmaps/defaults - @echo "First, type: 'xsokoban -c' to make score files." - @echo "You must be the superuser 'root', and enter password 'score'." - @echo + @${CAT} ${PKGMESSAGE} .include diff --git a/games/xsokoban/pkg-message b/games/xsokoban/pkg-message new file mode 100644 index 000000000000..9786bd53a2f7 --- /dev/null +++ b/games/xsokoban/pkg-message @@ -0,0 +1,3 @@ +First, type: 'xsokoban -c' to make score files. +You must be the superuser 'root', and enter password 'score'. + diff --git a/graphics/gracula/Makefile b/graphics/gracula/Makefile index 5f4cf0e775fc..bef9384ae40b 100644 --- a/graphics/gracula/Makefile +++ b/graphics/gracula/Makefile @@ -20,18 +20,6 @@ do-install: ${MKDIR} ${PREFIX}/share/doc/gracula ${INSTALL_MAN} ${WRKSRC}/NNL ${PREFIX}/share/doc/gracula ${INSTALL_MAN} ${WRKSRC}/README ${PREFIX}/share/doc/gracula - @echo - @echo " Please read the file ${PREFIX}/share/doc/gracula/README" - @echo " to learn how to use Graphic Counter Language." -.endif - @echo - @echo " An introductory tutorial, and a GCL FAQ, can be found at" - @echo " http://www.whizkidtech.net/gcl/" - @echo " You should read both to take full advantage of the power" - @echo " of Graphic Counter Language." - @echo - @echo " Also, sample scripts and graphics are available from" - @echo " Count Gracula's Gallery, http://www.whizkidtech.net/gcl/gallery/" - @echo + @${CAT} ${PKGMESSAGE} .include diff --git a/graphics/gracula/pkg-message b/graphics/gracula/pkg-message new file mode 100644 index 000000000000..f63e515ba9ae --- /dev/null +++ b/graphics/gracula/pkg-message @@ -0,0 +1,12 @@ + + Please read the file ${PREFIX}/share/doc/gracula/README + to learn how to use Graphic Counter Language. + + An introductory tutorial, and a GCL FAQ, can be found at + http://www.whizkidtech.net/gcl/ + You should read both to take full advantage of the power + of Graphic Counter Language. + + Also, sample scripts and graphics are available from + Count Gracula's Gallery, http://www.whizkidtech.net/gcl/gallery/ + diff --git a/graphics/hdf/Makefile b/graphics/hdf/Makefile index 64020af01685..594775c8ea68 100644 --- a/graphics/hdf/Makefile +++ b/graphics/hdf/Makefile @@ -37,7 +37,7 @@ pre-build: ${ECHO} #Phony makefile > ${WRKSRC}/hdf/jpeg/Makefile ${ECHO} >> ${WRKSRC}/hdf/jpeg/Makefile ${ECHO} libjpeg.a: >> ${WRKSRC}/hdf/jpeg/Makefile - printf '\t@echo Using the already installed JPEG library\n' \ + printf '\t@${ECHO} Using the already installed JPEG library\n' \ >> ${WRKSRC}/hdf/jpeg/Makefile printf '\nclean:\n\ttrue\n' >> ${WRKSRC}/hdf/jpeg/Makefile printf '\ninstall-lib:\n\ttrue\n' >> ${WRKSRC}/hdf/jpeg/Makefile @@ -51,7 +51,7 @@ pre-build: ${ECHO} #Phony makefile > ${WRKSRC}/hdf/zlib/Makefile ${ECHO} >> ${WRKSRC}/hdf/zlib/Makefile ${ECHO} libzlib.a: >> ${WRKSRC}/hdf/zlib/Makefile - printf '\t@echo Using the already installed ZLIB library\n' \ + printf '\t@${ECHO} Using the already installed ZLIB library\n' \ >> ${WRKSRC}/hdf/zlib/Makefile printf '\nclean:\n\ttrue\n' >> ${WRKSRC}/hdf/zlib/Makefile printf '\ninstall-lib:\n\ttrue\n' >> ${WRKSRC}/hdf/zlib/Makefile diff --git a/graphics/hdf5/Makefile b/graphics/hdf5/Makefile index 64020af01685..594775c8ea68 100644 --- a/graphics/hdf5/Makefile +++ b/graphics/hdf5/Makefile @@ -37,7 +37,7 @@ pre-build: ${ECHO} #Phony makefile > ${WRKSRC}/hdf/jpeg/Makefile ${ECHO} >> ${WRKSRC}/hdf/jpeg/Makefile ${ECHO} libjpeg.a: >> ${WRKSRC}/hdf/jpeg/Makefile - printf '\t@echo Using the already installed JPEG library\n' \ + printf '\t@${ECHO} Using the already installed JPEG library\n' \ >> ${WRKSRC}/hdf/jpeg/Makefile printf '\nclean:\n\ttrue\n' >> ${WRKSRC}/hdf/jpeg/Makefile printf '\ninstall-lib:\n\ttrue\n' >> ${WRKSRC}/hdf/jpeg/Makefile @@ -51,7 +51,7 @@ pre-build: ${ECHO} #Phony makefile > ${WRKSRC}/hdf/zlib/Makefile ${ECHO} >> ${WRKSRC}/hdf/zlib/Makefile ${ECHO} libzlib.a: >> ${WRKSRC}/hdf/zlib/Makefile - printf '\t@echo Using the already installed ZLIB library\n' \ + printf '\t@${ECHO} Using the already installed ZLIB library\n' \ >> ${WRKSRC}/hdf/zlib/Makefile printf '\nclean:\n\ttrue\n' >> ${WRKSRC}/hdf/zlib/Makefile printf '\ninstall-lib:\n\ttrue\n' >> ${WRKSRC}/hdf/zlib/Makefile diff --git a/multimedia/linux-realplayer/Makefile b/multimedia/linux-realplayer/Makefile index 0308980f5bfc..1499348f19ab 100644 --- a/multimedia/linux-realplayer/Makefile +++ b/multimedia/linux-realplayer/Makefile @@ -62,17 +62,17 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/welcome.rm ${PREFIX}/share/rvplayer5.0/ - @echo --------------------------------------------------------------- - @echo You must add ${PREFIX}/lib/rvplayer5.0 to your - @echo LD_LIBRARY_PATH environment variable to use RealPlayer 5.0. - @echo - @echo To use the Netscape plugin, you must have a Linux version of - @echo netscape \(e.g., ${PORTSDIR}/www/linux-netscape4/\) - see - @echo ${PREFIX}/share/doc/rvplayer5.0/plugin.html for instructions. - @echo - @echo To use rvplayer as an external helper app for Netscape \(any - @echo version\), follow the instructions in - @echo ${PREFIX}/share/doc/rvplayer5.0/browser.htm. - @echo --------------------------------------------------------------- + @${ECHO_MSG} --------------------------------------------------------------- + @${ECHO_MSG} You must add ${PREFIX}/lib/rvplayer5.0 to your + @${ECHO_MSG} LD_LIBRARY_PATH environment variable to use RealPlayer 5.0. + @${ECHO_MSG} + @${ECHO_MSG} To use the Netscape plugin, you must have a Linux version of + @${ECHO_MSG} netscape \(e.g., ${PORTSDIR}/www/linux-netscape4/\) - see + @${ECHO_MSG} ${PREFIX}/share/doc/rvplayer5.0/plugin.html for instructions. + @${ECHO_MSG} + @${ECHO_MSG} To use rvplayer as an external helper app for Netscape \(any + @${ECHO_MSG} version\), follow the instructions in + @${ECHO_MSG} ${PREFIX}/share/doc/rvplayer5.0/browser.htm. + @${ECHO_MSG} --------------------------------------------------------------- .include diff --git a/science/hdf/Makefile b/science/hdf/Makefile index 64020af01685..594775c8ea68 100644 --- a/science/hdf/Makefile +++ b/science/hdf/Makefile @@ -37,7 +37,7 @@ pre-build: ${ECHO} #Phony makefile > ${WRKSRC}/hdf/jpeg/Makefile ${ECHO} >> ${WRKSRC}/hdf/jpeg/Makefile ${ECHO} libjpeg.a: >> ${WRKSRC}/hdf/jpeg/Makefile - printf '\t@echo Using the already installed JPEG library\n' \ + printf '\t@${ECHO} Using the already installed JPEG library\n' \ >> ${WRKSRC}/hdf/jpeg/Makefile printf '\nclean:\n\ttrue\n' >> ${WRKSRC}/hdf/jpeg/Makefile printf '\ninstall-lib:\n\ttrue\n' >> ${WRKSRC}/hdf/jpeg/Makefile @@ -51,7 +51,7 @@ pre-build: ${ECHO} #Phony makefile > ${WRKSRC}/hdf/zlib/Makefile ${ECHO} >> ${WRKSRC}/hdf/zlib/Makefile ${ECHO} libzlib.a: >> ${WRKSRC}/hdf/zlib/Makefile - printf '\t@echo Using the already installed ZLIB library\n' \ + printf '\t@${ECHO} Using the already installed ZLIB library\n' \ >> ${WRKSRC}/hdf/zlib/Makefile printf '\nclean:\n\ttrue\n' >> ${WRKSRC}/hdf/zlib/Makefile printf '\ninstall-lib:\n\ttrue\n' >> ${WRKSRC}/hdf/zlib/Makefile diff --git a/science/hdf5-18/Makefile b/science/hdf5-18/Makefile index 64020af01685..594775c8ea68 100644 --- a/science/hdf5-18/Makefile +++ b/science/hdf5-18/Makefile @@ -37,7 +37,7 @@ pre-build: ${ECHO} #Phony makefile > ${WRKSRC}/hdf/jpeg/Makefile ${ECHO} >> ${WRKSRC}/hdf/jpeg/Makefile ${ECHO} libjpeg.a: >> ${WRKSRC}/hdf/jpeg/Makefile - printf '\t@echo Using the already installed JPEG library\n' \ + printf '\t@${ECHO} Using the already installed JPEG library\n' \ >> ${WRKSRC}/hdf/jpeg/Makefile printf '\nclean:\n\ttrue\n' >> ${WRKSRC}/hdf/jpeg/Makefile printf '\ninstall-lib:\n\ttrue\n' >> ${WRKSRC}/hdf/jpeg/Makefile @@ -51,7 +51,7 @@ pre-build: ${ECHO} #Phony makefile > ${WRKSRC}/hdf/zlib/Makefile ${ECHO} >> ${WRKSRC}/hdf/zlib/Makefile ${ECHO} libzlib.a: >> ${WRKSRC}/hdf/zlib/Makefile - printf '\t@echo Using the already installed ZLIB library\n' \ + printf '\t@${ECHO} Using the already installed ZLIB library\n' \ >> ${WRKSRC}/hdf/zlib/Makefile printf '\nclean:\n\ttrue\n' >> ${WRKSRC}/hdf/zlib/Makefile printf '\ninstall-lib:\n\ttrue\n' >> ${WRKSRC}/hdf/zlib/Makefile diff --git a/science/hdf5/Makefile b/science/hdf5/Makefile index 64020af01685..594775c8ea68 100644 --- a/science/hdf5/Makefile +++ b/science/hdf5/Makefile @@ -37,7 +37,7 @@ pre-build: ${ECHO} #Phony makefile > ${WRKSRC}/hdf/jpeg/Makefile ${ECHO} >> ${WRKSRC}/hdf/jpeg/Makefile ${ECHO} libjpeg.a: >> ${WRKSRC}/hdf/jpeg/Makefile - printf '\t@echo Using the already installed JPEG library\n' \ + printf '\t@${ECHO} Using the already installed JPEG library\n' \ >> ${WRKSRC}/hdf/jpeg/Makefile printf '\nclean:\n\ttrue\n' >> ${WRKSRC}/hdf/jpeg/Makefile printf '\ninstall-lib:\n\ttrue\n' >> ${WRKSRC}/hdf/jpeg/Makefile @@ -51,7 +51,7 @@ pre-build: ${ECHO} #Phony makefile > ${WRKSRC}/hdf/zlib/Makefile ${ECHO} >> ${WRKSRC}/hdf/zlib/Makefile ${ECHO} libzlib.a: >> ${WRKSRC}/hdf/zlib/Makefile - printf '\t@echo Using the already installed ZLIB library\n' \ + printf '\t@${ECHO} Using the already installed ZLIB library\n' \ >> ${WRKSRC}/hdf/zlib/Makefile printf '\nclean:\n\ttrue\n' >> ${WRKSRC}/hdf/zlib/Makefile printf '\ninstall-lib:\n\ttrue\n' >> ${WRKSRC}/hdf/zlib/Makefile diff --git a/textproc/coco/Makefile b/textproc/coco/Makefile index 48d4c71eeba3..577bdb1b8599 100644 --- a/textproc/coco/Makefile +++ b/textproc/coco/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}; \ -- cgit v1.2.3