ports/50618: update port: editors/vim

[Yen-Ming Lee]

>Number:         50618
>Category:       ports
>Synopsis:       update port: editors/vim
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Apr 04 22:50:04 PST 2003
>Closed-Date:
>Last-Modified:
>Originator:     Yen-Ming Lee
>Release:        FreeBSD 5.0-RELEASE-p3 i386
>Organization:
>Environment:
System: FreeBSD utopia.leeym.com 5.0-RELEASE-p3 FreeBSD 5.0-RELEASE-p3 #41: Sun Mar 2 05:56:42 CST 2003 root at utopia.leeym.com:/mnt/obj/usr/src/sys/UTOPIA i386


	
>Description:
correct DATADIR and update PLIST.share-vim as well.

>How-To-Repeat:
# cd /usr/ports/editors/vim && make install

>Fix:

	

--- vim.diff begins here ---
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/editors/vim/Makefile,v
retrieving revision 1.222
diff -u -r1.222 Makefile
--- Makefile	4 Apr 2003 16:54:25 -0000	1.222
+++ Makefile	5 Apr 2003 06:43:06 -0000
@@ -10,7 +10,7 @@
 PATCHLEVEL=	435
 BASE_PATCHLEVEL=405
 PORTVERSION=	6.1.${PATCHLEVEL}
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES?=	editors
 MASTER_SITES=	${MASTER_SITE_VIM}
 DISTNAME=	vim-${PORTVERSION:C/\.[0-9]*$//}.${BASE_PATCHLEVEL}
@@ -47,7 +47,8 @@
 MAKE_ARGS+=	CONF_ARGS="--prefix=${PREFIX} --with-tlib=termlib ${CSCOPE_ARG}"
 ALL_TARGET=	#
 PLIST_SUB=	VIM_VER=${DISTNAME:S/-//:S/.//}
-DATADIR=	${PREFIX}/share/vim/${DISTNAME:S/-//:S/.//}
+_DATADIR=	${DISTNAME:S/-//:S/.//:C/.[0-9]*$//}
+DATADIR=	${PREFIX}/share/vim/${_DATADIR}
 MAN1=		evim.1 vim.1 vimdiff.1 vimtutor.1 xxd.1
 MLINKS=		vim.1 rvim.1  vim.1 rview.1
 .if !defined(LITE)
@@ -154,11 +155,11 @@
 		|| (cd ${PREFIX}/bin ; ${LN} -sf vim gvimdiff)
 	${INSTALL_DATA} ${FILESDIR}/vietnamese_viscii.vim ${DATADIR}/keymap
 	cd ${PREFIX} ;\
-	    ${FIND} share/vim/${DISTNAME:S/-//:S/.//}/ -type f -o -type l	\
+	    ${FIND} share/vim/${_DATADIR}/ -type f -o -type l	\
 	    	| sort \
 	    	>${WRKDIR}/PLIST.share-vim
 	cd ${PREFIX} ;\
-	    ${FIND} share/vim/${DISTNAME:S/-//:S/.//}/ -type d \
+	    ${FIND} share/vim/${_DATADIR}/ -type d \
 	    	| sort -r | ${SED} -e 's/^/@dirrm /g' \
 		>>${WRKDIR}/PLIST.share-vim
 	${ECHO_CMD} "r ${TMPPLIST}"			> ${WRKDIR}/ex.script
--- vim.diff ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: