Index: head/editors/vim/Makefile
===================================================================
--- head/editors/vim/Makefile	(revision 130140)
+++ head/editors/vim/Makefile	(revision 130141)
@@ -1,187 +1,187 @@
 # ex:ts=8
 # Ports collection makefile for:  vim
 # Date created:			  Sat June 29, 1996
 # Whom:				  David O'Brien (obrien@cs.ucdavis.edu)
 #
 # $FreeBSD$
 #
 
 PORTNAME?=	vim
-PATCHLEVEL=	45
+PATCHLEVEL=	62
 PORTVERSION=	6.3.${PATCHLEVEL}
 PORTREVISION?=	0
 CATEGORIES?=	editors
 MASTER_SITES=	${MASTER_SITE_VIM}
 DISTNAME=	vim-${PORTVERSION:C/\.[0-9a-z]*$//}
 
 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
+BADPATCHES=	000 022 025 035 038 041 044 047 048 052
 .for p in ${BADPATCHES}
 PATCHFILES:=	${PATCHFILES:N6.3.${p}}
 .endfor
 
 MAINTAINER?=	obrien@FreeBSD.org
 COMMENT?=	Vi "workalike", with many additional features
 
 SLAVEDIRS=	editors/vim-lite
 
 .if defined(PACKAGE_BUILDING) && !defined(LITE)
 WITH_TCL=	yes
 WITH_PERL=	yes
 WITH_PYTHON=	yes
 WITH_CSCOPE=	yes
 .endif
 
 USE_BZIP2=	yes
 USE_REINPLACE=	yes
 DIST_SUBDIR=	vim
 WRKSRC=		${WRKDIR}/vim${PORTVERSION:C/\.[0-9]*$//:S/.//g}/src
 PATCH_DIST_ARGS= -d ${WRKSRC:S/src$//} --batch --forward --quiet -E ${PATCH_DIST_STRIP}
 # consider
 #PATCH_DIST_ARGS=	-t
 MAKE_ARGS+=	CONF_ARGS="--prefix=${PREFIX} --with-tlib=termlib ${CSCOPE_ARG}"
 ALL_TARGET=	#
 _DATADIR=	${DISTNAME:S/-//g:S/.//g}
 DATADIR=	${PREFIX}/share/vim/${_DATADIR}
 PLIST_SUB=	VIM_VER=${_DATADIR}
 MAN1=		evim.1 vim.1 vimdiff.1 vimtutor.1 xxd.1
 MLINKS=		vim.1 rvim.1	vim.1 rview.1
 .if !defined(LITE)
 MLINKS+=	vim.1 gvim.1	vim.1 gview.1	vimdiff.1 gvimdiff.1 \
 		vim.1 rgvim.1	vim.1 rgview.1	evim.1 eview.1
 .endif
 
 WANT_GNOME=	yes
 
 .include <bsd.port.pre.mk>
 
 .if !defined(LITE)
 MAKE_ARGS+=	CONF_OPT_FEAT="--with-features=big"
 I18N=		CONF_OPT_MULTIBYTE="--enable-multibyte --enable-fontset --enable-xim"
 
 .if defined(NO_GUI)
 WITHOUT_X11=	yes
 .endif
 
 .if defined(WITH_CSCOPE)
 RUN_DEPENDS+=	cscope:${PORTSDIR}/devel/cscope
 MAKE_ARGS+=	CONF_OPT_CSCOPE="--enable-cscope"
 .endif
 
 .if defined(WITH_PYTHON)
 USE_PYTHON=	yes
 MAKE_ARGS+=	CONF_OPT_PYTHON="--enable-pythoninterp"
 .endif
 
 .if defined(WITH_PERL)
 USE_PERL5=	yes
 MAKE_ARGS+=	CONF_OPT_PERL="--enable-perlinterp"
 .endif
 
 .if defined(WITH_TCL)
 BUILD_DEPENDS=	tclsh8.4:${PORTSDIR}/lang/tcl84
 LIB_DEPENDS=	tcl84.1:${PORTSDIR}/lang/tcl84
 MAKE_ARGS+=	CONF_OPT_TCL="--enable-tclinterp"
 .endif
 
 .if defined(WITH_RUBY)
 USE_RUBY=	yes
 MAKE_ARGS+=	CONF_OPT_RUBY="--enable-rubyinterp"
 .endif
 
 .if !defined(WITHOUT_X11)
 #	for now default the GUI to the GTK+ one
 #	will be reviewed when the GTK+ 1.{3,4} behemoth is released
 .if !defined(WITH_ATHENA) && !defined(WITH_MOTIF) && !defined(WITH_GNOME) && !defined(WITH_GTK2)
 WITH_GNOME=	gtk12
 .endif
 
 .if defined(WITH_ATHENA)
 MAKE_ARGS+=	CONF_OPT_GUI="--enable-gui=athena" ${I18N}
 .elif defined(WITH_GTK2)
 USE_GNOME=	gtk20
 PKGNAMESUFFIX=	-gtk2
 MAKE_ARGS+=	CONF_OPT_GUI="--enable-gui=gtk2 --with-gtk-prefix=${X11BASE}" ${I18N}
 MAKE_ARGS+=	X_LIBS="$(X_LIBS) -lXt"
 .elif defined(WITH_GNOME)
 .if ${WITH_GNOME:Mgnomelibs}!="" || ${WITH_GNOME}=="yes" || \
 	${WITH_GNOME}=="1"
 USE_GNOME=	gnomelibs gnomeprefix
 PKGNAMESUFFIX=	-gnome
 MAKE_ARGS+=	CONF_OPT_GUI="--enable-gui=gnome --with-gtk-prefix=${X11BASE}" ${I18N}
 MAKE_ARGS+=	X_LIBS="$(X_LIBS) -lXt"
 .else
 USE_GNOME=	gtk12
 MAKE_ARGS+=	CONF_OPT_GUI="--enable-gui=gtk --with-gtk-prefix=${X11BASE}" ${I18N}
 MAKE_ARGS+=	X_LIBS="$(X_LIBS) -lXt"
 .endif
 .elif defined(WITH_MOTIF)
 USE_MOTIF=	yes
 MAKE_ARGS+=	CONF_OPT_GUI="--enable-gui=motif --with-motif-lib=\"${MOTIFLIB}\"" MOTIFHOME=${X11BASE} ${I18N}
 .endif
 .else	# WITHOUT_X11
 MAKE_ARGS+=	CONF_OPT_GUI="--enable-gui=no --without-x" ${I18N}
 .endif	# WITHOUT_X11
 
 .else	# LITE
 PKGNAMESUFFIX=	-lite
 MAKE_ARGS+=	CONF_OPT_GUI="--enable-gui=no --without-x --enable-multibyte"
 MAKE_ARGS+=	CONF_OPT_PERL="--disable-perlinterp --disable-pythoninterp --disable-tclinterp --disable-rubyinterp"
 .endif	# LITE
 
 .if exists(${PREFIX}/lib/libiconv.so)
 USE_ICONV=	yes
 .endif
 
 pre-configure:
 	@(cd ${WRKSRC} ; ${MAKE} distclean)
 	@${REINPLACE_CMD} -e 's|8\.2|8.4|; \
 		s|\$$gtk_config_prefix/bin/gtk-config|\$${GTK_CONFIG}|; \
 		s|\$$gtk_config_exec_prefix/bin/gtk-config|\$${GTK_CONFIG}|' \
 		${WRKSRC}/auto/configure
 
 #	Clean up junk files to keep them from being installed.
 pre-install:
 	@${RM} -f ${WRKSRC}/../runtime/macros/maze/*.orig
 
 post-install:
 	[ -e ${PREFIX}/bin/gvim ] || (cd ${PREFIX}/bin ; ${LN} -sf vim gvim)
 	#	below needed for `vim-lite' port
 	${TEST} -e ${PREFIX}/bin/rgvim  || (cd ${PREFIX}/bin ; ${LN} -sf vim rgvim)
 	${TEST} -e ${PREFIX}/bin/gview  || (cd ${PREFIX}/bin ; ${LN} -sf vim gview)
 	${TEST} -e ${PREFIX}/bin/rgview || (cd ${PREFIX}/bin ; ${LN} -sf vim rgview)
 	${TEST} -e ${PREFIX}/bin/evim   || (cd ${PREFIX}/bin ; ${LN} -sf vim evim)
 	${TEST} -e ${PREFIX}/bin/eview  || (cd ${PREFIX}/bin ; ${LN} -sf vim eview)
 	${TEST} -e ${PREFIX}/bin/gvimdiff  \
 		|| (cd ${PREFIX}/bin ; ${LN} -sf vim gvimdiff)
 	${INSTALL_DATA} ${FILESDIR}/vietnamese_viscii.vim ${DATADIR}/keymap
 	cd ${PREFIX} ;\
 	    ${FIND} share/vim/${_DATADIR} -type f -o -type l	\
 	    	| ${SORT}					\
 	    	>${WRKDIR}/PLIST.share-vim
 	cd ${PREFIX} ;\
 	    ${FIND} share/vim/${_DATADIR} -type d		\
 	    	| ${SORT} -r | ${SED} -e 's/^/@dirrm /g'	\
 		>>${WRKDIR}/PLIST.share-vim
 	${ECHO_CMD} "r ${TMPPLIST}"			> ${WRKDIR}/ex.script
 	${ECHO_CMD} "/Insert PLIST.share-vim"		>> ${WRKDIR}/ex.script
 	${ECHO_CMD} "d"					>> ${WRKDIR}/ex.script
 	${ECHO_CMD} "r ${WRKDIR}/PLIST.share-vim"	>> ${WRKDIR}/ex.script
 	${ECHO_CMD} "x!"				>> ${WRKDIR}/ex.script
 	${CP} -p ${TMPPLIST} ${TMPPLIST}.pre-share-vim
 	cd ${WRKDIR} ; ex < ex.script
 
 cklatest:
 	@-ncftpls \
 	    ftp://ftp.vim.org/pub/vim/patches/${PORTVERSION:C/\.[0-9a-z]*$//}/ \
 		| fgrep ${PORTVERSION:C/[0-9]*$//} | ${TAIL}
 
 find-bad-patches:
 	cd ${DISTDIR} ; egrep -l \
-		'(src/os_win32|src/os_mswin|src/if_ole|src/proto/gui_w32|src/gui_w48|src/gui_mac|src/os_riscos)'\
+		'(src/os_win32|src/os_mswin|src/if_ole|src/proto/gui_w32|src/gui_w48|src/gui_mac|src/os_riscos|vms)'\
 		vim/${PORTVERSION:C/\.[0-9a-z]*$//}*
 
 .include <bsd.port.post.mk>

Property changes on: head/editors/vim/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.261
\ No newline at end of property
+1.262
\ No newline at end of property
Index: head/editors/vim/distinfo
===================================================================
--- head/editors/vim/distinfo	(revision 130140)
+++ head/editors/vim/distinfo	(revision 130141)
@@ -1,80 +1,110 @@
 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.048) = 40bdb1312b6865a7b13681e765bee0f1
+SIZE (vim/6.3.048) = 18175
+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

Property changes on: head/editors/vim/distinfo
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.154
\ No newline at end of property
+1.155
\ No newline at end of property