From ba71607e8b21c9dbe8d9a8ee2e1915cdebaa5784 Mon Sep 17 00:00:00 2001
From: tnn <tnn>
Date: Fri, 15 Jan 2010 17:48:44 +0000
Subject: Update to compositeproto-0.4.1. Changes:

Add pointers to mailing list, git repo, and wiki to README
Migrate to xorg macros 1.3 & XORG_DEFAULT_OPTIONS
compositeproto 0.4.1
compositeproto: use XORG_CHANGELOG macro to create ChangeLog. #22611
Replace static ChangeLog with dist-hook to generate from git log
Temporarily define Pixmap (just like Window and Region). (From pkgsrc.)
---
 x11/compositeproto/Makefile         |  7 +++----
 x11/compositeproto/distinfo         |  9 ++++-----
 x11/compositeproto/patches/patch-aa | 19 -------------------
 3 files changed, 7 insertions(+), 28 deletions(-)
 delete mode 100644 x11/compositeproto/patches/patch-aa

(limited to 'x11/compositeproto')

diff --git a/x11/compositeproto/Makefile b/x11/compositeproto/Makefile
index 4efb8750ae4..1c9dc8ac212 100644
--- a/x11/compositeproto/Makefile
+++ b/x11/compositeproto/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2008/05/24 21:45:14 tnn Exp $
+# $NetBSD: Makefile,v 1.8 2010/01/15 17:48:44 tnn Exp $
 #
 
-DISTNAME=		compositeproto-0.4
+DISTNAME=		compositeproto-0.4.1
 CATEGORIES=		x11
 MASTER_SITES=		${MASTER_SITE_XORG:=proto/}
 
@@ -14,8 +14,7 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 CONFLICTS+=		compositeext-[0-9]*
 
 GNU_CONFIGURE=		YES
-PKGCONFIG_OVERRIDE+=	${WRKSRC}/compositeproto.pc.in
-USE_LANGUAGES=		# none, not even C
+PKGCONFIG_OVERRIDE+=	compositeproto.pc.in
 
 .include "../../x11/fixesproto/buildlink3.mk"
 .include "../../x11/xproto/buildlink3.mk"
diff --git a/x11/compositeproto/distinfo b/x11/compositeproto/distinfo
index d8964275ab3..6cc3a4f2a9e 100644
--- a/x11/compositeproto/distinfo
+++ b/x11/compositeproto/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.4 2007/07/25 15:53:10 joerg Exp $
+$NetBSD: distinfo,v 1.5 2010/01/15 17:48:44 tnn Exp $
 
-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
+SHA1 (compositeproto-0.4.1.tar.gz) = 224d845738b01d663177eb25c2664ca1f32a96ee
+RMD160 (compositeproto-0.4.1.tar.gz) = 6762f26d34aef9feaf207c7fa3f40c14fd750dc6
+Size (compositeproto-0.4.1.tar.gz) = 106744 bytes
diff --git a/x11/compositeproto/patches/patch-aa b/x11/compositeproto/patches/patch-aa
deleted file mode 100644
index 5c592a423ac..00000000000
--- a/x11/compositeproto/patches/patch-aa
+++ /dev/null
@@ -1,19 +0,0 @@
-$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