From fd0b69cf907f6dee3e8c6956bb5ef1242b067d6b Mon Sep 17 00:00:00 2001
From: wiz <wiz@pkgsrc.org>
Date: Tue, 15 Apr 2014 08:29:23 +0000
Subject: Update to 7.0.26:

7.0.26:
Alan Coopersmith (1):
      Add more comments on connection setup to Xproto.h

Jon TURNEY (1):
      Xpoll.h.in: Fix WIN32 check to trigger on MinGW only

Julien Cristau (1):
      xproto 7.0.26

Keith Packard (1):
      Replace 'pointer' with explicit 'void *'

Yaakov Selkowitz (2):
      Xthreads.h: Declare _Xthread_init for WIN32
      Xwindows.h: Wrap Windows 64-bit types as well for 64-bit build

7.0.25:
This release cleans up some old Cray Unicos code, adds keysyms for German
keyboard layouts, adds a macro for gcc's "cold" attribute, and brings our
autoconf macros up to current support levels.

Alan Coopersmith (3):
      Add _X_COLD attribute for branch prediction hints
      Remove WORD64, MUSTCOPY, and other CRAY leftovers
      xproto 7.0.25

Benno Schulenberg (1):
      Additional dead keysyms to complete the German DIN T3 keyboard layout.

Gaetan Nadon (1):
      config: replace deprecated use of AC_OUTPUT with AC_CONFIG_FILES
---
 x11/xproto/Makefile                   |  7 +++----
 x11/xproto/distinfo                   | 10 +++++-----
 x11/xproto/patches/patch-configure.ac |  6 +++---
 3 files changed, 11 insertions(+), 12 deletions(-)

(limited to 'x11/xproto')

diff --git a/x11/xproto/Makefile b/x11/xproto/Makefile
index f30810db8ec..103d38ef060 100644
--- a/x11/xproto/Makefile
+++ b/x11/xproto/Makefile
@@ -1,8 +1,6 @@
-# $NetBSD: Makefile,v 1.24 2013/05/17 13:17:40 joerg Exp $
-#
+# $NetBSD: Makefile,v 1.25 2014/04/15 08:29:23 wiz Exp $
 
-DISTNAME=		xproto-7.0.24
-PKGREVISION=		1
+DISTNAME=		xproto-7.0.26
 CATEGORIES=		x11 devel
 MASTER_SITES=		${MASTER_SITE_XORG:=proto/}
 EXTRACT_SUFX=		.tar.bz2
@@ -20,5 +18,6 @@ USE_LANGUAGES=		c
 
 post-extract:
 	${MV} ${WRKSRC}/Xos_r.h ${WRKSRC}/Xos_r.h.in
+	sleep 1 && ${TOUCH} ${WRKSRC}/aclocal.m4 ${WRKSRC}/Makefile.in
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xproto/distinfo b/x11/xproto/distinfo
index fb7096856be..44046dfbe23 100644
--- a/x11/xproto/distinfo
+++ b/x11/xproto/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.22 2013/05/17 13:17:40 joerg Exp $
+$NetBSD: distinfo,v 1.23 2014/04/15 08:29:23 wiz Exp $
 
-SHA1 (xproto-7.0.24.tar.bz2) = c05b5757174839644f2fd98c1b062150494b6b15
-RMD160 (xproto-7.0.24.tar.bz2) = 9a4d909e2b434bb0f2b7664ed8f3331c94c98580
-Size (xproto-7.0.24.tar.bz2) = 292795 bytes
+SHA1 (xproto-7.0.26.tar.bz2) = 81101b78052fa0f652982081f9328f912b71a948
+RMD160 (xproto-7.0.26.tar.bz2) = c1572697e14307bd5350745f51d2a027efc424b6
+Size (xproto-7.0.26.tar.bz2) = 305321 bytes
 SHA1 (patch-Xfuncproto.h.in) = be2f94377fb61af159b704d3028fc82f93959557
 SHA1 (patch-Xos_r.h.in) = 6de176ec5bef08d67286a14eca651b1968d0b4bb
 SHA1 (patch-configure) = a589cc4b75bbaa4c93789d4ffc85a05fcaf0e25c
-SHA1 (patch-configure.ac) = 446b38c6043d90fb0f80df5f5d70d0b57e572310
+SHA1 (patch-configure.ac) = 8bc7d4b8c9c98d8902404d2e67755e0145173b36
diff --git a/x11/xproto/patches/patch-configure.ac b/x11/xproto/patches/patch-configure.ac
index 956fefcb821..141063be128 100644
--- a/x11/xproto/patches/patch-configure.ac
+++ b/x11/xproto/patches/patch-configure.ac
@@ -1,7 +1,7 @@
-$NetBSD: patch-configure.ac,v 1.1 2013/05/17 13:17:40 joerg Exp $
+$NetBSD: patch-configure.ac,v 1.2 2014/04/15 08:29:23 wiz Exp $
 
 
---- configure.ac.orig	2013-03-29 23:26:53.000000000 +0000
+--- configure.ac.orig	2014-04-14 13:33:50.000000000 +0000
 +++ configure.ac
 @@ -16,6 +16,7 @@ XORG_CHECK_SGML_DOCTOOLS(1.8)
  
@@ -24,5 +24,5 @@ $NetBSD: patch-configure.ac,v 1.1 2013/05/17 13:17:40 joerg Exp $
 +AC_CHECK_FUNC(gmtime_r, [AC_DEFINE(_XOS_R_H_MTSAFE_TIMEAPI,[],[Assume has gmtime_r and friends from time.h])],)
 +AC_CHECK_FUNC(ttyname_r, [AC_DEFINE(_XOS_R_H_MTSAFE_UNISTDAPI,[],[Assume has ttyname_r and friends from unistd.h])],)
  
- AC_OUTPUT([Makefile
+ AC_CONFIG_FILES([Makefile
             specs/Makefile
-- 
cgit v1.2.3