diff options
38 files changed, 75 insertions, 75 deletions
diff --git a/x11-clocks/asclock/Makefile b/x11-clocks/asclock/Makefile index 4ed226e51e8e..0721c81f53e8 100644 --- a/x11-clocks/asclock/Makefile +++ b/x11-clocks/asclock/Makefile @@ -21,7 +21,7 @@ MAN1= asclock.1 pre-configure: (cd ${WRKSRC}; \ - ${ECHO} ${ASCLOCK_LANG} | ${WRKSRC}/configure > /dev/null) + ${ECHO_CMD} ${ASCLOCK_LANG} | ${WRKSRC}/configure > /dev/null) @${ECHO_MSG} "***************** NOTE *****************" @${ECHO_MSG} "* *" @${ECHO_MSG} "* You can choose languages for asclock. *" diff --git a/x11-fm/systemg/Makefile b/x11-fm/systemg/Makefile index 9aa4139d7f85..4cc4d0c010e0 100644 --- a/x11-fm/systemg/Makefile +++ b/x11-fm/systemg/Makefile @@ -70,7 +70,7 @@ post-extract: .endfor post-patch: - @${ECHO} "SEARCHDIRS += ${PORTINCLUDES}" >> \ + @${ECHO_CMD} "SEARCHDIRS += ${PORTINCLUDES}" >> \ ${WRKSRC}/${EXTRALIBFILES_MAKE_WRKSRC}/jx_constants pre-build: diff --git a/x11-fonts/geminifonts/Makefile b/x11-fonts/geminifonts/Makefile index 19c9ddfed791..940783a6d052 100644 --- a/x11-fonts/geminifonts/Makefile +++ b/x11-fonts/geminifonts/Makefile @@ -36,8 +36,8 @@ post-install: # applications look for cronyx-*-koi8-r or koi8-r explicitly. -mi post-build: # Creating aliases for koi8-r encoding and Cronyx foundry: - @${ECHO} >> ${WRKSRC}/fonts.alias - @${ECHO} "! Automaticly generated aliases for koi8-r encoding:" \ + @${ECHO_CMD} >> ${WRKSRC}/fonts.alias + @${ECHO_CMD} "! Automaticly generated aliases for koi8-r encoding:" \ >> ${WRKSRC}/fonts.alias ${AWK} '/gemini/ { \ name = $$2; \ diff --git a/x11-fonts/intlfonts/Makefile b/x11-fonts/intlfonts/Makefile index c3f48d4ec1cc..e64a56c65bb9 100644 --- a/x11-fonts/intlfonts/Makefile +++ b/x11-fonts/intlfonts/Makefile @@ -43,8 +43,8 @@ do-build: cd ${WRKSRC}; \ for dir in ${NORMAL_FONTS} ${BIG_FONTS}; do \ for bdf in $$dir/*.bdf ; do \ - ${ECHO} $$bdf; \ - pcf_gz=`${ECHO} $$bdf | ${SED} 's/.bdf$$/.pcf.gz/'`; \ + ${ECHO_CMD} $$bdf; \ + pcf_gz=`${ECHO_CMD} $$bdf | ${SED} 's/.bdf$$/.pcf.gz/'`; \ ${CAT} $$bdf | bdftopcf | ${GZIP_CMD} \ > $$pcf_gz; \ done \ diff --git a/x11-fonts/webfonts/Makefile b/x11-fonts/webfonts/Makefile index cf509a852666..87719d3e8efe 100644 --- a/x11-fonts/webfonts/Makefile +++ b/x11-fonts/webfonts/Makefile @@ -153,11 +153,11 @@ make-fonts.alias: [ -t 0 ] && tty=/dev/tty || tty=/dev/null; \ ${TAIL} +2 ${WRKSRC}/fonts.scale | ${CUT} -f 2- -d" " | \ while read font; do \ - ${ECHO} \"$${font}\" \"$${font}\"; \ + ${ECHO_CMD} \"$${font}\" \"$${font}\"; \ for nsize in ${FONTSIZES}; do \ tsize=$${nsize}; \ [ $${tsize} -lt ${FONTLIMIT} ] && tsize=${FONTLIMIT}; \ - ${ECHO} \"$${font}\" \"$${font}\" | \ + ${ECHO_CMD} \"$${font}\" \"$${font}\" | \ ${SED} -e "s,--0-0-0-0-,--$${nsize}-$${nsize}0-0-0-," \ -e "s,--0-0-0-0-,--$${tsize}-$${tsize}0-75-75-," \ -e "s,^\"-${FONTNAME},\"-netscape,"; \ diff --git a/x11-servers/XttXF86srv-common/Makefile b/x11-servers/XttXF86srv-common/Makefile index d1be5c876034..3fe5d7076347 100644 --- a/x11-servers/XttXF86srv-common/Makefile +++ b/x11-servers/XttXF86srv-common/Makefile @@ -162,7 +162,7 @@ pre-configure: ${SETENV} ${SCRIPT_ENV} DISTDIR=${DISTDIR} WRKDIR=${WRKDIR} \ FILESDIR=${FILESDIR} ${MAKE}) ; \ ${CAT} ${HOSTDEFLOCAL} ${HOSTDEFSRV} > ${HOSTDEFDST} ; \ - ${ECHO} "#include <${LOCALFILE}>" >> ${HOSTDEFORG} ) + ${ECHO_CMD} "#include <${LOCALFILE}>" >> ${HOSTDEFORG} ) .if ${SERVER} == common do-install: diff --git a/x11-themes/xenostep/Makefile b/x11-themes/xenostep/Makefile index 062aa4c0acaf..b4703109d7c6 100644 --- a/x11-themes/xenostep/Makefile +++ b/x11-themes/xenostep/Makefile @@ -26,7 +26,7 @@ DIRS= "XenoStep Classic" "XenoStep Classic Small" "XenoStep HeliX" \ post-extract: for dir in ${DIRS}; do \ - destdir=`${ECHO} $${dir} | ${SED} 's| |_|g'`; \ + destdir=`${ECHO_CMD} $${dir} | ${SED} 's| |_|g'`; \ ${CP} -R "${WRKSRC}/$${dir}" "${WRKSRC}/$${destdir}"; \ done diff --git a/x11-toolkits/Xaw3d/Makefile b/x11-toolkits/Xaw3d/Makefile index f6151a4faef1..42b7cf9dd30a 100644 --- a/x11-toolkits/Xaw3d/Makefile +++ b/x11-toolkits/Xaw3d/Makefile @@ -27,7 +27,7 @@ post-extract: .if exists(${X11BASE}/bin/XFree86) post-build: ${CP} ${PKGDIR}/pkg-plist ${PLIST} - ${ECHO} "lib/libXaw3d.so.7" >> ${PLIST} + ${ECHO_CMD} "lib/libXaw3d.so.7" >> ${PLIST} .endif # Workaround a bug in egcs on FreeBSD/Alpha. diff --git a/x11-toolkits/libj2dplot/Makefile b/x11-toolkits/libj2dplot/Makefile index 27f12f2b2c21..e8ee04c66027 100644 --- a/x11-toolkits/libj2dplot/Makefile +++ b/x11-toolkits/libj2dplot/Makefile @@ -82,7 +82,7 @@ post-extract: .endfor post-patch: - @${ECHO} "SEARCHDIRS += ${PORTINCLUDES}" >> \ + @${ECHO_CMD} "SEARCHDIRS += ${PORTINCLUDES}" >> \ ${WRKSRC}/${EXTRALIBFILES_MAKE_WRKSRC}/jx_constants post-build: diff --git a/x11-toolkits/libjparser/Makefile b/x11-toolkits/libjparser/Makefile index e28f6aa30928..b98ae97fde57 100644 --- a/x11-toolkits/libjparser/Makefile +++ b/x11-toolkits/libjparser/Makefile @@ -81,7 +81,7 @@ post-extract: .endfor post-patch: - @${ECHO} "SEARCHDIRS += ${PORTINCLUDES}" >> \ + @${ECHO_CMD} "SEARCHDIRS += ${PORTINCLUDES}" >> \ ${WRKSRC}/${EXTRALIBFILES_MAKE_WRKSRC}/jx_constants post-build: diff --git a/x11-toolkits/libjsearch/Makefile b/x11-toolkits/libjsearch/Makefile index 49906b651a46..38358d083bdb 100644 --- a/x11-toolkits/libjsearch/Makefile +++ b/x11-toolkits/libjsearch/Makefile @@ -86,7 +86,7 @@ post-extract: .endfor post-patch: - @${ECHO} "SEARCHDIRS += ${PORTINCLUDES}" >> \ + @${ECHO_CMD} "SEARCHDIRS += ${PORTINCLUDES}" >> \ ${WRKSRC}/${EXTRALIBFILES_MAKE_WRKSRC}/jx_constants post-build: diff --git a/x11-toolkits/libjtoolbar/Makefile b/x11-toolkits/libjtoolbar/Makefile index 6595316718a3..006a7d34acc8 100644 --- a/x11-toolkits/libjtoolbar/Makefile +++ b/x11-toolkits/libjtoolbar/Makefile @@ -88,7 +88,7 @@ post-extract: .endfor post-patch: - @${ECHO} "SEARCHDIRS += ${PORTINCLUDES}" >> \ + @${ECHO_CMD} "SEARCHDIRS += ${PORTINCLUDES}" >> \ ${WRKSRC}/${EXTRALIBFILES_MAKE_WRKSRC}/jx_constants pre-build: diff --git a/x11-toolkits/libjtree/Makefile b/x11-toolkits/libjtree/Makefile index 24737bdd46db..15d25ec58bd7 100644 --- a/x11-toolkits/libjtree/Makefile +++ b/x11-toolkits/libjtree/Makefile @@ -82,7 +82,7 @@ post-extract: .endfor post-patch: - @${ECHO} "SEARCHDIRS += ${PORTINCLUDES}" >> \ + @${ECHO_CMD} "SEARCHDIRS += ${PORTINCLUDES}" >> \ ${WRKSRC}/${EXTRALIBFILES_MAKE_WRKSRC}/jx_constants post-build: diff --git a/x11-toolkits/qt23/Makefile b/x11-toolkits/qt23/Makefile index b43fe6c79f49..6784057df9be 100644 --- a/x11-toolkits/qt23/Makefile +++ b/x11-toolkits/qt23/Makefile @@ -39,7 +39,7 @@ CONFIGURE_ARGS= -system-zlib -system-libpng -system-jpeg -sm -gif \ CONFIGURE_ARGS+= -debug .endif -CONFIGURE_ENV= ${ECHO} yes | QTDIR=${WRKSRC} +CONFIGURE_ENV= ${ECHO_CMD} yes | QTDIR=${WRKSRC} .if defined(MAKE_JOBS) MAKE_ARGS+= MAKE="${GMAKE} -j${MAKE_JOBS}" .endif diff --git a/x11-toolkits/qt30/Makefile b/x11-toolkits/qt30/Makefile index b43fe6c79f49..6784057df9be 100644 --- a/x11-toolkits/qt30/Makefile +++ b/x11-toolkits/qt30/Makefile @@ -39,7 +39,7 @@ CONFIGURE_ARGS= -system-zlib -system-libpng -system-jpeg -sm -gif \ CONFIGURE_ARGS+= -debug .endif -CONFIGURE_ENV= ${ECHO} yes | QTDIR=${WRKSRC} +CONFIGURE_ENV= ${ECHO_CMD} yes | QTDIR=${WRKSRC} .if defined(MAKE_JOBS) MAKE_ARGS+= MAKE="${GMAKE} -j${MAKE_JOBS}" .endif diff --git a/x11-toolkits/qt31/Makefile b/x11-toolkits/qt31/Makefile index b43fe6c79f49..6784057df9be 100644 --- a/x11-toolkits/qt31/Makefile +++ b/x11-toolkits/qt31/Makefile @@ -39,7 +39,7 @@ CONFIGURE_ARGS= -system-zlib -system-libpng -system-jpeg -sm -gif \ CONFIGURE_ARGS+= -debug .endif -CONFIGURE_ENV= ${ECHO} yes | QTDIR=${WRKSRC} +CONFIGURE_ENV= ${ECHO_CMD} yes | QTDIR=${WRKSRC} .if defined(MAKE_JOBS) MAKE_ARGS+= MAKE="${GMAKE} -j${MAKE_JOBS}" .endif diff --git a/x11-toolkits/qt32/Makefile b/x11-toolkits/qt32/Makefile index b43fe6c79f49..6784057df9be 100644 --- a/x11-toolkits/qt32/Makefile +++ b/x11-toolkits/qt32/Makefile @@ -39,7 +39,7 @@ CONFIGURE_ARGS= -system-zlib -system-libpng -system-jpeg -sm -gif \ CONFIGURE_ARGS+= -debug .endif -CONFIGURE_ENV= ${ECHO} yes | QTDIR=${WRKSRC} +CONFIGURE_ENV= ${ECHO_CMD} yes | QTDIR=${WRKSRC} .if defined(MAKE_JOBS) MAKE_ARGS+= MAKE="${GMAKE} -j${MAKE_JOBS}" .endif diff --git a/x11-toolkits/qt33/Makefile b/x11-toolkits/qt33/Makefile index b43fe6c79f49..6784057df9be 100644 --- a/x11-toolkits/qt33/Makefile +++ b/x11-toolkits/qt33/Makefile @@ -39,7 +39,7 @@ CONFIGURE_ARGS= -system-zlib -system-libpng -system-jpeg -sm -gif \ CONFIGURE_ARGS+= -debug .endif -CONFIGURE_ENV= ${ECHO} yes | QTDIR=${WRKSRC} +CONFIGURE_ENV= ${ECHO_CMD} yes | QTDIR=${WRKSRC} .if defined(MAKE_JOBS) MAKE_ARGS+= MAKE="${GMAKE} -j${MAKE_JOBS}" .endif diff --git a/x11-toolkits/xenostep/Makefile b/x11-toolkits/xenostep/Makefile index 062aa4c0acaf..b4703109d7c6 100644 --- a/x11-toolkits/xenostep/Makefile +++ b/x11-toolkits/xenostep/Makefile @@ -26,7 +26,7 @@ DIRS= "XenoStep Classic" "XenoStep Classic Small" "XenoStep HeliX" \ post-extract: for dir in ${DIRS}; do \ - destdir=`${ECHO} $${dir} | ${SED} 's| |_|g'`; \ + destdir=`${ECHO_CMD} $${dir} | ${SED} 's| |_|g'`; \ ${CP} -R "${WRKSRC}/$${dir}" "${WRKSRC}/$${destdir}"; \ done diff --git a/x11-wm/aewm/Makefile b/x11-wm/aewm/Makefile index 64f22d725a8f..b1f63d46da61 100644 --- a/x11-wm/aewm/Makefile +++ b/x11-wm/aewm/Makefile @@ -21,12 +21,12 @@ USE_GMAKE= yes USE_X_PREFIX= yes pre-install: - ${ECHO} bin/aewm > ${PLIST} + ${ECHO_CMD} bin/aewm > ${PLIST} .if !defined(NOPORTDOCS) for i in ${DOCS}; \ - do ${ECHO} ${DOCDIR}/$${i} >> ${PLIST}; \ + do ${ECHO_CMD} ${DOCDIR}/$${i} >> ${PLIST}; \ done - ${ECHO} @dirrm ${DOCDIR} >> ${PLIST} + ${ECHO_CMD} @dirrm ${DOCDIR} >> ${PLIST} .endif do-install: diff --git a/x11-wm/e16utils/Makefile b/x11-wm/e16utils/Makefile index 4f60ddbc8ba2..fcc27c5d6029 100644 --- a/x11-wm/e16utils/Makefile +++ b/x11-wm/e16utils/Makefile @@ -33,7 +33,7 @@ do-build: do-install: .for i in ${SUB_STUBS} @cd ${WRKDIR}/${i} ; \ - ${INSTALL_PROGRAM} `${ECHO} '${i}' | ${SED} -e 's,-\(.*\),,'` \ + ${INSTALL_PROGRAM} `${ECHO_CMD} '${i}' | ${SED} -e 's,-\(.*\),,'` \ ${PREFIX}/bin .endfor diff --git a/x11-wm/evilwm/Makefile b/x11-wm/evilwm/Makefile index 512fabc7c88a..179aa8f4ddb2 100644 --- a/x11-wm/evilwm/Makefile +++ b/x11-wm/evilwm/Makefile @@ -27,12 +27,12 @@ do-build: -L${X11BASE}/lib -o evilwm *.c -lX11 pre-install: - ${ECHO} bin/evilwm > ${PLIST} + ${ECHO_CMD} bin/evilwm > ${PLIST} .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 do-install: diff --git a/x11-wm/qlwm/Makefile b/x11-wm/qlwm/Makefile index 7ab1087c6a3a..786650ea2754 100644 --- a/x11-wm/qlwm/Makefile +++ b/x11-wm/qlwm/Makefile @@ -36,23 +36,23 @@ post-patch: s|^MOC|#MOC|g' pre-install: - ${ECHO} bin/qlwm > ${PLIST} + ${ECHO_CMD} bin/qlwm > ${PLIST} .for i in biff dclock qlwm - ${ECHO} ${LIBDIR}/$i >> ${PLIST} + ${ECHO_CMD} ${LIBDIR}/$i >> ${PLIST} .endfor - for i in `cd ${WRKSRC}/files; ${ECHO} *`; do \ - ${ECHO} ${LIBDIR}/files/$$i >> ${PLIST}; \ + for i in `cd ${WRKSRC}/files; ${ECHO_CMD} *`; do \ + ${ECHO_CMD} ${LIBDIR}/files/$$i >> ${PLIST}; \ done .if !defined(NOPORTDOCS) .for i in ${DOCS} - ${ECHO} ${DOCDIR}/$i >> ${PLIST} + ${ECHO_CMD} ${DOCDIR}/$i >> ${PLIST} .endfor .endif .for i in ${LIBDIR}/files ${LIBDIR} - ${ECHO} @dirrm $i >> ${PLIST} + ${ECHO_CMD} @dirrm $i >> ${PLIST} .endfor .if !defined(NOPORTDOCS) - ${ECHO} @dirrm ${DOCDIR} >> ${PLIST} + ${ECHO_CMD} @dirrm ${DOCDIR} >> ${PLIST} .endif do-install: diff --git a/x11-wm/swm/Makefile b/x11-wm/swm/Makefile index a4e54e8bc638..66c31f0320ca 100644 --- a/x11-wm/swm/Makefile +++ b/x11-wm/swm/Makefile @@ -29,21 +29,21 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}-src/src pre-install: ${RM} -f ${PLIST} for i in ${BINS} ${SCRIPTS}; \ - do ${ECHO} bin/$${i} >> ${PLIST}; \ + do ${ECHO_CMD} bin/$${i} >> ${PLIST}; \ done .if !defined(NOPORTDOCS) for i in ${DOCS}; \ - do ${ECHO} ${DOCDIR}/$${i} >> ${PLIST}; \ + do ${ECHO_CMD} ${DOCDIR}/$${i} >> ${PLIST}; \ done for i in 1 2 3; \ - do ${ECHO} ${DOCDIR}/examples/.swm/button$${i} >> ${PLIST}; \ + do ${ECHO_CMD} ${DOCDIR}/examples/.swm/button$${i} >> ${PLIST}; \ done for i in ${EXAMPLES}; \ - do ${ECHO} ${DOCDIR}/examples/$${i} >> ${PLIST}; \ + do ${ECHO_CMD} ${DOCDIR}/examples/$${i} >> ${PLIST}; \ done - ${ECHO} @dirrm ${DOCDIR}/examples/.swm >> ${PLIST} - ${ECHO} @dirrm ${DOCDIR}/examples >> ${PLIST} - ${ECHO} @dirrm ${DOCDIR} >> ${PLIST} + ${ECHO_CMD} @dirrm ${DOCDIR}/examples/.swm >> ${PLIST} + ${ECHO_CMD} @dirrm ${DOCDIR}/examples >> ${PLIST} + ${ECHO_CMD} @dirrm ${DOCDIR} >> ${PLIST} .endif do-install: diff --git a/x11-wm/uwm/Makefile b/x11-wm/uwm/Makefile index a15814e4a13a..7334a964e584 100644 --- a/x11-wm/uwm/Makefile +++ b/x11-wm/uwm/Makefile @@ -24,9 +24,9 @@ post-patch: ${PERL} -pi -e 's:/usr/lib/X11:${PREFIX}/lib/X11:g' ${WRKSRC}/uwm.man pre-install: - ${ECHO} bin/uwm > ${PLIST} - ${ECHO} lib/X11/uwm/system.uwmrc >> ${PLIST} - ${ECHO} @dirrm lib/X11/uwm >> ${PLIST} + ${ECHO_CMD} bin/uwm > ${PLIST} + ${ECHO_CMD} lib/X11/uwm/system.uwmrc >> ${PLIST} + ${ECHO_CMD} @dirrm lib/X11/uwm >> ${PLIST} post-install: ${MKDIR} ${PREFIX}/lib/X11/uwm diff --git a/x11-wm/windowmaker/Makefile b/x11-wm/windowmaker/Makefile index 49df01587287..c0a41c2a38d9 100644 --- a/x11-wm/windowmaker/Makefile +++ b/x11-wm/windowmaker/Makefile @@ -76,6 +76,6 @@ post-install: update-LINGUAS: extract cd ${WRKSRC}/po && \ - ${ECHO} *.po | ${SED} 's|\.po||g' > ${FILESDIR}/LINGUAS + ${ECHO_CMD} *.po | ${SED} 's|\.po||g' > ${FILESDIR}/LINGUAS .include <bsd.port.post.mk> diff --git a/x11/XFree86-4-documents/Makefile b/x11/XFree86-4-documents/Makefile index 6149e7d8fab4..86a60191804c 100644 --- a/x11/XFree86-4-documents/Makefile +++ b/x11/XFree86-4-documents/Makefile @@ -32,11 +32,11 @@ post-extract: do-configure: (cd ${WRKSRC} ; \ - ${ECHO} "#define BuildMiscDocs YES" > host.def ; \ - ${ECHO} "#define BuildSpecsDocs YES" >> host.def ; \ - ${ECHO} "#define BuildLinuxDocPS NO" >> host.def ; \ - ${ECHO} "#define InstallHardcopyDocs YES" >> host.def ; \ - ${ECHO} "#define FreeBSDBuildXdoc YES" >> host.def ; \ + ${ECHO_CMD} "#define BuildMiscDocs YES" > host.def ; \ + ${ECHO_CMD} "#define BuildSpecsDocs YES" >> host.def ; \ + ${ECHO_CMD} "#define BuildLinuxDocPS NO" >> host.def ; \ + ${ECHO_CMD} "#define InstallHardcopyDocs YES" >> host.def ; \ + ${ECHO_CMD} "#define FreeBSDBuildXdoc YES" >> host.def ; \ imake -DUseInstalled ${PROJECTROOT} -I. -I${PREFIX}/lib/X11/config \ -DTOPDIR=.. -DCURDIR=.; \ ${MAKE} Makefiles ; \ diff --git a/x11/XFree86-4/Makefile b/x11/XFree86-4/Makefile index b513b4b2cb5d..d144e509e2af 100644 --- a/x11/XFree86-4/Makefile +++ b/x11/XFree86-4/Makefile @@ -54,7 +54,7 @@ PLIST= ${PKGDIR}/pkg-plist.alpha .endif pre-configure: - @if ${ECHO} "$(CFLAGS)" |${GREP} -q O[3456789]; then \ + @if ${ECHO_CMD} "$(CFLAGS)" |${GREP} -q O[3456789]; then \ ${ECHO} "XFree86-4 with thread support does not build with optimization"; \ ${ECHO} "flags different from O or -O2"; \ ${FALSE}; fi @@ -124,7 +124,7 @@ post-patch: @${MV} ${WRKDIR}/mgasource/mga-${MGA_DRIVER_DIR}/mga \ ${WRKSRC}/programs/Xserver/hw/xfree86/drivers @${CP} ${WRKSRC}/config/cf/xf86site.def ${WRKSRC}/config/cf/host.def - @${ECHO} "#define HaveMatroxHal YES" >> ${WRKSRC}/config/cf/host.def + @${ECHO_CMD} "#define HaveMatroxHal YES" >> ${WRKSRC}/config/cf/host.def @${PERL} -pi.orig -ne 's!(#define PCI_CHIP_MGAG400\s+0x0525)!\1\n#define PCI_CHIP_MGAG550 0x2527\n!; \ s!({PCI_CHIP_MGAG400,\s+"MGA G400 AGP",0},)!\1\n{PCI_CHIP_MGAG550, "MGA G550 AGP", 0},\n!' \ ${WRKSRC}/programs/Xserver/hw/xfree86/common/xf86PciInfo.h diff --git a/x11/buttonbox/Makefile b/x11/buttonbox/Makefile index 617f453f9a13..82f46b60ea29 100644 --- a/x11/buttonbox/Makefile +++ b/x11/buttonbox/Makefile @@ -27,13 +27,13 @@ do-build: colour.c dispatcher.c main.c pre-install: - ${ECHO} bin/buttonbox > ${PLIST} - ${ECHO} lib/X11/app-defaults/ButtonBox.ad >> ${PLIST} + ${ECHO_CMD} bin/buttonbox > ${PLIST} + ${ECHO_CMD} lib/X11/app-defaults/ButtonBox.ad >> ${PLIST} .if !defined(NOPORTDOCS) for i in ${DOCS}; \ - do ${ECHO} ${DOCDIR}/$${i} >> ${PLIST}; \ + do ${ECHO_CMD} ${DOCDIR}/$${i} >> ${PLIST}; \ done - ${ECHO} @dirrm ${DOCDIR} >> ${PLIST} + ${ECHO_CMD} @dirrm ${DOCDIR} >> ${PLIST} .endif do-install: diff --git a/x11/kde4-baseapps/Makefile b/x11/kde4-baseapps/Makefile index 1173bb45a718..f5be27d77504 100644 --- a/x11/kde4-baseapps/Makefile +++ b/x11/kde4-baseapps/Makefile @@ -55,8 +55,8 @@ pre-everything:: .endif post-extract: - @${ECHO} "#!/bin/sh" > ${WRKSRC}/mkpamserv - @${ECHO} "exit 0" >> ${WRKSRC}/mkpamserv + @${ECHO_CMD} "#!/bin/sh" > ${WRKSRC}/mkpamserv + @${ECHO_CMD} "exit 0" >> ${WRKSRC}/mkpamserv post-patch: .if !defined(WITH_MOTIF) diff --git a/x11/kde4-runtime/Makefile b/x11/kde4-runtime/Makefile index 1173bb45a718..f5be27d77504 100644 --- a/x11/kde4-runtime/Makefile +++ b/x11/kde4-runtime/Makefile @@ -55,8 +55,8 @@ pre-everything:: .endif post-extract: - @${ECHO} "#!/bin/sh" > ${WRKSRC}/mkpamserv - @${ECHO} "exit 0" >> ${WRKSRC}/mkpamserv + @${ECHO_CMD} "#!/bin/sh" > ${WRKSRC}/mkpamserv + @${ECHO_CMD} "exit 0" >> ${WRKSRC}/mkpamserv post-patch: .if !defined(WITH_MOTIF) diff --git a/x11/kde4-workspace/Makefile b/x11/kde4-workspace/Makefile index 1173bb45a718..f5be27d77504 100644 --- a/x11/kde4-workspace/Makefile +++ b/x11/kde4-workspace/Makefile @@ -55,8 +55,8 @@ pre-everything:: .endif post-extract: - @${ECHO} "#!/bin/sh" > ${WRKSRC}/mkpamserv - @${ECHO} "exit 0" >> ${WRKSRC}/mkpamserv + @${ECHO_CMD} "#!/bin/sh" > ${WRKSRC}/mkpamserv + @${ECHO_CMD} "exit 0" >> ${WRKSRC}/mkpamserv post-patch: .if !defined(WITH_MOTIF) diff --git a/x11/kdebase2/Makefile b/x11/kdebase2/Makefile index 1173bb45a718..f5be27d77504 100644 --- a/x11/kdebase2/Makefile +++ b/x11/kdebase2/Makefile @@ -55,8 +55,8 @@ pre-everything:: .endif post-extract: - @${ECHO} "#!/bin/sh" > ${WRKSRC}/mkpamserv - @${ECHO} "exit 0" >> ${WRKSRC}/mkpamserv + @${ECHO_CMD} "#!/bin/sh" > ${WRKSRC}/mkpamserv + @${ECHO_CMD} "exit 0" >> ${WRKSRC}/mkpamserv post-patch: .if !defined(WITH_MOTIF) diff --git a/x11/kdebase3/Makefile b/x11/kdebase3/Makefile index 1173bb45a718..f5be27d77504 100644 --- a/x11/kdebase3/Makefile +++ b/x11/kdebase3/Makefile @@ -55,8 +55,8 @@ pre-everything:: .endif post-extract: - @${ECHO} "#!/bin/sh" > ${WRKSRC}/mkpamserv - @${ECHO} "exit 0" >> ${WRKSRC}/mkpamserv + @${ECHO_CMD} "#!/bin/sh" > ${WRKSRC}/mkpamserv + @${ECHO_CMD} "exit 0" >> ${WRKSRC}/mkpamserv post-patch: .if !defined(WITH_MOTIF) diff --git a/x11/kdebase4-runtime/Makefile b/x11/kdebase4-runtime/Makefile index 1173bb45a718..f5be27d77504 100644 --- a/x11/kdebase4-runtime/Makefile +++ b/x11/kdebase4-runtime/Makefile @@ -55,8 +55,8 @@ pre-everything:: .endif post-extract: - @${ECHO} "#!/bin/sh" > ${WRKSRC}/mkpamserv - @${ECHO} "exit 0" >> ${WRKSRC}/mkpamserv + @${ECHO_CMD} "#!/bin/sh" > ${WRKSRC}/mkpamserv + @${ECHO_CMD} "exit 0" >> ${WRKSRC}/mkpamserv post-patch: .if !defined(WITH_MOTIF) diff --git a/x11/kdebase4-workspace/Makefile b/x11/kdebase4-workspace/Makefile index 1173bb45a718..f5be27d77504 100644 --- a/x11/kdebase4-workspace/Makefile +++ b/x11/kdebase4-workspace/Makefile @@ -55,8 +55,8 @@ pre-everything:: .endif post-extract: - @${ECHO} "#!/bin/sh" > ${WRKSRC}/mkpamserv - @${ECHO} "exit 0" >> ${WRKSRC}/mkpamserv + @${ECHO_CMD} "#!/bin/sh" > ${WRKSRC}/mkpamserv + @${ECHO_CMD} "exit 0" >> ${WRKSRC}/mkpamserv post-patch: .if !defined(WITH_MOTIF) diff --git a/x11/kdebase4/Makefile b/x11/kdebase4/Makefile index 1173bb45a718..f5be27d77504 100644 --- a/x11/kdebase4/Makefile +++ b/x11/kdebase4/Makefile @@ -55,8 +55,8 @@ pre-everything:: .endif post-extract: - @${ECHO} "#!/bin/sh" > ${WRKSRC}/mkpamserv - @${ECHO} "exit 0" >> ${WRKSRC}/mkpamserv + @${ECHO_CMD} "#!/bin/sh" > ${WRKSRC}/mkpamserv + @${ECHO_CMD} "exit 0" >> ${WRKSRC}/mkpamserv post-patch: .if !defined(WITH_MOTIF) diff --git a/x11/xcolorsel/Makefile b/x11/xcolorsel/Makefile index edba17c054f3..7e42cdc43f47 100644 --- a/x11/xcolorsel/Makefile +++ b/x11/xcolorsel/Makefile @@ -22,7 +22,7 @@ USE_XPM= yes MAN1= xcolorsel.1 post-patch: - ${ECHO} "*.file: ${X11BASE}/lib/X11/rgb.txt" >> ${WRKSRC}/Xcolorsel.ad + ${ECHO_CMD} "*.file: ${X11BASE}/lib/X11/rgb.txt" >> ${WRKSRC}/Xcolorsel.ad ${PERL} -pi -e "s|#include <malloc.h>||g; s|/Xaw/|/Xaw3d/|g;" \ ${WRKSRC}/*.[ch] ${PERL} -pi -e "s|app2head|./app2head|g; \ |