Import of pkgsrc-2016Q3

editors/vim-share/patches/patch-Makefile

@@ -1,8 +1,12 @@
-$NetBSD: patch-Makefile,v 1.3 2013/10/07 19:26:28 morr Exp $
+$NetBSD: patch-Makefile,v 1.5 2016/07/03 13:20:59 morr Exp $
 
---- src/Makefile.orig	2013-08-10 15:07:12.000000000 +0000
+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
-@@ -1201,22 +1201,27 @@ MOTIF_BUNDLE	=
+@@ -1253,22 +1253,27 @@ MOTIF_BUNDLE	=
  ### Athena GUI
  ### Use Xaw3d to make the menus look a little bit nicer
  #XAW_LIB = -lXaw3d
@@ -37,16 +41,16 @@ $NetBSD: patch-Makefile,v 1.3 2013/10/07 19:26:28 morr Exp $
  
  ATHENA_IPATH	= $(GUI_INC_LOC)
  ATHENA_LIBS_DIR = $(GUI_LIB_LOC)
-@@ -1947,7 +1952,7 @@ installrtbase: $(HELPSOURCE)/vim.1 $(DES
- 	-$(SHELL) ./installman.sh install $(DEST_MAN) "" $(INSTALLMANARGS)
+@@ -2168,7 +2173,7 @@ installrtbase: $(HELPSOURCE)/vim.1 $(DES
+ 		mv -f tags tags.dist; fi
  	@echo generating help tags
- # Generate the help tags with ":helptags" to handle all languages.
--	-@cd $(HELPSOURCE); $(MAKE) VIMEXE=$(DEST_BIN)/$(VIMTARGET) vimtags
-+	-@cd $(HELPSOURCE); $(MAKE) VIMEXE=../../src/$(VIMTARGET) vimtags
+ 	-@cd $(HELPSOURCE); if test -z "$(CROSS_COMPILING)"; then \
+-		$(MAKE) VIMEXE=$(DEST_BIN)/$(VIMTARGET) vimtags; fi
++		$(MAKE) VIMEXE=../../src/$(VIMTARGET) vimtags; fi
  	cd $(HELPSOURCE); \
  		files=`ls *.txt tags`; \
  		files="$$files `ls *.??x tags-?? 2>/dev/null || true`"; \
-@@ -2076,26 +2081,26 @@ installtools: $(TOOLS) $(DESTDIR)$(exec_
+@@ -2306,26 +2311,26 @@ installtools: $(TOOLS) $(DESTDIR)$(exec_
  	      fi
  	-chmod $(FILEMOD) $(DEST_TOOLS)/*
  # replace the path in some tools

editors/vim-share/patches/patch-auto_configure

@@ -1,10 +1,11 @@
-$NetBSD: patch-auto_configure,v 1.1 2012/08/28 05:59:39 morr Exp $
+$NetBSD: patch-auto_configure,v 1.3 2016/07/05 07:26:35 morr Exp $
 
 Buildlink takes care of include files.
+Also, remove stray dollar.
 
---- src/auto/configure.orig	2012-05-25 09:26:29.000000000 +0000
+--- src/auto/configure.orig	2016-07-02 20:33:46.000000000 +0000
 +++ src/auto/configure
-@@ -8198,7 +8198,7 @@ fi
+@@ -9490,7 +9490,7 @@ fi
  
  
  if test -z "$SKIP_MOTIF"; then
@@ -13,3 +14,12 @@ Buildlink takes care of include files.
      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
+   { $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
+-    LIBS=$"$LIBS -framework Cocoa"
++    LIBS="$LIBS -framework Cocoa"
+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+   else

editors/vim-share/patches/patch-feature.h

@@ -1,8 +1,8 @@
-$NetBSD: patch-feature.h,v 1.1 2012/08/28 05:59:39 morr Exp $
+$NetBSD: patch-feature.h,v 1.2 2016/07/03 13:20:59 morr Exp $
 
 --- src/feature.h.orig	2012-05-25 09:26:32.000000000 +0000
 +++ src/feature.h
-@@ -559,7 +559,7 @@
+@@ -548,7 +548,7 @@
   *			(used only with NO_BUILTIN_TCAPS not defined).
   */
  #ifdef HAVE_TGETENT
@@ -10,4 +10,4 @@ $NetBSD: patch-feature.h,v 1.1 2012/08/28 05:59:39 morr Exp $
 +#define NO_BUILTIN_TCAPS
  #endif
  
- #if !defined(NO_BUILTIN_TCAPS) && !defined(FEAT_GUI_W16)
+ #if !defined(NO_BUILTIN_TCAPS)