Some "pkglint -Wall" fixes.

8 files changed, 38 insertions, 31 deletions

diff --git a/editors/vim-gtk/Makefile b/editors/vim-gtk/Makefile
index dafa7a0e877..8a55f490f69 100644
--- a/editors/vim-gtk/Makefile
+++ b/editors/vim-gtk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.56 2007/05/18 22:49:01 heinz Exp $
+# $NetBSD: Makefile,v 1.57 2008/01/09 13:47:43 martti Exp $
 
 PKGNAME=		vim-gtk-${VIM_VERSION}.${VIM_PATCHLEVEL}
 #PKGREVISION=		1
@@ -26,12 +26,12 @@ CHECK_INTERPRETER_SKIP+=${PKGMANDIR}/man1/rgvim.1 ${PKGMANDIR}/man1/rgview.1
 
 post-install:
 .for f in gvim.1 gview.1 rgvim.1 rgview.1
-	${RM} -f ${DESTDIR:Q}${PREFIX:Q}/${PKGMANDIR}/man1/${f:Q}
-	${LN} -s vim.1 ${DESTDIR:Q}${PREFIX:Q}/${PKGMANDIR}/man1/${f:Q}
+	${RM} -f ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/${f}
+	${LN} -s vim.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/${f}
 .endfor
 .for f in gvim gview rgvim rgview rvim rview
-	${RM} -f ${DESTDIR:Q}${PREFIX:Q}/bin/${f:Q}
-	${LN} -s vim ${DESTDIR:Q}${PREFIX:Q}/bin/${f:Q}
+	${RM} -f ${DESTDIR}${PREFIX}/bin/${f}
+	${LN} -s vim ${DESTDIR}${PREFIX}/bin/${f}
 .endfor
 
 .include "../../devel/ncurses/buildlink3.mk"
diff --git a/editors/vim-gtk2/Makefile b/editors/vim-gtk2/Makefile
index c99fed1dec1..a9c5c875c7f 100644
--- a/editors/vim-gtk2/Makefile
+++ b/editors/vim-gtk2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2007/05/19 00:11:59 heinz Exp $
+# $NetBSD: Makefile,v 1.28 2008/01/09 13:47:43 martti Exp $
 
 PKGNAME=		vim-gtk2-${VIM_VERSION}.${VIM_PATCHLEVEL}
 #PKGREVISION=		1
@@ -28,12 +28,12 @@ CHECK_INTERPRETER_SKIP+=${PKGMANDIR}/man1/rgvim.1 ${PKGMANDIR}/man1/rgview.1
 
 post-install:
 .for f in gvim.1 gview.1 rgvim.1 rgview.1
-	${RM} -f ${DESTDIR:Q}${PREFIX:Q}/${PKGMANDIR}/man1/${f:Q}
-	${LN} -s vim.1 ${DESTDIR:Q}${PREFIX:Q}/${PKGMANDIR}/man1/${f:Q}
+	${RM} -f ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/${f}
+	${LN} -s vim.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/${f}
 .endfor
 .for f in gvim gview rgvim rgview rvim rview
-	${RM} -f ${DESTDIR:Q}${PREFIX:Q}/bin/${f:Q}
-	${LN} -s vim ${DESTDIR:Q}${PREFIX:Q}/bin/${f:Q}
+	${RM} -f ${DESTDIR}${PREFIX}/bin/${f}
+	${LN} -s vim ${DESTDIR}${PREFIX}/bin/${f}
 .endfor
 
 .include "../../devel/ncurses/buildlink3.mk"
diff --git a/editors/vim-kde/Makefile b/editors/vim-kde/Makefile
index c33a1e4b96c..ec5a12de899 100644
--- a/editors/vim-kde/Makefile
+++ b/editors/vim-kde/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.48 2007/12/02 11:58:59 wiz Exp $
+# $NetBSD: Makefile,v 1.49 2008/01/09 13:47:43 martti Exp $
 
 DISTNAME=	kvim-${KVIM_VERSION}
 PKGNAME=	vim-kde-${KVIM_VERSION}
 PKGREVISION=	14
 CATEGORIES=	editors kde
-MASTER_SITES=	ftp://ftp.kde.org/pub/kde/stable/apps/KDE3.x/utils/
+MASTER_SITES=	${MASTER_SITE_KDE:=apps/KDE3.x/utils/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
@@ -30,7 +30,7 @@ CONFIGURE_ARGS+=	--with-features=huge
 CONFIGURE_ARGS+=	--with-tlib=ncurses
 
 post-configure:
-	${TOUCH} ${WRKSRC:Q}/auto/configure ${WRKSRC:Q}/auto/config.mk
+	${TOUCH} ${WRKSRC}/auto/configure ${WRKSRC}/auto/config.mk
 
 .include "../../meta-pkgs/kde3/kde3.mk"
 .include "../../devel/ncurses/buildlink3.mk"
diff --git a/editors/vim-lang/Makefile b/editors/vim-lang/Makefile
index c86887df082..416d2d71b09 100644
--- a/editors/vim-lang/Makefile
+++ b/editors/vim-lang/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2007/07/02 07:47:59 martti Exp $
+# $NetBSD: Makefile,v 1.13 2008/01/09 13:47:43 martti Exp $
 
 PKGNAME=	vim-lang-${VIM_VERSION}.${VIM_PATCHLEVEL}
 #PKGREVISION=	1
@@ -13,7 +13,7 @@ USE_TOOLS+=	msgfmt
 BUILD_TARGET=	languages
 INSTALL_TARGET=	install-languages
 
-PLIST_SUBST+=	VIM_SUBDIR=${VIM_SUBDIR:Q}
+PLIST_SUBST+=	VIM_SUBDIR=${VIM_SUBDIR}
 
 BUILDLINK_DEPMETHOD.gettext-lib?=	build
 
diff --git a/editors/vim-motif/Makefile b/editors/vim-motif/Makefile
index 7918a760807..38e4f9540f9 100644
--- a/editors/vim-motif/Makefile
+++ b/editors/vim-motif/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2007/05/18 23:55:53 heinz Exp $
+# $NetBSD: Makefile,v 1.26 2008/01/09 13:47:43 martti Exp $
 
 PKGNAME=		vim-motif-${VIM_VERSION}.${VIM_PATCHLEVEL}
 #PKGREVISION=		1
@@ -16,8 +16,8 @@ CONFLICTS+=		vim-xaw-[0-9]* vim-kde-[0-9]*
 CONFIGURE_ARGS+=	--enable-gui=motif
 CONFIGURE_ARGS+=	--with-tlib=ncurses
 
-CONFIGURE_ENV+=		BUILDLINK_DIR=${BUILDLINK_DIR:Q}
-MAKE_ENV+=		BUILDLINK_DIR=${BUILDLINK_DIR:Q}
+CONFIGURE_ENV+=		BUILDLINK_DIR=${BUILDLINK_DIR}
+MAKE_ENV+=		BUILDLINK_DIR=${BUILDLINK_DIR}
 
 BUILD_TARGET=		vim
 INSTALL_TARGET=		installvimbin
@@ -29,12 +29,12 @@ CHECK_INTERPRETER_SKIP+=${PKGMANDIR}/man1/rgvim.1 ${PKGMANDIR}/man1/rgview.1
 
 post-install:
 .for f in gvim.1 gview.1 rgvim.1 rgview.1
-	${RM} -f ${DESTDIR:Q}${PREFIX:Q}/${PKGMANDIR}/man1/${f:Q}
-	${LN} -s vim.1 ${DESTDIR:Q}${PREFIX:Q}/${PKGMANDIR}/man1/${f:Q}
+	${RM} -f ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/${f}
+	${LN} -s vim.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/${f}
 .endfor
 .for f in gvim gview rgvim rgview rvim rview
-	${RM} -f ${DESTDIR:Q}${PREFIX:Q}/bin/${f:Q}
-	${LN} -s vim ${DESTDIR:Q}${PREFIX:Q}/bin/${f:Q}
+	${RM} -f ${DESTDIR}${PREFIX}/bin/${f}
+	${LN} -s vim ${DESTDIR}${PREFIX}/bin/${f}
 .endfor
 
 .include "../../devel/ncurses/buildlink3.mk"
diff --git a/editors/vim-share/Makefile.common b/editors/vim-share/Makefile.common
index 762c23497bd..399691c492b 100644
--- a/editors/vim-share/Makefile.common
+++ b/editors/vim-share/Makefile.common
@@ -1,4 +1,11 @@
-# $NetBSD: Makefile.common,v 1.99 2008/01/09 13:37:45 martti Exp $
+# $NetBSD: Makefile.common,v 1.100 2008/01/09 13:47:43 martti Exp $
+
+# used by editors/vim/Makefile
+# used by editors/vim-gtk/Makefile
+# used by editors/vim-gtk2/Makefile
+# used by editors/vim-lang/Makefile
+# used by editors/vim-motif/Makefile
+# used by editors/vim-xaw/Makefile
 
 .include "../../editors/vim-share/version.mk"
 
diff --git a/editors/vim-xaw/Makefile b/editors/vim-xaw/Makefile
index f283e1eaac4..0e84aea6d07 100644
--- a/editors/vim-xaw/Makefile
+++ b/editors/vim-xaw/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2007/05/18 23:46:31 heinz Exp $
+# $NetBSD: Makefile,v 1.46 2008/01/09 13:47:43 martti Exp $
 
 PKGNAME=		vim-xaw-${VIM_VERSION}.${VIM_PATCHLEVEL}
 #PKGREVISION=		1
@@ -37,12 +37,12 @@ CHECK_INTERPRETER_SKIP+=${PKGMANDIR}/man1/rgvim.1 ${PKGMANDIR}/man1/rgview.1
 
 post-install:
 .for f in gvim.1 gview.1 rgvim.1 rgview.1
-	${RM} -f ${DESTDIR:Q}${PREFIX:Q}/${PKGMANDIR}/man1/${f:Q}
-	${LN} -s vim.1 ${DESTDIR:Q}${PREFIX:Q}/${PKGMANDIR}/man1/${f:Q}
+	${RM} -f ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/${f}
+	${LN} -s vim.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/${f}
 .endfor
 .for f in gvim gview rgvim rgview rvim rview
-	${RM} -f ${DESTDIR:Q}${PREFIX:Q}/bin/${f:Q}
-	${LN} -s vim ${DESTDIR:Q}${PREFIX:Q}/bin/${f:Q}
+	${RM} -f ${DESTDIR}${PREFIX}/bin/${f}
+	${LN} -s vim ${DESTDIR}${PREFIX}/bin/${f}
 .endfor
 
 .include "../../devel/ncurses/buildlink3.mk"
diff --git a/editors/vim/Makefile b/editors/vim/Makefile
index 10ab8794f50..7d9188b57c7 100644
--- a/editors/vim/Makefile
+++ b/editors/vim/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.66 2008/01/03 23:20:50 heinz Exp $
+# $NetBSD: Makefile,v 1.67 2008/01/09 13:47:42 martti Exp $
 
 PKGNAME=		vim-${VIM_VERSION}.${VIM_PATCHLEVEL}
 #PKGREVISION=		1
@@ -23,8 +23,8 @@ TEST_TARGET=		check
 
 post-install:
 .for f in rvim rview
-	${RM} -f ${DESTDIR:Q}${PREFIX:Q}/bin/${f:Q}
-	${LN} -s vim ${DESTDIR:Q}${PREFIX:Q}/bin/${f:Q}
+	${RM} -f ${DESTDIR}${PREFIX}/bin/${f}
+	${LN} -s vim ${DESTDIR}${PREFIX}/bin/${f}
 .endfor
 
 .include "../../devel/ncurses/buildlink3.mk"