From fcf2c54505616b127840df295e363ea8e77e0794 Mon Sep 17 00:00:00 2001
From: drochner <drochner@pkgsrc.org>
Date: Wed, 13 Feb 2008 19:36:48 +0000
Subject: update to 2.14.12 changes: -Fix off by one in all method name
 lengths. Fixes interoperability  with other ORBs -Fix the build with glib
 2.15

pkgsrc fix: don't touch _res (resolver state) on NetBSD, it is
not thread safe
---
 net/ORBit2/Makefile         |  7 +++++--
 net/ORBit2/distinfo         | 10 +++++-----
 net/ORBit2/patches/patch-ad | 17 -----------------
 net/ORBit2/patches/patch-ae | 25 +++++++++++++++++++++++++
 4 files changed, 35 insertions(+), 24 deletions(-)
 delete mode 100644 net/ORBit2/patches/patch-ad
 create mode 100644 net/ORBit2/patches/patch-ae

(limited to 'net/ORBit2')

diff --git a/net/ORBit2/Makefile b/net/ORBit2/Makefile
index aefe8098aef..d963e56512a 100644
--- a/net/ORBit2/Makefile
+++ b/net/ORBit2/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.60 2007/10/31 19:48:32 drochner Exp $
+# $NetBSD: Makefile,v 1.61 2008/02/13 19:36:48 drochner Exp $
 #
 
-DISTNAME=		ORBit2-2.14.10
+DISTNAME=		ORBit2-2.14.12
 CATEGORIES=		net gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/ORBit2/2.14/}
 EXTRACT_SUFX=		.tar.bz2
@@ -49,6 +49,9 @@ PRINT_PLIST_AWK+=	/^@dirrm share\/idl$$/ \
 
 BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.8.0
 
+# needs interaction
+#TEST_TARGRT=	check
+
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../net/libIDL/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/ORBit2/distinfo b/net/ORBit2/distinfo
index b094bc2719a..38239b4816e 100644
--- a/net/ORBit2/distinfo
+++ b/net/ORBit2/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.39 2007/11/26 14:00:41 tron Exp $
+$NetBSD: distinfo,v 1.40 2008/02/13 19:36:48 drochner Exp $
 
-SHA1 (ORBit2-2.14.10.tar.bz2) = f5d7bbe36562b5daad48b92cc5b17afa12d211ee
-RMD160 (ORBit2-2.14.10.tar.bz2) = f6df0bf38218ba0d02e2e332d570cf3e1831ec53
-Size (ORBit2-2.14.10.tar.bz2) = 734630 bytes
+SHA1 (ORBit2-2.14.12.tar.bz2) = 0ae64c5e458c5cadab5af0e22d69ffea25f9f3fb
+RMD160 (ORBit2-2.14.12.tar.bz2) = ab535a00dacef3f4a80d685406c0dd115b424207
+Size (ORBit2-2.14.12.tar.bz2) = 746309 bytes
 SHA1 (patch-aa) = 6e87e28e3634908f35c219f81a47d0353cfaf551
 SHA1 (patch-ab) = 1661eaaa0119895a860e0c667990ea71b80e8ace
 SHA1 (patch-ac) = 075a11883b9d0a3ec7d5d93b37007ba64e1baf41
-SHA1 (patch-ad) = a6599d163cf577230b310845999cee2d343d7613
+SHA1 (patch-ae) = d92c0c8985be666e6ec60b46ff8007447ffc4275
diff --git a/net/ORBit2/patches/patch-ad b/net/ORBit2/patches/patch-ad
deleted file mode 100644
index 181bf21e648..00000000000
--- a/net/ORBit2/patches/patch-ad
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ad,v 1.3 2007/11/26 14:00:41 tron Exp $
-
---- include/orbit/GIOP/giop-endian.h.orig	2007-09-10 13:11:47.000000000 +0100
-+++ include/orbit/GIOP/giop-endian.h	2007-11-26 13:48:57.000000000 +0000
-@@ -8,9 +8,9 @@
- #ifdef ORBIT2_INTERNAL_API
- 
- /* This is also defined in IIOP-types.c */
--void giop_byteswap(guchar *outdata,
--		   const guchar *data,
--		   gulong datalen);
-+G_INLINE_FUNC void giop_byteswap(guchar *outdata,
-+				 const guchar *data,
-+				 gulong datalen);
- 
- #if defined(G_CAN_INLINE) && !defined(GIOP_DO_NOT_INLINE_IIOP_BYTESWAP)
- G_INLINE_FUNC void giop_byteswap(guchar *outdata,
diff --git a/net/ORBit2/patches/patch-ae b/net/ORBit2/patches/patch-ae
new file mode 100644
index 00000000000..7ce217d0175
--- /dev/null
+++ b/net/ORBit2/patches/patch-ae
@@ -0,0 +1,25 @@
+$NetBSD: patch-ae,v 1.1 2008/02/13 19:36:48 drochner Exp $
+
+--- linc2/src/linc-protocols.c.orig	2008-01-30 12:08:40.000000000 +0100
++++ linc2/src/linc-protocols.c
+@@ -582,14 +582,20 @@ link_protocol_get_sockaddr_ipv4 (const L
+ 	if ((saddr->sin_addr.s_addr = inet_addr (hostname)) == INADDR_NONE) {
+ 	        int i;
+ 
++#ifndef __NetBSD__ /* don't touch global state */
+ 		LINK_RESOLV_UNSET_IPV6;
+ #ifdef HAVE_RESOLV_H
+ 		if (!(_res.options & RES_INIT))
+ 			res_init();
+ #endif
++#endif /* NetBSD */
+ 		
+                 d_printf("%s:%s:%d:gethostbyname(%s)\n", __FILE__, __FUNCTION__, __LINE__, hostname);
++#ifdef __NetBSD__
++		host = gethostbyname2 (hostname, AF_INET);
++#else
+ 		host = gethostbyname (hostname);
++#endif
+ 		if (!host) {
+ 		  g_free (saddr);
+ 		  return NULL;
-- 
cgit v1.2.3