summaryrefslogtreecommitdiff
path: root/x11/xtrans
diff options
context:
space:
mode:
authorjoerg <joerg>2007-10-07 12:39:28 +0000
committerjoerg <joerg>2007-10-07 12:39:28 +0000
commitb1f33b3584383b2e691361dcab7d7a8b4fb51ffe (patch)
tree907a9b88b11fa89db037640b1ac920441cf7ff93 /x11/xtrans
parent00c020127afd319763ededc3b8bac947ee227468 (diff)
downloadpkgsrc-b1f33b3584383b2e691361dcab7d7a8b4fb51ffe.tar.gz
Don't define a local weak in6addr_any. Any sane IPv6 setup has and if it
doesn't include it, your lost mostly anyway. The weak alias creates a conflict on HP-UX tho. Bump revision.
Diffstat (limited to 'x11/xtrans')
-rw-r--r--x11/xtrans/Makefile3
-rw-r--r--x11/xtrans/distinfo4
-rw-r--r--x11/xtrans/patches/patch-aa16
3 files changed, 18 insertions, 5 deletions
diff --git a/x11/xtrans/Makefile b/x11/xtrans/Makefile
index cfeef3ff297..d31a69d4a9b 100644
--- a/x11/xtrans/Makefile
+++ b/x11/xtrans/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2007/09/21 19:46:27 bjs Exp $
+# $NetBSD: Makefile,v 1.5 2007/10/07 12:39:28 joerg Exp $
#
DISTNAME= xtrans-1.0.4
+PKGREVISION= 1
CATEGORIES= x11 net
MASTER_SITES= http://xorg.freedesktop.org/releases/individual/lib/
EXTRACT_SUFX= .tar.bz2
diff --git a/x11/xtrans/distinfo b/x11/xtrans/distinfo
index c74f973c470..800462f7473 100644
--- a/x11/xtrans/distinfo
+++ b/x11/xtrans/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.5 2007/09/21 19:46:27 bjs Exp $
+$NetBSD: distinfo,v 1.6 2007/10/07 12:39:28 joerg Exp $
SHA1 (xtrans-1.0.4.tar.bz2) = 9e6dd0970b72253f9558be43abd30bb8a802aa66
RMD160 (xtrans-1.0.4.tar.bz2) = 4cccff870a9297873ae99a6a8c49bb4d545607d9
Size (xtrans-1.0.4.tar.bz2) = 103761 bytes
-SHA1 (patch-aa) = 4d39401f40380fea729ceefabc23d8a422ea146f
+SHA1 (patch-aa) = c3c1ca1262d857d017079d9b37f71cb83c4d9052
SHA1 (patch-ab) = d2a7af633ab880ec71975b70f521c0e32cd07a5e
diff --git a/x11/xtrans/patches/patch-aa b/x11/xtrans/patches/patch-aa
index 7bc050850be..0389f655d0a 100644
--- a/x11/xtrans/patches/patch-aa
+++ b/x11/xtrans/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.1 2006/12/15 16:43:57 joerg Exp $
+$NetBSD: patch-aa,v 1.2 2007/10/07 12:39:29 joerg Exp $
---- Xtranssock.c.orig 2006-12-15 16:31:00.000000000 +0000
+--- Xtranssock.c.orig 2006-09-13 23:06:06.000000000 +0200
+++ Xtranssock.c
@@ -53,6 +53,7 @@ from the copyright holders.
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
@@ -10,3 +10,15 @@ $NetBSD: patch-aa,v 1.1 2006/12/15 16:43:57 joerg Exp $
#include <ctype.h>
#ifdef XTHREADS
#include <X11/Xthreads.h>
+@@ -286,11 +287,6 @@ static int TRANS(SocketINETClose) (Xtran
+ * that don't have IPv6 support.
+ */
+ #if defined(IPv6) && defined(AF_INET6)
+-static const struct in6_addr local_in6addr_any = IN6ADDR_ANY_INIT;
+-#pragma weak in6addr_any = local_in6addr_any
+-#ifndef __USLC__
+-#pragma weak getaddrinfo
+-#endif
+ static int haveIPv6 = 1;
+ #endif
+