Sat Apr 6 11:39:26 2013 UTC ()
"$foo is ambiguous. Use ${foo} if you mean a Makefile variable or $$foo if
you mean a shell variable."
(rodent)
diff -r1.20 -r1.21 pkgsrc/devel/gettext-m4/Makefile
diff -r1.1.1.1 -r1.2 pkgsrc/devel/hdf5-c++/Makefile
diff -r1.62 -r1.63 pkgsrc/lang/f2c/Makefile
diff -r1.43 -r1.44 pkgsrc/lang/openjdk7/Makefile
diff -r1.26 -r1.27 pkgsrc/lang/racket/Makefile
diff -r1.16 -r1.17 pkgsrc/lang/racket-textual/Makefile
diff -r1.5 -r1.6 pkgsrc/sysutils/ansible/Makefile
--- pkgsrc/devel/gettext-m4/Makefile 2013/01/31 21:45:04 1.20
+++ pkgsrc/devel/gettext-m4/Makefile 2013/04/06 11:39:25 1.21
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2013/01/31 21:45:04 adam Exp $
+# $NetBSD: Makefile,v 1.21 2013/04/06 11:39:25 rodent Exp $
.include "../../devel/gettext/Makefile.common"
@@ -21,7 +21,7 @@
${INSTALL_DATA} ${WRKSRC}/gettext-tools/m4/*.m4 \
${DESTDIR}${PREFIX}/share/aclocal
. for i in lib-ld.m4 lib-link.m4 lib-prefix.m4
- ${INSTALL_DATA} ${WRKSRC}/gettext-tools/gnulib-m4/$i \
+ ${INSTALL_DATA} ${WRKSRC}/gettext-tools/gnulib-m4/${i} \
${DESTDIR}${PREFIX}/share/aclocal
. endfor
--- pkgsrc/devel/hdf5-c++/Makefile 2011/10/07 10:42:18 1.1.1.1
+++ pkgsrc/devel/hdf5-c++/Makefile 2013/04/06 11:39:25 1.2
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2011/10/07 10:42:18 alnsn Exp $
+# $NetBSD: Makefile,v 1.2 2013/04/06 11:39:25 rodent Exp $
PKGNAME= hdf5-c++-${HDF5_VER}
COMMENT= Hierarchical Data Format (new generation) - C++ wrappers
@@ -24,15 +24,15 @@
H5Exception.h H5FaccProp.h H5FcreatProp.h H5File.h H5FloatType.h \
H5Group.h H5IdComponent.h H5Include.h H5IntType.h H5Library.h \
H5Object.h H5PredType.h H5PropList.h H5StrType.h H5VarLenType.h
- ${INSTALL_DATA} ${WRKSRC}/c++/src/$f ${DESTDIR}/${PREFIX}/include/
+ ${INSTALL_DATA} ${WRKSRC}/c++/src/${f} ${DESTDIR}/${PREFIX}/include/
.endfor
.for f in chunks.cpp compound.cpp create.cpp extend_ds.cpp \
h5group.cpp readdata.cpp run-c++-ex.sh writedata.cpp
- ${INSTALL_DATA} ${WRKSRC}/c++/examples/$f \
+ ${INSTALL_DATA} ${WRKSRC}/c++/examples/${f} \
${DESTDIR}/${PREFIX}/share/examples/hdf5/c++/
.endfor
.for f in ptExampleFL.cpp ptExampleVL.cpp run-hlc++-ex.sh
- ${INSTALL_DATA} ${WRKSRC}/hl/c++/examples/$f \
+ ${INSTALL_DATA} ${WRKSRC}/hl/c++/examples/${f} \
${DESTDIR}/${PREFIX}/share/examples/hdf5/hl/c++/
.endfor
--- pkgsrc/lang/f2c/Makefile 2012/10/02 20:11:39 1.62
+++ pkgsrc/lang/f2c/Makefile 2013/04/06 11:39:25 1.63
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.62 2012/10/02 20:11:39 asau Exp $
+# $NetBSD: Makefile,v 1.63 2013/04/06 11:39:25 rodent Exp $
DISTNAME= f2c-20100903 # see notes below
CATEGORIES= lang
@@ -45,7 +45,7 @@
${INSTALL_SCRIPT} ${WRKSRC}/f2c-f77 ${DESTDIR}${PREFIX}/bin
${INSTALL_DATA} ${WRKSRC}/f2c.1t ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/f2c.1
.for f in changes f2c.ps f2c.pdf
- ${INSTALL_DATA} ${WRKSRC}/$f ${DESTDIR}${PREFIX}/share/doc/f2c/$f
+ ${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${PREFIX}/share/doc/f2c/${f}
.endfor
# Note. the distfile is kept locally because it is
--- pkgsrc/lang/openjdk7/Attic/Makefile 2013/02/16 11:22:52 1.43
+++ pkgsrc/lang/openjdk7/Attic/Makefile 2013/04/06 11:39:26 1.44
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2013/02/16 11:22:52 wiz Exp $
+# $NetBSD: Makefile,v 1.44 2013/04/06 11:39:26 rodent Exp $
DISTNAME= openjdk-7-fcs-src-b147-27_jun_2011
PKGNAME= openjdk7-1.7.0.147.20110811
@@ -129,10 +129,10 @@
${WRKDIR} > ${WRKDIR}/bootstrap/bin/java
chmod a+x ${WRKDIR}/bootstrap/bin/java
.for T in idlj jar javac javah javap native2ascii rmic
- mv ${WRKDIR}/bootstrap/bin/$T ${WRKDIR}/bootstrap/bin/$T-real
- printf '#!/bin/sh\n\nexec %s/bootstrap/bin/$T-real -J-mx256m "$$@"\n' \
- ${WRKDIR} > ${WRKDIR}/bootstrap/bin/$T
- chmod a+x ${WRKDIR}/bootstrap/bin/$T
+ mv ${WRKDIR}/bootstrap/bin/${T} ${WRKDIR}/bootstrap/bin/${T}-real
+ printf '#!/bin/sh\n\nexec %s/bootstrap/bin/${T}-real -J-mx256m "$$@"\n' \
+ ${WRKDIR} > ${WRKDIR}/bootstrap/bin/${T}
+ chmod a+x ${WRKDIR}/bootstrap/bin/${T}
.endfor
do-build: ${WRKDIR}/stage3-done
--- pkgsrc/lang/racket/Makefile 2013/02/16 21:20:21 1.26
+++ pkgsrc/lang/racket/Makefile 2013/04/06 11:39:26 1.27
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2013/02/16 21:20:21 asau Exp $
+# $NetBSD: Makefile,v 1.27 2013/04/06 11:39:26 rodent Exp $
PKGNAME= racket-5.3.3
DISTNAME= $(PKGNAME_NOREV)-src-unix
@@ -43,7 +43,7 @@
CHECK_INTERPRETER_SKIP+= lib/racket/collects/tests/jpr/mon-script.ss
.for f in use-c-printf.rkt use-crypt.rkt use-esd.rkt use-magick.rkt use-sndfile.rkt use-tcl.rkt use-xmmsctrl.rkt use-xosd.rkt
-REPLACE_RACKET+= collects/ffi/examples/$f
+REPLACE_RACKET+= collects/ffi/examples/${f}
.endfor
REPLACE_INTERPRETER+= racket
--- pkgsrc/lang/racket-textual/Makefile 2013/02/16 21:20:22 1.16
+++ pkgsrc/lang/racket-textual/Makefile 2013/04/06 11:39:26 1.17
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2013/02/16 21:20:22 asau Exp $
+# $NetBSD: Makefile,v 1.17 2013/04/06 11:39:26 rodent Exp $
PKGNAME= racket-textual-5.3.3
DISTNAME= $(PKGNAME_NOREV)-src-unix
@@ -39,7 +39,7 @@
CHECK_INTERPRETER_SKIP+= lib/racket/collects/tests/jpr/mon-script.ss
.for f in use-c-printf.rkt use-crypt.rkt use-esd.rkt use-magick.rkt use-sndfile.rkt use-tcl.rkt use-xmmsctrl.rkt use-xosd.rkt
-REPLACE_RACKET+= collects/ffi/examples/$f
+REPLACE_RACKET+= collects/ffi/examples/${f}
.endfor
REPLACE_INTERPRETER+= racket
--- pkgsrc/sysutils/ansible/Makefile 2013/04/06 03:45:23 1.5
+++ pkgsrc/sysutils/ansible/Makefile 2013/04/06 11:39:26 1.6
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2013/04/06 03:45:23 rodent Exp $
+# $NetBSD: Makefile,v 1.6 2013/04/06 11:39:26 rodent Exp $
#
DISTNAME= ansible-1.0
@@ -59,13 +59,13 @@
post-install:
.for f in ${MANPAGES}
- ${INSTALL_MAN} ${WRKSRC}/docs/man/man1/$f \
+ ${INSTALL_MAN} ${WRKSRC}/docs/man/man1/${f} \
${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/
.endfor
${INSTALL_MAN} ${WRKSRC}/docs/man/man3/* \
${DESTDIR}${PREFIX}/${PKGMANDIR}/man3/
.for f in ansible.cfg hosts
- ${INSTALL_DATA} ${WRKSRC}/examples/$f \
+ ${INSTALL_DATA} ${WRKSRC}/examples/${f} \
${DESTDIR}/${EGDIR}
.endfor
${INSTALL_DATA_DIR} ${DESTDIR}/${EGDIR}/playbooks
@@ -73,9 +73,9 @@
${INSTALL_DATA} $$f ${DESTDIR}/${EGDIR}/playbooks; \
done
.for f in filter_plugins handlers tasks templates vars
- ${INSTALL_DATA_DIR} ${DESTDIR}/${EGDIR}/playbooks/$f
- for g in ${WRKSRC}/examples/playbooks/$f/*; do \
- ${INSTALL_DATA} $$g ${DESTDIR}/${EGDIR}/playbooks/$f; \
+ ${INSTALL_DATA_DIR} ${DESTDIR}/${EGDIR}/playbooks/${f}
+ for g in ${WRKSRC}/examples/playbooks/${f}/*; do \
+ ${INSTALL_DATA} $$g ${DESTDIR}/${EGDIR}/playbooks/${f}; \
done
.endfor