aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorobrien <obrien@FreeBSD.org>2003-04-07 00:28:32 +0800
committerobrien <obrien@FreeBSD.org>2003-04-07 00:28:32 +0800
commit0506edbda0ed3b8ea97f75a7b8884afa2cc2af60 (patch)
treeacde68534d6245c2ba67f9e31bf647f96c4ec052
parentaf2a0d0ddba85814ee9c53a4376529cbf88b7dc9 (diff)
downloadfreebsd-ports-gnome-0506edbda0ed3b8ea97f75a7b8884afa2cc2af60.tar.gz
freebsd-ports-gnome-0506edbda0ed3b8ea97f75a7b8884afa2cc2af60.tar.zst
freebsd-ports-gnome-0506edbda0ed3b8ea97f75a7b8884afa2cc2af60.zip
Fix another place where having the patch level in the distfile caused problems.
PR: 50618 Submitted by: Yen-Ming Lee <leeym@utopia.leeym.com>
-rw-r--r--editors/vim/Makefile13
1 files changed, 7 insertions, 6 deletions
diff --git a/editors/vim/Makefile b/editors/vim/Makefile
index df322e7500ba..8abfb876a1c9 100644
--- a/editors/vim/Makefile
+++ b/editors/vim/Makefile
@@ -46,8 +46,9 @@ PATCH_DIST_ARGS= -d ${WRKSRC:S/src$//} --forward --quiet -E ${PATCH_DIST_STRIP}
#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/vim${PORTVERSION:C/\.[0-9]*$//:S/.//g}
+_DATADIR= ${DISTNAME:C/.[0-9]*$//: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)
@@ -154,12 +155,12 @@ post-install:
|| (cd ${PREFIX}/bin ; ${LN} -sf vim gvimdiff)
${INSTALL_DATA} ${FILESDIR}/vietnamese_viscii.vim ${DATADIR}/keymap
cd ${PREFIX} ;\
- ${FIND} ${DATADIR:S/^${PREFIX}\///} -type f -o -type l \
- | sort \
+ ${FIND} share/vim/${_DATADIR} -type f -o -type l \
+ | sort \
>${WRKDIR}/PLIST.share-vim
cd ${PREFIX} ;\
- ${FIND} ${DATADIR:S/^${PREFIX}\///} -type d \
- | sort -r | ${SED} -e 's/^/@dirrm /g' \
+ ${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