sync with base libdnet and patch some lhs casts to make it build with

newer gcc

4 files changed, 35 insertions, 18 deletions

diff --git a/net/py-libdnet/Makefile b/net/py-libdnet/Makefile
index a24de54bc06..43d62f5b101 100644
--- a/net/py-libdnet/Makefile
+++ b/net/py-libdnet/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2006/06/06 20:36:17 joerg Exp $
+# $NetBSD: Makefile,v 1.5 2007/02/23 20:35:12 drochner Exp $
 #
 
-DISTNAME=	libdnet-1.10
-PKGNAME=	${PYPKGPREFIX}-libdnet-1.10
-PKGREVISION=	1
+DISTNAME=	libdnet-1.11
+PKGNAME=	${PYPKGPREFIX}-libdnet-1.11
 CATEGORIES=	devel net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=libdnet/}
 
diff --git a/net/py-libdnet/distinfo b/net/py-libdnet/distinfo
index aa1706803ed..93df55eee04 100644
--- a/net/py-libdnet/distinfo
+++ b/net/py-libdnet/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.3 2006/03/23 09:03:20 joerg Exp $
+$NetBSD: distinfo,v 1.4 2007/02/23 20:35:12 drochner Exp $
 
-SHA1 (libdnet-1.10.tar.gz) = 1dd9594adb5a3af121960abd6960bcedfc815f37
-RMD160 (libdnet-1.10.tar.gz) = 167cf841b3fdd061ec8d6a56d53c341678ee5a9e
-Size (libdnet-1.10.tar.gz) = 419752 bytes
-SHA1 (patch-aa) = 34258a63fc9f3866920b7529e8d8b4ea94d36445
+SHA1 (libdnet-1.11.tar.gz) = e2ae8c7f0ca95655ae9f77fd4a0e2235dc4716bf
+RMD160 (libdnet-1.11.tar.gz) = 9a940cdd96af4b513a048f3a389e3f7eb0bb7011
+Size (libdnet-1.11.tar.gz) = 446233 bytes
+SHA1 (patch-aa) = 199e1f868cd4e8a032933556b01206207645fb32
 SHA1 (patch-ab) = 119592eda96557f71230514ab788933e8d60e3d6
-SHA1 (patch-ac) = 92397ac1e116390253141d9ca590361112ab1530
+SHA1 (patch-ac) = 9e70af75192dd6c8137928e6abb87768f200378f
diff --git a/net/py-libdnet/patches/patch-aa b/net/py-libdnet/patches/patch-aa
index 4925de5ef24..ec0c8aeb741 100644
--- a/net/py-libdnet/patches/patch-aa
+++ b/net/py-libdnet/patches/patch-aa
@@ -1,10 +1,10 @@
-$NetBSD: patch-aa,v 1.1.1.1 2005/08/10 13:52:52 drochner Exp $
+$NetBSD: patch-aa,v 1.2 2007/02/23 20:35:13 drochner Exp $
 
---- python/setup.py.in.orig	2005-08-10 13:33:42.000000000 +0200
+--- python/setup.py.in.orig	2006-01-19 04:49:14.000000000 +0100
 +++ python/setup.py.in
 @@ -6,7 +6,7 @@ from distutils.core import setup, Extens
- dnet_srcs = [ './dnet.c' ]
- dnet_incdirs = [ '../include' ]
+ dnet_srcs = [ '@srcdir@/dnet.c' ]
+ dnet_incdirs = [ '@top_srcdir@/include' ]
  dnet_libdirs = []
 -dnet_libs = []
 +dnet_libs = [ 'dnet' ]
diff --git a/net/py-libdnet/patches/patch-ac b/net/py-libdnet/patches/patch-ac
index 05459b7b80f..9ee548fd3a2 100644
--- a/net/py-libdnet/patches/patch-ac
+++ b/net/py-libdnet/patches/patch-ac
@@ -1,12 +1,30 @@
-$NetBSD: patch-ac,v 1.1 2006/03/23 00:59:05 joerg Exp $
+$NetBSD: patch-ac,v 1.2 2007/02/23 20:35:13 drochner Exp $
 
---- python/dnet.c.orig	2006-03-23 00:56:28.000000000 +0000
+--- python/dnet.c.orig	2006-01-19 08:08:23.000000000 +0100
 +++ python/dnet.c
-@@ -270,7 +270,6 @@ static PyObject *__pyx_f_4dnet___memcpy(
- 
+@@ -438,7 +438,6 @@ static PyObject *__pyx_f_4dnet___memcpy(
+ }
  
  static PyObject *__pyx_f_4dnet___oserror(void) {
 -  extern int errno;
    PyObject *__pyx_r;
    PyObject *__pyx_1 = 0;
  
+@@ -2726,7 +2725,7 @@ static PyObject *__pyx_f_4dnet_15__addr_
+   PyObject *__pyx_3 = 0;
+   unsigned short __pyx_4;
+   Py_INCREF(__pyx_v_self);
+-  ((PyObject*)__pyx_v_next) = Py_None; Py_INCREF(((PyObject*)__pyx_v_next));
++  __pyx_v_next = (void *)Py_None; Py_INCREF(((PyObject*)__pyx_v_next));
+ 
+   /* "/Users/dugsong/projects/libdnet/python/./dnet.pyx":634 */
+   __pyx_1 = (((struct __pyx_obj_4dnet___addr_ip4_iter *)__pyx_v_self)->cur <= ((struct __pyx_obj_4dnet___addr_ip4_iter *)__pyx_v_self)->max);
+@@ -2738,7 +2737,7 @@ static PyObject *__pyx_f_4dnet_15__addr_
+     Py_DECREF(__pyx_2); __pyx_2 = 0;
+     if (!__Pyx_TypeTest(__pyx_3, __pyx_ptype_4dnet_addr)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 635; goto __pyx_L1;}
+     Py_DECREF(((PyObject *)__pyx_v_next));
+-    ((PyObject *)__pyx_v_next) = __pyx_3;
++    __pyx_v_next = (void *)__pyx_3;
+     __pyx_3 = 0;
+ 
+     /* "/Users/dugsong/projects/libdnet/python/./dnet.pyx":636 */