[pkgsrc/trunk]: pkgsrc/x11/xtrans Don't define a local weak in6addr_any. Any ...

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/4f2b15376b9e
branches:  trunk
changeset: 533924:4f2b15376b9e
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Sun Oct 07 12:39:28 2007 +0000

description:
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:

 x11/xtrans/Makefile         |   3 ++-
 x11/xtrans/distinfo         |   4 ++--
 x11/xtrans/patches/patch-aa |  16 ++++++++++++++--
 3 files changed, 18 insertions(+), 5 deletions(-)

diffs (54 lines):

diff -r 2346e42f305e -r 4f2b15376b9e x11/xtrans/Makefile
--- a/x11/xtrans/Makefile       Sun Oct 07 12:32:52 2007 +0000
+++ b/x11/xtrans/Makefile       Sun Oct 07 12:39:28 2007 +0000
@@ -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 -r 2346e42f305e -r 4f2b15376b9e x11/xtrans/distinfo
--- a/x11/xtrans/distinfo       Sun Oct 07 12:32:52 2007 +0000
+++ b/x11/xtrans/distinfo       Sun Oct 07 12:39:28 2007 +0000
@@ -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 -r 2346e42f305e -r 4f2b15376b9e x11/xtrans/patches/patch-aa
--- a/x11/xtrans/patches/patch-aa       Sun Oct 07 12:32:52 2007 +0000
+++ b/x11/xtrans/patches/patch-aa       Sun Oct 07 12:39:28 2007 +0000
@@ -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 @@
  #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
+