diff options
author | wiz <wiz@pkgsrc.org> | 2017-08-15 21:00:11 +0000 |
---|---|---|
committer | wiz <wiz@pkgsrc.org> | 2017-08-15 21:00:11 +0000 |
commit | b384bdf8f3b1706ffa11371c732b6f6b861b2176 (patch) | |
tree | ec41fe081391a4842e89e4b7396015e2b47d8fe4 | |
parent | a3ad76585d21c28816349561b6cca7050da59324 (diff) | |
download | pkgsrc-b384bdf8f3b1706ffa11371c732b6f6b861b2176.tar.gz |
Updated vim-share to 8.0.0921.
The usual bugfixes.
Add PRINT_PLIST_AWK line to make updates easier.
-rw-r--r-- | editors/vim-share/PLIST | 3 | ||||
-rw-r--r-- | editors/vim-share/distinfo | 16 | ||||
-rw-r--r-- | editors/vim-share/patches/patch-Makefile | 22 | ||||
-rw-r--r-- | editors/vim-share/patches/patch-auto_configure | 8 | ||||
-rw-r--r-- | editors/vim-share/patches/patch-configure | 4 | ||||
-rw-r--r-- | editors/vim-share/version.mk | 6 |
6 files changed, 31 insertions, 28 deletions
diff --git a/editors/vim-share/PLIST b/editors/vim-share/PLIST index abd959ff2ad..2ba791230ae 100644 --- a/editors/vim-share/PLIST +++ b/editors/vim-share/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.33 2017/07/09 23:58:24 wen Exp $ +@comment $NetBSD: PLIST,v 1.34 2017/08/15 21:00:11 wiz Exp $ bin/xxd man/man1/evim.1 man/man1/vim.1 @@ -1038,6 +1038,7 @@ share/vim/${VIM_SUBDIR}/syntax/msidl.vim share/vim/${VIM_SUBDIR}/syntax/msmessages.vim share/vim/${VIM_SUBDIR}/syntax/msql.vim share/vim/${VIM_SUBDIR}/syntax/mupad.vim +share/vim/${VIM_SUBDIR}/syntax/murphi.vim share/vim/${VIM_SUBDIR}/syntax/mush.vim share/vim/${VIM_SUBDIR}/syntax/muttrc.vim share/vim/${VIM_SUBDIR}/syntax/mysql.vim diff --git a/editors/vim-share/distinfo b/editors/vim-share/distinfo index 57dc39df3b3..eca958445ca 100644 --- a/editors/vim-share/distinfo +++ b/editors/vim-share/distinfo @@ -1,11 +1,11 @@ -$NetBSD: distinfo,v 1.164 2017/07/09 23:58:24 wen Exp $ +$NetBSD: distinfo,v 1.165 2017/08/15 21:00:11 wiz Exp $ -SHA1 (vim-8.0.0702.tar.gz) = 26edfeb68eef3e8b19fd26caf0fc6d1eb15126ca -RMD160 (vim-8.0.0702.tar.gz) = f55721b2305cf47a003f55e9dd0f2bf203c5028c -SHA512 (vim-8.0.0702.tar.gz) = 6e3c537545d8978a11e2ab4eb4eaf4f3231bd32cf8f9d35d2614d0137753d7d2a508683dd2849a173462ea17ed40b645f2ff04f96952dac25ee137208977bd2d -Size (vim-8.0.0702.tar.gz) = 13206138 bytes -SHA1 (patch-Makefile) = 38fc271ce8feaeefbf22595eef8921d652737519 -SHA1 (patch-auto_configure) = 58a0d41f257d39f61d7705c65737bd9bcb3bf719 -SHA1 (patch-configure) = ae5970dec6d557d81da8a8f1da36d05ddc59ca56 +SHA1 (vim-8.0.0921.tar.gz) = 12bec550961cefc7e84e0a8929e7ee81650ab8eb +RMD160 (vim-8.0.0921.tar.gz) = 43f26186de9b8d5652f38f342d211f8f91dd7ea2 +SHA512 (vim-8.0.0921.tar.gz) = da178ac1469cd5d42d5e4b4ebcab2820128342112696da4265bc2dfd04b7fb38e15a8bc529607611a26303beb0bed5e74d5b6e3c0306ce54339fd597b2a27f05 +Size (vim-8.0.0921.tar.gz) = 13284673 bytes +SHA1 (patch-Makefile) = a7a25e77bcb5b53118b12af1dbca7f8312f353a5 +SHA1 (patch-auto_configure) = c71e1e5dc3d7dc204272826a3f24e17712b1bfa5 +SHA1 (patch-configure) = 8bd8d7f463959c1b3b93364c8f3b156ad49965be SHA1 (patch-feature.h) = 19c5ac2d7056adf9e6e074732871abc4058a59eb SHA1 (patch-link.sh) = 24db881cea873330a8a3bf672f6135d0835651fd diff --git a/editors/vim-share/patches/patch-Makefile b/editors/vim-share/patches/patch-Makefile index f02fa1946ff..2d104c1a625 100644 --- a/editors/vim-share/patches/patch-Makefile +++ b/editors/vim-share/patches/patch-Makefile @@ -1,12 +1,12 @@ -$NetBSD: patch-Makefile,v 1.6 2016/10/03 20:04:46 morr Exp $ +$NetBSD: patch-Makefile,v 1.7 2017/08/15 21:00:11 wiz Exp $ Handle Xaw support appropiately. Fix GNUmakeism by not depending on $< in non-suffix rules. ---- src/Makefile.orig 2016-07-02 20:33:46.000000000 +0000 +--- src/Makefile.orig 2017-08-12 20:55:58.000000000 +0000 +++ src/Makefile -@@ -1253,22 +1253,27 @@ MOTIF_BUNDLE = +@@ -1285,22 +1285,27 @@ MOTIF_BUNDLE = ### Athena GUI ### Use Xaw3d to make the menus look a little bit nicer #XAW_LIB = -lXaw3d @@ -15,25 +15,25 @@ Fix GNUmakeism by not depending on $< in non-suffix rules. ### When using Xaw3d, uncomment/comment the following lines to also get the ### scrollbars from Xaw3d. --#ATHENA_SRC = gui.c gui_athena.c gui_x11.c pty.c gui_beval.c gui_at_fs.c +-#ATHENA_SRC = gui.c gui_athena.c gui_x11.c gui_beval.c gui_at_fs.c -#ATHENA_OBJ = objects/gui.o objects/gui_athena.o objects/gui_x11.o \ --# objects/pty.o objects/gui_beval.o objects/gui_at_fs.o +-# objects/gui_beval.o objects/gui_at_fs.o -#ATHENA_DEFS = -DFEAT_GUI_ATHENA $(NARROW_PROTO) \ -# -Dvim_scrollbarWidgetClass=scrollbarWidgetClass \ -# -Dvim_XawScrollbarSetThumb=XawScrollbarSetThumb +.if defined(XAW_LIB) +.if (${XAW_LIB} != "-lXaw") -+ATHENA_SRC = gui.c gui_athena.c gui_x11.c pty.c gui_beval.c gui_at_fs.c ++ATHENA_SRC = gui.c gui_athena.c gui_x11.c gui_beval.c gui_at_fs.c +ATHENA_OBJ = objects/gui.o objects/gui_athena.o objects/gui_x11.o \ -+ objects/pty.o objects/gui_beval.o objects/gui_at_fs.o ++ objects/gui_beval.o objects/gui_at_fs.o +ATHENA_DEFS = -DFEAT_GUI_ATHENA $(NARROW_PROTO) \ + -Dvim_scrollbarWidgetClass=scrollbarWidgetClass \ + -Dvim_XawScrollbarSetThumb=XawScrollbarSetThumb +.else - ATHENA_SRC = gui.c gui_athena.c gui_x11.c pty.c gui_beval.c \ + ATHENA_SRC = gui.c gui_athena.c gui_x11.c gui_beval.c \ gui_at_sb.c gui_at_fs.c ATHENA_OBJ = objects/gui.o objects/gui_athena.o objects/gui_x11.o \ - objects/pty.o objects/gui_beval.o \ + objects/gui_beval.o \ objects/gui_at_sb.o objects/gui_at_fs.o ATHENA_DEFS = -DFEAT_GUI_ATHENA $(NARROW_PROTO) +.endif # Xaw @@ -41,7 +41,7 @@ Fix GNUmakeism by not depending on $< in non-suffix rules. ATHENA_IPATH = $(GUI_INC_LOC) ATHENA_LIBS_DIR = $(GUI_LIB_LOC) -@@ -2168,7 +2173,7 @@ installrtbase: $(HELPSOURCE)/vim.1 $(DES +@@ -2382,7 +2387,7 @@ installrtbase: $(HELPSOURCE)/vim.1 $(DES mv -f tags tags.dist; fi @echo generating help tags -@cd $(HELPSOURCE); if test -z "$(CROSS_COMPILING)"; then \ @@ -50,7 +50,7 @@ Fix GNUmakeism by not depending on $< in non-suffix rules. cd $(HELPSOURCE); \ files=`ls *.txt tags`; \ files="$$files `ls *.??x tags-?? 2>/dev/null || true`"; \ -@@ -2306,26 +2311,26 @@ installtools: $(TOOLS) $(DESTDIR)$(exec_ +@@ -2522,26 +2527,26 @@ installtools: $(TOOLS) $(DESTDIR)$(exec_ fi -chmod $(FILEMOD) $(DEST_TOOLS)/* # replace the path in some tools diff --git a/editors/vim-share/patches/patch-auto_configure b/editors/vim-share/patches/patch-auto_configure index 2178a7aef48..42a66d18702 100644 --- a/editors/vim-share/patches/patch-auto_configure +++ b/editors/vim-share/patches/patch-auto_configure @@ -1,11 +1,11 @@ -$NetBSD: patch-auto_configure,v 1.3 2016/07/05 07:26:35 morr Exp $ +$NetBSD: patch-auto_configure,v 1.4 2017/08/15 21:00:11 wiz Exp $ Buildlink takes care of include files. Also, remove stray dollar. ---- src/auto/configure.orig 2016-07-02 20:33:46.000000000 +0000 +--- src/auto/configure.orig 2017-08-12 20:55:58.000000000 +0000 +++ src/auto/configure -@@ -9490,7 +9490,7 @@ fi +@@ -9535,7 +9535,7 @@ fi if test -z "$SKIP_MOTIF"; then @@ -14,7 +14,7 @@ Also, remove stray dollar. GUI_INC_LOC="`echo $GUI_INC_LOC|sed 's%-I%%g'`" { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of Motif GUI includes" >&5 -@@ -14028,7 +14028,7 @@ if test "x$MACOSX" = "xyes"; then +@@ -14093,7 +14093,7 @@ if test "x$MACOSX" = "xyes"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we need -framework Cocoa" >&5 $as_echo_n "checking whether we need -framework Cocoa... " >&6; } if test "x$features" != "xtiny" || test "x$enable_multibyte" = "xyes"; then diff --git a/editors/vim-share/patches/patch-configure b/editors/vim-share/patches/patch-configure index d8cb2d43420..e0f66b3fe37 100644 --- a/editors/vim-share/patches/patch-configure +++ b/editors/vim-share/patches/patch-configure @@ -1,9 +1,9 @@ -$NetBSD: patch-configure,v 1.1 2012/08/28 05:59:39 morr Exp $ +$NetBSD: patch-configure,v 1.2 2017/08/15 21:00:11 wiz Exp $ use the right shell and avoid a non-portable construct Needed to configure on SunOS-5.9/sparc. ---- src/configure.orig 2010-08-15 13:02:25.000000000 +0000 +--- src/configure.orig 2017-08-12 20:55:58.000000000 +0000 +++ src/configure @@ -1,7 +1,8 @@ #! /bin/sh diff --git a/editors/vim-share/version.mk b/editors/vim-share/version.mk index a479d5c9817..6a9f25414dd 100644 --- a/editors/vim-share/version.mk +++ b/editors/vim-share/version.mk @@ -1,5 +1,7 @@ -# $NetBSD: version.mk,v 1.105 2017/07/09 23:58:24 wen Exp $ +# $NetBSD: version.mk,v 1.106 2017/08/15 21:00:11 wiz Exp $ VIM_VERSION= 8.0 -VIM_PATCHLEVEL= 0702 +VIM_PATCHLEVEL= 0921 VIM_SUBDIR= vim80 + +PRINT_PLIST_AWK+= { gsub(/${VIM_SUBDIR}/, "$${VIM_SUBDIR}"); print; next; } |