From 3b9934071668791d851415e5c032be123cb93b01 Mon Sep 17 00:00:00 2001
From: tnn <tnn>
Date: Fri, 15 Jan 2010 18:08:11 +0000
Subject: Update to xtrans-1.2.5. This release moved the xtrans.pc file from
 lib/pkgconfig to share/pkgconfig. AFAICT pkgsrc deals with this properly.

Changes:
Migrate to xorg macros 1.3 & XORG_DEFAULT_OPTIONS
Move Xtrans interface docs from xorg-docs module
xtrans 1.2.5
Xtranssock: assume that we have getaddrinfo if ipv6 is enabled
Move xtrans.pc to /usr/share/pkg-config
Don't use -lws2_32 on Cygwin
Silence root ownership warnings on Cygwin
---
 x11/xtrans/Makefile         |  4 ++--
 x11/xtrans/PLIST            |  5 +++--
 x11/xtrans/distinfo         |  9 ++++-----
 x11/xtrans/patches/patch-aa | 16 ----------------
 4 files changed, 9 insertions(+), 25 deletions(-)
 delete mode 100644 x11/xtrans/patches/patch-aa

(limited to 'x11')

diff --git a/x11/xtrans/Makefile b/x11/xtrans/Makefile
index 5959f558133..f20abd0ff73 100644
--- a/x11/xtrans/Makefile
+++ b/x11/xtrans/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2009/08/09 22:19:38 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2010/01/15 18:08:11 tnn Exp $
 #
 
-DISTNAME=		xtrans-1.2.4
+DISTNAME=		xtrans-1.2.5
 CATEGORIES=		x11 net
 MASTER_SITES=		${MASTER_SITE_XORG:=lib/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/x11/xtrans/PLIST b/x11/xtrans/PLIST
index b02bf099153..62364764133 100644
--- a/x11/xtrans/PLIST
+++ b/x11/xtrans/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2009/06/14 22:06:43 joerg Exp $
+@comment $NetBSD: PLIST,v 1.6 2010/01/15 18:08:11 tnn Exp $
 include/X11/Xtrans/Xtrans.c
 include/X11/Xtrans/Xtrans.h
 include/X11/Xtrans/Xtransint.h
@@ -7,5 +7,6 @@ include/X11/Xtrans/Xtranssock.c
 include/X11/Xtrans/Xtranstli.c
 include/X11/Xtrans/Xtransutil.c
 include/X11/Xtrans/transport.c
-lib/pkgconfig/xtrans.pc
 share/aclocal/xtrans.m4
+share/pkgconfig/xtrans.pc
+@pkgdir share/doc/xtrans
diff --git a/x11/xtrans/distinfo b/x11/xtrans/distinfo
index b9f78934dba..a02251de973 100644
--- a/x11/xtrans/distinfo
+++ b/x11/xtrans/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.16 2009/08/09 22:19:38 wiz Exp $
+$NetBSD: distinfo,v 1.17 2010/01/15 18:08:11 tnn Exp $
 
-SHA1 (xtrans-1.2.4.tar.bz2) = 093221433efb5539661a2fb4e2afa4b073b1fe27
-RMD160 (xtrans-1.2.4.tar.bz2) = ad78e5c1690db08bcc250f67753aa128f7e54368
-Size (xtrans-1.2.4.tar.bz2) = 106861 bytes
-SHA1 (patch-aa) = f4faf481fdbd0f7fe1d984a3a4632dba46eb7eb0
+SHA1 (xtrans-1.2.5.tar.bz2) = e8c4ce58b42d05e613fe535319a7d7f45f30f3e9
+RMD160 (xtrans-1.2.5.tar.bz2) = 81e86fcbc0b6ea6b7da80f3de2146571f6d07f71
+Size (xtrans-1.2.5.tar.bz2) = 141859 bytes
 SHA1 (patch-ab) = d2a7af633ab880ec71975b70f521c0e32cd07a5e
diff --git a/x11/xtrans/patches/patch-aa b/x11/xtrans/patches/patch-aa
deleted file mode 100644
index 0f9dfa4d510..00000000000
--- a/x11/xtrans/patches/patch-aa
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-aa,v 1.7 2008/09/09 13:59:13 dsainty Exp $
-
---- Xtranssock.c.orig	2008-05-09 02:23:07.000000000 +1200
-+++ Xtranssock.c	2008-05-10 09:41:28.000000000 +1200
-@@ -294,11 +294,6 @@
-  * 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
- 
-- 
cgit v1.2.3