From 33b24322d584415e3df83b35652c5d38d02d1a19 Mon Sep 17 00:00:00 2001
From: Adam Weinberger <adamw@FreeBSD.org>
Date: Sat, 19 Nov 2016 18:50:11 +0000
Subject: Update to patchlevel 94, and simplify the Makefile a bit.

---
 editors/vim/Makefile | 20 +++++++-------------
 editors/vim/distinfo |  6 +++---
 2 files changed, 10 insertions(+), 16 deletions(-)

(limited to 'editors/vim')

diff --git a/editors/vim/Makefile b/editors/vim/Makefile
index 1017313da2aa..0939fb9f5e79 100644
--- a/editors/vim/Makefile
+++ b/editors/vim/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	vim
-PORTVERSION=	8.0.0082
+PORTVERSION=	8.0.0094
 DISTVERSIONPREFIX=	v
 CATEGORIES=	editors
 
@@ -139,6 +139,9 @@ MAKE_ARGS+=	CONF_OPT_PYTHON="--enable-python3interp --disable-pythoninterp"
 .endif
 .endif
 
+post-extract:
+	${INSTALL_DATA} ${FILESDIR}/vietnamese_viscii.vim ${WRKSRC}/runtime/keymap
+
 post-patch:
 	@${FIND} ${WRKSRC}/ -name 'Makefile' | ${XARGS} ${REINPLACE_CMD} -e 's| $$<| $$>|'
 	@${REINPLACE_CMD} -e '/^install_normal: / s|install-icons|# &|; /cd $$(DEST_BIN); ln -s/d' ${WRKSRC}/src/Makefile
@@ -168,15 +171,9 @@ post-configure:
 	@${REINPLACE_CMD} -e 's|#define HAVE_SYSINFO 1|/* #undef HAVE_SYSINFO */|' ${WRKSRC}/src/auto/config.h
 
 post-install:
-	${MKDIR} ${STAGEDIR}${DATADIR}/${VIM_VER}/lang/
-.for file in evim rview rvim vimdiff
-	${LN} -fs vim ${STAGEDIR}${PREFIX}/bin/${file}
-.endfor
-.if empty(PORT_OPTIONS:MCONSOLE) && empty(PORT_OPTIONS:MX11)
-.for file in eview gview gvim gvimdiff rgview rgvim
-	${LN} -fs vim ${STAGEDIR}${PREFIX}/bin/${file}
+.for F in eview evim gview gvim gvimdiff rgview rgvim rview rvim vimdiff
+	${LN} -s vim ${STAGEDIR}${PREFIX}/bin/$F
 .endfor
-.endif
 
 post-install-DEFAULT_VIMRC-on:
 	@${MKDIR} ${STAGEDIR}${ETCDIR}
@@ -184,11 +181,8 @@ post-install-DEFAULT_VIMRC-on:
 	${INSTALL_DATA} ${FILESDIR}/vimrc ${STAGEDIR}${ETCDIR}/vimrc.sample
 
 post-install-NLS-off:
+	@${MKDIR} ${STAGEDIR}${DATADIR}/${VIM_VER}/lang
 	@${MKDIR} ${STAGEDIR}${DATADIR}/${VIM_VER}/keymap
 	${INSTALL_DATA} ${WRKSRC}/runtime/keymap/* ${STAGEDIR}${DATADIR}/${VIM_VER}/keymap
-	${INSTALL_DATA} ${FILESDIR}/vietnamese_viscii.vim ${STAGEDIR}${DATADIR}/${VIM_VER}/keymap
-
-post-install-NLS-on:
-	${INSTALL_DATA} ${FILESDIR}/vietnamese_viscii.vim ${STAGEDIR}${DATADIR}/${VIM_VER}/keymap
 
 .include <bsd.port.post.mk>
diff --git a/editors/vim/distinfo b/editors/vim/distinfo
index a8a594ac0fd8..f4ed86a08772 100644
--- a/editors/vim/distinfo
+++ b/editors/vim/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1478991171
-SHA256 (vim-vim-v8.0.0082_GH0.tar.gz) = 8d346aa42522838615d7362cedf76bfba4d94627efdc500b234f74bc66fc4244
-SIZE (vim-vim-v8.0.0082_GH0.tar.gz) = 12935467
+TIMESTAMP = 1479579149
+SHA256 (vim-vim-v8.0.0094_GH0.tar.gz) = 03f50820f889041ad27862c6efa3f59ab3d9765df30f55937dda980c801b4848
+SIZE (vim-vim-v8.0.0094_GH0.tar.gz) = 12945045
-- 
cgit v1.2.3