diff options
Diffstat (limited to 'editors')
| -rw-r--r-- | editors/vim-share/Makefile | 8 | ||||
| -rw-r--r-- | editors/vim-share/Makefile.common | 13 | ||||
| -rw-r--r-- | editors/vim-share/PLIST | 8 | ||||
| -rw-r--r-- | editors/vim-share/distinfo | 12 | ||||
| -rw-r--r-- | editors/vim-share/patches/patch-Makefile | 4 | ||||
| -rw-r--r-- | editors/vim-share/version.mk | 8 |
6 files changed, 30 insertions, 23 deletions
diff --git a/editors/vim-share/Makefile b/editors/vim-share/Makefile index 27f43ffa14e..9f701a9dbad 100644 --- a/editors/vim-share/Makefile +++ b/editors/vim-share/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.45 2016/07/25 10:51:37 jperkin Exp $ +# $NetBSD: Makefile,v 1.46 2016/10/03 20:04:46 morr Exp $ PKGNAME= vim-share-${VIM_VERSION}.${VIM_PATCHLEVEL} COMMENT= Data files for the vim editor (vi clone) @@ -15,9 +15,9 @@ INSTALL_MAKE_FLAGS+= ${MAKE_FLAGS} TOOLS_AWK=${TOOLS_AWK} TOOLS_SETENV=${TOOLS_S PLIST_SUBST+= VIM_SUBDIR=${VIM_SUBDIR} -CHECK_INTERPRETER_SKIP+= share/vim/vim74/doc/*.pl -CHECK_INTERPRETER_SKIP+= share/vim/vim74/tools/*.pl -CHECK_INTERPRETER_SKIP+= share/vim/vim74/tools/*.py +CHECK_INTERPRETER_SKIP+= share/vim/${VIM_SUBDIR}/doc/*.pl +CHECK_INTERPRETER_SKIP+= share/vim/${VIM_SUBDIR}/tools/*.pl +CHECK_INTERPRETER_SKIP+= share/vim/${VIM_SUBDIR}/tools/*.py .include "../../mk/curses.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/editors/vim-share/Makefile.common b/editors/vim-share/Makefile.common index 7006bc559e3..a325a8fbd85 100644 --- a/editors/vim-share/Makefile.common +++ b/editors/vim-share/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.153 2016/07/25 10:51:37 jperkin Exp $ +# $NetBSD: Makefile.common,v 1.154 2016/10/03 20:04:46 morr Exp $ # used by editors/vim/Makefile # used by editors/vim-gtk/Makefile @@ -11,8 +11,9 @@ DISTNAME= vim-${VIM_VERSION}.${VIM_PATCHLEVEL} CATEGORIES= editors -MASTER_SITES= ${MASTER_SITE_LOCAL} -EXTRACT_SUFX= .tar.bz2 +GITHUB_PROJECT= vim +GITHUB_TAG= v${VIM_VERSION}.${VIM_PATCHLEVEL} +MASTER_SITES= ${MASTER_SITE_GITHUB:=vim/} .include "../../mk/bsd.prefs.mk" @@ -22,7 +23,7 @@ LICENSE= vim-license CONFLICTS+= vim-kde-[0-9]* -WRKSRC= ${WRKDIR}/${VIM_SUBDIR}/src +WRKSRC= ${WRKDIR}/${DISTNAME}/src GNU_CONFIGURE= yes USE_LANGUAGES+= c99 @@ -39,9 +40,9 @@ CONFIGURE_ARGS+= ${VIM_EXTRA_OPTS} CONFIGURE_ARGS+= --enable-multibyte CONFIGURE_ARGS+= --enable-cscope -PATCH_ARGS= -d ${WRKDIR}/${VIM_SUBDIR} --forward --quiet \ +PATCH_ARGS= -d ${WRKDIR}/${DISTNAME} --forward --quiet \ -E ${PATCH_STRIP:Q} -PATCH_DIST_ARGS= -d ${WRKDIR}/${VIM_SUBDIR} --forward --quiet \ +PATCH_DIST_ARGS= -d ${WRKDIR}/${DISTNAME} --forward --quiet \ -E ${PATCH_DIST_STRIP:Q} PATCHDIR= ${.CURDIR}/../../editors/vim-share/patches DISTINFO_FILE?= ${.CURDIR}/../../editors/vim-share/distinfo diff --git a/editors/vim-share/PLIST b/editors/vim-share/PLIST index 67469c698df..5fc94f2deb5 100644 --- a/editors/vim-share/PLIST +++ b/editors/vim-share/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.26 2016/07/03 13:20:59 morr Exp $ +@comment $NetBSD: PLIST,v 1.27 2016/10/03 20:04:46 morr Exp $ bin/xxd man/man1/evim.1 man/man1/vim.1 @@ -126,6 +126,7 @@ share/vim/${VIM_SUBDIR}/compiler/tidy.vim share/vim/${VIM_SUBDIR}/compiler/xbuild.vim share/vim/${VIM_SUBDIR}/compiler/xmllint.vim share/vim/${VIM_SUBDIR}/compiler/xmlwf.vim +share/vim/${VIM_SUBDIR}/defaults.vim share/vim/${VIM_SUBDIR}/delmenu.vim share/vim/${VIM_SUBDIR}/doc/arabic.txt share/vim/${VIM_SUBDIR}/doc/autocmd.txt @@ -423,6 +424,7 @@ share/vim/${VIM_SUBDIR}/ftplugin/rrst.vim share/vim/${VIM_SUBDIR}/ftplugin/rst.vim share/vim/${VIM_SUBDIR}/ftplugin/ruby.vim share/vim/${VIM_SUBDIR}/ftplugin/sass.vim +share/vim/${VIM_SUBDIR}/ftplugin/scala.vim share/vim/${VIM_SUBDIR}/ftplugin/scheme.vim share/vim/${VIM_SUBDIR}/ftplugin/screen.vim share/vim/${VIM_SUBDIR}/ftplugin/scss.vim @@ -536,6 +538,7 @@ share/vim/${VIM_SUBDIR}/indent/lua.vim share/vim/${VIM_SUBDIR}/indent/mail.vim share/vim/${VIM_SUBDIR}/indent/make.vim share/vim/${VIM_SUBDIR}/indent/matlab.vim +share/vim/${VIM_SUBDIR}/indent/mf.vim share/vim/${VIM_SUBDIR}/indent/mma.vim share/vim/${VIM_SUBDIR}/indent/mp.vim share/vim/${VIM_SUBDIR}/indent/objc.vim @@ -560,6 +563,7 @@ share/vim/${VIM_SUBDIR}/indent/rrst.vim share/vim/${VIM_SUBDIR}/indent/rst.vim share/vim/${VIM_SUBDIR}/indent/ruby.vim share/vim/${VIM_SUBDIR}/indent/sass.vim +share/vim/${VIM_SUBDIR}/indent/scala.vim share/vim/${VIM_SUBDIR}/indent/scheme.vim share/vim/${VIM_SUBDIR}/indent/scss.vim share/vim/${VIM_SUBDIR}/indent/sdl.vim @@ -1117,6 +1121,7 @@ share/vim/${VIM_SUBDIR}/syntax/samba.vim share/vim/${VIM_SUBDIR}/syntax/sas.vim share/vim/${VIM_SUBDIR}/syntax/sass.vim share/vim/${VIM_SUBDIR}/syntax/sather.vim +share/vim/${VIM_SUBDIR}/syntax/scala.vim share/vim/${VIM_SUBDIR}/syntax/scheme.vim share/vim/${VIM_SUBDIR}/syntax/scilab.vim share/vim/${VIM_SUBDIR}/syntax/screen.vim @@ -1308,6 +1313,7 @@ share/vim/${VIM_SUBDIR}/tutor/README.txt share/vim/${VIM_SUBDIR}/tutor/tutor share/vim/${VIM_SUBDIR}/tutor/tutor.bar share/vim/${VIM_SUBDIR}/tutor/tutor.bar.utf-8 +share/vim/${VIM_SUBDIR}/tutor/tutor.bg.utf-8 share/vim/${VIM_SUBDIR}/tutor/tutor.ca share/vim/${VIM_SUBDIR}/tutor/tutor.ca.utf-8 share/vim/${VIM_SUBDIR}/tutor/tutor.cs diff --git a/editors/vim-share/distinfo b/editors/vim-share/distinfo index 6fa997ff89b..0f15c7fcc9f 100644 --- a/editors/vim-share/distinfo +++ b/editors/vim-share/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.155 2016/07/05 07:26:35 morr Exp $ +$NetBSD: distinfo,v 1.156 2016/10/03 20:04:46 morr Exp $ -SHA1 (vim-7.4.1987.tar.bz2) = 662102162ee6b07dd4a623f560e26737999d658a -RMD160 (vim-7.4.1987.tar.bz2) = 66ba5a2581354d46354979607b27213a98736e6f -SHA512 (vim-7.4.1987.tar.bz2) = 66cbf234741e980097da3f4d6754639042af1020bcca4dd8edfb91ab427498d18ef2de15a850d0c62be1d79e838e48e9822cceeb2224bd9cf4c93efac82e4cae -Size (vim-7.4.1987.tar.bz2) = 10140434 bytes -SHA1 (patch-Makefile) = 6373437f649d627b2bc1595bf67e821412500fb5 +SHA1 (vim-8.0.0021.tar.gz) = 1703f3a9b6f50bdb4b21b90318d4b494636beed1 +RMD160 (vim-8.0.0021.tar.gz) = 52e98ea2b4ff761a8db9beebef3b4e119359425d +SHA512 (vim-8.0.0021.tar.gz) = 1310720c1efae4842cc25c233148de07573c07373f1c04d6d8edc4541da43d48e152e9010fc11c4f1721a57040780dc89a6a1f4f651bba69a580c9fe68eeb302 +Size (vim-8.0.0021.tar.gz) = 12928873 bytes +SHA1 (patch-Makefile) = 38fc271ce8feaeefbf22595eef8921d652737519 SHA1 (patch-auto_configure) = 58a0d41f257d39f61d7705c65737bd9bcb3bf719 SHA1 (patch-configure) = ae5970dec6d557d81da8a8f1da36d05ddc59ca56 SHA1 (patch-feature.h) = 6fc4b6c07d33af4df44e12af8d1148931a848ef4 diff --git a/editors/vim-share/patches/patch-Makefile b/editors/vim-share/patches/patch-Makefile index 80e63e44305..f02fa1946ff 100644 --- a/editors/vim-share/patches/patch-Makefile +++ b/editors/vim-share/patches/patch-Makefile @@ -1,10 +1,10 @@ -$NetBSD: patch-Makefile,v 1.5 2016/07/03 13:20:59 morr Exp $ +$NetBSD: patch-Makefile,v 1.6 2016/10/03 20:04:46 morr Exp $ Handle Xaw support appropiately. Fix GNUmakeism by not depending on $< in non-suffix rules. ---- src/Makefile.orig 2016-07-03 10:35:32.000000000 +0000 +--- src/Makefile.orig 2016-07-02 20:33:46.000000000 +0000 +++ src/Makefile @@ -1253,22 +1253,27 @@ MOTIF_BUNDLE = ### Athena GUI diff --git a/editors/vim-share/version.mk b/editors/vim-share/version.mk index a3d668dd24a..cc720bf9650 100644 --- a/editors/vim-share/version.mk +++ b/editors/vim-share/version.mk @@ -1,5 +1,5 @@ -# $NetBSD: version.mk,v 1.97 2016/07/03 13:20:59 morr Exp $ +# $NetBSD: version.mk,v 1.98 2016/10/03 20:04:46 morr Exp $ -VIM_VERSION= 7.4 -VIM_PATCHLEVEL= 1987 -VIM_SUBDIR= vim74 +VIM_VERSION= 8.0 +VIM_PATCHLEVEL= 0021 +VIM_SUBDIR= vim80 |