Update to 7.0.27:

This release improves support for compiler attributes for the clang and
Solaris Studio 12.4 compilers, and makes builds on AIX choose the right
headers to include.

Alan Coopersmith (4):
      Enable use of __attribute__((deprecated)) with Solaris Studio 12.4 compiler
      Do not suggest adding new keysyms to XF86keysym.h
      Use clang's __has_attribute to check for attribute support
      xproto 7.0.27

Michael Haubenwallner (1):
      Bug #80528: make it build on AIX

3 files changed, 7 insertions, 42 deletions

diff --git a/x11/xproto/Makefile b/x11/xproto/Makefile
index d959635a85f..da500776e6f 100644
--- a/x11/xproto/Makefile
+++ b/x11/xproto/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.27 2014/10/09 14:07:16 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2014/12/31 14:25:03 wiz Exp $
 
-DISTNAME=		xproto-7.0.26
+DISTNAME=		xproto-7.0.27
 CATEGORIES=		x11 devel
 MASTER_SITES=		${MASTER_SITE_XORG:=proto/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/x11/xproto/distinfo b/x11/xproto/distinfo
index 44046dfbe23..cc58ac96244 100644
--- a/x11/xproto/distinfo
+++ b/x11/xproto/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.23 2014/04/15 08:29:23 wiz Exp $
+$NetBSD: distinfo,v 1.24 2014/12/31 14:25:03 wiz Exp $
 
-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 (xproto-7.0.27.tar.bz2) = b34e7438623c8016cc8338549e5fcc29e2f64034
+RMD160 (xproto-7.0.27.tar.bz2) = 1de2d31965275f756eb40b886e135b509278ce45
+Size (xproto-7.0.27.tar.bz2) = 305768 bytes
+SHA1 (patch-Xfuncproto.h.in) = 4f1b33198ab93c16c7ef27d29c09a72038f8e084
 SHA1 (patch-Xos_r.h.in) = 6de176ec5bef08d67286a14eca651b1968d0b4bb
 SHA1 (patch-configure) = a589cc4b75bbaa4c93789d4ffc85a05fcaf0e25c
 SHA1 (patch-configure.ac) = 8bc7d4b8c9c98d8902404d2e67755e0145173b36
diff --git a/x11/xproto/patches/patch-Xfuncproto.h.in b/x11/xproto/patches/patch-Xfuncproto.h.in
deleted file mode 100644
index 6e72daa2ce1..00000000000
--- a/x11/xproto/patches/patch-Xfuncproto.h.in
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD: patch-Xfuncproto.h.in,v 1.1 2013/05/17 13:17:40 joerg Exp $
-
---- Xfuncproto.h.in.orig	2013-03-29 23:26:53.000000000 +0000
-+++ Xfuncproto.h.in
-@@ -84,9 +84,9 @@ in this Software without prior written a
- 
- /* Added in X11R6.9, so available in any version of modular xproto */
- #if defined(__GNUC__) && (__GNUC__ >= 4) && !defined(__CYGWIN__) && !defined(__MINGW32__)
--# define _X_EXPORT      __attribute__((visibility("default")))
--# define _X_HIDDEN      __attribute__((visibility("hidden")))
--# define _X_INTERNAL    __attribute__((visibility("internal")))
-+# define _X_EXPORT      __attribute__((__visibility__("default")))
-+# define _X_HIDDEN      __attribute__((__visibility__("hidden")))
-+# define _X_INTERNAL    __attribute__((__visibility__("internal")))
- #elif defined(__SUNPRO_C) && (__SUNPRO_C >= 0x550)
- # define _X_EXPORT      __global
- # define _X_HIDDEN      __hidden
-@@ -108,7 +108,7 @@ in this Software without prior written a
- 
- /* Added in X11R6.9, so available in any version of modular xproto */
- #if defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 301)
--# define _X_DEPRECATED  __attribute__((deprecated))
-+# define _X_DEPRECATED  __attribute__((__deprecated__))
- #else /* not gcc >= 3.1 */
- # define _X_DEPRECATED
- #endif
-@@ -132,7 +132,7 @@ in this Software without prior written a
-    argument macros, must be only used inside #ifdef _X_NONNULL guards, as
-    many legacy X clients are compiled in C89 mode still. */
- #if defined(__GNUC__) &&  ((__GNUC__ * 100 + __GNUC_MINOR__) >= 303)
--#define _X_NONNULL(args...)  __attribute__((nonnull(args)))
-+#define _X_NONNULL(args...)  __attribute__((__nonnull__(args)))
- #elif defined(__STDC_VERSION__) && (__STDC_VERSION__ - 0 >= 199901L) /* C99 */
- #define _X_NONNULL(...)  /* */
- #endif