From 57020cbf75ef48cac186536cac00d0ba095f1c29 Mon Sep 17 00:00:00 2001
From: joerg <joerg@pkgsrc.org>
Date: Wed, 25 Jul 2007 15:53:10 +0000
Subject: Update to compositeproto-0.4. Add CompositeNumberEvents and protocol
 specification in English.

---
 x11/compositeproto/Makefile         |  4 ++--
 x11/compositeproto/PLIST            |  6 ++++--
 x11/compositeproto/distinfo         |  9 +++++----
 x11/compositeproto/patches/patch-aa | 19 +++++++++++++++++++
 4 files changed, 30 insertions(+), 8 deletions(-)
 create mode 100644 x11/compositeproto/patches/patch-aa

(limited to 'x11')

diff --git a/x11/compositeproto/Makefile b/x11/compositeproto/Makefile
index 62bba79ee9c..df6e43b7f23 100644
--- a/x11/compositeproto/Makefile
+++ b/x11/compositeproto/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2007/01/18 17:23:39 joerg Exp $
+# $NetBSD: Makefile,v 1.6 2007/07/25 15:53:10 joerg Exp $
 #
 
-DISTNAME=		compositeproto-0.3.1
+DISTNAME=		compositeproto-0.4
 CATEGORIES=		x11
 MASTER_SITES=		http://xorg.freedesktop.org/releases/individual/proto/
 
diff --git a/x11/compositeproto/PLIST b/x11/compositeproto/PLIST
index ce0f42d0fbf..a51047efcb3 100644
--- a/x11/compositeproto/PLIST
+++ b/x11/compositeproto/PLIST
@@ -1,5 +1,7 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2006/04/18 17:17:50 reed Exp $
+@comment $NetBSD: PLIST,v 1.2 2007/07/25 15:53:10 joerg Exp $
 include/X11/extensions/composite.h
 include/X11/extensions/compositeproto.h
 lib/pkgconfig/compositeproto.pc
-@comment @dirrm include/X11/extensions
+share/doc/compositeproto/compositeproto.txt
+@dirrm share/doc/compositeproto
+@dirrm include/X11/extensions
diff --git a/x11/compositeproto/distinfo b/x11/compositeproto/distinfo
index ec2609342e2..d8964275ab3 100644
--- a/x11/compositeproto/distinfo
+++ b/x11/compositeproto/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.3 2007/01/18 17:23:39 joerg Exp $
+$NetBSD: distinfo,v 1.4 2007/07/25 15:53:10 joerg Exp $
 
-SHA1 (compositeproto-0.3.1.tar.gz) = 61ca38c6c504264935ba20a30954aa046443fa7f
-RMD160 (compositeproto-0.3.1.tar.gz) = 4d1b3c3fc15c69370ad56c1ef6b832382530b66b
-Size (compositeproto-0.3.1.tar.gz) = 44435 bytes
+SHA1 (compositeproto-0.4.tar.gz) = 976a6a5102688cd6c3e9a0a03175e8ce1aa34d9f
+RMD160 (compositeproto-0.4.tar.gz) = d60934c8e22829d8710cd9c8cf600ce69e718bbf
+Size (compositeproto-0.4.tar.gz) = 53324 bytes
+SHA1 (patch-aa) = ead53d18596ad98dcc41025fad4ce821a8882f27
diff --git a/x11/compositeproto/patches/patch-aa b/x11/compositeproto/patches/patch-aa
new file mode 100644
index 00000000000..5c592a423ac
--- /dev/null
+++ b/x11/compositeproto/patches/patch-aa
@@ -0,0 +1,19 @@
+$NetBSD: patch-aa,v 1.1 2007/07/25 15:53:11 joerg Exp $
+
+--- compositeproto.h.orig	2007-07-25 15:30:26.000000000 +0000
++++ compositeproto.h
+@@ -51,6 +51,7 @@
+ 
+ #define Window CARD32
+ #define Region CARD32
++#define Pixmap CARD32
+ 
+ /* 
+  * requests and replies
+@@ -187,5 +188,6 @@ typedef struct {
+ 
+ #undef Window
+ #undef Region
++#undef Pixmap
+ 
+ #endif /* _COMPOSITEPROTO_H_ */
-- 
cgit v1.2.3