update to xproto-7.0.24 for modular-xorg-server-1.12.4

6 files changed, 8 insertions, 392 deletions

diff --git a/x11/xproto/Makefile b/x11/xproto/Makefile
index 55eaadbde1a..3f481e974e5 100644
--- a/x11/xproto/Makefile
+++ b/x11/xproto/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.22 2012/11/16 20:04:47 joerg Exp $
+# $NetBSD: Makefile,v 1.23 2013/05/16 05:49:54 richard Exp $
 #
 
-DISTNAME=		xproto-7.0.23
-PKGREVISION=		2
+DISTNAME=		xproto-7.0.24
 CATEGORIES=		x11 devel
 MASTER_SITES=		${MASTER_SITE_XORG:=proto/}
 EXTRACT_SUFX=		.tar.bz2
@@ -18,7 +17,7 @@ GNU_CONFIGURE=		yes
 PKGCONFIG_OVERRIDE+=	xproto.pc.in
 USE_LANGUAGES=		c
 
-post-extract:
-	${MV} ${WRKSRC}/Xos_r.h ${WRKSRC}/Xos_r.h.in
+#post-extract:
+#	${MV} ${WRKSRC}/Xos_r.h ${WRKSRC}/Xos_r.h.in
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xproto/distinfo b/x11/xproto/distinfo
index 2c2cf94c846..2783b903a80 100644
--- a/x11/xproto/distinfo
+++ b/x11/xproto/distinfo
@@ -1,9 +1,5 @@
-$NetBSD: distinfo,v 1.20 2012/11/16 20:04:47 joerg Exp $
+$NetBSD: distinfo,v 1.21 2013/05/16 05:49:54 richard Exp $
 
-SHA1 (xproto-7.0.23.tar.bz2) = 5d7f00d1dbe6cf8e725841ef663f0ee2491ba5b2
-RMD160 (xproto-7.0.23.tar.bz2) = b4077227a012c90cbcab8b6e7a289931b2ee6efb
-Size (xproto-7.0.23.tar.bz2) = 290114 bytes
-SHA1 (patch-aa) = 22cfcde47f2139c685286e97968bfc0c708e1fea
-SHA1 (patch-ab) = 9327483e9a48b8715cd212c84dfa3f9e120bbb7f
-SHA1 (patch-ad) = d6c005848abad31861983fcd14d0c37520b81cac
-SHA1 (patch-configure) = 9656a03001a26a8853dc21a37c8b3ae25a8562ad
+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
diff --git a/x11/xproto/patches/patch-aa b/x11/xproto/patches/patch-aa
deleted file mode 100644
index 3b7798712ee..00000000000
--- a/x11/xproto/patches/patch-aa
+++ /dev/null
@@ -1,134 +0,0 @@
-$NetBSD: patch-aa,v 1.8 2012/06/03 19:57:33 wiz Exp $
-
---- Xos_r.h.in.orig	2012-03-16 06:11:44.000000000 +0000
-+++ Xos_r.h.in
-@@ -73,13 +73,7 @@ in this Software without prior written a
- # include <X11/Xfuncs.h>
- 
- # ifndef X_NOT_POSIX
--#  ifdef _POSIX_SOURCE
--#   include <limits.h>
--#  else
--#   define _POSIX_SOURCE
--#   include <limits.h>
--#   undef _POSIX_SOURCE
--#  endif
-+#  include <limits.h>
- #  ifndef LINE_MAX
- #   define X_LINE_MAX 2048
- #  else
-@@ -88,6 +82,10 @@ in this Software without prior written a
- # endif
- #endif /* _XOS_R_H */
- 
-+# ifdef __APPLE__
-+#  include <sys/param.h>
-+# endif
-+
- #ifndef WIN32
- 
- #ifdef __cplusplus
-@@ -185,6 +183,13 @@ extern void XtProcessUnlock(
- #  endif
- # endif
- 
-+#undef _XOS_R_H_MTSAFE_DIRENTAPI
-+#undef _XOS_R_H_MTSAFE_NETDBAPI
-+#undef _XOS_R_H_MTSAFE_PWDAPI
-+#undef _XOS_R_H_MTSAFE_UNISTDAPI
-+#undef _XOS_R_H_MTSAFE_STRINGAPI
-+#undef _XOS_R_H_MTSAFE_TIMEAPI
-+#undef _XOS_R_H_MTSAFE_GRPAPI
- #endif /* !defined WIN32 */
- 
- /*
-@@ -214,7 +219,7 @@ extern void XtProcessUnlock(
- 
- #if defined(X_INCLUDE_PWD_H) && !defined(_XOS_INCLUDED_PWD_H)
- # include <pwd.h>
--# if defined(XUSE_MTSAFE_API) || defined(XUSE_MTSAFE_PWDAPI)
-+# if defined(_XOS_R_H_MTSAFE_PWDAPI)
- #  define XOS_USE_MTSAFE_PWDAPI 1
- # endif
- #endif
-@@ -318,7 +323,7 @@ static __inline__ void _Xpw_copyPasswd(_
-   (_Xos_processUnlock), \
-   (p).pwp )
- 
--#elif !defined(_POSIX_THREAD_SAFE_FUNCTIONS) && !defined(__APPLE__)
-+#elif !defined(_POSIX_THREAD_SAFE_FUNCTIONS) && !defined(__APPLE__) && !defined(__NetBSD__) && !defined(__DragonFly__)
- # define X_NEEDS_PWPARAMS
- typedef struct {
-   struct passwd pws;
-@@ -384,7 +389,7 @@ typedef int _Xgetpwret;
- #if defined(X_INCLUDE_NETDB_H) && !defined(_XOS_INCLUDED_NETDB_H) \
-     && !defined(WIN32)
- # include <netdb.h>
--# if defined(XUSE_MTSAFE_API) || defined(XUSE_MTSAFE_NETDBAPI)
-+# if defined(_XOS_R_H_MTSAFE_NETDBAPI)
- #  define XOS_USE_MTSAFE_NETDBAPI 1
- # endif
- #endif
-@@ -543,7 +548,7 @@ typedef int _Xgetservbynameparams; /* du
- #   define dirent direct
- #  endif
- # endif
--# if defined(XUSE_MTSAFE_API) || defined(XUSE_MTSAFE_DIRENTAPI)
-+# if defined(_XOS_R_H_MTSAFE_DIRENTAPI)
- #  define XOS_USE_MTSAFE_DIRENTAPI 1
- # endif
- #endif
-@@ -604,15 +609,8 @@ typedef struct {
- /* Pre-POSIX API, returns non-NULL on success. */
- #  define _XReaddir(d,p)	(readdir_r((d), &(p).dir_entry))
- # else
--/* We have no idea what is going on.  Fake it all using process locks. */
--#  define _XReaddir(d,p)	\
--    ( (_Xos_processLock),						\
--      (((p).result = readdir((d))) ?					\
--       (memcpy(&((p).dir_entry), (p).result, (p).result->d_reclen),	\
--	((p).result = &(p).dir_entry), 0) :				\
--       0),								\
--      (_Xos_processUnlock),						\
--      (p).result )
-+#  define _XReaddir(d,p)						\
-+    (readdir_r((d), &((p).dir_entry), &((p).result)) ? NULL : (p).result)
- # endif
- #endif /* X_INCLUDE_DIRENT_H */
- 
-@@ -639,7 +637,7 @@ typedef struct {
- 
- #if defined(X_INCLUDE_UNISTD_H) && !defined(_XOS_INCLUDED_UNISTD_H)
- /* <unistd.h> already included by <X11/Xos.h> */
--# if defined(XUSE_MTSAFE_API) || defined(XUSE_MTSAFE_UNISTDAPI)
-+# if defined(_XOS_R_H__MTSAFE_UNISTDAPI)
- #  define XOS_USE_MTSAFE_UNISTDAPI 1
- # endif
- #endif
-@@ -779,7 +777,7 @@ typedef struct {
- 
- #if defined(X_INCLUDE_STRING_H) && !defined(_XOS_INCLUDED_STRING_H)
- /* <string.h> has already been included by <X11/Xos.h> */
--# if defined(XUSE_MTSAFE_API) || defined(XUSE_MTSAFE_STRINGAPI)
-+# if defined(_XOS_R_H_MTSAFE_STRINGAPI)
- #  define XOS_USE_MTSAFE_STRINGAPI 1
- # endif
- #endif
-@@ -831,7 +829,7 @@ typedef char * _Xstrtokparams;
- 
- #if defined(X_INCLUDE_TIME_H) && !defined(_XOS_INCLUDED_TIME_H)
- # include <time.h>
--# if defined(XUSE_MTSAFE_API) || defined(XUSE_MTSAFE_TIMEAPI)
-+# if defined(_XOS_R_H_MTSAFE_TIMEAPI)
- #  define XOS_USE_MTSAFE_TIMEAPI 1
- # endif
- #endif
-@@ -987,7 +985,7 @@ typedef struct tm _Xltimeparams;
- 
- #if defined(X_INCLUDE_GRP_H) && !defined(_XOS_INCLUDED_GRP_H)
- # include <grp.h>
--# if defined(XUSE_MTSAFE_API) || defined(XUSE_MTSAFE_GRPAPI)
-+# if defined(_XOS_R_H_MTSAFE_GRPAPI)
- #  define XOS_USE_MTSAFE_GRPAPI 1
- # endif
- #endif
diff --git a/x11/xproto/patches/patch-ab b/x11/xproto/patches/patch-ab
deleted file mode 100644
index eac8b2c50f2..00000000000
--- a/x11/xproto/patches/patch-ab
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-ab,v 1.5 2012/06/03 19:57:33 wiz Exp $
-
-
---- configure.ac.orig	2012-03-16 06:11:44.000000000 +0000
-+++ configure.ac
-@@ -17,6 +17,7 @@ XORG_CHECK_SGML_DOCTOOLS(1.8)
- 
- AC_CONFIG_HEADER([do-not-use-config.h])
- AC_CONFIG_HEADER([Xfuncproto.h])
-+AC_CONFIG_HEADER([Xos_r.h])
- 
- AC_CANONICAL_HOST
- 
-@@ -209,6 +210,14 @@ if test "x$WIDEPROTO" = xno; then
- 	AC_DEFINE(NARROWPROTO, [], [Narrow prototypes])
- fi
- 
-+# Handle Xos_r.h
-+AC_CHECK_FUNC(readdir_r, [AC_DEFINE(_XOS_R_H_MTSAFE_DIRENTAPI,[],[Assume has readdir_r and friends from dirent.h])],)
-+AC_CHECK_FUNC(getgrgid_r, [AC_DEFINE(_XOS_R_H_MTSAFE_GRPAPI,[],[Assume has getgrgid_r and friends from grp.h])],)
-+AC_CHECK_FUNC(getpwuid_r, [AC_DEFINE(_XOS_R_H_MTSAFE_PWDAPI,[],[Assume has getpwuid_r and friends from pwd.h])],)
-+AC_CHECK_FUNC(gethostbyname_r, [AC_DEFINE(_XOS_R_H_MTSAFE_NETDBAPI,[],[Assume has gethostbyname_r and friends from netdb.h])],)
-+AC_CHECK_FUNC(strtok_r, [AC_DEFINE(_XOS_R_H_MTSAFE_STRINGAPI,[],[Assume has strtok_r from string.h])],)
-+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
-            specs/Makefile
diff --git a/x11/xproto/patches/patch-ad b/x11/xproto/patches/patch-ad
deleted file mode 100644
index 43894609425..00000000000
--- a/x11/xproto/patches/patch-ad
+++ /dev/null
@@ -1,58 +0,0 @@
-$NetBSD: patch-ad,v 1.5 2012/11/16 20:04:48 joerg Exp $
-
-Patch from https://bugs.freedesktop.org/attachment.cgi?id=66181
-
---- Xfuncproto.h.in.orig	2012-03-16 06:11:44.000000000 +0000
-+++ Xfuncproto.h.in
-@@ -83,10 +83,10 @@ in this Software without prior written a
- #endif /* GNUC >= 4 */
- 
- /* Added in X11R6.9, so available in any version of modular xproto */
--#if defined(__GNUC__) && (__GNUC__ >= 4) && !defined(__CYGWIN__)
--# define _X_EXPORT      __attribute__((visibility("default")))
--# define _X_HIDDEN      __attribute__((visibility("hidden")))
--# define _X_INTERNAL    __attribute__((visibility("internal")))
-+#if defined(__GNUC__) && (__GNUC__ >= 4) && !defined(__CYGWIN__) && !defined(__sun)
-+# 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
-@@ -116,7 +116,7 @@ in this Software without prior written a
- /* requires xproto >= 7.0.17 */
- #if (defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 205)) \
- 	|| (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590))
--# define _X_NORETURN __attribute((noreturn))
-+# define _X_NORETURN __attribute((__noreturn__))
- #else
- # define _X_NORETURN
- #endif /* GNUC  */
-@@ -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
-@@ -161,7 +161,8 @@ in this Software without prior written a
- /* requires xproto >= 7.0.21 */
- #ifndef _X_RESTRICT_KYWD
- # if defined(restrict) /* assume autoconf set it correctly */ || \
--   (defined(__STDC_VERSION__) && (__STDC_VERSION__ - 0 >= 199901L)) /* C99 */
-+    (defined(__STDC_VERSION__) && (__STDC_VERSION__ - 0 >= 199901L) /* C99 */ \
-+     && !defined(__cplusplus)) /* Workaround g++ issue on Solaris */
- #  define _X_RESTRICT_KYWD  restrict
- # elif defined(__GNUC__) && !defined(__STRICT_ANSI__) /* gcc w/C89+extensions */
- #  define _X_RESTRICT_KYWD __restrict__
diff --git a/x11/xproto/patches/patch-configure b/x11/xproto/patches/patch-configure
deleted file mode 100644
index 02dfc89a70d..00000000000
--- a/x11/xproto/patches/patch-configure
+++ /dev/null
@@ -1,159 +0,0 @@
-$NetBSD: patch-configure,v 1.1 2012/06/03 19:57:33 wiz Exp $
-
---- configure.orig	2012-03-16 06:11:49.000000000 +0000
-+++ configure
-@@ -1964,12 +1982,79 @@ $as_echo "$ac_res" >&6; }
-   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
- 
- } # ac_fn_c_check_member
-+
-+# ac_fn_c_check_func LINENO FUNC VAR
-+# ----------------------------------
-+# Tests whether FUNC exists, setting the cache variable VAR accordingly
-+ac_fn_c_check_func ()
-+{
-+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-+$as_echo_n "checking for $2... " >&6; }
-+if eval \${$3+:} false; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+/* Define $2 to an innocuous variant, in case <limits.h> declares $2.
-+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-+#define $2 innocuous_$2
-+
-+/* System header to define __stub macros and hopefully few prototypes,
-+    which can conflict with char $2 (); below.
-+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+    <limits.h> exists even on freestanding compilers.  */
-+
-+#ifdef __STDC__
-+# include <limits.h>
-+#else
-+# include <assert.h>
-+#endif
-+
-+#undef $2
-+
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char $2 ();
-+/* The GNU C library defines this for functions which it implements
-+    to always fail with ENOSYS.  Some functions are actually named
-+    something starting with __ and the normal name is an alias.  */
-+#if defined __stub_$2 || defined __stub___$2
-+choke me
-+#endif
-+
-+int
-+main ()
-+{
-+return $2 ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_link "$LINENO"; then :
-+  eval "$3=yes"
-+else
-+  eval "$3=no"
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
-+fi
-+eval ac_res=\$$3
-+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-+$as_echo "$ac_res" >&6; }
-+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-+
-+} # ac_fn_c_check_func
- cat >config.log <<_ACEOF
- This file contains any messages produced by compilers while
- running configure, to aid debugging if configure makes a mistake.
- 
- It was created by Xproto $as_me 7.0.23, which was
--generated by GNU Autoconf 2.68.  Invocation command line was
-+generated by GNU Autoconf 2.69.  Invocation command line was
- 
-   $ $0 $@
- 
-@@ -11099,6 +11183,8 @@ ac_config_headers="$ac_config_headers do
- 
- ac_config_headers="$ac_config_headers Xfuncproto.h"
- 
-+ac_config_headers="$ac_config_headers Xos_r.h"
-+
- 
- 
- 
-@@ -11350,6 +11436,56 @@ $as_echo "#define NARROWPROTO /**/" >>co
- 
- fi
- 
-+# Handle Xos_r.h
-+ac_fn_c_check_func "$LINENO" "readdir_r" "ac_cv_func_readdir_r"
-+if test "x$ac_cv_func_readdir_r" = xyes; then :
-+
-+$as_echo "#define _XOS_R_H_MTSAFE_DIRENTAPI /**/" >>confdefs.h
-+
-+fi
-+
-+ac_fn_c_check_func "$LINENO" "getgrgid_r" "ac_cv_func_getgrgid_r"
-+if test "x$ac_cv_func_getgrgid_r" = xyes; then :
-+
-+$as_echo "#define _XOS_R_H_MTSAFE_GRPAPI /**/" >>confdefs.h
-+
-+fi
-+
-+ac_fn_c_check_func "$LINENO" "getpwuid_r" "ac_cv_func_getpwuid_r"
-+if test "x$ac_cv_func_getpwuid_r" = xyes; then :
-+
-+$as_echo "#define _XOS_R_H_MTSAFE_PWDAPI /**/" >>confdefs.h
-+
-+fi
-+
-+ac_fn_c_check_func "$LINENO" "gethostbyname_r" "ac_cv_func_gethostbyname_r"
-+if test "x$ac_cv_func_gethostbyname_r" = xyes; then :
-+
-+$as_echo "#define _XOS_R_H_MTSAFE_NETDBAPI /**/" >>confdefs.h
-+
-+fi
-+
-+ac_fn_c_check_func "$LINENO" "strtok_r" "ac_cv_func_strtok_r"
-+if test "x$ac_cv_func_strtok_r" = xyes; then :
-+
-+$as_echo "#define _XOS_R_H_MTSAFE_STRINGAPI /**/" >>confdefs.h
-+
-+fi
-+
-+ac_fn_c_check_func "$LINENO" "gmtime_r" "ac_cv_func_gmtime_r"
-+if test "x$ac_cv_func_gmtime_r" = xyes; then :
-+
-+$as_echo "#define _XOS_R_H_MTSAFE_TIMEAPI /**/" >>confdefs.h
-+
-+fi
-+
-+ac_fn_c_check_func "$LINENO" "ttyname_r" "ac_cv_func_ttyname_r"
-+if test "x$ac_cv_func_ttyname_r" = xyes; then :
-+
-+$as_echo "#define _XOS_R_H_MTSAFE_UNISTDAPI /**/" >>confdefs.h
-+
-+fi
-+
- 
- ac_config_files="$ac_config_files Makefile specs/Makefile specs/SIAddresses/Makefile Xpoll.h xproto.pc"
- 
-@@ -12113,6 +12237,7 @@ do
-     "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
-     "do-not-use-config.h") CONFIG_HEADERS="$CONFIG_HEADERS do-not-use-config.h" ;;
-     "Xfuncproto.h") CONFIG_HEADERS="$CONFIG_HEADERS Xfuncproto.h" ;;
-+    "Xos_r.h") CONFIG_HEADERS="$CONFIG_HEADERS Xos_r.h" ;;
-     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-     "specs/Makefile") CONFIG_FILES="$CONFIG_FILES specs/Makefile" ;;
-     "specs/SIAddresses/Makefile") CONFIG_FILES="$CONFIG_FILES specs/SIAddresses/Makefile" ;;