diff options
| -rw-r--r-- | pkgtools/dfdisk/Makefile | 7 | ||||
| -rw-r--r-- | security/logcheck/Makefile | 5 | ||||
| -rw-r--r-- | sysutils/screentest/Makefile | 5 | ||||
| -rw-r--r-- | sysutils/user_interix/Makefile | 4 | ||||
| -rw-r--r-- | wm/ion/Makefile | 5 | ||||
| -rw-r--r-- | wm/ion3-devel/Makefile | 7 | ||||
| -rw-r--r-- | wm/weewm/Makefile | 4 | ||||
| -rw-r--r-- | x11/wdm/Makefile | 5 |
8 files changed, 18 insertions, 24 deletions
diff --git a/pkgtools/dfdisk/Makefile b/pkgtools/dfdisk/Makefile index 0df0d6aafef..c44c4a97dfd 100644 --- a/pkgtools/dfdisk/Makefile +++ b/pkgtools/dfdisk/Makefile @@ -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 @@ INSTALLATION_DIRS= bin man/man1 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 --git a/security/logcheck/Makefile b/security/logcheck/Makefile index f4905a31f39..cec9336021d 100644 --- a/security/logcheck/Makefile +++ b/security/logcheck/Makefile @@ -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 @@ PKG_SYSCONFSUBDIR= logcheck 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 --git a/sysutils/screentest/Makefile b/sysutils/screentest/Makefile index 3f1f68ecbd1..b08af0cded5 100644 --- a/sysutils/screentest/Makefile +++ b/sysutils/screentest/Makefile @@ -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 @@ GNU_CONFIGURE= yes 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 --git a/sysutils/user_interix/Makefile b/sysutils/user_interix/Makefile index 011570fc0fa..7ddef1bf52e 100644 --- a/sysutils/user_interix/Makefile +++ b/sysutils/user_interix/Makefile @@ -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 @@ INSTALLATION_DIRS= sbin 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 --git a/wm/ion/Makefile b/wm/ion/Makefile index 4916d3bcc77..ac55cc97191 100644 --- a/wm/ion/Makefile +++ b/wm/ion/Makefile @@ -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 @@ EGFILES= floatws.lua ion-bindings.lua ion-menus.lua \ 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 --git a/wm/ion3-devel/Makefile b/wm/ion3-devel/Makefile index 1750047e1b9..ba57006f211 100644 --- a/wm/ion3-devel/Makefile +++ b/wm/ion3-devel/Makefile @@ -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 @@ EGFILES= cfg_bindings.lua cfg_dock.lua cfg_floatws.lua \ 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 @@ CONF_FILES+= ${EGDIR}/$f ${PKG_SYSCONFDIR}/$f # 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 --git a/wm/weewm/Makefile b/wm/weewm/Makefile index 555ecee2100..fa4783e135d 100644 --- a/wm/weewm/Makefile +++ b/wm/weewm/Makefile @@ -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 @@ do-install: ${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 --git a/x11/wdm/Makefile b/x11/wdm/Makefile index a4a852207f0..5e23e9fafe4 100644 --- a/x11/wdm/Makefile +++ b/x11/wdm/Makefile @@ -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 @@ CONF_FILES= 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" |