From bc07afc1c299155a3451d285f1e3c862af0c8e83 Mon Sep 17 00:00:00 2001 From: Akinori MUSHA Date: Tue, 29 Jan 2002 10:53:27 +0000 Subject: Use ${ECHO_CMD} instead of ${ECHO} where you mean the echo command; the ECHO macro is set to "echo" by default, but it is set to "true" if make(1) is invoked with the -s option while ECHO_CMD is always set to the echo command. Use command macros where appropriate. --- french/xtel/Makefile | 2 +- ftp/sftp/Makefile | 4 ++-- ftp/vsftpd/Makefile | 2 +- games/bomb/Makefile | 16 ++++++++-------- games/doom/Makefile | 6 +++--- games/gnushogi/Makefile | 12 ++++++------ games/halflifeserver/Makefile | 4 ++-- games/linux-q3ademo/Makefile | 10 +++++----- games/linux-quake3-demo/Makefile | 10 +++++----- games/newkind/Makefile | 4 ++-- games/oneko-sakura/Makefile | 2 +- games/oneko/Makefile | 2 +- games/quakeforge/Makefile | 2 +- games/rollemup/Makefile | 2 +- games/senso/Makefile | 2 +- games/xinvaders/Makefile | 2 +- games/xnibbles/Makefile | 2 +- games/xquarto/Makefile | 2 +- games/xshogi/Makefile | 4 ++-- games/xsol/Makefile | 2 +- german/BBBike/Makefile | 6 +++--- german/citrix_ica/Makefile | 4 ++-- german/citrix_xenapp/Makefile | 4 ++-- german/staroffice5/Makefile | 2 +- german/staroffice52/Makefile | 4 ++-- graphics/acidwarp/Makefile | 8 ++++---- graphics/linplasma/Makefile | 10 +++++----- graphics/p5-Image-Grab/Makefile | 2 +- graphics/piddle/Makefile | 2 +- 29 files changed, 67 insertions(+), 67 deletions(-) diff --git a/french/xtel/Makefile b/french/xtel/Makefile index c0fb32bb616c..966713ac3d6a 100644 --- a/french/xtel/Makefile +++ b/french/xtel/Makefile @@ -29,7 +29,7 @@ MAN1= xtel.1 xteld.1 .include .if defined(LANG) -LANGUE!=${ECHO} ${LANG} | ${CUT} -c 1-2 +LANGUE!=${ECHO_CMD} ${LANG} | ${CUT} -c 1-2 .else LANGUE= english .endif diff --git a/ftp/sftp/Makefile b/ftp/sftp/Makefile index 998eb2cd4152..0a8eaec0b21b 100644 --- a/ftp/sftp/Makefile +++ b/ftp/sftp/Makefile @@ -36,8 +36,8 @@ do-install: ${ECHO} "No other sftp found, linking sftp to secftp"; \ ${LN} -s ${PREFIX}/bin/secftp ${PREFIX}/bin/sftp; \ ${LN} -s ${PREFIX}/man/man1/secftp.1.gz ${PREFIX}/man/man1/sftp.1.gz; \ - ${ECHO} bin/sftp >> ${PLIST}.unsorted; \ - ${ECHO} man/man1/sftp.1.gz >> ${PLIST}.unsorted; \ + ${ECHO_CMD} bin/sftp >> ${PLIST}.unsorted; \ + ${ECHO_CMD} man/man1/sftp.1.gz >> ${PLIST}.unsorted; \ else \ ${ECHO} "Other sftp found, not linking sftp to secftp"; \ fi diff --git a/ftp/vsftpd/Makefile b/ftp/vsftpd/Makefile index 85258a7d81ca..757099f86f5c 100644 --- a/ftp/vsftpd/Makefile +++ b/ftp/vsftpd/Makefile @@ -22,7 +22,7 @@ post-patch: @${PERL} -pi -e 's@/etc/vsftpd.conf@${PREFIX}/etc/vsftpd.conf@' \ ${WRKSRC}/defs.h @${PERL} -pi -e 's@ -ldl@@; s@^CFLAGS.*$$@@' ${WRKSRC}/Makefile - @${ECHO} "secure_chroot_dir=${PREFIX}/share/vsftpd/empty" >> \ + @${ECHO_CMD} "secure_chroot_dir=${PREFIX}/share/vsftpd/empty" >> \ ${WRKSRC}/vsftpd.conf do-install: diff --git a/games/bomb/Makefile b/games/bomb/Makefile index 239bc99b0684..6ceb087e3236 100644 --- a/games/bomb/Makefile +++ b/games/bomb/Makefile @@ -33,21 +33,21 @@ USE_X_PREFIX= yes WRKSRC= ${WRKDIR}/${PORTNAME} pre-build: - ${ECHO} "bin/bomb" > ${PLIST} - for i in `find -s ${WRKSRC}/suck -type f`; do \ - ${ECHO} ${DATADIR}suck/`${BASENAME} $${i}` >> ${PLIST}; \ + ${ECHO_CMD} "bin/bomb" > ${PLIST} + for i in `${FIND} -s ${WRKSRC}/suck -type f`; do \ + ${ECHO_CMD} ${DATADIR}suck/`${BASENAME} $${i}` >> ${PLIST}; \ done .for i in cmap-data flame-data seq-data title.tif - ${ECHO} ${DATADIR}/${i} >> ${PLIST} + ${ECHO_CMD} ${DATADIR}/${i} >> ${PLIST} .endfor .if !defined(NOPORTDOCS) .for i in ${DOCS} - ${ECHO} ${DOCDIR}${i} >> ${PLIST} + ${ECHO_CMD} ${DOCDIR}${i} >> ${PLIST} .endfor - ${ECHO} "@dirrm "${DOCDIR} >> ${PLIST} + ${ECHO_CMD} "@dirrm "${DOCDIR} >> ${PLIST} .endif - ${ECHO} "@dirrm "${DATADIR}/suck >> ${PLIST} - ${ECHO} "@dirrm "${DATADIR} >> ${PLIST} + ${ECHO_CMD} "@dirrm "${DATADIR}/suck >> ${PLIST} + ${ECHO_CMD} "@dirrm "${DATADIR} >> ${PLIST} do-build: .for i in ${SRCS} diff --git a/games/doom/Makefile b/games/doom/Makefile index 6137f0b5e226..92d4bdd0740c 100644 --- a/games/doom/Makefile +++ b/games/doom/Makefile @@ -36,7 +36,7 @@ do-fetch: DISTFILES="${DISTFILES2}" MASTER_SITES="${MASTER_SITES2}" .endif post-extract: - @cd ${WRKDIR} && tar xzf linuxdoom-1.10.src.tgz && tar xzf sndserv.tgz + @cd ${WRKDIR} && ${TAR} xzf linuxdoom-1.10.src.tgz && ${TAR} xzf sndserv.tgz post-patch: @${FIND} ${WRKSRC} -type f | ${XARGS} ${PERL} -pi -e "s@#include +@#include @g" @@ -49,8 +49,8 @@ do-install: @${MKDIR} ${PREFIX}/libexec/doom ${PREFIX}/share/doom @${INSTALL_PROGRAM} ${WRKDIR}/linuxdoom-1.10/linux/linuxxdoom ${PREFIX}/libexec/doom/xdoom @${INSTALL_PROGRAM} ${WRKDIR}/sndserv/linux/sndserver ${PREFIX}/libexec/doom/sndserver - @(${ECHO} "#!/bin/sh"; ${ECHO} "cd ${PREFIX}/libexec/doom"; \ - ${ECHO} 'export PATH=.:$$PATH';${ECHO} "export DOOMWADDIR=${PREFIX}/share/doom"; ${ECHO} "./xdoom $$*") > ${PREFIX}/bin/doom + @(${ECHO_CMD} "#!/bin/sh"; ${ECHO_CMD} "cd ${PREFIX}/libexec/doom"; \ + ${ECHO_CMD} 'export PATH=.:$$PATH';${ECHO_CMD} "export DOOMWADDIR=${PREFIX}/share/doom"; ${ECHO_CMD} "./xdoom $$*") > ${PREFIX}/bin/doom @${CHMOD} ugo+x ${PREFIX}/bin/doom @${GZCAT} ${DISTDIR}/${DISTFILES2} > ${PREFIX}/share/doom/doom1.wad diff --git a/games/gnushogi/Makefile b/games/gnushogi/Makefile index 9b2fae22648c..24bb61e97bde 100644 --- a/games/gnushogi/Makefile +++ b/games/gnushogi/Makefile @@ -19,15 +19,15 @@ 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_CMD} "DISTDIR=${WRKDIR}" >> ${WRKSRC}/src/${MAKEFILE} + ${ECHO_CMD} "prefix=${PREFIX}" >> ${WRKSRC}/src/${MAKEFILE} do-build: (cd ${WRKSRC}/src; \ - make gnushogir; \ - make gnushogi.bbk; \ - make gnushogi; \ - make gnushogix ) + ${MAKE} gnushogir; \ + ${MAKE} gnushogi.bbk; \ + ${MAKE} gnushogi; \ + ${MAKE} gnushogix ) do-install: @${MKDIR} ${PREFIX}/share/gnushogi diff --git a/games/halflifeserver/Makefile b/games/halflifeserver/Makefile index 954dce2c28e7..abe119a6b8d5 100644 --- a/games/halflifeserver/Makefile +++ b/games/halflifeserver/Makefile @@ -73,7 +73,7 @@ post-extract: pre-patch: # remove trailing ^M - @find -E ${WRKSRC} -type f \ + @${FIND} -E ${WRKSRC} -type f \ -iregex ".*\.(bat|cfg|gam|htm|html|inf|ini|lst|sc|scr|txt|rc)" \ -exec ${PERL} -pi -ne 's!\r\n!\n!' {} 1>/dev/null 2>&1 \; .ifdef(WITH_PING_BOOSTER) @@ -122,7 +122,7 @@ install-run-scripts: .endfor @if ! (${GREP} -E \"^${HLDSDIR}$$\" ${PREFIX}/etc/ld.so.conf 1>/dev/null 2>&1) ;\ then \ - ${ECHO} ${HLDSDIR} >> ${PREFIX}/etc/ld.so.conf ;\ + ${ECHO_CMD} ${HLDSDIR} >> ${PREFIX}/etc/ld.so.conf ;\ fi scan-libs: diff --git a/games/linux-q3ademo/Makefile b/games/linux-q3ademo/Makefile index 222169c8310b..7cad0d4d5f70 100644 --- a/games/linux-q3ademo/Makefile +++ b/games/linux-q3ademo/Makefile @@ -54,11 +54,11 @@ do-extract: @${SH} ${FILESDIR}/peel ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} ${WRKSRC} do-configure: - @${ECHO} "#!/bin/sh" > ${WRKSRC}/q3demo - @${ECHO} "cd "${Q3ADIR} >> ${WRKSRC}/q3demo - @${ECHO} "quake=\"./q3demo\"" >> ${WRKSRC}/q3demo - @${ECHO} "\""$$"quake\" "$$"*" >> ${WRKSRC}/q3demo - @${ECHO} "exit "$$"?" >> ${WRKSRC}/q3demo + @${ECHO_CMD} "#!/bin/sh" > ${WRKSRC}/q3demo + @${ECHO_CMD} "cd "${Q3ADIR} >> ${WRKSRC}/q3demo + @${ECHO_CMD} "quake=\"./q3demo\"" >> ${WRKSRC}/q3demo + @${ECHO_CMD} "\""$$"quake\" "$$"*" >> ${WRKSRC}/q3demo + @${ECHO_CMD} "exit "$$"?" >> ${WRKSRC}/q3demo do-install: ${INSTALL_PROGRAM} ${WRKSRC}/q3demo ${PREFIX}/bin diff --git a/games/linux-quake3-demo/Makefile b/games/linux-quake3-demo/Makefile index 222169c8310b..7cad0d4d5f70 100644 --- a/games/linux-quake3-demo/Makefile +++ b/games/linux-quake3-demo/Makefile @@ -54,11 +54,11 @@ do-extract: @${SH} ${FILESDIR}/peel ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} ${WRKSRC} do-configure: - @${ECHO} "#!/bin/sh" > ${WRKSRC}/q3demo - @${ECHO} "cd "${Q3ADIR} >> ${WRKSRC}/q3demo - @${ECHO} "quake=\"./q3demo\"" >> ${WRKSRC}/q3demo - @${ECHO} "\""$$"quake\" "$$"*" >> ${WRKSRC}/q3demo - @${ECHO} "exit "$$"?" >> ${WRKSRC}/q3demo + @${ECHO_CMD} "#!/bin/sh" > ${WRKSRC}/q3demo + @${ECHO_CMD} "cd "${Q3ADIR} >> ${WRKSRC}/q3demo + @${ECHO_CMD} "quake=\"./q3demo\"" >> ${WRKSRC}/q3demo + @${ECHO_CMD} "\""$$"quake\" "$$"*" >> ${WRKSRC}/q3demo + @${ECHO_CMD} "exit "$$"?" >> ${WRKSRC}/q3demo do-install: ${INSTALL_PROGRAM} ${WRKSRC}/q3demo ${PREFIX}/bin diff --git a/games/newkind/Makefile b/games/newkind/Makefile index ba216d070a96..c8958b509510 100644 --- a/games/newkind/Makefile +++ b/games/newkind/Makefile @@ -42,8 +42,8 @@ do-install: ${WRKSRC}/*.bmp ${WRKSRC}/*.wav ${SHAREDIR} @ ${INSTALL_DATA} ${WRKSRC}/data/* ${SHAREDIR}/data @ ${MKDIR} ${PREFIX}/bin - @ ${ECHO} "#!${SH}" > ${WRKSRC}/newkind - @ ${ECHO} "cd ${SHAREDIR} && exec \"./newkind.exe\" \"\$$@\"" \ + @ ${ECHO_CMD} "#!${SH}" > ${WRKSRC}/newkind + @ ${ECHO_CMD} "cd ${SHAREDIR} && exec \"./newkind.exe\" \"\$$@\"" \ >> ${WRKSRC}/newkind @ ${INSTALL_SCRIPT} ${WRKSRC}/newkind ${PREFIX}/bin diff --git a/games/oneko-sakura/Makefile b/games/oneko-sakura/Makefile index 2ac186e40f0b..b0d4308c0320 100644 --- a/games/oneko-sakura/Makefile +++ b/games/oneko-sakura/Makefile @@ -24,6 +24,6 @@ NO_CDROM= "Including derivatives from CARDCAPTOR SAKURA. See http://www.clamp.f- RESTRICTED_FILES= ${PATCHFILES} pre-configure: - @${ECHO} "MANSUFFIX=6" >>${WRKSRC}/Imakefile + @${ECHO_CMD} "MANSUFFIX=6" >>${WRKSRC}/Imakefile .include diff --git a/games/oneko/Makefile b/games/oneko/Makefile index 0963f15b81ea..7cc6ac4ebdb8 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_CMD} "MANSUFFIX=6" >>${WRKSRC}/Imakefile .include diff --git a/games/quakeforge/Makefile b/games/quakeforge/Makefile index 80b248a00447..03c79d08c03b 100644 --- a/games/quakeforge/Makefile +++ b/games/quakeforge/Makefile @@ -72,7 +72,7 @@ do-install: @printf "#!/bin/sh\ncd ${PREFIX}/share/quakeforge\n./${binary} \$$@" > \ ${WRKDIR}/${binary}.sh ${INSTALL_SCRIPT} ${WRKDIR}/${binary}.sh ${PREFIX}/bin/${binary} - @${ECHO} share/quakeforge/${binary} >>${PLIST} + @${ECHO_CMD} share/quakeforge/${binary} >>${PLIST} .endfor @${CAT} ${PKGDIR}/pkg-plist.wad >>${PLIST} .endif diff --git a/games/rollemup/Makefile b/games/rollemup/Makefile index 20ec793ef838..91d3c93da08a 100644 --- a/games/rollemup/Makefile +++ b/games/rollemup/Makefile @@ -52,7 +52,7 @@ do-install: @(cd ${PREFIX}; \ find ${GAMES_DIR}/Rollemup -type f >> ${PLIST_SRC}; \ for DIR in `find ${GAMES_DIR}/Rollemup -type d | sort -r`; do \ - ${ECHO} "@dirrm $$DIR" >> ${PLIST_SRC}; \ + ${ECHO_CMD} "@dirrm $$DIR" >> ${PLIST_SRC}; \ done) @${CHOWN} root:games ${PREFIX}/bin/Rollemup @${CHMOD} 2755 ${PREFIX}/bin/Rollemup diff --git a/games/senso/Makefile b/games/senso/Makefile index 629dd04a460a..e80b03e08f49 100644 --- a/games/senso/Makefile +++ b/games/senso/Makefile @@ -24,7 +24,7 @@ do-extract: ${MKDIR} ${WRKDIR} pre-install: - ${ECHO} "bin/senso" > ${PLIST} + ${ECHO_CMD} "bin/senso" > ${PLIST} do-install: ${INSTALL_SCRIPT} ${_DISTDIR}/${DISTFILES} ${PREFIX}/bin/senso diff --git a/games/xinvaders/Makefile b/games/xinvaders/Makefile index 9acaa68c9367..2f945e128507 100644 --- a/games/xinvaders/Makefile +++ b/games/xinvaders/Makefile @@ -29,7 +29,7 @@ MAN6= xinvaders.6 post-install: ${INSTALL_DATA} ${FILESDIR}/Vaders.ad ${PREFIX}/lib/X11/app-defaults/Vaders @${MKDIR} ${PREFIX}/share/xinvaders - @${ECHO} '0' > ${PREFIX}/share/xinvaders/xinvaders.scores + @${ECHO_CMD} '0' > ${PREFIX}/share/xinvaders/xinvaders.scores @${CHOWN} root:games ${PREFIX}/bin/xinvaders @${CHMOD} 2555 ${PREFIX}/bin/xinvaders @${CHOWN} root:games ${PREFIX}/share/xinvaders/xinvaders.scores diff --git a/games/xnibbles/Makefile b/games/xnibbles/Makefile index 1e79f533b067..e57d2b71886a 100644 --- a/games/xnibbles/Makefile +++ b/games/xnibbles/Makefile @@ -34,7 +34,7 @@ do-install: .endif @${TOUCH} ${PREFIX}/share/xnibbles/levels/LEVELS .for file in 001 002 003 004 005 006 007 008 009 010 011 012 - @${ECHO} ${PREFIX}/share/xnibbles/levels/level${file}.xnl >> ${PREFIX}/share/xnibbles/levels/LEVELS + @${ECHO_CMD} ${PREFIX}/share/xnibbles/levels/level${file}.xnl >> ${PREFIX}/share/xnibbles/levels/LEVELS ${INSTALL_DATA} ${WRKSRC}/levels/*.xnl ${PREFIX}/share/xnibbles/levels .endfor @${MKDIR} ${PREFIX}/share/doc/xnibbles diff --git a/games/xquarto/Makefile b/games/xquarto/Makefile index 50744aeeb930..7968e45c5299 100644 --- a/games/xquarto/Makefile +++ b/games/xquarto/Makefile @@ -17,6 +17,6 @@ USE_XPM= yes MAN6= xquarto.6 pre-configure: - @${ECHO} "MANSUFFIX=6" >>${WRKSRC}/src/Imakefile + @${ECHO_CMD} "MANSUFFIX=6" >>${WRKSRC}/src/Imakefile .include diff --git a/games/xshogi/Makefile b/games/xshogi/Makefile index bcacd2b8600c..f5f8b93ad4a0 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_CMD} "DISTDIR=${WRKDIR}" >> ${WRKSRC}/${MAKEFILE} + @${ECHO_CMD} "LOCALBASE=${LOCALBASE}" >> ${WRKSRC}/${MAKEFILE} post-install: @strip ${PREFIX}/bin/xshogi diff --git a/games/xsol/Makefile b/games/xsol/Makefile index 23399f6879f3..0717380fd622 100644 --- a/games/xsol/Makefile +++ b/games/xsol/Makefile @@ -17,6 +17,6 @@ USE_IMAKE= yes MAN6= xsol.6 post-patch: - @${ECHO} "MANSUFFIX=6" >> ${WRKSRC}/Imakefile + @${ECHO_CMD} "MANSUFFIX=6" >> ${WRKSRC}/Imakefile .include diff --git a/german/BBBike/Makefile b/german/BBBike/Makefile index 7d18adb0d03d..fc28d96caaf0 100644 --- a/german/BBBike/Makefile +++ b/german/BBBike/Makefile @@ -30,7 +30,7 @@ do-build: cd ${WRKSRC}/ext/VirtArray; ${PERL5} Makefile.PL; make all install clean; ${RM} Makefile.old cd ${WRKSRC}; ${POD2MAN} --lax bbbike.pod > bbbike.1 ${MV} ${WRKSRC}/bbbike ${WRKSRC}/bbbike.tmp - ${ECHO} "#! ${PERL}" > ${WRKSRC}/bbbike + ${ECHO_CMD} "#! ${PERL}" > ${WRKSRC}/bbbike ${CAT} ${WRKSRC}/bbbike.tmp >> ${WRKSRC}/bbbike ${RM} -f ${WRKSRC}/bbbike.tmp ${CHMOD} 0755 ${WRKSRC}/bbbike @@ -40,8 +40,8 @@ BBBIKEEXE= bbbike cbbbike bbbikeclient cmdbbbike do-install: -${RM} -rf ${MYDESTDIR} ${CP} -r ${WRKSRC} ${MYDESTDIR} - find ${MYDESTDIR} -exec ${CHMOD} ugo+r {} \; - find ${MYDESTDIR} -perm -u=x -exec ${CHMOD} go+x {} \; + ${FIND} ${MYDESTDIR} -exec ${CHMOD} ugo+r {} \; + ${FIND} ${MYDESTDIR} -perm -u=x -exec ${CHMOD} go+x {} \; .for f in ${BBBIKEEXE} -${RM} -f ${PREFIX}/bin/$f ${LN} -s ${MYDESTDIR}/$f ${PREFIX}/bin/$f diff --git a/german/citrix_ica/Makefile b/german/citrix_ica/Makefile index 26308f45817b..c2f45e5acc94 100644 --- a/german/citrix_ica/Makefile +++ b/german/citrix_ica/Makefile @@ -52,13 +52,13 @@ do-install: ${FALSE} ; \ fi - @${ECHO} -e "1\n${CDIR}\nj\nj\nj\nj\n3" > ${WRKSRC}/response ; + @${ECHO_CMD} -e "1\n${CDIR}\nj\nj\nj\nj\n3" > ${WRKSRC}/response ; @for dir in ${NSCP}; do \ if [ -e $${dir}/plugins/libnullplugin.so ]; then \ BIN=`${FILE} $${dir}/plugins/libnullplugin.so | ${AWK} '{print $$11}'` ; \ case $${BIN} in \ \(SYSV\),) \ - ${ECHO} -e "1\n${CDIR}\nj\nj\nj\n3" > ${WRKSRC}/response ; \ + ${ECHO_CMD} -e "1\n${CDIR}\nj\nj\nj\n3" > ${WRKSRC}/response ; \ esac \ fi \ done diff --git a/german/citrix_xenapp/Makefile b/german/citrix_xenapp/Makefile index 26308f45817b..c2f45e5acc94 100644 --- a/german/citrix_xenapp/Makefile +++ b/german/citrix_xenapp/Makefile @@ -52,13 +52,13 @@ do-install: ${FALSE} ; \ fi - @${ECHO} -e "1\n${CDIR}\nj\nj\nj\nj\n3" > ${WRKSRC}/response ; + @${ECHO_CMD} -e "1\n${CDIR}\nj\nj\nj\nj\n3" > ${WRKSRC}/response ; @for dir in ${NSCP}; do \ if [ -e $${dir}/plugins/libnullplugin.so ]; then \ BIN=`${FILE} $${dir}/plugins/libnullplugin.so | ${AWK} '{print $$11}'` ; \ case $${BIN} in \ \(SYSV\),) \ - ${ECHO} -e "1\n${CDIR}\nj\nj\nj\n3" > ${WRKSRC}/response ; \ + ${ECHO_CMD} -e "1\n${CDIR}\nj\nj\nj\n3" > ${WRKSRC}/response ; \ esac \ fi \ done diff --git a/german/staroffice5/Makefile b/german/staroffice5/Makefile index 615c9184d3a3..af260bf12a09 100644 --- a/german/staroffice5/Makefile +++ b/german/staroffice5/Makefile @@ -71,7 +71,7 @@ do-install: @${LN} -fs /compat/linux/usr/local/Office51 ${PREFIX}/Office51 .endif @${CP} /compat/linux/etc/ld.so.conf ${WRKDIR}/tmp/ld.so.conf.temp - @${ECHO} "${WRKDIR}/tmp" >> ${WRKDIR}/tmp/ld.so.conf.temp + @${ECHO_CMD} "${WRKDIR}/tmp" >> ${WRKDIR}/tmp/ld.so.conf.temp @PATH=${PATH}:${WRKDIR}/tmp @LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${WRKDIR}/tmp:/usr/lib:/lib:/compat/linux/lib @/compat/linux/sbin/ldconfig -f ${WRKDIR}/tmp/ld.so.conf.temp diff --git a/german/staroffice52/Makefile b/german/staroffice52/Makefile index 2a2a6b5a79c9..606940cd114a 100644 --- a/german/staroffice52/Makefile +++ b/german/staroffice52/Makefile @@ -43,8 +43,8 @@ LD_PATH= ${TMPDIR}:${WRKSRC}:${LINUXBASE}/lib:${LINUXBASE}/usr/lib INSTDB.INS= ${PREFIX}/office52/program/instdb.ins SUNSOLVE= ${WRKDIR}/109939-03 ADABAS_DIST= soa-5_2-ga-bin-linux-de.bin -SIZE!= /bin/df -k . | /usr/bin/tail -n 1 | /usr/bin/awk '{print $$4}' -LINPROCFS!= /sbin/mount | /usr/bin/grep linprocfs | /usr/bin/awk '{print $1}' +SIZE!= /bin/df -k . | ${TAIL} -n 1 | ${AWK} '{print $$4}' +LINPROCFS!= /sbin/mount | ${GREP} linprocfs | ${AWK} '{print $1}' .include diff --git a/graphics/acidwarp/Makefile b/graphics/acidwarp/Makefile index 390f246d9f98..18d4b50523d3 100644 --- a/graphics/acidwarp/Makefile +++ b/graphics/acidwarp/Makefile @@ -27,13 +27,13 @@ post-patch: @${PERL} -pi -e "s:%%PREFIX%%:${PREFIX}:g" ${WRKSRC}/Makefile pre-install: - ${ECHO} "bin/acidwarp" > ${PLIST} + ${ECHO_CMD} "bin/acidwarp" > ${PLIST} .if !defined(NOPORTDOCS) .for i in ${DOCFILES} - ${ECHO} -n "share/doc/acidwarp/" >> ${PLIST} - ${ECHO} ${i} >> ${PLIST} + ${ECHO_CMD} -n "share/doc/acidwarp/" >> ${PLIST} + ${ECHO_CMD} ${i} >> ${PLIST} .endfor - ${ECHO} "@dirrm share/doc/acidwarp" >> ${PLIST} + ${ECHO_CMD} "@dirrm share/doc/acidwarp" >> ${PLIST} .endif do-install: diff --git a/graphics/linplasma/Makefile b/graphics/linplasma/Makefile index a880ffa8d17f..6bb40df9f7e7 100644 --- a/graphics/linplasma/Makefile +++ b/graphics/linplasma/Makefile @@ -26,14 +26,14 @@ post-patch: @${PERL} -pi -e "s:PI:M_PI:g" ${WRKSRC}/linplasma.c pre-install: - ${ECHO} "bin/linplasma" > ${PLIST} + ${ECHO_CMD} "bin/linplasma" > ${PLIST} .if !defined(NOPORTDOCS) .for i in ${DOCFILES} - ${ECHO} -n ${DOCDIR} >> ${PLIST} - ${ECHO} ${i} >> ${PLIST} + ${ECHO_CMD} -n ${DOCDIR} >> ${PLIST} + ${ECHO_CMD} ${i} >> ${PLIST} .endfor - ${ECHO} -n "@dirrm " >> ${PLIST} - ${ECHO} ${DOCDIR} >> ${PLIST} + ${ECHO_CMD} -n "@dirrm " >> ${PLIST} + ${ECHO_CMD} ${DOCDIR} >> ${PLIST} .endif do-install: diff --git a/graphics/p5-Image-Grab/Makefile b/graphics/p5-Image-Grab/Makefile index 60836144e69a..0f1c9d5a52ac 100644 --- a/graphics/p5-Image-Grab/Makefile +++ b/graphics/p5-Image-Grab/Makefile @@ -25,7 +25,7 @@ RUN_DEPENDS= ${BUILD_DEPENDS} SITE_PERL= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER} PERL_CONFIGURE= yes -CONFIGURE_ENV= ${ECHO} "N" | +CONFIGURE_ENV= ${ECHO_CMD} "N" | MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION} MAN3= Image::Grab.3 diff --git a/graphics/piddle/Makefile b/graphics/piddle/Makefile index 2497978720ea..d14d3f6d90ed 100644 --- a/graphics/piddle/Makefile +++ b/graphics/piddle/Makefile @@ -34,7 +34,7 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/pilfonts/*.pil ${PIDDLEDIR}/pilfonts ${INSTALL_DATA} ${WRKSRC}/pilfonts/*.pbm ${PIDDLEDIR}/pilfonts ${INSTALL_DATA} ${WRKSRC}/pilfonts/metrics.dat ${PIDDLEDIR}/pilfonts - ${ECHO} 'piddle' > ${PIDDLEDIR}.pth + ${ECHO_CMD} 'piddle' > ${PIDDLEDIR}.pth @${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${PIDDLEDIR} @${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py ${PIDDLEDIR} ${MKDIR} ${PIDDLEDOCDIR} -- cgit v1.2.3