diff --git a/editors/vim/Makefile b/editors/vim/Makefile
index f227d2e5521..6df703707e5 100644
--- a/editors/vim/Makefile
+++ b/editors/vim/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.53 2004/12/08 04:29:55 marcm Exp $
+# $OpenBSD: Makefile,v 1.54 2005/02/12 23:00:50 naddy Exp $
 
 COMMENT=	"vi clone, many additional features"
 COMMENT-lang=	"vi clone, NLS subpackage"
 
 DISTNAME=	vim-6.3
-REVISION=	31
+REVISION=	61
 VERSION=	6.3.${REVISION}
 PKGNAME=	vim-${VERSION}
 P=		${DISTNAME:C/[-\.]//g}
@@ -112,6 +112,7 @@ WANTLIB+=	ICE SM X11 Xext Xi Xt glib gmodule m
 .elif ${FLAVOR:L:Mgtk2} && \
 	        !${FLAVOR:L:Mmotif} && !${FLAVOR:L:Mno_x11} && !${FLAVOR:L:Mathena} && !${FLAVOR:L:Mgtk}
 LIB_DEPENDS+=   gdk-x11-2.0.0.11,gdk_pixbuf-2.0.0.11,gtk-x11-2.0.0.11::x11/gtk+2
+BUILD_DEPENDS+=	:pkgconfig-*:devel/pkgconfig
 CONFIGURE_ARGS+=--enable-gui="gtk2" --with-x --enable-fontset --enable-xim --disable-gtk-check --enable-gtk2-check
 WANTLIB+=	ICE SM X11 Xext Xft Xinerama Xrender Xt atk-1.0.0.0 \
 		fontconfig freetype glib-2.0.0.0 gmodule-2.0.0.0 \
diff --git a/editors/vim/distinfo b/editors/vim/distinfo
index 826bda93483..5622e82fbb0 100644
--- a/editors/vim/distinfo
+++ b/editors/vim/distinfo
@@ -29,6 +29,36 @@ MD5 (vim6/6.3.028) = 11c22371c8ca2e3588f894bba8c5409f
 MD5 (vim6/6.3.029) = 7a3493a75ee1ae8277ac2d824b356758
 MD5 (vim6/6.3.030) = f1a101fcc7474f68189fbfb08d73fd52
 MD5 (vim6/6.3.031) = 69ce6ad1dbcb5df6579764bb1975153b
+MD5 (vim6/6.3.032) = b0004e79c5fb690dca71822c1e9051fc
+MD5 (vim6/6.3.033) = 2e4a5a94cbc17ca42535f0702f103743
+MD5 (vim6/6.3.034) = ceae20562137686b028bb03f8bdc1276
+MD5 (vim6/6.3.035) = e859fe3957ebbf260005caf679593e31
+MD5 (vim6/6.3.036) = 162c46080fc0a858917ea63d156154de
+MD5 (vim6/6.3.037) = b595c4f9d9638e9d715d0dec09089b16
+MD5 (vim6/6.3.038) = 605fb63a99305bd48918ea5df2664057
+MD5 (vim6/6.3.039) = 6de3ea5c394d55504fc846a7e2e54968
+MD5 (vim6/6.3.040) = 26f4b0e018ceb5d4a8298989e5a57dc0
+MD5 (vim6/6.3.041) = 78d5441d1de1db062534b7448e073ec0
+MD5 (vim6/6.3.042) = 4a8bc79b06357416164bfc77b16e3b40
+MD5 (vim6/6.3.043) = 54352b78dae65bdd0cac2471c257b5f1
+MD5 (vim6/6.3.044) = db084b31f1cbc8b66be82cb919d6fde9
+MD5 (vim6/6.3.045) = 025814a6478f8d1bcf199ce6422b59be
+MD5 (vim6/6.3.046) = db175fa4955264572d092e67b9c756af
+MD5 (vim6/6.3.047) = 195cc3b08a4f4da8547faf7722a46035
+MD5 (vim6/6.3.048) = 40bdb1312b6865a7b13681e765bee0f1
+MD5 (vim6/6.3.049) = b2171359bc93f307f941865a859d1eea
+MD5 (vim6/6.3.050) = 7303a0dd8232ea1fcc72df21e6839184
+MD5 (vim6/6.3.051) = 1d8a15e289b09afee95df671b8216e17
+MD5 (vim6/6.3.052) = 01b0fb256e3fe6ce2daffc83c4d93f6f
+MD5 (vim6/6.3.053) = 933f35dfc3969ede01738fe05261932b
+MD5 (vim6/6.3.054) = 34589da311b5d930c4b277bb5667cf97
+MD5 (vim6/6.3.055) = f30fd2a5532eb5070e87ba944a770d0e
+MD5 (vim6/6.3.056) = 676dd4ecd31056fd532f20704bea4caa
+MD5 (vim6/6.3.057) = 6ddcf6560f6add3315d37730a04c3916
+MD5 (vim6/6.3.058) = e459f5ab4398afcf1ca950fe481f8c7f
+MD5 (vim6/6.3.059) = 0e96b634e90f44ec105e2e645defad67
+MD5 (vim6/6.3.060) = 8fd62455ed7997427dc18a251fcf2b35
+MD5 (vim6/6.3.061) = 94f802921fe0687b283369b4deed1255
 MD5 (vim6/vim-6.3-extra.tar.gz) = 6e4bd6c8122bcb9dc576514bdb52484e
 MD5 (vim6/vim-6.3-lang.tar.gz) = 5395c4dacbf1c5008b22c4b86794e8a7
 MD5 (vim6/vim-6.3.tar.bz2) = 821fda8f14d674346b87e3ef9cb96389
@@ -63,6 +93,36 @@ RMD160 (vim6/6.3.028) = bc462b9af851c037cb00bb0fb5ffded1c28948a9
 RMD160 (vim6/6.3.029) = b1a1a3501479ce1053637f73db2bfff04dab6c91
 RMD160 (vim6/6.3.030) = a72db86fda6190300ce71ee70fb9346969d988bb
 RMD160 (vim6/6.3.031) = cccddb2b79ac9fc4faa8b68de45a55340d6bace2
+RMD160 (vim6/6.3.032) = 1241a00bd2e860a3a81bfd3307110d005da99ea0
+RMD160 (vim6/6.3.033) = 27d02502c9f713f99d605a1be5f29e2f639e64f1
+RMD160 (vim6/6.3.034) = 441160831bc7e6e1af6a366f634cf49b810b0cbe
+RMD160 (vim6/6.3.035) = 960f8b4fd1196b42d7507f7402f5c00745c78885
+RMD160 (vim6/6.3.036) = 80db342e60e2e8eec2a4dafbe1d3fcfa228943b5
+RMD160 (vim6/6.3.037) = 2950841803e5c8c63234410f711abe93bf463ab0
+RMD160 (vim6/6.3.038) = 5fd446af1da4b02440cb57b55123a1bea6d626dd
+RMD160 (vim6/6.3.039) = 6a7c24b31c099ac2abe64b26366b797cfa3e061e
+RMD160 (vim6/6.3.040) = 6463403fb98e75a0ede13328e5a616b7eb70c8fb
+RMD160 (vim6/6.3.041) = 584518a8e9748a8eeba7e1966ea398c6de29f531
+RMD160 (vim6/6.3.042) = c57cce122f5b6ebef2f84da8a5baee206b78d56b
+RMD160 (vim6/6.3.043) = 8f67b5432850d13792e1dd62e29b9b741d0013be
+RMD160 (vim6/6.3.044) = c59dbb74d8d05e709e0ca655f2af35020a83d611
+RMD160 (vim6/6.3.045) = 918a4c5a02f1be65bc49314fb9f32ca7bdb8517a
+RMD160 (vim6/6.3.046) = dea5e8a0642b1ca05f42a5a56ba40a8d37ce5028
+RMD160 (vim6/6.3.047) = 01a839c8d3c4d4679fa8753516aede925a50c9ab
+RMD160 (vim6/6.3.048) = b865e1d850aa7715de7de93460c8c6c1347afb53
+RMD160 (vim6/6.3.049) = 0e4c4ccb4a55bade03298e5709238b29ad53ca70
+RMD160 (vim6/6.3.050) = 28b35c702eda86482b5cef869666dc3a03ca8999
+RMD160 (vim6/6.3.051) = 981a665e04c08f8bc359e0fcc41462ec6bdecd1a
+RMD160 (vim6/6.3.052) = 8878d09755ca530c198ab44aac49f036605dbbbe
+RMD160 (vim6/6.3.053) = b740f865bedc21b1c2ed1326970d577cd6337406
+RMD160 (vim6/6.3.054) = 4a89cd7960798ea55712b479169a67e4e3f34af3
+RMD160 (vim6/6.3.055) = 08eb783a6edf87e39ef3b546fdd20a12e46f0248
+RMD160 (vim6/6.3.056) = 1383f20f7eb2612070feef49a835ecc22d2f6cbe
+RMD160 (vim6/6.3.057) = 3755dc7e2008c0ee999286ea46bf4d4b5ee19332
+RMD160 (vim6/6.3.058) = 4c73b4686f9fbb1854b3d1cf48ca18aa20555eb9
+RMD160 (vim6/6.3.059) = c2273b8a1abd5b3e83b0decddb9787dcea8d54d3
+RMD160 (vim6/6.3.060) = 024dda054dacea1dd5bd2a9198c32e4d87eae82c
+RMD160 (vim6/6.3.061) = fc2bb92c10694acb84f88c2775c1753489d946cc
 RMD160 (vim6/vim-6.3-extra.tar.gz) = 6379a64e5c5f50fd55a27bb6721097bb3abf1197
 RMD160 (vim6/vim-6.3-lang.tar.gz) = e8e332657a4773396f143b341edaf587c1bba0c7
 RMD160 (vim6/vim-6.3.tar.bz2) = 321c59d62f6fce99396be33875ec5a7d84944525
@@ -97,6 +157,36 @@ SHA1 (vim6/6.3.028) = e80fd139422059f69a59dcf77f01b81a5583a15e
 SHA1 (vim6/6.3.029) = 893c33c802f79830278475a313734b225f02d336
 SHA1 (vim6/6.3.030) = d01dc7d392cef1a6661bc05e4859a915e592679a
 SHA1 (vim6/6.3.031) = 23f492500186564660907078e8a2e5c5c4fab3c1
+SHA1 (vim6/6.3.032) = c6079719111ac1804383c620e08a0aa5fce8f3e3
+SHA1 (vim6/6.3.033) = cfa3f49b01bf12e48f7281d4f27dacacd1f7bb04
+SHA1 (vim6/6.3.034) = 05482ed58f6a6b5ee062de585152f1ea00825ed6
+SHA1 (vim6/6.3.035) = cc694a9c9b415ae63a3fd842e6dbc30a97f5e865
+SHA1 (vim6/6.3.036) = 443822a03fc7313e97459a2142a4078103f03b91
+SHA1 (vim6/6.3.037) = b8dba3125202799bf56d5c6e71382e2c4987ee33
+SHA1 (vim6/6.3.038) = ec7547a4e4a0773c5696326410a7aeafb77ae64f
+SHA1 (vim6/6.3.039) = 21b8d58ad5e2f6d5ad16e7cd421c6614997c0762
+SHA1 (vim6/6.3.040) = bafa7413ad7af8d8a9cdbfd06a12faf5278ad4e4
+SHA1 (vim6/6.3.041) = 2ae53ff47ce71ca5544d252be08571327ba5ffd1
+SHA1 (vim6/6.3.042) = 54f7e15ce39b7fcc5408fd11cb406e567fc03be7
+SHA1 (vim6/6.3.043) = 0f158d92782f1b11e6be3b8664c8dd2cff7a0efd
+SHA1 (vim6/6.3.044) = bbcf3cae5d636dcf07160886a2af0fd1fd0e2f64
+SHA1 (vim6/6.3.045) = 6354d0a0353055052d4e53c53b2c79e8964cd37a
+SHA1 (vim6/6.3.046) = 4c89515d66645d51a8179205b6f6a385197abe97
+SHA1 (vim6/6.3.047) = df04155997cb834966208062559d824d38d6ec4a
+SHA1 (vim6/6.3.048) = c9b2ac8aed7b699a7aab2bf18c48c7ed53eab5b4
+SHA1 (vim6/6.3.049) = 30abe56ee682553000382d4b3aa11f0dc9b0967a
+SHA1 (vim6/6.3.050) = 38b09d8637169d353db30cfc7bcd61456fdb10f2
+SHA1 (vim6/6.3.051) = 598987c3d141570e8fd8ab93862168fe9b92a020
+SHA1 (vim6/6.3.052) = b1994fe7afe2dd93ed647941b65b243dac7b3b98
+SHA1 (vim6/6.3.053) = af86f7ec87e33ae62df791721ad4270250cee328
+SHA1 (vim6/6.3.054) = c64492b0e36221b6a2c06d795501ec33629efa6d
+SHA1 (vim6/6.3.055) = f2005d1ff38bb062f34d7f6a44eea7559e9f08e6
+SHA1 (vim6/6.3.056) = 138f12ad324a0f8b96a17306e1b883962a050eea
+SHA1 (vim6/6.3.057) = 4ecbb4bbc1fe7dcf3aca60d1bff40064a1f95ad7
+SHA1 (vim6/6.3.058) = 0ea7dc762c984e714d5d6534f5deffa9a79a91f3
+SHA1 (vim6/6.3.059) = 93247ac7bae66c75952f9609bec8e1ae61420ad6
+SHA1 (vim6/6.3.060) = 4907b03ac2cfa8f9e4b0f397230371fcb4d69363
+SHA1 (vim6/6.3.061) = ade434a1b588647e16a9f4659ba47e10217030a3
 SHA1 (vim6/vim-6.3-extra.tar.gz) = 1bed69ecbe53b7e4cc2fec459d3c7e9c17bebcf3
 SHA1 (vim6/vim-6.3-lang.tar.gz) = f265365b6075d7887c2000a3b90dac8c0b4222db
 SHA1 (vim6/vim-6.3.tar.bz2) = 76f663277140d314ecfafecb0307e832bdbbaf06
@@ -131,6 +221,36 @@ SIZE (vim6/6.3.028) = 2128
 SIZE (vim6/6.3.029) = 2173
 SIZE (vim6/6.3.030) = 4579
 SIZE (vim6/6.3.031) = 1483
+SIZE (vim6/6.3.032) = 2094
+SIZE (vim6/6.3.033) = 1552
+SIZE (vim6/6.3.034) = 1618
+SIZE (vim6/6.3.035) = 7883
+SIZE (vim6/6.3.036) = 1770
+SIZE (vim6/6.3.037) = 2889
+SIZE (vim6/6.3.038) = 1664
+SIZE (vim6/6.3.039) = 2749
+SIZE (vim6/6.3.040) = 18020
+SIZE (vim6/6.3.041) = 1932
+SIZE (vim6/6.3.042) = 1760
+SIZE (vim6/6.3.043) = 8053
+SIZE (vim6/6.3.044) = 2812
+SIZE (vim6/6.3.045) = 12283
+SIZE (vim6/6.3.046) = 2231
+SIZE (vim6/6.3.047) = 2196
+SIZE (vim6/6.3.048) = 18175
+SIZE (vim6/6.3.049) = 1776
+SIZE (vim6/6.3.050) = 2225
+SIZE (vim6/6.3.051) = 1661
+SIZE (vim6/6.3.052) = 3175
+SIZE (vim6/6.3.053) = 1576
+SIZE (vim6/6.3.054) = 1981
+SIZE (vim6/6.3.055) = 8844
+SIZE (vim6/6.3.056) = 2091
+SIZE (vim6/6.3.057) = 1748
+SIZE (vim6/6.3.058) = 4440
+SIZE (vim6/6.3.059) = 2286
+SIZE (vim6/6.3.060) = 1609
+SIZE (vim6/6.3.061) = 1984
 SIZE (vim6/vim-6.3-extra.tar.gz) = 868609
 SIZE (vim6/vim-6.3-lang.tar.gz) = 1057792
 SIZE (vim6/vim-6.3.tar.bz2) = 3699397