From 83e755d1a228f531fcbbfe3a41eb8fc6a36e4ec3 Mon Sep 17 00:00:00 2001 From: martti Date: Tue, 18 Jul 2006 10:27:16 +0000 Subject: * Make sure PATCHDIR is always set so that the patches are really used. This fixes the vim-motif build. * Update to 7.0.39 3990 7.0.036 can't compile with small features and syntax HL 1880 7.0.037 crash when resizing Vim window when a line doesn't fit 3236 7.0.038 complete() can be used from expr. mapping after inserting text 3240 7.0.039 third argument for inputdialog() doesn't work in the console --- editors/vim-lang/PLIST | 24 +++++++++++++++++++++++- editors/vim-motif/Makefile | 4 +--- editors/vim-share/Makefile.common | 6 +++--- editors/vim-share/distinfo | 26 +++++++++++++++++++------- editors/vim-share/version.mk | 4 ++-- 5 files changed, 48 insertions(+), 16 deletions(-) (limited to 'editors') diff --git a/editors/vim-lang/PLIST b/editors/vim-lang/PLIST index 1bb51501e0e..2defbec3bc0 100644 --- a/editors/vim-lang/PLIST +++ b/editors/vim-lang/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.5 2006/05/21 13:32:27 martti Exp $ +@comment $NetBSD: PLIST,v 1.6 2006/07/18 10:27:16 martti Exp $ man/fr.ISO8859-1/man1/evim.1 man/fr.ISO8859-1/man1/ex.1 man/fr.ISO8859-1/man1/rview.1 @@ -325,3 +325,25 @@ share/vim/${VIM_SUBDIR}/lang/zh_TW/LC_MESSAGES/vim.mo @dirrm share/vim/${VIM_SUBDIR}/lang/zh_CN.UTF-8/LC_MESSAGES @dirrm share/vim/${VIM_SUBDIR}/lang/zh_CN.UTF-8 @dirrm share/vim/${VIM_SUBDIR}/lang +@unexec ${RMDIR} %D/man/fr.ISO8859-1/man1 2>/dev/null || ${TRUE} +@unexec ${RMDIR} %D/man/fr.ISO8859-1 2>/dev/null || ${TRUE} +@unexec ${RMDIR} %D/man/fr.UTF-8/man1 2>/dev/null || ${TRUE} +@unexec ${RMDIR} %D/man/fr.UTF-8 2>/dev/null || ${TRUE} +@unexec ${RMDIR} %D/man/fr/man1 2>/dev/null || ${TRUE} +@unexec ${RMDIR} %D/man/fr 2>/dev/null || ${TRUE} +@unexec ${RMDIR} %D/man/it.ISO8859-1/man1 2>/dev/null || ${TRUE} +@unexec ${RMDIR} %D/man/it.ISO8859-1 2>/dev/null || ${TRUE} +@unexec ${RMDIR} %D/man/it.UTF-8/man1 2>/dev/null || ${TRUE} +@unexec ${RMDIR} %D/man/it.UTF-8 2>/dev/null || ${TRUE} +@unexec ${RMDIR} %D/man/it/man1 2>/dev/null || ${TRUE} +@unexec ${RMDIR} %D/man/it 2>/dev/null || ${TRUE} +@unexec ${RMDIR} %D/man/pl.ISO8859-2/man1 2>/dev/null || ${TRUE} +@unexec ${RMDIR} %D/man/pl.ISO8859-2 2>/dev/null || ${TRUE} +@unexec ${RMDIR} %D/man/pl.UTF-8/man1 2>/dev/null || ${TRUE} +@unexec ${RMDIR} %D/man/pl.UTF-8 2>/dev/null || ${TRUE} +@unexec ${RMDIR} %D/man/pl/man1 2>/dev/null || ${TRUE} +@unexec ${RMDIR} %D/man/pl 2>/dev/null || ${TRUE} +@unexec ${RMDIR} %D/man/ru.KOI8-R/man1 2>/dev/null || ${TRUE} +@unexec ${RMDIR} %D/man/ru.KOI8-R 2>/dev/null || ${TRUE} +@unexec ${RMDIR} %D/man/ru.UTF-8/man1 2>/dev/null || ${TRUE} +@unexec ${RMDIR} %D/man/ru.UTF-8 2>/dev/null || ${TRUE} diff --git a/editors/vim-motif/Makefile b/editors/vim-motif/Makefile index 6d45a215396..276f73c549b 100644 --- a/editors/vim-motif/Makefile +++ b/editors/vim-motif/Makefile @@ -1,6 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2006/05/09 06:36:48 martti Exp $ - -BROKEN= Motif support is not configured correctly. +# $NetBSD: Makefile,v 1.23 2006/07/18 10:27:16 martti Exp $ PKGNAME= vim-motif-${VIM_VERSION}.${VIM_PATCHLEVEL} #PKGREVISION= 1 diff --git a/editors/vim-share/Makefile.common b/editors/vim-share/Makefile.common index 5b382ba7049..aa628dd4f21 100644 --- a/editors/vim-share/Makefile.common +++ b/editors/vim-share/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.60 2006/07/02 17:05:14 martti Exp $ +# $NetBSD: Makefile.common,v 1.61 2006/07/18 10:27:16 martti Exp $ .include "../../editors/vim-share/version.mk" @@ -18,7 +18,7 @@ PATCHFILES+= 7.0.001 7.0.002 7.0.003 7.0.004 7.0.007 7.0.008 7.0.009 PATCHFILES+= 7.0.010 7.0.011 7.0.012 7.0.013 7.0.014 7.0.015 7.0.016 PATCHFILES+= 7.0.017 7.0.018 7.0.019 7.0.020 7.0.021 7.0.022 7.0.023 PATCHFILES+= 7.0.024 7.0.025 7.0.026 7.0.029 7.0.030 7.0.031 7.0.033 -PATCHFILES+= 7.0.034 7.0.035 +PATCHFILES+= 7.0.034 7.0.035 7.0.036 7.0.037 7.0.038 7.0.039 MAINTAINER= martti@NetBSD.org HOMEPAGE= http://www.vim.org/ @@ -39,7 +39,7 @@ PATCH_ARGS= -d ${WRKDIR:Q}/${VIM_SUBDIR:Q} --forward --quiet \ -E ${PATCH_STRIP:Q} PATCH_DIST_ARGS= -d ${WRKDIR:Q}/${VIM_SUBDIR:Q} --forward --quiet \ -E ${PATCH_DIST_STRIP:Q} -PATCHDIR?= ${.CURDIR}/../../editors/vim-share/patches +PATCHDIR= ${.CURDIR}/../../editors/vim-share/patches DISTINFO_FILE?= ${.CURDIR}/../../editors/vim-share/distinfo .if empty(PKGNAME:Mvim-share*) diff --git a/editors/vim-share/distinfo b/editors/vim-share/distinfo index bee3b22d1e6..9b76eda90fd 100644 --- a/editors/vim-share/distinfo +++ b/editors/vim-share/distinfo @@ -1,11 +1,5 @@ -$NetBSD: distinfo,v 1.48 2006/07/02 17:05:15 martti Exp $ +$NetBSD: distinfo,v 1.49 2006/07/18 10:27:16 martti Exp $ -SHA1 (vim/vim-7.0.tar.bz2) = 38ef48cabf942d0dc804a794dcc6f002b9457fc8 -RMD160 (vim/vim-7.0.tar.bz2) = 5c0d6f2dbd0382a432781fe6cb224028cbb783de -Size (vim/vim-7.0.tar.bz2) = 6575205 bytes -SHA1 (vim/vim-7.0-lang.tar.gz) = 3db6b0004d213490cc00d361835e7a7c685adb52 -RMD160 (vim/vim-7.0-lang.tar.gz) = 954a098f2f513ccdda96fdfcd043a737e52a5366 -Size (vim/vim-7.0-lang.tar.gz) = 1180240 bytes SHA1 (vim/7.0.001) = 54143281b4d21a825b7bb02bdd55c4716e7b6f80 RMD160 (vim/7.0.001) = 808e7e5947fccd64ae010e37acb81890e0adc7f0 Size (vim/7.0.001) = 1627 bytes @@ -96,6 +90,24 @@ Size (vim/7.0.034) = 2042 bytes SHA1 (vim/7.0.035) = e8da3cff17eed18950fe680458ba3203bfa9e395 RMD160 (vim/7.0.035) = fb5554c12bca1d261fc8c21d4c2b85416951fc03 Size (vim/7.0.035) = 5905 bytes +SHA1 (vim/7.0.036) = 09e9784634f32488ea91b3f49b35229552224480 +RMD160 (vim/7.0.036) = b1ad5eef29186243a0c71d4f18630affcf672420 +Size (vim/7.0.036) = 3990 bytes +SHA1 (vim/7.0.037) = 10a54622bab8c9abe6559334c2017c9160013e33 +RMD160 (vim/7.0.037) = 9dd4f431e479c215740c37040ae7ccd4344be193 +Size (vim/7.0.037) = 1880 bytes +SHA1 (vim/7.0.038) = 07065c93f3b9c88687344d108b0a877d729f6027 +RMD160 (vim/7.0.038) = f742ccca69aa9dcdb43201be45f6bc8d454c9500 +Size (vim/7.0.038) = 3236 bytes +SHA1 (vim/7.0.039) = c64379758a14ec88659c8769d59c3f8df4e67a11 +RMD160 (vim/7.0.039) = fb237226531b7cb1b08a7b100318d221e2ffd214 +Size (vim/7.0.039) = 3240 bytes +SHA1 (vim/vim-7.0-lang.tar.gz) = 3db6b0004d213490cc00d361835e7a7c685adb52 +RMD160 (vim/vim-7.0-lang.tar.gz) = 954a098f2f513ccdda96fdfcd043a737e52a5366 +Size (vim/vim-7.0-lang.tar.gz) = 1180240 bytes +SHA1 (vim/vim-7.0.tar.bz2) = 38ef48cabf942d0dc804a794dcc6f002b9457fc8 +RMD160 (vim/vim-7.0.tar.bz2) = 5c0d6f2dbd0382a432781fe6cb224028cbb783de +Size (vim/vim-7.0.tar.bz2) = 6575205 bytes SHA1 (patch-aa) = 6490dce35e099967272a84dd96b16cc3db0b4d53 SHA1 (patch-ab) = 1ee4f14cb6c73743704d2dd2631cb3ca48f0303e SHA1 (patch-ad) = 1f83cdb17f7ce367d9ae3358db7370065ab76435 diff --git a/editors/vim-share/version.mk b/editors/vim-share/version.mk index 39728a1fd22..935b4bb126d 100644 --- a/editors/vim-share/version.mk +++ b/editors/vim-share/version.mk @@ -1,5 +1,5 @@ -# $NetBSD: version.mk,v 1.10 2006/07/02 17:05:15 martti Exp $ +# $NetBSD: version.mk,v 1.11 2006/07/18 10:27:16 martti Exp $ VIM_VERSION= 7.0 -VIM_PATCHLEVEL= 35 +VIM_PATCHLEVEL= 39 VIM_SUBDIR= vim70 -- cgit v1.2.3