Update to 1.4.4:

Adam Jackson (2):
      C sucks: define XEventClass in terms of unsigned int, not CARD32.
      Typo fix.

Peter Hutterer (2):
      Add DeviceControlChanged define.
      inputproto 1.4.4

4 files changed, 8 insertions, 47 deletions

diff --git a/x11/inputproto/Makefile b/x11/inputproto/Makefile
index 5862171f21a..e2b24936c2a 100644
--- a/x11/inputproto/Makefile
+++ b/x11/inputproto/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2008/07/24 17:30:14 bjs Exp $
+# $NetBSD: Makefile,v 1.9 2008/07/30 09:56:48 wiz Exp $
 #
 
-DISTNAME=		inputproto-1.4.3
-PKGREVISION=		1
+DISTNAME=		inputproto-1.4.4
 CATEGORIES=		x11
 MASTER_SITES=		${MASTER_SITE_XORG:=proto/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/x11/inputproto/buildlink3.mk b/x11/inputproto/buildlink3.mk
index e38e8b6ee32..bd7b226bf06 100644
--- a/x11/inputproto/buildlink3.mk
+++ b/x11/inputproto/buildlink3.mk
@@ -1,6 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2007/01/23 14:28:15 joerg Exp $
-
-BUILDLINK_DEPMETHOD.inputproto?=	build
+# $NetBSD: buildlink3.mk,v 1.3 2008/07/30 09:56:48 wiz Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 INPUTPROTO_BUILDLINK3_MK:=	${INPUTPROTO_BUILDLINK3_MK}+
@@ -16,6 +14,7 @@ BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}inputproto
 .if ${INPUTPROTO_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.inputproto+=	inputproto>=1.4
 BUILDLINK_PKGSRCDIR.inputproto?=	../../x11/inputproto
+BUILDLINK_DEPMETHOD.inputproto?=	build
 .endif	# INPUTPROTO_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/inputproto/distinfo b/x11/inputproto/distinfo
index f12a44fc49e..d895ffb461a 100644
--- a/x11/inputproto/distinfo
+++ b/x11/inputproto/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.7 2008/07/24 17:30:14 bjs Exp $
+$NetBSD: distinfo,v 1.8 2008/07/30 09:56:48 wiz Exp $
 
-SHA1 (inputproto-1.4.3.tar.bz2) = d583df60442615b030910a0791319c015175e4e9
-RMD160 (inputproto-1.4.3.tar.bz2) = c33958cfd561f1e28d82255d8b6d6da6d398cae2
-Size (inputproto-1.4.3.tar.bz2) = 54190 bytes
-SHA1 (patch-aa) = 16f889b7c96bc761f577c51e4d7c1bc4fd662d6e
+SHA1 (inputproto-1.4.4.tar.bz2) = 9501ae977350a561a1510a543f17167568a7415c
+RMD160 (inputproto-1.4.4.tar.bz2) = 771db687cab6f2e77f36e3efd1bc4793c73b152b
+Size (inputproto-1.4.4.tar.bz2) = 54417 bytes
diff --git a/x11/inputproto/patches/patch-aa b/x11/inputproto/patches/patch-aa
deleted file mode 100644
index 4a2695527f2..00000000000
--- a/x11/inputproto/patches/patch-aa
+++ /dev/null
@@ -1,36 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2008/07/24 17:30:14 bjs Exp $
-
-"Apparently pulling in Xmd.h here breaks qt, since they both define an
-INT32 type (and incompatible ones even, since Xmd's is unsigned long on
-ILP32." (from GIT)
-
---- XI.h.orig	2008-03-05 22:05:38.000000000 -0500
-+++ XI.h
-@@ -52,8 +52,6 @@ SOFTWARE.
- #ifndef _XI_H_
- #define _XI_H_
- 
--#include <X11/Xmd.h> /* CARD32 */
--
- #define sz_xGetExtensionVersionReq		8
- #define sz_xGetExtensionVersionReply		32
- #define sz_xListInputDevicesReq			4
-@@ -263,12 +261,16 @@ SOFTWARE.
- #define XI_DeviceBusy	3
- #define XI_BadClass	4
- 
--/* Make XEventClass be a CARD32 for 64 bit servers.  Don't affect client
-+/*
-+ * Make XEventClass be a CARD32 for 64 bit servers.  Don't affect client
-  * definition of XEventClass since that would be a library interface change.
-  * See the top of X.h for more _XSERVER64 magic.
-+ *
-+ * But, don't actually use the CARD32 type.  We can't get it defined here
-+ * without polluting the namespace.
-  */
- #ifdef _XSERVER64
--typedef	CARD32		XEventClass;
-+typedef unsigned int	XEventClass;
- #else
- typedef	unsigned long	XEventClass;
- #endif