Update to 1.3:

Bart Massey (2):
      kludgily hand-merged xid fixes
      Fix XDM-AUTHORIZATION-1 (bug #14202)

Bob Ham (1):
      Store xcbproto version libxcb was compiled with

Jeremy Huddleston (1):
      darwin: Don't use poll() on versions of darwin before darwin10

Julien Danjou (9):
      Copy full IPv4 mapping (Bug #20665)
      Fix do_append() arguments
      auth: precompute authnameslen
      auth: use snprintf() return value
      util: open_abstract gets filelen as parameters
      util: merge common code for xcb_connect
      util: remove useless strlen calls from decnet opening
      depends on recent xcb-proto and bump version of randr
      Release libxcb 1.3

Michael Ost (1):
      use poll() instead of select() when available

Peter Harris (3):
      Don't use enums in generated C code - use integer constants instead.
      Revert "Don't use enums in generated C code"
      Avoid name collisions between xidtype and enum.

Samuel Thibault (1):
      Local socket connections do not work on hurd-i386

elupus (1):
      Disable Nagle on TCP socket

4 files changed, 19 insertions, 22 deletions

diff --git a/x11/libxcb/Makefile b/x11/libxcb/Makefile
index 1420c687f88..e1c154e1b08 100644
--- a/x11/libxcb/Makefile
+++ b/x11/libxcb/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2009/05/14 02:57:28 hasso Exp $
+# $NetBSD: Makefile,v 1.5 2009/05/29 09:27:45 wiz Exp $
 #
 
-DISTNAME=	libxcb-1.2
-PKGREVISION=	1
+DISTNAME=	libxcb-1.3
 CATEGORIES=	x11
 MASTER_SITES=	http://xcb.freedesktop.org/dist/
 EXTRACT_SUFX=	.tar.bz2
@@ -11,9 +10,10 @@ MAINTAINER=	reed@reedmedia.net
 HOMEPAGE=	http://xcb.freedesktop.org/
 COMMENT=	X protocol C-language Binding
 
-PKG_DESTDIR_SUPPORT=	user-destdir
-
 BUILD_DEPENDS+=		libxslt>=1.1.0:../../textproc/libxslt
+BUILD_DEPENDS+= ${PYPKGPREFIX}-xcbgen>=1.5:../../x11/py-xcbgen
+
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
@@ -48,8 +48,6 @@ PKGCONFIG_OVERRIDE+=	xcb.pc.in
 # libXdmcp is optional; adds support for XDM-AUTHORIZATION-1 in
 # addition to MIT-MAGIC-COOKIE-1.
 
-BUILDLINK_API_DEPENDS.xcb-proto+=	xcb-proto>=1.1
-
 .include "../../mk/pthread.buildlink3.mk"
 
 ###
@@ -79,8 +77,6 @@ post-extract:
 pre-configure:
 	cd ${WRKSRC} && autoreconf -v -i -f
 
-BUILD_DEPENDS+= ${PYPKGPREFIX}-xcbgen-[0-9]*:../../x11/py-xcbgen
-
 ###
 ### XXX needed to build from scratch, but we're patching right now
 ###	so it's not needed (nor should it ever be, really).
@@ -88,6 +84,7 @@ BUILD_DEPENDS+= ${PYPKGPREFIX}-xcbgen-[0-9]*:../../x11/py-xcbgen
 #.include "../../devel/gperf/buildlink3.mk"
 PYTHON_FOR_BUILD_ONLY=	yes
 .include "../../lang/python/application.mk"
+BUILDLINK_API_DEPENDS.xcb-proto?=	xcb-proto>=1.5
 .include "../../x11/xcb-proto/buildlink3.mk"
 .include "../../x11/libXdmcp/buildlink3.mk"
 .include "../../x11/libXau/buildlink3.mk"
diff --git a/x11/libxcb/distinfo b/x11/libxcb/distinfo
index 0b4fae388d6..cb35cb37efb 100644
--- a/x11/libxcb/distinfo
+++ b/x11/libxcb/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.2 2009/04/11 12:48:07 wiz Exp $
+$NetBSD: distinfo,v 1.3 2009/05/29 09:27:45 wiz Exp $
 
-SHA1 (libxcb-1.2.tar.bz2) = 12be595ce1e26da3b63e6a17a47ab9392259f10f
-RMD160 (libxcb-1.2.tar.bz2) = 0a1d18c44edf7696a5f4d079dfb6b7a98faf933c
-Size (libxcb-1.2.tar.bz2) = 323667 bytes
-SHA1 (patch-ab) = 77c89a95ab207a3efc8d5f983183d866c35c8e4f
-SHA1 (patch-ai) = 6c030296b818b2740c055a908eef0e8d250c2e59
+SHA1 (libxcb-1.3.tar.bz2) = 6fd426cfa32460de36a9b40c6e9be8154ad7455d
+RMD160 (libxcb-1.3.tar.bz2) = 90b15625000c35982d56a9018b72f3cdb97f340d
+Size (libxcb-1.3.tar.bz2) = 308179 bytes
+SHA1 (patch-ab) = 65259b352fe08cf579aaff81ba23f0df404feab7
+SHA1 (patch-ai) = 637affb3aa2f7d40e0aada4dadab8c695ea74b6f
 SHA1 (patch-aj) = 558465dbda40e05f9e76767ddd9d242ad1762719
diff --git a/x11/libxcb/patches/patch-ab b/x11/libxcb/patches/patch-ab
index 30b5fd4b000..f759ba7e510 100644
--- a/x11/libxcb/patches/patch-ab
+++ b/x11/libxcb/patches/patch-ab
@@ -1,11 +1,11 @@
-$NetBSD: patch-ab,v 1.1.1.1 2009/04/06 10:23:59 drochner Exp $
+$NetBSD: patch-ab,v 1.2 2009/05/29 09:27:45 wiz Exp $
 
---- configure.ac.orig	2007-11-04 18:17:11.000000000 -0500
+--- configure.ac.orig	2009-05-29 06:28:44.000000000 +0000
 +++ configure.ac
 @@ -33,7 +33,7 @@ AC_SUBST(HTML_CHECK_RESULT)
  
  # Checks for pkg-config packages
- PKG_CHECK_MODULES(XCBPROTO, xcb-proto >= 1.1)
+ PKG_CHECK_MODULES(XCBPROTO, xcb-proto >= 1.5)
 -NEEDED="pthread-stubs xau >= 0.99.2"
 +NEEDED="xau >= 0.99.2"
  PKG_CHECK_MODULES(NEEDED, $NEEDED)
diff --git a/x11/libxcb/patches/patch-ai b/x11/libxcb/patches/patch-ai
index 1706b16e083..b3f47243dcd 100644
--- a/x11/libxcb/patches/patch-ai
+++ b/x11/libxcb/patches/patch-ai
@@ -1,10 +1,10 @@
-$NetBSD: patch-ai,v 1.1.1.1 2009/04/06 10:23:59 drochner Exp $
+$NetBSD: patch-ai,v 1.2 2009/05/29 09:27:45 wiz Exp $
 
---- xcb.pc.in.orig	2006-11-24 05:42:54.000000000 -0500
+--- xcb.pc.in.orig	2009-05-29 06:20:17.000000000 +0000
 +++ xcb.pc.in
-@@ -3,10 +3,12 @@ exec_prefix=@exec_prefix@
- libdir=@libdir@
+@@ -4,10 +4,12 @@ libdir=@libdir@
  includedir=@includedir@
+ xcbproto_version=@XCBPROTO_VERSION@
  
 +XTHREADLIB=@XTHREADLIB@
 +