From owner-freebsd-ports@FreeBSD.ORG Sat Apr 5 10:32:32 2003 Return-Path: Delivered-To: freebsd-ports@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 79ED637B401 for ; Sat, 5 Apr 2003 10:32:32 -0800 (PST) Received: from smtp2.netcologne.de (smtp.netcologne.de [194.8.194.218]) by mx1.FreeBSD.org (Postfix) with ESMTP id C9FBA43FAF for ; Sat, 5 Apr 2003 10:32:30 -0800 (PST) (envelope-from tmseck-usenet@netcologne.de) Received: from localhost (xdsl-213-168-116-218.netcologne.de [213.168.116.218]) by smtp2.netcologne.de (Postfix) with ESMTP id BDF6739E14 for ; Sat, 5 Apr 2003 20:32:28 +0200 (MEST) Received: (qmail 14803 invoked by uid 1001); 5 Apr 2003 18:32:35 -0000 Date: 5 Apr 2003 18:32:35 -0000 Message-ID: <20030405183235.14802.qmail@laurel.tmseck.homedns.org> From: tmseck-lists@netcologne.de (Thomas Seck) To: freebsd-ports@freebsd.org Organization: private site In-Reply-To: <20030405095840.GA40592@rot13.obsecurity.org> X-Newsgroups: gmane.os.freebsd.devel.ports X-Attribution: tms Mail-Copies-To: nobody Subject: Re: FreeBSD Port: vim-6.1.435 X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Apr 2003 18:32:32 -0000 * Kris Kennaway (kris@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