From d1ab944efa723690c73d79dd38b8bd2e74c27281 Mon Sep 17 00:00:00 2001
From: drochner <drochner>
Date: Fri, 2 Mar 2007 10:52:23 +0000
Subject: Switch to new master site, update to 1.12. There is no changelog
 available. Appearently some minor build issues are fixed. Thanks to Arne H.
 Juul for pointing me at that.

---
 net/libdnet/Makefile            |  9 +++++----
 net/libdnet/distinfo            |  8 ++++----
 net/py-libdnet/Makefile         | 11 ++++++-----
 net/py-libdnet/distinfo         | 10 +++++-----
 net/py-libdnet/patches/patch-ac | 26 ++++----------------------
 5 files changed, 24 insertions(+), 40 deletions(-)

diff --git a/net/libdnet/Makefile b/net/libdnet/Makefile
index 4e88a6fd37c..3ad816f5b57 100644
--- a/net/libdnet/Makefile
+++ b/net/libdnet/Makefile
@@ -1,12 +1,13 @@
-# $NetBSD: Makefile,v 1.13 2007/02/23 20:33:05 drochner Exp $
+# $NetBSD: Makefile,v 1.14 2007/03/02 10:52:23 drochner Exp $
 #
 
-DISTNAME=	libdnet-1.11
+DISTNAME=	libdnet-1.12
 CATEGORIES=	devel net
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=libdnet/}
+MASTER_SITES=	http://libdnet.googlecode.com/files/
+EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://libdnet.sourceforge.net/
+HOMEPAGE=	http://code.google.com/p/libdnet/
 COMMENT=	C interface to several low-level networking routines
 
 GNU_CONFIGURE=	yes
diff --git a/net/libdnet/distinfo b/net/libdnet/distinfo
index ec035de642f..e0e2618e6b6 100644
--- a/net/libdnet/distinfo
+++ b/net/libdnet/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.6 2007/02/23 20:33:06 drochner Exp $
+$NetBSD: distinfo,v 1.7 2007/03/02 10:52:23 drochner Exp $
 
-SHA1 (libdnet-1.11.tar.gz) = e2ae8c7f0ca95655ae9f77fd4a0e2235dc4716bf
-RMD160 (libdnet-1.11.tar.gz) = 9a940cdd96af4b513a048f3a389e3f7eb0bb7011
-Size (libdnet-1.11.tar.gz) = 446233 bytes
+SHA1 (libdnet-1.12.tgz) = 71302be302e84fc19b559e811951b5d600d976f8
+RMD160 (libdnet-1.12.tgz) = 4b849f07c3513522fda65af067928b7e6d504aab
+Size (libdnet-1.12.tgz) = 970125 bytes
diff --git a/net/py-libdnet/Makefile b/net/py-libdnet/Makefile
index 43d62f5b101..21e7e685936 100644
--- a/net/py-libdnet/Makefile
+++ b/net/py-libdnet/Makefile
@@ -1,13 +1,14 @@
-# $NetBSD: Makefile,v 1.5 2007/02/23 20:35:12 drochner Exp $
+# $NetBSD: Makefile,v 1.6 2007/03/02 10:52:24 drochner Exp $
 #
 
-DISTNAME=	libdnet-1.11
-PKGNAME=	${PYPKGPREFIX}-libdnet-1.11
+DISTNAME=	libdnet-1.12
+PKGNAME=	${PYPKGPREFIX}-libdnet-1.12
 CATEGORIES=	devel net
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=libdnet/}
+MASTER_SITES=	http://libdnet.googlecode.com/files/
+EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://libdnet.sourceforge.net/
+HOMEPAGE=	http://code.google.com/p/libdnet/
 COMMENT=	Python wrapper for libdnet
 
 GNU_CONFIGURE=	yes
diff --git a/net/py-libdnet/distinfo b/net/py-libdnet/distinfo
index 93df55eee04..decca9fa33b 100644
--- a/net/py-libdnet/distinfo
+++ b/net/py-libdnet/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.4 2007/02/23 20:35:12 drochner Exp $
+$NetBSD: distinfo,v 1.5 2007/03/02 10:52:24 drochner Exp $
 
-SHA1 (libdnet-1.11.tar.gz) = e2ae8c7f0ca95655ae9f77fd4a0e2235dc4716bf
-RMD160 (libdnet-1.11.tar.gz) = 9a940cdd96af4b513a048f3a389e3f7eb0bb7011
-Size (libdnet-1.11.tar.gz) = 446233 bytes
+SHA1 (libdnet-1.12.tgz) = 71302be302e84fc19b559e811951b5d600d976f8
+RMD160 (libdnet-1.12.tgz) = 4b849f07c3513522fda65af067928b7e6d504aab
+Size (libdnet-1.12.tgz) = 970125 bytes
 SHA1 (patch-aa) = 199e1f868cd4e8a032933556b01206207645fb32
 SHA1 (patch-ab) = 119592eda96557f71230514ab788933e8d60e3d6
-SHA1 (patch-ac) = 9e70af75192dd6c8137928e6abb87768f200378f
+SHA1 (patch-ac) = 2ea199cb8a87c9342467f3016b61436fe8845a25
diff --git a/net/py-libdnet/patches/patch-ac b/net/py-libdnet/patches/patch-ac
index 9ee548fd3a2..840755c703e 100644
--- a/net/py-libdnet/patches/patch-ac
+++ b/net/py-libdnet/patches/patch-ac
@@ -1,30 +1,12 @@
-$NetBSD: patch-ac,v 1.2 2007/02/23 20:35:13 drochner Exp $
+$NetBSD: patch-ac,v 1.3 2007/03/02 10:52:24 drochner Exp $
 
---- python/dnet.c.orig	2006-01-19 08:08:23.000000000 +0100
+--- python/dnet.c.orig	2007-01-20 12:39:54.000000000 +0100
 +++ python/dnet.c
-@@ -438,7 +438,6 @@ static PyObject *__pyx_f_4dnet___memcpy(
+@@ -444,7 +444,6 @@ static PyObject *__pyx_f_4dnet___memcpy(
  }
  
  static PyObject *__pyx_f_4dnet___oserror(void) {
--  extern int errno;
+-  __PYX_EXTERN_C 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 */
-- 
cgit v1.2.3