summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--editors/vim-gtk/Makefile18
-rw-r--r--editors/vim-gtk/PLIST14
-rw-r--r--editors/vim-gtk2/Makefile18
-rw-r--r--editors/vim-gtk2/PLIST14
-rw-r--r--editors/vim-kde/Makefile8
-rw-r--r--editors/vim-lang/Makefile4
-rw-r--r--editors/vim-motif/Makefile18
-rw-r--r--editors/vim-share/Makefile7
-rw-r--r--editors/vim-share/Makefile.common10
-rw-r--r--editors/vim-xaw/Makefile18
-rw-r--r--editors/vim-xaw/PLIST14
-rw-r--r--editors/vim/Makefile10
12 files changed, 78 insertions, 75 deletions
diff --git a/editors/vim-gtk/Makefile b/editors/vim-gtk/Makefile
index 136542970a4..9d8c20eb63a 100644
--- a/editors/vim-gtk/Makefile
+++ b/editors/vim-gtk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.53 2006/02/28 11:09:47 martti Exp $
+# $NetBSD: Makefile,v 1.54 2006/03/02 10:41:41 martti Exp $
PKGNAME= vim-gtk-${VIM_VERSION}.${VIM_PATCHLEVEL}
#PKGREVISION= 1
@@ -18,14 +18,14 @@ BUILD_TARGET= vim
INSTALL_TARGET= installvimbin
post-install:
- for f in gvim.1 gview.1 rgvim.1 rgview.1; do \
- ${RM} -f ${PREFIX}/man/man1/$$f; \
- ${LN} -s vim.1 ${PREFIX}/man/man1/$$f; \
- done
- for f in gvim gview rgvim rgview rvim rview; do \
- ${RM} -f ${PREFIX}/bin/$$f; \
- ${LN} -s vim ${PREFIX}/bin/$$f; \
- done
+.for f in gvim.1 gview.1 rgvim.1 rgview.1
+ ${RM} -f ${PREFIX:Q}/man/man1/${f:Q}
+ ${LN} -s vim.1 ${PREFIX:Q}/man/man1/${f:Q}
+.endfor
+.for f in gvim gview rgvim rgview rvim rview
+ ${RM} -f ${PREFIX:Q}/bin/${f:Q}
+ ${LN} -s vim ${PREFIX:Q}/bin/${f:Q}
+.endfor
.include "../../devel/ncurses/buildlink3.mk"
.include "../../graphics/xpm/buildlink3.mk"
diff --git a/editors/vim-gtk/PLIST b/editors/vim-gtk/PLIST
index 7b20c0dcede..ff8453ce68c 100644
--- a/editors/vim-gtk/PLIST
+++ b/editors/vim-gtk/PLIST
@@ -1,12 +1,12 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 21:24:12 zuntum Exp $
-bin/vim
-bin/gvim
+@comment $NetBSD: PLIST,v 1.2 2006/03/02 10:41:41 martti Exp $
bin/gview
-bin/rgvim
+bin/gvim
bin/rgview
-bin/rvim
+bin/rgvim
bin/rview
-man/man1/gvim.1
+bin/rvim
+bin/vim
man/man1/gview.1
-man/man1/rgvim.1
+man/man1/gvim.1
man/man1/rgview.1
+man/man1/rgvim.1
diff --git a/editors/vim-gtk2/Makefile b/editors/vim-gtk2/Makefile
index d6a18aeaad4..43440154d38 100644
--- a/editors/vim-gtk2/Makefile
+++ b/editors/vim-gtk2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2006/02/28 11:10:14 martti Exp $
+# $NetBSD: Makefile,v 1.22 2006/03/02 10:41:41 martti Exp $
PKGNAME= vim-gtk2-${VIM_VERSION}.${VIM_PATCHLEVEL}
#PKGREVISION= 1
@@ -18,14 +18,14 @@ BUILD_TARGET= vim
INSTALL_TARGET= installvimbin
post-install:
- for f in gvim.1 gview.1 rgvim.1 rgview.1; do \
- ${RM} -f ${PREFIX}/man/man1/$$f; \
- ${LN} -s vim.1 ${PREFIX}/man/man1/$$f; \
- done
- for f in gvim gview rgvim rgview rvim rview; do \
- ${RM} -f ${PREFIX}/bin/$$f; \
- ${LN} -s vim ${PREFIX}/bin/$$f; \
- done
+.for f in gvim.1 gview.1 rgvim.1 rgview.1
+ ${RM} -f ${PREFIX:Q}/man/man1/${f:Q}
+ ${LN} -s vim.1 ${PREFIX:Q}/man/man1/${f:Q}
+.endfor
+.for f in gvim gview rgvim rgview rvim rview
+ ${RM} -f ${PREFIX:Q}/bin/${f:Q}
+ ${LN} -s vim ${PREFIX:Q}/bin/${f:Q}
+.endfor
.include "../../devel/ncurses/buildlink3.mk"
.include "../../graphics/xpm/buildlink3.mk"
diff --git a/editors/vim-gtk2/PLIST b/editors/vim-gtk2/PLIST
index 38f2afda65b..ff8453ce68c 100644
--- a/editors/vim-gtk2/PLIST
+++ b/editors/vim-gtk2/PLIST
@@ -1,12 +1,12 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/06/02 08:24:45 martti Exp $
-bin/vim
-bin/gvim
+@comment $NetBSD: PLIST,v 1.2 2006/03/02 10:41:41 martti Exp $
bin/gview
-bin/rgvim
+bin/gvim
bin/rgview
-bin/rvim
+bin/rgvim
bin/rview
-man/man1/gvim.1
+bin/rvim
+bin/vim
man/man1/gview.1
-man/man1/rgvim.1
+man/man1/gvim.1
man/man1/rgview.1
+man/man1/rgvim.1
diff --git a/editors/vim-kde/Makefile b/editors/vim-kde/Makefile
index e0286875369..432f0e40e26 100644
--- a/editors/vim-kde/Makefile
+++ b/editors/vim-kde/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2006/02/05 23:08:58 joerg Exp $
+# $NetBSD: Makefile,v 1.33 2006/03/02 10:41:41 martti Exp $
DISTNAME= kvim-${KVIM_VERSION}
PKGNAME= vim-kde-${KVIM_VERSION}
@@ -21,8 +21,8 @@ CONFLICTS+= vim-gtk-[0-9]* vim-gtk2-[0-9]* vim-motif-[0-9]*
CONFLICTS+= vim-share-[0-9]* vim-[0-9]* vim-xaw-[0-9]*
CONFLICTS+= pkg_alternatives-[0-9]*
-WRKSRC= ${WRKDIR}/kvim-${KVIM_VERSION}/src
-USE_DIRS+= xdg-1.1
+WRKSRC= ${WRKDIR}/kvim-${KVIM_VERSION}/src
+USE_DIRS+= xdg-1.1
GNU_CONFIGURE= YES
CONFIGURE_ARGS+= --enable-gui=kde
@@ -31,7 +31,7 @@ CONFIGURE_ARGS+= --with-features=huge
CONFIGURE_ARGS+= --with-tlib=ncurses
post-configure:
- ${TOUCH} ${WRKSRC}/auto/configure ${WRKSRC}/auto/config.mk
+ ${TOUCH} ${WRKSRC:Q}/auto/configure ${WRKSRC:Q}/auto/config.mk
.include "../../devel/ncurses/buildlink3.mk"
.include "../../meta-pkgs/kde3/kde3.mk"
diff --git a/editors/vim-lang/Makefile b/editors/vim-lang/Makefile
index 0fd4a53a1dd..24775533bef 100644
--- a/editors/vim-lang/Makefile
+++ b/editors/vim-lang/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2006/02/28 11:13:21 martti Exp $
+# $NetBSD: Makefile,v 1.7 2006/03/02 10:41:41 martti Exp $
PKGNAME= vim-lang-${VIM_VERSION}.${VIM_PATCHLEVEL}
#PKGREVISION= 1
@@ -15,7 +15,7 @@ INSTALL_TARGET= install-languages
PLIST_SUBST+= VIM_SUBDIR=${VIM_SUBDIR:Q}
-BUILDLINK_DEPMETHOD.gettext-lib?= build
+BUILDLINK_DEPMETHOD.gettext-lib?= build
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/editors/vim-motif/Makefile b/editors/vim-motif/Makefile
index 245af87ace7..25fa83cf906 100644
--- a/editors/vim-motif/Makefile
+++ b/editors/vim-motif/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2006/02/28 11:10:45 martti Exp $
+# $NetBSD: Makefile,v 1.21 2006/03/02 10:41:41 martti Exp $
PKGNAME= vim-motif-${VIM_VERSION}.${VIM_PATCHLEVEL}
#PKGREVISION= 1
@@ -21,14 +21,14 @@ BUILD_TARGET= vim
INSTALL_TARGET= installvimbin
post-install:
- for f in gvim.1 gview.1 rgvim.1 rgview.1; do \
- ${RM} -f ${PREFIX}/man/man1/$$f; \
- ${LN} -s vim.1 ${PREFIX}/man/man1/$$f; \
- done
- for f in gvim gview rgvim rgview rvim rview; do \
- ${RM} -f ${PREFIX}/bin/$$f; \
- ${LN} -s vim ${PREFIX}/bin/$$f; \
- done
+.for f in gvim.1 gview.1 rgvim.1 rgview.1
+ ${RM} -f ${PREFIX:Q}/man/man1/${f:Q}
+ ${LN} -s vim.1 ${PREFIX:Q}/man/man1/${f:Q}
+.endfor
+.for f in gvim gview rgvim rgview rvim rview
+ ${RM} -f ${PREFIX:Q}/bin/${f:Q}
+ ${LN} -s vim ${PREFIX:Q}/bin/${f:Q}
+.endfor
.include "../../devel/ncurses/buildlink3.mk"
.include "../../graphics/xpm/buildlink3.mk"
diff --git a/editors/vim-share/Makefile b/editors/vim-share/Makefile
index e6acf3555b3..cdfe0e4e02b 100644
--- a/editors/vim-share/Makefile
+++ b/editors/vim-share/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2006/03/02 07:27:44 martti Exp $
+# $NetBSD: Makefile,v 1.19 2006/03/02 10:41:41 martti Exp $
PKGNAME= vim-share-${VIM_VERSION}.${VIM_PATCHLEVEL}
PKGREVISION= 1
@@ -11,11 +11,12 @@ CONFIGURE_ARGS+= --disable-gui
INSTALL_TARGET= installruntime installmacros installtutor installtools
USE_TOOLS+= awk
-INSTALL_MAKE_FLAGS+= TOOLS_AWK="${TOOLS_AWK}"
+INSTALL_MAKE_FLAGS+= TOOLS_AWK=${TOOLS_AWK:Q}
PLIST_SUBST+= VIM_SUBDIR=${VIM_SUBDIR:Q}
do-build:
- @cd ${WRKSRC}/xxd && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS}
+ @cd ${WRKSRC:Q}/xxd && \
+ ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS}
.include "../../mk/bsd.pkg.mk"
diff --git a/editors/vim-share/Makefile.common b/editors/vim-share/Makefile.common
index 0ad15cfccca..a86710b8a98 100644
--- a/editors/vim-share/Makefile.common
+++ b/editors/vim-share/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.55 2006/03/02 07:27:44 martti Exp $
+# $NetBSD: Makefile.common,v 1.56 2006/03/02 10:41:41 martti Exp $
.include "../../editors/vim-share/version.mk"
@@ -9,7 +9,7 @@ CATEGORIES= editors
MASTER_SITES= ftp://ftp.vim.org/pub/editors/vim/unix/ \
ftp://ftp.fu-berlin.de/misc/editors/vim/unix/ \
ftp://ftp.twics.co.jp/pub/vim/unix/
-SITES_vim-${VIM_VERSION}-lang.tar.gz= ftp://ftp.vim.org/pub/vim/extra/
+SITES_vim-${VIM_VERSION}-lang.tar.gz= ftp://ftp.vim.org/pub/vim/extra/
DIST_SUBDIR= vim
EXTRACT_SUFX= .tar.bz2
@@ -24,14 +24,16 @@ CONFLICTS+= vim-kde-[0-9]*
WRKSRC= ${WRKDIR}/${VIM_SUBDIR}/src
GNU_CONFIGURE= yes
+.include "../../mk/bsd.prefs.mk"
+
# See "configure --help" extra options. These might affect the installed
# files (and PLIST might not include all files) so use at your own risk!
CONFIGURE_ARGS+= ${VIM_EXTRA_OPTS}
CONFIGURE_ARGS+= --enable-multibyte
-PATCH_ARGS= -d ${WRKDIR}/${VIM_SUBDIR} --forward --quiet \
+PATCH_ARGS= -d ${WRKDIR:Q}/${VIM_SUBDIR:Q} --forward --quiet \
-E ${PATCH_STRIP}
-PATCH_DIST_ARGS= -d ${WRKDIR}/${VIM_SUBDIR} --forward --quiet \
+PATCH_DIST_ARGS= -d ${WRKDIR:Q}/${VIM_SUBDIR:Q} --forward --quiet \
-E ${PATCH_DIST_STRIP}
PATCHDIR?= ${.CURDIR}/../../editors/vim-share/patches
DISTINFO_FILE?= ${.CURDIR}/../../editors/vim-share/distinfo
diff --git a/editors/vim-xaw/Makefile b/editors/vim-xaw/Makefile
index 49965e113e9..045b47d3e71 100644
--- a/editors/vim-xaw/Makefile
+++ b/editors/vim-xaw/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2006/02/28 11:11:13 martti Exp $
+# $NetBSD: Makefile,v 1.43 2006/03/02 10:41:41 martti Exp $
PKGNAME= vim-xaw-${VIM_VERSION}.${VIM_PATCHLEVEL}
#PKGREVISION= 1
@@ -29,14 +29,14 @@ MAKE_ENV+= XAW_LIB="Xaw"
LIBS+= -lXaw
post-install:
- for f in gvim.1 gview.1 rgvim.1 rgview.1; do \
- ${RM} -f ${PREFIX}/man/man1/$$f; \
- ${LN} -s vim.1 ${PREFIX}/man/man1/$$f; \
- done
- for f in gvim gview rgvim rgview rvim rview; do \
- ${RM} -f ${PREFIX}/bin/$$f; \
- ${LN} -s vim ${PREFIX}/bin/$$f; \
- done
+.for f in gvim.1 gview.1 rgvim.1 rgview.1
+ ${RM} -f ${PREFIX:Q}/man/man1/${f:Q}
+ ${LN} -s vim.1 ${PREFIX:Q}/man/man1/${f:Q}
+.endfor
+.for f in gvim gview rgvim rgview rvim rview
+ ${RM} -f ${PREFIX:Q}/bin/${f:Q}
+ ${LN} -s vim ${PREFIX:Q}/bin/${f:Q}
+.endfor
.include "../../devel/ncurses/buildlink3.mk"
.include "../../graphics/xpm/buildlink3.mk"
diff --git a/editors/vim-xaw/PLIST b/editors/vim-xaw/PLIST
index a102ede1947..ff8453ce68c 100644
--- a/editors/vim-xaw/PLIST
+++ b/editors/vim-xaw/PLIST
@@ -1,12 +1,12 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 21:24:16 zuntum Exp $
-bin/vim
-bin/gvim
+@comment $NetBSD: PLIST,v 1.2 2006/03/02 10:41:41 martti Exp $
bin/gview
-bin/rgvim
+bin/gvim
bin/rgview
-bin/rvim
+bin/rgvim
bin/rview
-man/man1/gvim.1
+bin/rvim
+bin/vim
man/man1/gview.1
-man/man1/rgvim.1
+man/man1/gvim.1
man/man1/rgview.1
+man/man1/rgvim.1
diff --git a/editors/vim/Makefile b/editors/vim/Makefile
index da7b8e6b1b0..ad930b30d86 100644
--- a/editors/vim/Makefile
+++ b/editors/vim/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.64 2006/02/10 20:56:57 heinz Exp $
+# $NetBSD: Makefile,v 1.65 2006/03/02 10:41:41 martti Exp $
PKGNAME= vim-${VIM_VERSION}.${VIM_PATCHLEVEL}
#PKGREVISION= 1
@@ -20,10 +20,10 @@ INSTALL_TARGET= installvimbin
TEST_TARGET= check
post-install:
- for f in rvim rview ; do \
- ${RM} -f ${PREFIX}/bin/$$f; \
- ${LN} -s vim ${PREFIX}/bin/$$f; \
- done
+.for f in rvim rview
+ ${RM} -f ${PREFIX:Q}/bin/${f:Q}
+ ${LN} -s vim ${PREFIX:Q}/bin/${f:Q}
+.endfor
.include "../../devel/ncurses/buildlink3.mk"
.include "../../converters/libiconv/buildlink3.mk"
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-09 05:13:51 +0000