Update to libX11-1.1.1:

Changes include:
- fix use-after-free
- fix dependency on inputproto
- XListFontsWithInfo
- avoid calling callbacks to applications with holding the display lock
- fix leaks in XKB
- fix compose entries in the NLS lists
- fix display locking in XKB
- fix double open of compose file
- fallback to unix domain or TCP connections, when the local connection
  failed

Note that XCB is currently not active as I don't think it is currently
useful or stable enough.

4 files changed, 13 insertions, 10 deletions

diff --git a/x11/libX11/Makefile b/x11/libX11/Makefile
index d78e12501ac..1de5b6ba5cd 100644
--- a/x11/libX11/Makefile
+++ b/x11/libX11/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2006/12/20 15:09:12 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2007/01/23 19:47:53 joerg Exp $
 #
 
-DISTNAME=		libX11-1.0.3
+DISTNAME=		libX11-1.1.1
 CATEGORIES=		x11 devel
 MASTER_SITES=		http://xorg.freedesktop.org/releases/individual/lib/
 EXTRACT_SUFX=		.tar.bz2
@@ -20,6 +20,7 @@ GNU_CONFIGURE=		yes
 USE_TOOLS+=		gmake pkg-config
 
 CONFIGURE_ARGS+=	--enable-man-pages=3
+CONFIGURE_ARGS+=	--without-xcb
 PKGCONFIG_OVERRIDE+=	x11.pc.in
 
 .include "../../x11/bigreqsproto/buildlink3.mk"
diff --git a/x11/libX11/PLIST b/x11/libX11/PLIST
index 245554deba3..0b965765ae4 100644
--- a/x11/libX11/PLIST
+++ b/x11/libX11/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2006/11/03 18:11:18 joerg Exp $
+@comment $NetBSD: PLIST,v 1.2 2007/01/23 19:47:53 joerg Exp $
 include/X11/ImUtil.h
 include/X11/XKBlib.h
 include/X11/Xcms.h
@@ -275,6 +275,7 @@ man/man3/XGetWMProtocols.3
 man/man3/XGetWMSizeHints.3
 man/man3/XGetWindowAttributes.3
 man/man3/XGetWindowProperty.3
+man/man3/XGetXCBConnection.3
 man/man3/XGrabButton.3
 man/man3/XGrabKey.3
 man/man3/XGrabKeyboard.3
@@ -412,6 +413,7 @@ man/man3/XSetClipRectangles.3
 man/man3/XSetCloseDownMode.3
 man/man3/XSetCommand.3
 man/man3/XSetDashes.3
+man/man3/XSetEventQueueOwner.3
 man/man3/XSetErrorHandler.3
 man/man3/XSetFillRule.3
 man/man3/XSetFillStyle.3
diff --git a/x11/libX11/buildlink3.mk b/x11/libX11/buildlink3.mk
index 616e6cb0e8d..751afbae883 100644
--- a/x11/libX11/buildlink3.mk
+++ b/x11/libX11/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2007/01/02 11:35:13 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2007/01/23 19:47:53 joerg Exp $
 
 .include "../../mk/bsd.fast.prefs.mk"
 
@@ -18,14 +18,14 @@ BUILDLINK_PACKAGES+=	libX11
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libX11
 
 .if ${LIBX11_BUILDLINK3_MK} == "+"
-BUILDLINK_API_DEPENDS.libX11+=	libX11>=0.99
+BUILDLINK_API_DEPENDS.libX11+=	libX11>=1.1
+BUILDLINK_ABI_DEPENDS.libX11+=	libX11>=0.99
 BUILDLINK_PKGSRCDIR.libX11?=	../../x11/libX11
 
 X11_LDFLAGS+=	${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.libX11}/lib
 X11_LDFLAGS+=	-L${BUILDLINK_PREFIX.libX11}/lib
 .endif	# LIBX11_BUILDLINK3_MK
 
-.include "../../x11/inputproto/buildlink3.mk"
 .include "../../x11/kbproto/buildlink3.mk"
 .include "../../x11/libXau/buildlink3.mk"
 .include "../../x11/libXdmcp/buildlink3.mk"
diff --git a/x11/libX11/distinfo b/x11/libX11/distinfo
index 13a7dfd820e..e55d1b1dbd6 100644
--- a/x11/libX11/distinfo
+++ b/x11/libX11/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2006/11/03 18:11:18 joerg Exp $
+$NetBSD: distinfo,v 1.2 2007/01/23 19:47:53 joerg Exp $
 
-SHA1 (libX11-1.0.3.tar.bz2) = ec0493d3669862a9a4f9955532e3bd73b0806be1
-RMD160 (libX11-1.0.3.tar.bz2) = 285a878a8ec9ecbd86e67897ca15ce96c994f38a
-Size (libX11-1.0.3.tar.bz2) = 1449835 bytes
+SHA1 (libX11-1.1.1.tar.bz2) = 048dc3d850666010e81a86bbe0960a643557251a
+RMD160 (libX11-1.1.1.tar.bz2) = 99c2d2bd6823c09667dffa5e4265924e93e76eef
+Size (libX11-1.1.1.tar.bz2) = 1426405 bytes