summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--fonts/AnonymousPro/Makefile4
-rw-r--r--fonts/acroread7-font-share/Makefile.common6
-rw-r--r--fonts/efont-unicode/Makefile6
-rw-r--r--fonts/ms-ttf/Makefile4
-rw-r--r--graphics/kipi-plugins/Makefile8
-rw-r--r--graphics/libungif/Makefile4
-rw-r--r--graphics/py-matplotlib-gtk2/Makefile24
-rw-r--r--graphics/py-matplotlib-tk/Makefile24
-rw-r--r--graphics/py-matplotlib/Makefile16
-rw-r--r--graphics/tiff/Makefile4
-rw-r--r--lang/gcc34/options.mk4
-rw-r--r--lang/gcc34/preconfigure.mk2
-rw-r--r--lang/hugs/package.mk4
-rw-r--r--lang/swi-prolog-packages/Makefile4
-rw-r--r--mail/fml/Makefile4
-rw-r--r--mail/mailhops/Makefile4
-rw-r--r--math/muparser/Makefile4
-rw-r--r--misc/libkgeomap/Makefile8
-rw-r--r--net/icsi-finger/Makefile12
-rw-r--r--security/rid/Makefile6
-rw-r--r--sysutils/checkperms/Makefile8
-rw-r--r--wm/ethemes/Makefile4
-rw-r--r--x11/openmotif/Makefile4
-rw-r--r--x11/xmindpath/Makefile8
-rw-r--r--x11/xorg-cf-files/Makefile4
25 files changed, 90 insertions, 90 deletions
diff --git a/fonts/AnonymousPro/Makefile b/fonts/AnonymousPro/Makefile
index dda106991cb..bec8f082bf1 100644
--- a/fonts/AnonymousPro/Makefile
+++ b/fonts/AnonymousPro/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2012/10/03 18:28:15 asau Exp $
+# $NetBSD: Makefile,v 1.3 2013/04/06 14:58:18 rodent Exp $
#
DISTNAME= AnonymousPro-1.001
@@ -32,7 +32,7 @@ INSTALL_DOCS= FONTLOG.txt OFL-FAQ.txt OFL.txt README.txt
post-extract:
cd ${WRKSRC} && for i in *.ttf; do \
- j=`echo $$i | sed "s/ //g"`; \
+ j=`${ECHO} $$i | sed "s/ //g"`; \
mv "$$i" "$$j"; done
do-install:
diff --git a/fonts/acroread7-font-share/Makefile.common b/fonts/acroread7-font-share/Makefile.common
index 45b3158e0c2..98addd06c6e 100644
--- a/fonts/acroread7-font-share/Makefile.common
+++ b/fonts/acroread7-font-share/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.6 2012/10/03 18:28:16 asau Exp $
+# $NetBSD: Makefile.common,v 1.7 2013/04/06 14:58:18 rodent Exp $
#
PKGNAME= acroread7-${DISTNAME}-7.0
@@ -25,8 +25,8 @@ USE_TOOLS+= tar
INSTALLATION_DIRS= Acrobat7/Resource
do-install:
- echo CMap/Identity-H > ${WRKSRC}/exclude.txt
- echo CMap/Identity-V >> ${WRKSRC}/exclude.txt
+ ${ECHO} CMap/Identity-H > ${WRKSRC}/exclude.txt
+ ${ECHO} CMap/Identity-V >> ${WRKSRC}/exclude.txt
${TAR} -xf ${TAR_FILE} -X ${WRKSRC}/exclude.txt -C ${DESTDIR}${PREFIX}/Acrobat7/Resource
.include "../../mk/bsd.pkg.mk"
diff --git a/fonts/efont-unicode/Makefile b/fonts/efont-unicode/Makefile
index c286fc5db09..9bb94da0b0e 100644
--- a/fonts/efont-unicode/Makefile
+++ b/fonts/efont-unicode/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2012/10/03 18:28:18 asau Exp $
+# $NetBSD: Makefile,v 1.13 2013/04/06 14:58:18 rodent Exp $
DISTNAME= efont-unicode-bdf-0.4.2
PKGNAME= ${DISTNAME:S/-bdf//}
@@ -34,7 +34,7 @@ FONTS_DIRS.x11= ${FONTDIR}
do-build:
@cd ${WRKSRC}; \
for FONT in ${FONTS}; do \
- ${ECHO} -n "Compiling font $${FONT} ... "; \
+ ${ECHO_N} "Compiling font $${FONT} ... "; \
bdftopcf $${FONT}.bdf | \
${GZIP_CMD} -c >$${FONT}.pcf.gz; \
${ECHO} "done"; \
@@ -43,7 +43,7 @@ do-build:
do-install:
@${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/${FONTDIR}
@for FONT in ${FONTS}; do \
- ${ECHO} -n "Installing font $${FONT} ... "; \
+ ${ECHO_N} "Installing font $${FONT} ... "; \
${INSTALL_DATA} ${WRKSRC}/$${FONT}.pcf.gz \
${DESTDIR}${PREFIX}/${FONTDIR}; \
${ECHO} "done"; \
diff --git a/fonts/ms-ttf/Makefile b/fonts/ms-ttf/Makefile
index d602aa85481..b90566a0063 100644
--- a/fonts/ms-ttf/Makefile
+++ b/fonts/ms-ttf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2012/10/03 18:28:28 asau Exp $
+# $NetBSD: Makefile,v 1.20 2013/04/06 14:58:18 rodent Exp $
DISTNAME= # empty
PKGNAME= ms-ttf-20020306
@@ -39,7 +39,7 @@ INSTALLATION_DIRS= ${FONTDIR} ${DOCDIR}
post-extract:
${RUN} \
for f in ${WRKSRC}/*.TTF ; do \
- ${MV} $$f `echo $$f | ${SED} 's|TTF$$|ttf|'`; \
+ ${MV} $$f `${ECHO} $$f | ${SED} 's|TTF$$|ttf|'`; \
done
do-install:
diff --git a/graphics/kipi-plugins/Makefile b/graphics/kipi-plugins/Makefile
index 5c30fe9dbd1..d233e9a416e 100644
--- a/graphics/kipi-plugins/Makefile
+++ b/graphics/kipi-plugins/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.84 2013/04/06 09:46:09 markd Exp $
+# $NetBSD: Makefile,v 1.85 2013/04/06 14:58:18 rodent Exp $
#
PKGNAME= kipi-plugins-3.1.0
@@ -23,9 +23,9 @@ USE_TOOLS+= msgfmt pkg-config
WRKSRC= ${WRKDIR}/${DISTNAME}/extra/kipi-plugins
post-patch:
- echo "FIND_PACKAGE(Msgfmt REQUIRED)" >> ${WRKSRC}/CMakeLists.txt
- echo "FIND_PACKAGE(Gettext REQUIRED)" >> ${WRKSRC}/CMakeLists.txt
- echo "ADD_SUBDIRECTORY(po)" >> ${WRKSRC}/CMakeLists.txt
+ ${ECHO} "FIND_PACKAGE(Msgfmt REQUIRED)" >> ${WRKSRC}/CMakeLists.txt
+ ${ECHO} "FIND_PACKAGE(Gettext REQUIRED)" >> ${WRKSRC}/CMakeLists.txt
+ ${ECHO} "ADD_SUBDIRECTORY(po)" >> ${WRKSRC}/CMakeLists.txt
ln -s ../../po ${WRKSRC}/po
rm ${WRKSRC}/po/*/digikam.po ${WRKSRC}/po/*/libkgeomap.po ${WRKSRC}/po/*/libkipi.po
diff --git a/graphics/libungif/Makefile b/graphics/libungif/Makefile
index dfe1a9f51b2..474a384fa8b 100644
--- a/graphics/libungif/Makefile
+++ b/graphics/libungif/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2012/10/06 14:11:06 asau Exp $
+# $NetBSD: Makefile,v 1.44 2013/04/06 14:58:19 rodent Exp $
DISTNAME= libungif-4.1.4
PKGREVISION= 2
@@ -31,7 +31,7 @@ post-patch:
post-install:
cd ${DESTDIR}${PREFIX}/lib && \
for SOURCE in libungif.*; do \
- TARGET=`echo $$SOURCE | ${SED} -e s/libungif/libgif/`; \
+ TARGET=`${ECHO} $$SOURCE | ${SED} -e s/libungif/libgif/`; \
${RM} -f $$TARGET; \
if [ $$SOURCE = libungif.la ]; then \
${SED} -e s/libungif/libgif/g $$SOURCE >$$TARGET; \
diff --git a/graphics/py-matplotlib-gtk2/Makefile b/graphics/py-matplotlib-gtk2/Makefile
index 21560a5bfb9..e528c7e245d 100644
--- a/graphics/py-matplotlib-gtk2/Makefile
+++ b/graphics/py-matplotlib-gtk2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2013/02/16 11:22:25 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2013/04/06 14:58:19 rodent Exp $
#
DISTNAME= matplotlib-1.2.0
@@ -18,17 +18,17 @@ PYDISTUTILSPKG= yes
USE_LANGUAGES= c c++
post-patch:
- ( echo "[directories]"; \
- echo "basedirlist=/usr"; \
- echo "[provide_packages]"; \
- echo "pytz = False"; \
- echo "dateutil = False"; \
- echo "[gui_support]"; \
- echo "gtk = True"; \
- echo "gtkagg = True"; \
- echo "tkagg = False"; \
- echo "wxagg = False"; \
- echo "macosx = False" ) > ${WRKSRC}/setup.cfg
+ ( ${ECHO} "[directories]"; \
+ ${ECHO} "basedirlist=/usr"; \
+ ${ECHO} "[provide_packages]"; \
+ ${ECHO} "pytz = False"; \
+ ${ECHO} "dateutil = False"; \
+ ${ECHO} "[gui_support]"; \
+ ${ECHO} "gtk = True"; \
+ ${ECHO} "gtkagg = True"; \
+ ${ECHO} "tkagg = False"; \
+ ${ECHO} "wxagg = False"; \
+ ${ECHO} "macosx = False" ) > ${WRKSRC}/setup.cfg
.include "../../lang/python/extension.mk"
.include "../../graphics/py-matplotlib/buildlink3.mk"
diff --git a/graphics/py-matplotlib-tk/Makefile b/graphics/py-matplotlib-tk/Makefile
index 9b9e1d2ab37..089c7ae0eda 100644
--- a/graphics/py-matplotlib-tk/Makefile
+++ b/graphics/py-matplotlib-tk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2013/02/16 11:22:25 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2013/04/06 14:58:19 rodent Exp $
#
DISTNAME= matplotlib-1.2.0
@@ -18,17 +18,17 @@ PYDISTUTILSPKG= yes
USE_LANGUAGES= c c++
post-patch:
- ( echo "[directories]"; \
- echo "basedirlist=/usr"; \
- echo "[provide_packages]"; \
- echo "pytz = False"; \
- echo "dateutil = False"; \
- echo "[gui_support]"; \
- echo "gtk = False"; \
- echo "gtkagg = False"; \
- echo "tkagg = True"; \
- echo "wxagg = False"; \
- echo "macosx = False" ) > ${WRKSRC}/setup.cfg
+ ( ${ECHO} "[directories]"; \
+ ${ECHO} "basedirlist=/usr"; \
+ ${ECHO} "[provide_packages]"; \
+ ${ECHO} "pytz = False"; \
+ ${ECHO} "dateutil = False"; \
+ ${ECHO} "[gui_support]"; \
+ ${ECHO} "gtk = False"; \
+ ${ECHO} "gtkagg = False"; \
+ ${ECHO} "tkagg = True"; \
+ ${ECHO} "wxagg = False"; \
+ ${ECHO} "macosx = False" ) > ${WRKSRC}/setup.cfg
.include "../../lang/python/extension.mk"
.include "../../graphics/py-matplotlib/buildlink3.mk"
diff --git a/graphics/py-matplotlib/Makefile b/graphics/py-matplotlib/Makefile
index ff49d0cfb89..482b4636a37 100644
--- a/graphics/py-matplotlib/Makefile
+++ b/graphics/py-matplotlib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2013/02/16 11:22:25 wiz Exp $
+# $NetBSD: Makefile,v 1.36 2013/04/06 14:58:19 rodent Exp $
#
DISTNAME= matplotlib-1.2.0
@@ -28,13 +28,13 @@ REPLACE_PYTHON+= lib/mpl_toolkits/mplot3d/axis3d.py
REPLACE_PYTHON+= lib/mpl_toolkits/mplot3d/proj3d.py
post-patch:
- ( echo "[directories]"; \
- echo "basedirlist=/usr"; \
- echo "[gui_support]"; \
- echo "gtk = False"; \
- echo "gtkagg = False"; \
- echo "tkagg = False"; \
- echo "wxagg = False" ) > ${WRKSRC}/setup.cfg
+ ( ${ECHO} "[directories]"; \
+ ${ECHO} "basedirlist=/usr"; \
+ ${ECHO} "[gui_support]"; \
+ ${ECHO} "gtk = False"; \
+ ${ECHO} "gtkagg = False"; \
+ ${ECHO} "tkagg = False"; \
+ ${ECHO} "wxagg = False" ) > ${WRKSRC}/setup.cfg
.include "../../lang/python/application.mk"
.include "../../lang/python/extension.mk"
diff --git a/graphics/tiff/Makefile b/graphics/tiff/Makefile
index e45688e2f96..9c8ad31eea9 100644
--- a/graphics/tiff/Makefile
+++ b/graphics/tiff/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.110 2013/01/26 21:36:32 adam Exp $
+# $NetBSD: Makefile,v 1.111 2013/04/06 14:58:19 rodent Exp $
DISTNAME= tiff-4.0.3
PKGREVISION= 2
@@ -29,7 +29,7 @@ TEST_TARGET= check
post-install:
cd ${DESTDIR}/${PREFIX}/${PKGMANDIR}/man3 && for file in *.3tiff; do\
- target=`echo $$file | sed "s/3tiff/3/"`; \
+ target=`${ECHO} $$file | sed "s/3tiff/3/"`; \
${MV} $$file $$target; \
done
diff --git a/lang/gcc34/options.mk b/lang/gcc34/options.mk
index ebf7140f9ff..3016d935d33 100644
--- a/lang/gcc34/options.mk
+++ b/lang/gcc34/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.4 2013/04/06 04:07:24 rodent Exp $
+# $NetBSD: options.mk,v 1.5 2013/04/06 14:58:19 rodent Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.gcc34
PKG_SUPPORTED_OPTIONS= nls gcc-inplace-math gcc-c++ gcc-fortran gcc-java gcc-objc gcc-ada
@@ -108,7 +108,7 @@ pre-configure:
cd ${WRKDIR}/.gcc/bin/ && \
for filename in ${ALT_GCC:T} $${bin_files} ; do \
${ECHO} '#!${TOOLS_SHELL}' > $${filename}; \
- ${ECHO} -n "exec ${ALT_GCC:H}/$${filename} " >>$${filename}; \
+ ${ECHO_N} "exec ${ALT_GCC:H}/$${filename} " >>$${filename}; \
${ECHO} '"$$@"' >>$${filename}; \
${CHMOD} +x $${filename}; \
done )
diff --git a/lang/gcc34/preconfigure.mk b/lang/gcc34/preconfigure.mk
index 2b47fd5a20c..4d2e5da185b 100644
--- a/lang/gcc34/preconfigure.mk
+++ b/lang/gcc34/preconfigure.mk
@@ -4,7 +4,7 @@
cd ${WRKDIR}/.gcc/bin && \
for _target_ in $${bin_files} ; do \
${ECHO} '#!${TOOLS_SHELL}' > $${_target_} && \
- ${ECHO} -n "exec ${BUILDLINK_PREFIX.gcc34}/bin/$${_target_}" >> $${_target_} && \
+ ${ECHO_N} "exec ${BUILDLINK_PREFIX.gcc34}/bin/$${_target_}" >> $${_target_} && \
${ECHO} ' "$$@"' >> $${_target_} && \
${CHMOD} +x $${_target_}; \
done )
diff --git a/lang/hugs/package.mk b/lang/hugs/package.mk
index fcce7b04523..3b27682ca58 100644
--- a/lang/hugs/package.mk
+++ b/lang/hugs/package.mk
@@ -1,4 +1,4 @@
-# $NetBSD: package.mk,v 1.4 2010/01/29 18:52:09 joerg Exp $
+# $NetBSD: package.mk,v 1.5 2013/04/06 14:58:19 rodent Exp $
#
PKGNAME= hugs98-${DISTNAME}
@@ -34,7 +34,7 @@ do-install:
copy --verbose --destdir=${DESTDIR}
cd ${WRKSRC} && \
pkg=`awk '{ print $$2; nextfile }' < .installed-pkg-config` && \
- echo $$pkg && \
+ ${ECHO} $$pkg && \
${INSTALL_DATA_DIR} \
${DESTDIR}${PREFIX}/lib/hugs/packages/$$pkg/packages/$$pkg && \
${INSTALL_DATA} .installed-pkg-config \
diff --git a/lang/swi-prolog-packages/Makefile b/lang/swi-prolog-packages/Makefile
index c1e62fd8f3e..c3d4ed26762 100644
--- a/lang/swi-prolog-packages/Makefile
+++ b/lang/swi-prolog-packages/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2013/02/06 23:22:39 jperkin Exp $
+# $NetBSD: Makefile,v 1.36 2013/04/06 14:58:20 rodent Exp $
.include "../../lang/swi-prolog-lite/Makefile.common"
@@ -54,7 +54,7 @@ pre-install: checkforx
# Based on misc/openoffice:
DISPLAY?= #empty, if unset
checkforx:
-.if ${DISPLAY} == "" || ${DISPLAY_OK:!${X11BASE}/bin/xdpyinfo >/dev/null 2>&1 && echo YES || echo NO!} == "NO"
+.if ${DISPLAY} == "" || ${DISPLAY_OK:!${X11BASE}/bin/xdpyinfo >/dev/null 2>&1 && ${ECHO} YES || ${ECHO} NO!} == "NO"
. if exists(${X11BASE}/bin/Xvfb)
-${X11BASE}/bin/Xvfb :2 & \
${ECHO} $$! >${WRKDIR}/.Xvfb.pid
diff --git a/mail/fml/Makefile b/mail/fml/Makefile
index d43c6ee5f37..50d75850aff 100644
--- a/mail/fml/Makefile
+++ b/mail/fml/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2013/01/29 15:51:06 taca Exp $
+# $NetBSD: Makefile,v 1.7 2013/04/06 14:58:20 rodent Exp $
#
DISTNAME= fml-7.98.18-${FML_STAMP}
@@ -61,7 +61,7 @@ CHECK_INTERPRETER_SKIP+= lib/fml/${FML_STAMP}/* \
libexec/fml/${FML_STAMP}/loader.in
pre-configure:
- echo ${FML_STAMP} > ${WRKSRC}/.version
+ ${ECHO} ${FML_STAMP} > ${WRKSRC}/.version
post-install:
.for f in ${CONFS}
diff --git a/mail/mailhops/Makefile b/mail/mailhops/Makefile
index 0393e714f88..575dc07487b 100644
--- a/mail/mailhops/Makefile
+++ b/mail/mailhops/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2013/04/06 13:09:25 rodent Exp $
+# $NetBSD: Makefile,v 1.7 2013/04/06 14:58:20 rodent Exp $
#
DISTNAME= mailhops-1.4
@@ -14,7 +14,7 @@ HOMEPAGE= http://www.spinnaker.de/mutt/
COMMENT= Shows the route of an Internet mail message
WRKSRC= ${WRKDIR}
-EXTRACT_CMD= echo ${CP} "$${extract_file}" ${WRKSRC}/mailhops; \
+EXTRACT_CMD= ${ECHO} ${CP} "$${extract_file}" ${WRKSRC}/mailhops; \
${CP} "$${extract_file}" ${WRKSRC}/mailhops
diff --git a/math/muparser/Makefile b/math/muparser/Makefile
index 2efc3df51b5..11e15a22d1c 100644
--- a/math/muparser/Makefile
+++ b/math/muparser/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2012/09/11 23:04:24 asau Exp $
+# $NetBSD: Makefile,v 1.7 2013/04/06 14:58:20 rodent Exp $
#
DISTNAME= muparser_v2_2_2
@@ -21,6 +21,6 @@ GNU_CONFIGURE= yes
PKGCONFIG_OVERRIDE+= build/autoconf/muparser.pc.in
do-test:
- cd ${WRKSRC}/samples/example1 && echo quit | LD_LIBRARY_PATH=../../lib ./example1
+ cd ${WRKSRC}/samples/example1 && ${ECHO} quit | LD_LIBRARY_PATH=../../lib ./example1
.include "../../mk/bsd.pkg.mk"
diff --git a/misc/libkgeomap/Makefile b/misc/libkgeomap/Makefile
index 15882acc07f..b4d53b44e18 100644
--- a/misc/libkgeomap/Makefile
+++ b/misc/libkgeomap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2013/04/03 12:36:51 markd Exp $
+# $NetBSD: Makefile,v 1.12 2013/04/06 14:58:20 rodent Exp $
#
PKGNAME= libkgeomap-3.1.0
@@ -23,9 +23,9 @@ PKGCONFIG_OVERRIDE+= libkgeomap.pc.cmake
WRKSRC= ${WRKDIR}/${DISTNAME}/extra/libkgeomap
post-patch:
- echo "FIND_PACKAGE(Msgfmt REQUIRED)" >> ${WRKSRC}/CMakeLists.txt
- echo "FIND_PACKAGE(Gettext REQUIRED)" >> ${WRKSRC}/CMakeLists.txt
- echo "ADD_SUBDIRECTORY(po)" >> ${WRKSRC}/CMakeLists.txt
+ ${ECHO} "FIND_PACKAGE(Msgfmt REQUIRED)" >> ${WRKSRC}/CMakeLists.txt
+ ${ECHO} "FIND_PACKAGE(Gettext REQUIRED)" >> ${WRKSRC}/CMakeLists.txt
+ ${ECHO} "ADD_SUBDIRECTORY(po)" >> ${WRKSRC}/CMakeLists.txt
ln -s ../../po ${WRKSRC}/po
rm ${WRKSRC}/po/*/digikam.po ${WRKSRC}/po/*/kipiplug* ${WRKSRC}/po/*/libkipi*
diff --git a/net/icsi-finger/Makefile b/net/icsi-finger/Makefile
index a2becfff113..aafc279fb41 100644
--- a/net/icsi-finger/Makefile
+++ b/net/icsi-finger/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2012/10/23 17:18:28 asau Exp $
+# $NetBSD: Makefile,v 1.24 2013/04/06 14:58:20 rodent Exp $
#
DISTNAME= icsi-finger-1.0.29
@@ -22,15 +22,15 @@ INSTALLATION_DIRS+= share/examples/icsi-finger/targets
pre-configure:
chmod +w ${WRKSRC}/config.h
- echo \#define ManDir ${PREFIX}/${PKGMANDIR} >> \
+ ${ECHO} \#define ManDir ${PREFIX}/${PKGMANDIR} >> \
${WRKSRC}/config.h
- echo \#define TARGETDIR \"${PKG_SYSCONFDIR}/fingerdir/targets\"\
+ ${ECHO} \#define TARGETDIR \"${PKG_SYSCONFDIR}/fingerdir/targets\"\
>> ${WRKSRC}/config.h
- echo \#define TargetDir ${PKG_SYSCONFDIR}/fingerdir/targets \
+ ${ECHO} \#define TargetDir ${PKG_SYSCONFDIR}/fingerdir/targets \
>> ${WRKSRC}/config.h
- echo \#define TTYLOCFILE \"${PKG_SYSCONFDIR}/fingerdir/ttylocs\" \
+ ${ECHO} \#define TTYLOCFILE \"${PKG_SYSCONFDIR}/fingerdir/ttylocs\" \
>> ${WRKSRC}/config.h
- echo \#define HOSTCONFIGFILE \"${PKG_SYSCONFDIR}/fingerdir/hostconfig\" \
+ ${ECHO} \#define HOSTCONFIGFILE \"${PKG_SYSCONFDIR}/fingerdir/hostconfig\" \
>> ${WRKSRC}/config.h
${MV} -f ${WRKSRC}/support/inetd.conf-add \
${WRKSRC}/support/inetd.conf-add.bak
diff --git a/security/rid/Makefile b/security/rid/Makefile
index 25b05461788..c3a4dabfd81 100644
--- a/security/rid/Makefile
+++ b/security/rid/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2013/02/06 19:31:05 jperkin Exp $
+# $NetBSD: Makefile,v 1.17 2013/04/06 14:58:20 rodent Exp $
#
DISTNAME= rid-1.11
@@ -21,8 +21,8 @@ CONF_FILES= ${PREFIX}/share/examples/rid/rid.conf ${PKG_SYSCONFDIR}/rid.conf
INSTALLATION_DIRS= sbin share/doc/rid share/examples/rid
post-configure:
- @echo "#undef DEFAULT_YYIN" >> ${WRKSRC}/netconfig.h
- @echo "#define DEFAULT_YYIN \"${PKG_SYSCONFDIR}/rid.conf\"" >> \
+ @${ECHO} "#undef DEFAULT_YYIN" >> ${WRKSRC}/netconfig.h
+ @${ECHO} "#define DEFAULT_YYIN \"${PKG_SYSCONFDIR}/rid.conf\"" >> \
${WRKSRC}/netconfig.h
do-install:
diff --git a/sysutils/checkperms/Makefile b/sysutils/checkperms/Makefile
index 2ad5962e01d..949cf95cca2 100644
--- a/sysutils/checkperms/Makefile
+++ b/sysutils/checkperms/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2013/02/21 07:58:21 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2013/04/06 14:58:21 rodent Exp $
#
DISTNAME= checkperms-1.11
@@ -33,8 +33,8 @@ MAKE_ENV+= NOGCCERROR=yes # see PR 35930
# Avoid catpage regeneration
post-extract:
- echo ".PHONY: checkperms.cat1" >> ${WRKSRC}/Makefile
- echo "checkperms.cat1:" >> ${WRKSRC}/Makefile
- echo "" >> ${WRKSRC}/Makefile
+ ${ECHO} ".PHONY: checkperms.cat1" >> ${WRKSRC}/Makefile
+ ${ECHO} "checkperms.cat1:" >> ${WRKSRC}/Makefile
+ ${ECHO} "" >> ${WRKSRC}/Makefile
.include "../../mk/bsd.pkg.mk"
diff --git a/wm/ethemes/Makefile b/wm/ethemes/Makefile
index f66ce91ead4..2c2bb7dc9f7 100644
--- a/wm/ethemes/Makefile
+++ b/wm/ethemes/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2013/04/06 13:24:20 rodent Exp $
+# $NetBSD: Makefile,v 1.22 2013/04/06 14:58:21 rodent Exp $
DISTNAME= ethemes-0.1
PKGREVISION= 3
@@ -39,7 +39,7 @@ E_THEMES?= Absolute_E-DR16-199911060830.etheme \
do-install:
.for file in ${E_THEMES}
- NAME=`echo ${file} | ${SED} -e s/-DR16.*//` ; \
+ NAME=`${ECHO} ${file} | ${SED} -e s/-DR16.*//` ; \
${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/${E_DATADIR}/$$NAME ; \
${GTAR} -C ${DESTDIR}${PREFIX}/${E_DATADIR}/$$NAME \
-xzf ${DISTDIR}/${DIST_SUBDIR}/${file}
diff --git a/x11/openmotif/Makefile b/x11/openmotif/Makefile
index 32431d2b506..ab6c321d1ce 100644
--- a/x11/openmotif/Makefile
+++ b/x11/openmotif/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.75 2013/02/16 11:18:03 wiz Exp $
+# $NetBSD: Makefile,v 1.76 2013/04/06 14:58:21 rodent Exp $
PKGVER= 2.3.3
DISTNAME= openmotif-${PKGVER}
@@ -101,7 +101,7 @@ post-patch:
${RM} -f $${manpage}.presubst; \
done; \
done
- echo "#include <X11/Xos_r.h>" > ${WRKSRC}/lib/Xm/Xmos_r.h
+ ${ECHO} "#include <X11/Xos_r.h>" > ${WRKSRC}/lib/Xm/Xmos_r.h
# Filter the manpages through tbl.
post-build:
diff --git a/x11/xmindpath/Makefile b/x11/xmindpath/Makefile
index 432639ed2a6..e57361eb34e 100644
--- a/x11/xmindpath/Makefile
+++ b/x11/xmindpath/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2012/10/29 05:07:15 asau Exp $
+# $NetBSD: Makefile,v 1.20 2013/04/06 14:58:21 rodent Exp $
DISTNAME= magicpoint-1.09a
PKGNAME= xmindpath-1.09a
@@ -23,9 +23,9 @@ SPECIAL_PERMS= bin/xmindpath uucp ${REAL_ROOT_GROUP} 4511
.if !empty(MISSING_FEATURES:Merr)
pre-build:
cd ${BUILDLINK_DIR}/include && \
- { echo "#include <nbcompat/cdefs.h>"; \
- echo "#include <stdarg.h>"; \
- echo "#include <nbcompat/err.h>"; \
+ { ${ECHO} "#include <nbcompat/cdefs.h>"; \
+ ${ECHO} "#include <stdarg.h>"; \
+ ${ECHO} "#include <nbcompat/err.h>"; \
} > err.h
.endif
diff --git a/x11/xorg-cf-files/Makefile b/x11/xorg-cf-files/Makefile
index 26e983bcd2a..1e8e45f79b6 100644
--- a/x11/xorg-cf-files/Makefile
+++ b/x11/xorg-cf-files/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2012/10/29 05:07:17 asau Exp $
+# $NetBSD: Makefile,v 1.23 2013/04/06 14:58:21 rodent Exp $
#
DISTNAME= xorg-cf-files-1.0.4
@@ -52,7 +52,7 @@ pre-configure:
-e "s|@MAKE@|${MAKE_PROGRAM}|" ${FILESDIR}/host.def > \
${WRKSRC}/host.def
if [ ${X11BASE} != ${PREFIX} ]; then \
- echo '#define RealProjectRoot ${X11BASE}' >> ${WRKSRC}/host.def; \
+ ${ECHO} '#define RealProjectRoot ${X11BASE}' >> ${WRKSRC}/host.def; \
fi
.include "../../x11/xproto/buildlink3.mk"