3 files changed, 12 insertions, 162 deletions

diff --git a/editors/vim/Makefile b/editors/vim/Makefile
index 6222f93ea13c..65669a8557c4 100644
--- a/editors/vim/Makefile
+++ b/editors/vim/Makefile
@@ -7,8 +7,8 @@
 #
 
 PORTNAME?=	vim
-PATCHLEVEL=	90
-PORTVERSION=	6.3.${PATCHLEVEL}
+PATCHLEVEL=	0
+PORTVERSION=	6.4.${PATCHLEVEL}
 PORTREVISION?=	0
 CATEGORIES?=	editors
 MASTER_SITES=	${MASTER_SITE_VIM}
@@ -18,9 +18,9 @@ PATCH_SITES=	${MASTER_SITES:S|unix|patches/${PORTVERSION:C/\.[0-9a-z]*$//}|}
 PATCHFILES!=	/usr/bin/jot -s " " -w ${PORTVERSION:C/\.[0-9]*$//}.%03d  \
 			${PATCHLEVEL} 1 ${PATCHLEVEL}
 #	bits to remove
-BADPATCHES=	000 022 025 035 038 041 044 047 048 052 073 077 078 080 084 086
+BADPATCHES=	000
 .for p in ${BADPATCHES}
-PATCHFILES:=	${PATCHFILES:N6.3.${p}}
+PATCHFILES:=	${PATCHFILES:N6.4.${p}}
 .endfor
 
 MAINTAINER?=	obrien@FreeBSD.org
@@ -138,7 +138,7 @@ USE_ICONV=	yes
 
 pre-configure:
 	@(cd ${WRKSRC} ; ${MAKE} distclean)
-	@${REINPLACE_CMD} -e 's|8\.2|8.4|g; \
+	@${REINPLACE_CMD} -e ' \
 		s|\$$gtk_config_prefix/bin/gtk-config|\$${GTK_CONFIG}|g; \
 		s|\$$gtk_config_exec_prefix/bin/gtk-config|\$${GTK_CONFIG}|g; \
 		s|/usr/local|${PREFIX}|g' \
diff --git a/editors/vim/distinfo b/editors/vim/distinfo
index c45a2f5bc463..04a836fb9c55 100644
--- a/editors/vim/distinfo
+++ b/editors/vim/distinfo
@@ -1,152 +1,2 @@
-MD5 (vim/vim-6.3.tar.bz2) = 821fda8f14d674346b87e3ef9cb96389
-SIZE (vim/vim-6.3.tar.bz2) = 3699397
-MD5 (vim/6.3.001) = 798fc87d3ebc06e7f104ff30960a4630
-SIZE (vim/6.3.001) = 2672
-MD5 (vim/6.3.002) = 039c3f84677116a20ad98e09a03d827d
-SIZE (vim/6.3.002) = 3913
-MD5 (vim/6.3.003) = 3a39b1d6d46724b89425a19843d42908
-SIZE (vim/6.3.003) = 1891
-MD5 (vim/6.3.004) = ce8cb9548ad2ae5dafcf01cd23df4100
-SIZE (vim/6.3.004) = 2438
-MD5 (vim/6.3.005) = a98e90e9444fe9e9d7c8d5dc07302740
-SIZE (vim/6.3.005) = 2809
-MD5 (vim/6.3.006) = f85608457424ad71191dc1c8953f3fc4
-SIZE (vim/6.3.006) = 1566
-MD5 (vim/6.3.007) = 9bb94caebd7e0ed959398d55d842eacf
-SIZE (vim/6.3.007) = 1755
-MD5 (vim/6.3.008) = 1d205e97c42374d32520c95a1db9e497
-SIZE (vim/6.3.008) = 1865
-MD5 (vim/6.3.009) = a489375bf0b15f144f87a88ab5e36c95
-SIZE (vim/6.3.009) = 3670
-MD5 (vim/6.3.010) = 9bcec5ee9abbffac4f12f70f69241a4c
-SIZE (vim/6.3.010) = 2450
-MD5 (vim/6.3.011) = 7e32cbdb890405d6ca4ee37c671e279b
-SIZE (vim/6.3.011) = 1896
-MD5 (vim/6.3.012) = d6258661d78b82cdc29b6b0d8e355289
-SIZE (vim/6.3.012) = 2882
-MD5 (vim/6.3.013) = 3e31ecaaf531318aa73c6adc33aab7fd
-SIZE (vim/6.3.013) = 11947
-MD5 (vim/6.3.014) = a0cd31c8ec7a575b04be2416e5f64edf
-SIZE (vim/6.3.014) = 1566
-MD5 (vim/6.3.015) = 2864855cb6cb0d3048cc8e74b16a5990
-SIZE (vim/6.3.015) = 1207
-MD5 (vim/6.3.016) = 2f58e8b00f4614c2b071838d299310b6
-SIZE (vim/6.3.016) = 1735
-MD5 (vim/6.3.017) = 821323cc5cdefbc69899e6bc8b30bc30
-SIZE (vim/6.3.017) = 1364
-MD5 (vim/6.3.018) = 735e869f92d6c80c6d43c837dee670b3
-SIZE (vim/6.3.018) = 1844
-MD5 (vim/6.3.019) = f6885686d11cd7f794805a70ee849579
-SIZE (vim/6.3.019) = 1992
-MD5 (vim/6.3.020) = e51adda32a4a1a73dff2e92b3715b1ef
-SIZE (vim/6.3.020) = 1915
-MD5 (vim/6.3.021) = 559410e68495eed2fd05e65533b03aa8
-SIZE (vim/6.3.021) = 2822
-MD5 (vim/6.3.023) = 2f460f5691c31d14354f5ca20536b6f1
-SIZE (vim/6.3.023) = 6419
-MD5 (vim/6.3.024) = e3e1f86a74242731d93a009cb692f952
-SIZE (vim/6.3.024) = 2456
-MD5 (vim/6.3.026) = 30c225d5ee55b073eec23037969edb48
-SIZE (vim/6.3.026) = 3070
-MD5 (vim/6.3.027) = c6f122ba3c95d03f835842d05d66c3bd
-SIZE (vim/6.3.027) = 7500
-MD5 (vim/6.3.028) = 11c22371c8ca2e3588f894bba8c5409f
-SIZE (vim/6.3.028) = 2128
-MD5 (vim/6.3.029) = 7a3493a75ee1ae8277ac2d824b356758
-SIZE (vim/6.3.029) = 2173
-MD5 (vim/6.3.030) = f1a101fcc7474f68189fbfb08d73fd52
-SIZE (vim/6.3.030) = 4579
-MD5 (vim/6.3.031) = 69ce6ad1dbcb5df6579764bb1975153b
-SIZE (vim/6.3.031) = 1483
-MD5 (vim/6.3.032) = b0004e79c5fb690dca71822c1e9051fc
-SIZE (vim/6.3.032) = 2094
-MD5 (vim/6.3.033) = 2e4a5a94cbc17ca42535f0702f103743
-SIZE (vim/6.3.033) = 1552
-MD5 (vim/6.3.034) = ceae20562137686b028bb03f8bdc1276
-SIZE (vim/6.3.034) = 1618
-MD5 (vim/6.3.036) = 162c46080fc0a858917ea63d156154de
-SIZE (vim/6.3.036) = 1770
-MD5 (vim/6.3.037) = b595c4f9d9638e9d715d0dec09089b16
-SIZE (vim/6.3.037) = 2889
-MD5 (vim/6.3.039) = 6de3ea5c394d55504fc846a7e2e54968
-SIZE (vim/6.3.039) = 2749
-MD5 (vim/6.3.040) = 26f4b0e018ceb5d4a8298989e5a57dc0
-SIZE (vim/6.3.040) = 18020
-MD5 (vim/6.3.042) = 4a8bc79b06357416164bfc77b16e3b40
-SIZE (vim/6.3.042) = 1760
-MD5 (vim/6.3.043) = 54352b78dae65bdd0cac2471c257b5f1
-SIZE (vim/6.3.043) = 8053
-MD5 (vim/6.3.045) = 025814a6478f8d1bcf199ce6422b59be
-SIZE (vim/6.3.045) = 12283
-MD5 (vim/6.3.046) = db175fa4955264572d092e67b9c756af
-SIZE (vim/6.3.046) = 2231
-MD5 (vim/6.3.049) = b2171359bc93f307f941865a859d1eea
-SIZE (vim/6.3.049) = 1776
-MD5 (vim/6.3.050) = 7303a0dd8232ea1fcc72df21e6839184
-SIZE (vim/6.3.050) = 2225
-MD5 (vim/6.3.051) = 1d8a15e289b09afee95df671b8216e17
-SIZE (vim/6.3.051) = 1661
-MD5 (vim/6.3.053) = 933f35dfc3969ede01738fe05261932b
-SIZE (vim/6.3.053) = 1576
-MD5 (vim/6.3.054) = 34589da311b5d930c4b277bb5667cf97
-SIZE (vim/6.3.054) = 1981
-MD5 (vim/6.3.055) = f30fd2a5532eb5070e87ba944a770d0e
-SIZE (vim/6.3.055) = 8844
-MD5 (vim/6.3.056) = 676dd4ecd31056fd532f20704bea4caa
-SIZE (vim/6.3.056) = 2091
-MD5 (vim/6.3.057) = 6ddcf6560f6add3315d37730a04c3916
-SIZE (vim/6.3.057) = 1748
-MD5 (vim/6.3.058) = e459f5ab4398afcf1ca950fe481f8c7f
-SIZE (vim/6.3.058) = 4440
-MD5 (vim/6.3.059) = 0e96b634e90f44ec105e2e645defad67
-SIZE (vim/6.3.059) = 2286
-MD5 (vim/6.3.060) = 8fd62455ed7997427dc18a251fcf2b35
-SIZE (vim/6.3.060) = 1609
-MD5 (vim/6.3.061) = 94f802921fe0687b283369b4deed1255
-SIZE (vim/6.3.061) = 1984
-MD5 (vim/6.3.062) = 2206f44458cb7a857e572f598034a9c7
-SIZE (vim/6.3.062) = 2337
-MD5 (vim/6.3.063) = bf517161b45786a20d8d7c1023d85bec
-SIZE (vim/6.3.063) = 1434
-MD5 (vim/6.3.064) = bfda6b471fb5e00ef47a222450237b6f
-SIZE (vim/6.3.064) = 1586
-MD5 (vim/6.3.065) = e5d1cd5766735e2972104e6b2162a76f
-SIZE (vim/6.3.065) = 4436
-MD5 (vim/6.3.066) = 4f367e1dbb4586598adc0ad5c9fc133d
-SIZE (vim/6.3.066) = 4728
-MD5 (vim/6.3.067) = 230c335c728a62828077c98a0d70d804
-SIZE (vim/6.3.067) = 2200
-MD5 (vim/6.3.068) = bfec5079535e1dadb87bf6205a7d0c1d
-SIZE (vim/6.3.068) = 2247
-MD5 (vim/6.3.069) = 50d75f86e2d4e8aeb7b11a7c0242bd37
-SIZE (vim/6.3.069) = 1710
-MD5 (vim/6.3.070) = ef33566dd7e9c9286760275023c8c1d3
-SIZE (vim/6.3.070) = 1928
-MD5 (vim/6.3.071) = adbe73dc97617e0d744dda9f25697e11
-SIZE (vim/6.3.071) = 1722
-MD5 (vim/6.3.072) = 22e41c0e790ab4dbd69a224a06a9f832
-SIZE (vim/6.3.072) = 2083
-MD5 (vim/6.3.074) = cffffffd902f270c3727c8fff9d4324f
-SIZE (vim/6.3.074) = 2365
-MD5 (vim/6.3.075) = b1d6abbad12838321632c95a146f086f
-SIZE (vim/6.3.075) = 1745
-MD5 (vim/6.3.076) = ccb87038392e542b1a0c4ede980e997b
-SIZE (vim/6.3.076) = 3546
-MD5 (vim/6.3.079) = 6d9d39cd3440d628fc09cd8eeabd64ab
-SIZE (vim/6.3.079) = 1853
-MD5 (vim/6.3.081) = 24e8249cbb5a54c8c1f68baef225e852
-SIZE (vim/6.3.081) = 1729
-MD5 (vim/6.3.082) = 337d03cf50317445534131717e62693b
-SIZE (vim/6.3.082) = 2102
-MD5 (vim/6.3.083) = 46c0f40dfbd75756c024d1787b245006
-SIZE (vim/6.3.083) = 5053
-MD5 (vim/6.3.085) = 03b3ba06adb63ec38a96047c69d9fe45
-SIZE (vim/6.3.085) = 3408
-MD5 (vim/6.3.087) = db87ec44fb2b6d5d83c18d8cd6c268ad
-SIZE (vim/6.3.087) = 1471
-MD5 (vim/6.3.088) = 36b7bfe4e9801f15013c0f5853be8a80
-SIZE (vim/6.3.088) = 2269
-MD5 (vim/6.3.089) = fe1b461487162948471b9b0704d38a48
-SIZE (vim/6.3.089) = 2223
-MD5 (vim/6.3.090) = 8652d58a33ab89ac5fba8c3feab4bcbc
-SIZE (vim/6.3.090) = 1484
+MD5 (vim/vim-6.4.tar.bz2) = 774c14d93ce58674b3b2c880edd12d77
+SIZE (vim/vim-6.4.tar.bz2) = 3737338
diff --git a/editors/vim/files/patch-configure b/editors/vim/files/patch-configure
index fcf7c62f9bca..def640982ee2 100644
--- a/editors/vim/files/patch-configure
+++ b/editors/vim/files/patch-configure
@@ -1,11 +1,11 @@
---- auto/configure.orig	Sun May  9 20:47:46 2004
-+++ auto/configure	Sun May  9 20:46:02 2004
-@@ -1931,7 +1931,7 @@
+--- auto/configure.orig	Sat Oct 15 05:55:10 2005
++++ auto/configure	Sun Oct 23 18:13:17 2005
+@@ -2184,7 +2184,7 @@ echo "configure:2177: checking for locat
  	    echo "$ac_t""$try/tclConfig.sh" 1>&6
  	    . $try/tclConfig.sh
  	    	    TCL_LIBS=`eval echo "$TCL_LIB_SPEC $TCL_LIBS"`
--	    	    	    TCL_DEFS=`echo $TCL_DEFS | tr ' ' '\012' | sed -e '/^-[^D]/d' -e '/-D[^_]/d' -e 's/-D_/ -D_/' | tr -d '\012'`
-+	    	    	    TCL_DEFS=`echo $TCL_DEFS | tr ' ' '\012' | sed -e '/^[^-]/d' -e '/^-[^D]/d' -e '/-D[^_]/d' -e 's/-D_/ -D_/' | tr -d '\012'`
+-	    	    	    TCL_DEFS=`echo $TCL_DEFS | sed -e 's/\ /\X/' | tr ' ' '\012' | sed -e '/^-[^D]/d' -e '/-D[^_]/d' -e 's/-D_/ -D_/' | tr -d '\012'`
++	    	    	    TCL_DEFS=`echo $TCL_DEFS       | tr ' ' '\012' | sed -e '/^[^-]/d' -e '/^-[^D]/d' -e '/-D[^_]/d' -e 's/-D_/ -D_/' | tr -d '\012'`
  	    break
  	  fi
  	done