Sat May 3 07:30:19 2014 UTC ()
'list_remove', being defined as well on SunOS under <sys/list.h>, causes
a 'conflicting types' error when building with perl, python and/or ruby.
Affects the following files: eval.c, if_lua.c and if_py_both.c


(richard)
diff -r1.32 -r1.33 pkgsrc/editors/vim-share/Makefile
diff -r1.142 -r1.143 pkgsrc/editors/vim-share/distinfo
diff -r0 -r1.1 pkgsrc/editors/vim-share/patches/patch-eval.c
diff -r0 -r1.1 pkgsrc/editors/vim-share/patches/patch-if__lua.c
diff -r0 -r1.1 pkgsrc/editors/vim-share/patches/patch-if__py__both.h
diff -r0 -r1.1 pkgsrc/editors/vim-share/patches/patch-proto_eval.pro
cvs diff -r1.32 -r1.33 pkgsrc/editors/vim-share/Makefile (expand / switch to unified diff)

--- pkgsrc/editors/vim-share/Makefile 2014/02/20 10:15:57 1.32
+++ pkgsrc/editors/vim-share/Makefile 2014/05/03 07:30:19 1.33
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.32 2014/02/20 10:15:57 jperkin Exp $ 1# $NetBSD: Makefile,v 1.33 2014/05/03 07:30:19 richard Exp $
2 2
3PKGNAME= vim-share-${VIM_VERSION}.${VIM_PATCHLEVEL} 3PKGNAME= vim-share-${VIM_VERSION}.${VIM_PATCHLEVEL}
4 4PKGREVISION= 1
5COMMENT= Data files for the vim editor (vi clone) 5COMMENT= Data files for the vim editor (vi clone)
6 6
7.include "Makefile.common" 7.include "Makefile.common"
8 8
9CONFIGURE_ARGS+= --disable-gui 9CONFIGURE_ARGS+= --disable-gui
10CONFIGURE_ARGS+= --without-x 10CONFIGURE_ARGS+= --without-x
11 11
12BUILD_TARGET= vim 12BUILD_TARGET= vim
13INSTALL_TARGET= installruntime installmacros installtutor installtools 13INSTALL_TARGET= installruntime installmacros installtutor installtools
14USE_TOOLS+= awk 14USE_TOOLS+= awk
15INSTALL_MAKE_FLAGS+= ${MAKE_FLAGS} TOOLS_AWK=${TOOLS_AWK} TOOLS_SETENV=${TOOLS_SETENV} 15INSTALL_MAKE_FLAGS+= ${MAKE_FLAGS} TOOLS_AWK=${TOOLS_AWK} TOOLS_SETENV=${TOOLS_SETENV}
16 16
17PLIST_SUBST+= VIM_SUBDIR=${VIM_SUBDIR} 17PLIST_SUBST+= VIM_SUBDIR=${VIM_SUBDIR}
cvs diff -r1.142 -r1.143 pkgsrc/editors/vim-share/distinfo (expand / switch to unified diff)

--- pkgsrc/editors/vim-share/distinfo 2014/01/11 23:24:03 1.142
+++ pkgsrc/editors/vim-share/distinfo 2014/05/03 07:30:19 1.143
@@ -1,10 +1,14 @@ @@ -1,10 +1,14 @@
1$NetBSD: distinfo,v 1.142 2014/01/11 23:24:03 morr Exp $ 1$NetBSD: distinfo,v 1.143 2014/05/03 07:30:19 richard Exp $
2 2
3SHA1 (vim-7.4.141.tar.bz2) = 23f7844950671f08768f2bc6bc1b97908cd01dfc 3SHA1 (vim-7.4.141.tar.bz2) = 23f7844950671f08768f2bc6bc1b97908cd01dfc
4RMD160 (vim-7.4.141.tar.bz2) = 7c67da719b2093d08c702b1706fc4cb72097bf13 4RMD160 (vim-7.4.141.tar.bz2) = 7c67da719b2093d08c702b1706fc4cb72097bf13
5Size (vim-7.4.141.tar.bz2) = 9404354 bytes 5Size (vim-7.4.141.tar.bz2) = 9404354 bytes
6SHA1 (patch-Makefile) = 741f2b59d843094dbc1677aef9df93cf97c8d5a1 6SHA1 (patch-Makefile) = 741f2b59d843094dbc1677aef9df93cf97c8d5a1
7SHA1 (patch-auto_configure) = e25c8821182231074033132d70dab077c273d5f8 7SHA1 (patch-auto_configure) = e25c8821182231074033132d70dab077c273d5f8
8SHA1 (patch-configure) = ae5970dec6d557d81da8a8f1da36d05ddc59ca56 8SHA1 (patch-configure) = ae5970dec6d557d81da8a8f1da36d05ddc59ca56
 9SHA1 (patch-eval.c) = df2c63e4ba725c1397c672c76655c8add08fdfa3
9SHA1 (patch-feature.h) = 7fc572f7d94e5342b32b9395c2632fa7ae528c39 10SHA1 (patch-feature.h) = 7fc572f7d94e5342b32b9395c2632fa7ae528c39
 11SHA1 (patch-if__lua.c) = 47e666b6316a8f11725f72c2767a4cb7c15068b2
 12SHA1 (patch-if__py__both.h) = 657c43c8e51b01694c063f14a52a9a5efecf2751
10SHA1 (patch-link.sh) = 24db881cea873330a8a3bf672f6135d0835651fd 13SHA1 (patch-link.sh) = 24db881cea873330a8a3bf672f6135d0835651fd
 14SHA1 (patch-proto_eval.pro) = 752a3e12864ecf0eb4d8465ade8baa44fdaaf0ff
File Added: pkgsrc/editors/vim-share/patches/Attic/patch-eval.c
$NetBSD: patch-eval.c,v 1.1 2014/05/03 07:30:19 richard Exp $

--- src/eval.c.orig	2014-01-11 21:59:11.000000000 +0000
+++ src/eval.c
@@ -5981,7 +5981,7 @@ listitem_remove(l, item)
     list_T  *l;
     listitem_T *item;
 {
-    list_remove(l, item, item);
+    vimlist_remove(l, item, item);
     listitem_free(item);
 }
 
@@ -6553,7 +6553,7 @@ list_copy(orig, deep, copyID)
  * Does not free the listitem or the value!
  */
     void
-list_remove(l, item, item2)
+vimlist_remove(l, item, item2)
     list_T	*l;
     listitem_T	*item;
     listitem_T	*item2;
@@ -15344,7 +15344,7 @@ f_remove(argvars, rettv)
 	    if (argvars[2].v_type == VAR_UNKNOWN)
 	    {
 		/* Remove one item, return its value. */
-		list_remove(l, item, item);
+		vimlist_remove(l, item, item);
 		*rettv = item->li_tv;
 		vim_free(item);
 	    }
@@ -15370,7 +15370,7 @@ f_remove(argvars, rettv)
 			EMSG(_(e_invrange));
 		    else
 		    {
-			list_remove(l, item, item2);
+			vimlist_remove(l, item, item2);
 			if (rettv_list_alloc(rettv) == OK)
 			{
 			    l = rettv->vval.v_list;
File Added: pkgsrc/editors/vim-share/patches/Attic/patch-if__lua.c
$NetBSD: patch-if__lua.c,v 1.1 2014/05/03 07:30:19 richard Exp $

--- src/if_lua.c.orig	2013-04-22 08:09:33.000000000 +0000
+++ src/if_lua.c
@@ -734,7 +734,7 @@ luaV_list_newindex (lua_State *L)
     if (li == NULL) return 0;
     if (lua_isnil(L, 3)) /* remove? */
     {
-	list_remove(l, li, li);
+	vimlist_remove(l, li, li);
 	clear_tv(&li->li_tv);
 	vim_free(li);
     }
File Added: pkgsrc/editors/vim-share/patches/Attic/patch-if__py__both.h
$NetBSD: patch-if__py__both.h,v 1.1 2014/05/03 07:30:19 richard Exp $

--- src/if_py_both.h.orig	2014-01-11 21:59:11.000000000 +0000
+++ src/if_py_both.h
@@ -2392,7 +2392,7 @@ ListAssItem(ListObject *self, Py_ssize_t
     if (obj == NULL)
     {
 	li = list_find(l, (long) index);
-	list_remove(l, li, li);
+	vimlist_remove(l, li, li);
 	clear_tv(&li->li_tv);
 	vim_free(li);
 	return 0;
File Added: pkgsrc/editors/vim-share/patches/Attic/patch-proto_eval.pro
$NetBSD: patch-proto_eval.pro,v 1.1 2014/05/03 07:30:19 richard Exp $

'list_remove', being defined as well on SunOS under <sys/list.h>, causes
a 'conflicting types' error when building with perl, python and/or ruby.
Affects the following files: eval.c, if_lua.c and if_py_both.c

--- src/proto/eval.pro.orig	2013-07-06 19:39:48.000000000 +0000
+++ src/proto/eval.pro
@@ -59,7 +59,7 @@ int list_append_tv __ARGS((list_T *l, ty
 int list_append_dict __ARGS((list_T *list, dict_T *dict));
 int list_append_string __ARGS((list_T *l, char_u *str, int len));
 int list_insert_tv __ARGS((list_T *l, typval_T *tv, listitem_T *item));
-void list_remove __ARGS((list_T *l, listitem_T *item, listitem_T *item2));
+void vimlist_remove __ARGS((list_T *l, listitem_T *item, listitem_T *item2));
 int garbage_collect __ARGS((void));
 void set_ref_in_ht __ARGS((hashtab_T *ht, int copyID));
 void set_ref_in_list __ARGS((list_T *l, int copyID));