FreeBSD Port: vim-6.1.435

[Thomas Seck]

* Kris Kennaway (kris at obsecurity.org):

> [-- text/plain, encoding quoted-printable, 15 lines --]
> 
> On Sat, Apr 05, 2003 at 10:53:44AM +0200, Daniel Mueller wrote:
> 
>> Hi,
>> when i try to update vim i via portupgrade get the following error on my 
>> 4.8-RELEASE box:
> 
>> /usr/local/share/vim/vim61.405/keymap
>> install: /usr/local/share/vim/vim61.405/keymap: No such file or directory
>> *** Error code 71
> 
> bento sees this too on 5.0.

The logic to determine the directory for shared data is broken since the
inclusion of the "BASEPATCHLEVEL" variable.

I have thus defined a variable "VIMVERSION" which will remove most of the
change-substitution magic in vim/Makefile.

See the following patch:

Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/editors/vim/Makefile,v
retrieving revision 1.222
diff -u -u -r1.222 Makefile
--- Makefile	4 Apr 2003 16:54:03 -0000	1.222
+++ Makefile	5 Apr 2003 18:30:44 -0000
@@ -7,6 +7,7 @@
 #
 
 PORTNAME?=	vim
+VIMVERSION=	61
 PATCHLEVEL=	435
 BASE_PATCHLEVEL=405
 PORTVERSION=	6.1.${PATCHLEVEL}
@@ -40,14 +41,14 @@
 USE_REINPLACE=	yes
 USE_GNOMENG=	yes
 DIST_SUBDIR=	vim
-WRKSRC=		${WRKDIR}/vim${PORTVERSION:C/\.[0-9]*$//:S/.//g}/src
+WRKSRC=		${WRKDIR}/vim${VIMVERSION}/src
 PATCH_DIST_ARGS=	-d ${WRKSRC:S/src$//} --forward --quiet -E ${PATCH_DIST_STRIP}
 # consider
 #PATCH_DIST_ARGS=	-t
 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/.//}
+PLIST_SUB=	VIM_VER=${VIMVERSION}
+DATADIR=	${PREFIX}/share/vim/vim${VIMVERSION}
 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/vim${VIMVERSION}/ -type f -o -type l	\
 	    	| sort \
 	    	>${WRKDIR}/PLIST.share-vim
 	cd ${PREFIX} ;\
-	    ${FIND} share/vim/${DISTNAME:S/-//:S/.//}/ -type d \
+	    ${FIND} share/vim/vim${VIMVERSION}/ -type d \
 	    	| sort -r | ${SED} -e 's/^/@dirrm /g' \
 		>>${WRKDIR}/PLIST.share-vim
 	${ECHO_CMD} "r ${TMPPLIST}"			> ${WRKDIR}/ex.script

     --Thomas