Update to Vim 6.1 patchlevel 32

3 files changed, 19 insertions, 30 deletions

diff --git a/editors/vim/Makefile b/editors/vim/Makefile
index f287a49a1e53..8189e154501c 100644
--- a/editors/vim/Makefile
+++ b/editors/vim/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME?=	vim
-PATCHLEVEL=	14
+PATCHLEVEL=	32
 PORTVERSION=	6.1.${PATCHLEVEL}
 PORTREVISION?=	0
 CATEGORIES?=	editors
@@ -16,15 +16,14 @@ MASTER_SITES=	ftp://nuxi.ucdavis.edu/pub/vim/unix/ \
 		ftp://ftp.vim.org/pub/vim/unix/  \
 		ftp://ftp.is.co.za/applications/editors/vim/unix/  \
 		ftp://ftp.prz.tu-berlin.de/pub/unix/editors/vim/unix/  \
-		ftp://ftp.mirror.ac.uk/sites/ftp.vim.org/pub/vim/unix/ \
-		ftp://ftp.progsoc.uts.edu.au/pub/vim/unix/
+		ftp://ftp.mirror.ac.uk/sites/ftp.vim.org/pub/vim/unix/
 DISTNAME=	vim-${PORTVERSION:C/\.[0-9]*$//}
 
 PATCH_SITES=	${MASTER_SITES:S/unix/patches/}
 PATCHFILES!=    jot -s " " -w ${PORTVERSION:C/\.[0-9]*$//}.%03d  \
 			${PATCHLEVEL} 1 ${PATCHLEVEL}
 #	bits to remove
-BADPATCHES= 002
+BADPATCHES= 002 016 019 023
 .for p in ${BADPATCHES}
 PATCHFILES:=	${PATCHFILES:N6.1.${p}}
 .endfor
diff --git a/editors/vim/distinfo b/editors/vim/distinfo
index c6ef71c903f9..78ad04ef4d31 100644
--- a/editors/vim/distinfo
+++ b/editors/vim/distinfo
@@ -12,3 +12,19 @@ MD5 (vim/6.1.011) = 7b2ce911d7f47bf4a1e0bc8de98b3e18
 MD5 (vim/6.1.012) = 242d3d264064af7eb798d609ce631e8a
 MD5 (vim/6.1.013) = 61558b5cd2c06d1bb286461588ed82ea
 MD5 (vim/6.1.014) = 9bb6eb1e884453390343e7d2a1ac6f7a
+MD5 (vim/6.1.015) = 2f58ccb2587a4618978306104026baf7
+MD5 (vim/6.1.017) = 75c41038ed5b12b79b806a065e4dba31
+MD5 (vim/6.1.018) = ec1f70263932bf5ca28c90e72502e3fd
+MD5 (vim/6.1.020) = 382b0248a866c410bec2bc387aaee620
+MD5 (vim/6.1.021) = 698af2583867dab3e4d98252033c1865
+MD5 (vim/6.1.022) = d3a8ba370ec646f3d65da1a62f599fbb
+MD5 (vim/6.1.023) = 4c127b84c3aa0f0ea6c27aa5b7bbbd4e
+MD5 (vim/6.1.024) = e086691d1b6e33480c6c1c64ba017b9b
+MD5 (vim/6.1.025) = a5f159d0ef1eeea1ecf6f4a0b0bfd027
+MD5 (vim/6.1.026) = 863837c6dc02dacd8cb598e35c91b22a
+MD5 (vim/6.1.027) = b04c8fdf185328cedfd49e48bdffdaa5
+MD5 (vim/6.1.028) = 3e791accb2209d8ce48e9ace0f6cdb9d
+MD5 (vim/6.1.029) = fc7e0672fbd10d20602181b5c0fcf2c6
+MD5 (vim/6.1.030) = 8d752dbeb970859924f2fbd44f983056
+MD5 (vim/6.1.031) = e53b71e78fb14d90574a07eb66f58f83
+MD5 (vim/6.1.032) = 839a304568b18d40034eedbffa41bab8
diff --git a/editors/vim/files/patch-osdef.sh b/editors/vim/files/patch-osdef.sh
deleted file mode 100644
index be9c7669aa66..000000000000
--- a/editors/vim/files/patch-osdef.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-*** osdef.sh.orig	Sun Jun 11 23:36:49 2000
---- osdef.sh	Tue Apr  9 20:28:37 2002
-***************
-*** 47,56 ****
-  # start of the line is matched with "[)*, 	]\1[ 	(]"
-  sed < osdef0.cc -e '/\(..*\)/s// \1/' > osdef0.ccc
-  
-! sed < $srcdir/osdef1.h.in -n -e '/^extern/s@.*[)* 	][)* 	]*\([a-zA-Z_][a-zA-Z0-9_]*\) __ARGS.*@/[)*, 	]\1[ 	(]/i\\\
-  \\/\\[^a-zA-Z_\\]\1 __ARGS\\/d@p' > osdef11.sed
-  
-! sed < $srcdir/osdef2.h.in -n -e '/^extern/s@.*[)* 	][)* 	]*\([a-zA-Z_][a-zA-Z0-9_]*\) __ARGS.*@/[)*, 	]\1[ 	(]/i\\\
-  \\/\\[^a-zA-Z_\\]\1 __ARGS\\/d@p' > osdef21.sed
-  
-  cat << EOF > osdef2.sed
---- 47,56 ----
-  # start of the line is matched with "[)*, 	]\1[ 	(]"
-  sed < osdef0.cc -e '/\(..*\)/s// \1/' > osdef0.ccc
-  
-! sed < $srcdir/osdef1.h.in -n -e '/^extern/s@.*[)* 	][)* 	]*\([a-zA-Z_][a-zA-Z0-9_]*\) __ARGS.*@/[)*, 	][(]*\1[)]*[ 	(]/i\\\
-  \\/\\[^a-zA-Z_\\]\1 __ARGS\\/d@p' > osdef11.sed
-  
-! sed < $srcdir/osdef2.h.in -n -e '/^extern/s@.*[)* 	][)* 	]*\([a-zA-Z_][a-zA-Z0-9_]*\) __ARGS.*@/[)*, 	][(]*\1[)]*[ 	(]/i\\\
-  \\/\\[^a-zA-Z_\\]\1 __ARGS\\/d@p' > osdef21.sed
-  
-  cat << EOF > osdef2.sed
-