Update to libXext-1.1.1.

Following the xextproto cleanup, the client-side header files previouly in
xextproto have now moved to libXext.

5 files changed, 51 insertions, 23 deletions

diff --git a/x11/libXext/Makefile b/x11/libXext/Makefile
index ac10fcdc1da..056375a1de5 100644
--- a/x11/libXext/Makefile
+++ b/x11/libXext/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2009/09/22 19:34:05 tnn Exp $
+# $NetBSD: Makefile,v 1.11 2010/04/09 08:50:17 tnn Exp $
 #
 
-DISTNAME=		libXext-1.0.5
-PKGREVISION=		1
+DISTNAME=		libXext-1.1.1
 CATEGORIES=		x11 devel
 MASTER_SITES=		${MASTER_SITE_XORG:=lib/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/x11/libXext/PLIST b/x11/libXext/PLIST
index fac8dfe09fe..4bf7d7a34ac 100644
--- a/x11/libXext/PLIST
+++ b/x11/libXext/PLIST
@@ -1,4 +1,23 @@
-@comment $NetBSD: PLIST,v 1.2 2007/02/26 14:58:18 joerg Exp $
+@comment $NetBSD: PLIST,v 1.3 2010/04/09 08:50:17 tnn Exp $
+include/X11/extensions/MITMisc.h
+include/X11/extensions/XEVI.h
+include/X11/extensions/XLbx.h
+include/X11/extensions/XShm.h
+include/X11/extensions/Xag.h
+include/X11/extensions/Xcup.h
+include/X11/extensions/Xdbe.h
+include/X11/extensions/Xext.h
+include/X11/extensions/Xge.h
+include/X11/extensions/dpms.h
+include/X11/extensions/extutil.h
+include/X11/extensions/lbxbuf.h
+include/X11/extensions/lbxbufstr.h
+include/X11/extensions/lbximage.h
+include/X11/extensions/multibuf.h
+include/X11/extensions/security.h
+include/X11/extensions/shape.h
+include/X11/extensions/sync.h
+include/X11/extensions/xtestext1.h
 lib/libXext.la
 lib/pkgconfig/xext.pc
 man/man3/DBE.3
diff --git a/x11/libXext/buildlink3.mk b/x11/libXext/buildlink3.mk
index 5eb51446f49..484d8a6f9dd 100644
--- a/x11/libXext/buildlink3.mk
+++ b/x11/libXext/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2009/03/20 19:25:44 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2010/04/09 08:50:17 tnn Exp $
 
 .include "../../mk/bsd.fast.prefs.mk"
 
@@ -11,7 +11,7 @@ BUILDLINK_TREE+=	libXext
 .if !defined(LIBXEXT_BUILDLINK3_MK)
 LIBXEXT_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.libXext+=	libXext>=0.99.0
+BUILDLINK_API_DEPENDS.libXext+=	libXext>=1.1.1
 BUILDLINK_PKGSRCDIR.libXext?=	../../x11/libXext
 
 .include "../../x11/libX11/buildlink3.mk"
diff --git a/x11/libXext/distinfo b/x11/libXext/distinfo
index 20366719199..d4d02ec563a 100644
--- a/x11/libXext/distinfo
+++ b/x11/libXext/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.7 2009/02/27 16:00:01 tnn Exp $
+$NetBSD: distinfo,v 1.8 2010/04/09 08:50:17 tnn Exp $
 
-SHA1 (libXext-1.0.5.tar.bz2) = 926c7237108aaccbb8e437ebd80b8edc67615249
-RMD160 (libXext-1.0.5.tar.bz2) = a6ed71d3b4d0e7f1442e196fc795324ff3188f5a
-Size (libXext-1.0.5.tar.bz2) = 271301 bytes
-SHA1 (patch-aa) = ac7ff4582731a3c3886ff156979a14c304a81d67
+SHA1 (libXext-1.1.1.tar.bz2) = c2eb8d8d760c6881e51c938812764d1d6cefd51c
+RMD160 (libXext-1.1.1.tar.bz2) = b2659a7ed3034712e811474c039bfd9d8cb0cfe1
+Size (libXext-1.1.1.tar.bz2) = 318737 bytes
+SHA1 (patch-aa) = 37b0fb5da1f238792793c8fd93b5c1f552574cc7
diff --git a/x11/libXext/patches/patch-aa b/x11/libXext/patches/patch-aa
index f0112bf62c6..4e49020b5b6 100644
--- a/x11/libXext/patches/patch-aa
+++ b/x11/libXext/patches/patch-aa
@@ -1,13 +1,23 @@
-$NetBSD: patch-aa,v 1.3 2009/02/27 16:00:01 tnn Exp $
+$NetBSD: patch-aa,v 1.4 2010/04/09 08:50:17 tnn Exp $
 
---- src/Xge.c.orig	2008-12-03 20:02:05.000000000 +0100
-+++ src/Xge.c
-@@ -161,6 +161,8 @@ cleanup:
- static Bool
- _xgeCheckExtension(Display* dpy, XExtDisplayInfo* info)
- {
-+    if (!XextHasExtension(info))
-+        return False;
-     XextCheckExtension(dpy, info, xge_extension_name, False);
-     return True;
- }
+--- include/X11/extensions/dpms.h.orig	2009-10-16 21:26:30.000000000 +0000
++++ include/X11/extensions/dpms.h
+@@ -31,10 +31,18 @@ Equipment Corporation.
+ #ifndef _X11_EXTENSIONS_DPMS_H
+ #define _X11_EXTENSIONS_DPMS_H 1
+ 
++#include <X11/Xfuncproto.h>
+ #include <X11/X.h>
+ #include <X11/Xmd.h>
+ #include <X11/extensions/dpmsconst.h>
+ 
++#ifndef Status
++/* XXX: this is a hack to let old xf86-video-* build. Does not belong here. */
++#define Bool int
++#define Status int
++typedef struct _XDisplay Display;
++#endif
++
+ _XFUNCPROTOBEGIN
+ 
+ extern Bool DPMSQueryExtension(Display *, int *, int *);