[pkgsrc/trunk]: pkgsrc/editors Some "pkglint -Wall" fixes.

[martti <martti%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/0bcddcfc79a5
branches:  trunk
changeset: 537466:0bcddcfc79a5
user:      martti <martti%pkgsrc.org@localhost>
date:      Wed Jan 09 13:47:42 2008 +0000

description:
Some "pkglint -Wall" fixes.

diffstat:

 editors/vim-gtk/Makefile          |  10 +++++-----
 editors/vim-gtk2/Makefile         |  10 +++++-----
 editors/vim-kde/Makefile          |   6 +++---
 editors/vim-lang/Makefile         |   4 ++--
 editors/vim-motif/Makefile        |  14 +++++++-------
 editors/vim-share/Makefile.common |   9 ++++++++-
 editors/vim-xaw/Makefile          |  10 +++++-----
 editors/vim/Makefile              |   6 +++---
 8 files changed, 38 insertions(+), 31 deletions(-)

diffs (194 lines):

diff -r c963d546edb4 -r 0bcddcfc79a5 editors/vim-gtk/Makefile
--- a/editors/vim-gtk/Makefile  Wed Jan 09 13:42:47 2008 +0000
+++ b/editors/vim-gtk/Makefile  Wed Jan 09 13:47:42 2008 +0000
@@ -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 @@
 
 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 -r c963d546edb4 -r 0bcddcfc79a5 editors/vim-gtk2/Makefile
--- a/editors/vim-gtk2/Makefile Wed Jan 09 13:42:47 2008 +0000
+++ b/editors/vim-gtk2/Makefile Wed Jan 09 13:47:42 2008 +0000
@@ -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 @@
 
 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 -r c963d546edb4 -r 0bcddcfc79a5 editors/vim-kde/Makefile
--- a/editors/vim-kde/Makefile  Wed Jan 09 13:42:47 2008 +0000
+++ b/editors/vim-kde/Makefile  Wed Jan 09 13:47:42 2008 +0000
@@ -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@localhost
@@ -30,7 +30,7 @@
 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 -r c963d546edb4 -r 0bcddcfc79a5 editors/vim-lang/Makefile
--- a/editors/vim-lang/Makefile Wed Jan 09 13:42:47 2008 +0000
+++ b/editors/vim-lang/Makefile Wed Jan 09 13:47:42 2008 +0000
@@ -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 @@
 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 -r c963d546edb4 -r 0bcddcfc79a5 editors/vim-motif/Makefile
--- a/editors/vim-motif/Makefile        Wed Jan 09 13:42:47 2008 +0000
+++ b/editors/vim-motif/Makefile        Wed Jan 09 13:47:42 2008 +0000
@@ -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 @@
 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 @@
 
 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 -r c963d546edb4 -r 0bcddcfc79a5 editors/vim-share/Makefile.common
--- a/editors/vim-share/Makefile.common Wed Jan 09 13:42:47 2008 +0000
+++ b/editors/vim-share/Makefile.common Wed Jan 09 13:47:42 2008 +0000
@@ -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 -r c963d546edb4 -r 0bcddcfc79a5 editors/vim-xaw/Makefile
--- a/editors/vim-xaw/Makefile  Wed Jan 09 13:42:47 2008 +0000
+++ b/editors/vim-xaw/Makefile  Wed Jan 09 13:47:42 2008 +0000
@@ -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 @@
 
 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 -r c963d546edb4 -r 0bcddcfc79a5 editors/vim/Makefile
--- a/editors/vim/Makefile      Wed Jan 09 13:42:47 2008 +0000
+++ b/editors/vim/Makefile      Wed Jan 09 13:47:42 2008 +0000
@@ -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 @@
 
 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"