Update to xextproto-7.1.1.

"Many headers included in xextproto were combined library, server and
 protocol headers. This release splits those headers up and moves the
 client-side library headers into the libXext module.
 Clients should not be affected by this change.
 Drivers that included headers from this module will need to be fixed."

"Note that as a result of this file removal and renaming, xextproto is only
 partially compatible to other, already released modules. An upgrade of
 xextproto from 7.0.x to 7.1.0 also requires upgrades of libXext, libXtst,
 the X server and possible others."

xxx tnn note: I've added a compat shmstr.h to help old software,
such as xorg-server 1.6 to build. More fixes coming.

5 files changed, 72 insertions, 45 deletions

diff --git a/x11/xextproto/Makefile b/x11/xextproto/Makefile
index d1f04f67e81..55f001601fa 100644
--- a/x11/xextproto/Makefile
+++ b/x11/xextproto/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2009/02/20 07:47:56 bjs Exp $
+# $NetBSD: Makefile,v 1.8 2010/04/09 08:33:38 tnn Exp $
 #
 
-DISTNAME=		xextproto-7.0.5
+DISTNAME=		xextproto-7.1.1
 CATEGORIES=		x11
 MASTER_SITES=		${MASTER_SITE_XORG:=proto/}
 EXTRACT_SUFX=		.tar.bz2
@@ -16,6 +16,8 @@ CONFLICTS+=		xextensions-[0-9]*
 
 GNU_CONFIGURE=		yes
 PKGCONFIG_OVERRIDE+=	${WRKSRC}/xextproto.pc.in
-USE_LANGUAGES=		# none, not even C
+
+post-install:
+	${INSTALL_DATA} ${FILESDIR}/shmstr.h ${DESTDIR}${PREFIX}/include/X11/extensions
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xextproto/PLIST b/x11/xextproto/PLIST
index 2c53eaba280..1ef77a2d392 100644
--- a/x11/xextproto/PLIST
+++ b/x11/xextproto/PLIST
@@ -1,40 +1,33 @@
-@comment $NetBSD: PLIST,v 1.3 2009/06/14 18:25:11 joerg Exp $
-include/X11/extensions/MITMisc.h
-include/X11/extensions/XEVI.h
-include/X11/extensions/XEVIstr.h
-include/X11/extensions/XLbx.h
-include/X11/extensions/XShm.h
-include/X11/extensions/XTest.h
-include/X11/extensions/Xag.h
-include/X11/extensions/Xagstr.h
-include/X11/extensions/Xcup.h
-include/X11/extensions/Xcupstr.h
-include/X11/extensions/Xdbe.h
-include/X11/extensions/Xdbeproto.h
-include/X11/extensions/Xext.h
-include/X11/extensions/Xge.h
-include/X11/extensions/dpms.h
-include/X11/extensions/dpmsstr.h
-include/X11/extensions/extutil.h
+@comment $NetBSD: PLIST,v 1.4 2010/04/09 08:33:38 tnn Exp $
+include/X11/extensions/EVI.h
+include/X11/extensions/EVIproto.h
+include/X11/extensions/ag.h
+include/X11/extensions/agproto.h
+include/X11/extensions/cup.h
+include/X11/extensions/cupproto.h
+include/X11/extensions/dbe.h
+include/X11/extensions/dbeproto.h
+include/X11/extensions/dpmsconst.h
+include/X11/extensions/dpmsproto.h
 include/X11/extensions/ge.h
 include/X11/extensions/geproto.h
-include/X11/extensions/lbxbuf.h
-include/X11/extensions/lbxbufstr.h
-include/X11/extensions/lbxdeltastr.h
-include/X11/extensions/lbximage.h
-include/X11/extensions/lbxopts.h
-include/X11/extensions/lbxstr.h
-include/X11/extensions/lbxzlib.h
-include/X11/extensions/mitmiscstr.h
-include/X11/extensions/multibuf.h
-include/X11/extensions/multibufst.h
-include/X11/extensions/security.h
-include/X11/extensions/securstr.h
-include/X11/extensions/shape.h
-include/X11/extensions/shapestr.h
+include/X11/extensions/lbx.h
+include/X11/extensions/lbxproto.h
+include/X11/extensions/mitmiscconst.h
+include/X11/extensions/mitmiscproto.h
+include/X11/extensions/multibufconst.h
+include/X11/extensions/multibufproto.h
+include/X11/extensions/secur.h
+include/X11/extensions/securproto.h
+include/X11/extensions/shapeconst.h
+include/X11/extensions/shapeproto.h
+include/X11/extensions/shm.h
+include/X11/extensions/shmproto.h
 include/X11/extensions/shmstr.h
-include/X11/extensions/sync.h
-include/X11/extensions/syncstr.h
-include/X11/extensions/xtestext1.h
-include/X11/extensions/xteststr.h
+include/X11/extensions/syncconst.h
+include/X11/extensions/syncproto.h
+include/X11/extensions/xtestconst.h
+include/X11/extensions/xtestext1const.h
+include/X11/extensions/xtestext1proto.h
+include/X11/extensions/xtestproto.h
 lib/pkgconfig/xextproto.pc
diff --git a/x11/xextproto/buildlink3.mk b/x11/xextproto/buildlink3.mk
index ba3eb799fdd..8242fc35c8d 100644
--- a/x11/xextproto/buildlink3.mk
+++ b/x11/xextproto/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:25:52 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2010/04/09 08:33:38 tnn Exp $
 
 .include "../../mk/bsd.fast.prefs.mk"
 
@@ -9,7 +9,7 @@ BUILDLINK_TREE+=	xextproto
 .if !defined(XEXTPROTO_BUILDLINK3_MK)
 XEXTPROTO_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.xextproto+=	xextproto>=7.0
+BUILDLINK_API_DEPENDS.xextproto+=	xextproto>=7.1.1
 BUILDLINK_PKGSRCDIR.xextproto?=	../../x11/xextproto
 
 .include "../../x11/inputproto/buildlink3.mk"
diff --git a/x11/xextproto/distinfo b/x11/xextproto/distinfo
index 7a58aefbaa4..43e8dcfef93 100644
--- a/x11/xextproto/distinfo
+++ b/x11/xextproto/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.4 2009/02/20 07:47:56 bjs Exp $
+$NetBSD: distinfo,v 1.5 2010/04/09 08:33:38 tnn Exp $
 
-SHA1 (xextproto-7.0.5.tar.bz2) = d62e704039e7c647da66c9a6531ebdede37dace8
-RMD160 (xextproto-7.0.5.tar.bz2) = 52cbe5751387665050cb5d871d6376a8cc22c7ce
-Size (xextproto-7.0.5.tar.bz2) = 80831 bytes
+SHA1 (xextproto-7.1.1.tar.bz2) = 1bb4bd12d65a17b3168dc9b4e028b33a2f7b2cad
+RMD160 (xextproto-7.1.1.tar.bz2) = 10d840838da0870f9ff83afddc12eaea46098e54
+Size (xextproto-7.1.1.tar.bz2) = 71234 bytes
diff --git a/x11/xextproto/files/shmstr.h b/x11/xextproto/files/shmstr.h
new file mode 100644
index 00000000000..b99233db1d4
--- /dev/null
+++ b/x11/xextproto/files/shmstr.h
@@ -0,0 +1,32 @@
+/* $NetBSD: shmstr.h,v 1.1 2010/04/09 08:33:38 tnn Exp $ */
+
+#warning this file is deprecated and provided only for source compatibility
+
+#include "shmproto.h"
+ 
+#define XSHM_PUT_IMAGE_ARGS \
+    DrawablePtr		/* dst */, \
+    GCPtr		/* pGC */, \
+    int			/* depth */, \
+    unsigned int	/* format */, \
+    int			/* w */, \
+    int			/* h */, \
+    int			/* sx */, \
+    int			/* sy */, \
+    int			/* sw */, \
+    int			/* sh */, \
+    int			/* dx */, \
+    int			/* dy */, \
+    char *		/* data */
+
+#define XSHM_CREATE_PIXMAP_ARGS \
+    ScreenPtr	/* pScreen */, \
+    int		/* width */, \
+    int		/* height */, \
+    int		/* depth */, \
+    char *	/* addr */
+
+typedef struct _ShmFuncs {
+    PixmapPtr	(* CreatePixmap)(XSHM_CREATE_PIXMAP_ARGS);
+    void	(* PutImage)(XSHM_PUT_IMAGE_ARGS);
+} ShmFuncs, *ShmFuncsPtr;