pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc Replaced $f with ${f} to fix some pkglint warnings.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/a800fe5bc5eb
branches:  trunk
changeset: 501559:a800fe5bc5eb
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Sun Oct 23 21:54:35 2005 +0000

description:
Replaced $f with ${f} to fix some pkglint warnings.

diffstat:

 pkgtools/dfdisk/Makefile       |  7 +++----
 security/logcheck/Makefile     |  5 ++---
 sysutils/screentest/Makefile   |  5 ++---
 sysutils/user_interix/Makefile |  4 ++--
 wm/ion/Makefile                |  5 ++---
 wm/ion3-devel/Makefile         |  7 +++----
 wm/weewm/Makefile              |  4 ++--
 x11/wdm/Makefile               |  5 ++---
 8 files changed, 18 insertions(+), 24 deletions(-)

diffs (164 lines):

diff -r 081d8247220f -r a800fe5bc5eb pkgtools/dfdisk/Makefile
--- a/pkgtools/dfdisk/Makefile  Sun Oct 23 21:45:57 2005 +0000
+++ b/pkgtools/dfdisk/Makefile  Sun Oct 23 21:54:35 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/06/17 03:50:29 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2005/10/23 21:54:35 rillig Exp $
 #
 
 DISTNAME=      dfdisk-1.0
@@ -31,10 +31,9 @@
 
 do-build:
 .for f in dfdisk.sh dfdisk.1 dfdisk.conf
-       @${ECHO} "Generating $f..."
-       @${SED} ${FILES_SUBST_SED} < ${FILESDIR}/$f > ${WRKDIR}/$f
+       @${ECHO} "Generating ${f}..."
+       @${SED} ${FILES_SUBST_SED} < ${FILESDIR}/${f} > ${WRKDIR}/${f}
 .endfor
-.undef f
 
 do-install:
        ${INSTALL_SCRIPT} ${WRKDIR}/dfdisk.sh ${PREFIX}/bin/dfdisk
diff -r 081d8247220f -r a800fe5bc5eb security/logcheck/Makefile
--- a/security/logcheck/Makefile        Sun Oct 23 21:45:57 2005 +0000
+++ b/security/logcheck/Makefile        Sun Oct 23 21:54:35 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/04/11 21:47:13 tv Exp $
+# $NetBSD: Makefile,v 1.11 2005/10/23 21:55:11 rillig Exp $
 
 DISTNAME=      logcheck-1.1.1
 PKGREVISION=   1
@@ -17,9 +17,8 @@
 EGDIR=         ${PREFIX}/share/examples/logcheck
 CONF_FILES=
 .for f in hacking ignore violations violations.ignore
-CONF_FILES+=   ${EGDIR}/logcheck.$f ${PKG_SYSCONFDIR}/logcheck.$f
+CONF_FILES+=   ${EGDIR}/logcheck.${f} ${PKG_SYSCONFDIR}/logcheck.${f}
 .endfor
-.undef f
 
 pre-configure:
        @${MV} ${WRKSRC}/Makefile ${WRKSRC}/Makefile.old
diff -r 081d8247220f -r a800fe5bc5eb sysutils/screentest/Makefile
--- a/sysutils/screentest/Makefile      Sun Oct 23 21:45:57 2005 +0000
+++ b/sysutils/screentest/Makefile      Sun Oct 23 21:54:35 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/06/01 18:03:22 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2005/10/23 21:55:40 rillig Exp $
 #
 
 DISTNAME=      screentest-1.0
@@ -15,9 +15,8 @@
 post-install:
        ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/screentest
 .for f in AUTHORS ChangeLog NEWS README
-       ${INSTALL_DATA} ${WRKSRC}/$f ${PREFIX}/share/doc/screentest
+       ${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/share/doc/screentest
 .endfor
-.undef f
 
 .include "../../x11/gtk/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 081d8247220f -r a800fe5bc5eb sysutils/user_interix/Makefile
--- a/sysutils/user_interix/Makefile    Sun Oct 23 21:45:57 2005 +0000
+++ b/sysutils/user_interix/Makefile    Sun Oct 23 21:54:35 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/06/17 03:50:36 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2005/10/23 21:56:41 rillig Exp $
 #
 
 DISTNAME=              user-20040426
@@ -22,7 +22,7 @@
 
 do-install:
 .for f in useradd userdel groupadd groupdel
-       ${INSTALL_SCRIPT} ${FILESDIR}/$f.sh ${PREFIX}/sbin/$f
+       ${INSTALL_SCRIPT} ${FILESDIR}/${f}.sh ${PREFIX}/sbin/${f}
 .endfor
 
 .include "../../mk/bsd.pkg.mk"
diff -r 081d8247220f -r a800fe5bc5eb wm/ion/Makefile
--- a/wm/ion/Makefile   Sun Oct 23 21:45:57 2005 +0000
+++ b/wm/ion/Makefile   Sun Oct 23 21:54:35 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2005/09/04 05:00:36 jlam Exp $
+# $NetBSD: Makefile,v 1.25 2005/10/23 21:57:22 rillig Exp $
 #
 
 DISTNAME=      ion-2-20040729
@@ -30,9 +30,8 @@
                        query.lua draw.lua pwm.lua pwm-bindings.lua     \
                        pwm-menus.lua dock.lua dock-draw.lua
 .for f in ${EGFILES}
-CONF_FILES+=           ${EGDIR}/$f ${PKG_SYSCONFDIR}/$f
+CONF_FILES+=           ${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f}
 .endfor
-.undef f
 
 INSTALLATION_DIRS=     bin lib/ion libexec/ion man/man1
 INSTALLATION_DIRS+=    share/doc/ion share/examples/ion share/ion
diff -r 081d8247220f -r a800fe5bc5eb wm/ion3-devel/Makefile
--- a/wm/ion3-devel/Makefile    Sun Oct 23 21:45:57 2005 +0000
+++ b/wm/ion3-devel/Makefile    Sun Oct 23 21:54:35 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/09/04 05:00:36 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2005/10/23 21:59:59 rillig Exp $
 #
 
 DISTNAME=      ion-3ds-20040906
@@ -35,9 +35,8 @@
                        look_greyviolet.lua look_ios.lua                \
                        look_simpleblue.lua look_wheat2.lua
 .for f in ${EGFILES}
-CONF_FILES+=           ${EGDIR}/$f ${PKG_SYSCONFDIR}/$f
+CONF_FILES+=           ${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f}
 .endfor
-.undef f
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../lang/lua/buildlink3.mk"
@@ -48,4 +47,4 @@
 # and ion3's autoconf is rather broken in the way it auto-configures
 # itself for gettext.  Eventually ion3 should be fixed, but right now
 # it is not really possible.
-LIBS=
+LIBS=                  # none
diff -r 081d8247220f -r a800fe5bc5eb wm/weewm/Makefile
--- a/wm/weewm/Makefile Sun Oct 23 21:45:57 2005 +0000
+++ b/wm/weewm/Makefile Sun Oct 23 21:54:35 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/06/17 03:50:39 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2005/10/23 22:00:46 rillig Exp $
 #
 
 DISTNAME=      weewm-0.0.2
@@ -26,7 +26,7 @@
        ${INSTALL_DATA} ${WRKSRC}/examples/keys.rc ${EXAMPLESDIR}
        ${INSTALL_DATA_DIR} ${DOCDIR}
 .for f in AUTHORS FAQ README
-       ${INSTALL_DATA} ${WRKSRC}/$f ${DOCDIR}
+       ${INSTALL_DATA} ${WRKSRC}/${f} ${DOCDIR}
 .endfor
 
 .include "../../mk/bsd.pkg.mk"
diff -r 081d8247220f -r a800fe5bc5eb x11/wdm/Makefile
--- a/x11/wdm/Makefile  Sun Oct 23 21:45:57 2005 +0000
+++ b/x11/wdm/Makefile  Sun Oct 23 21:54:35 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2005/09/22 21:33:45 jmmv Exp $
+# $NetBSD: Makefile,v 1.24 2005/10/23 22:01:26 rillig Exp $
 
 DISTNAME=              wdm-1.25
 PKGREVISION=           6
@@ -41,9 +41,8 @@
                Xresources Xservers Xservers.fs Xservers.ws Xsession    \
                Xsession.XFree86 Xsession.orig Xsetup_0 wdm-config      \
                wdm-config.in wdmReconfig
-CONF_FILES+=   ${PREFIX}/share/examples/wdm/$f ${PKG_SYSCONFDIR}/$f
+CONF_FILES+=   ${PREFIX}/share/examples/wdm/${f} ${PKG_SYSCONFDIR}/${f}
 .endfor
-.undef f
 
 .include "../../mk/bsd.prefs.mk"
 



Home | Main Index | Thread Index | Old Index