Include <sys/param.h> in Xos_r.h under Mac OS so that MAXHOSTNAMELEN is

always defined. Unbreaks the build of modular libX11.

OK joerg

3 files changed, 27 insertions, 15 deletions

diff --git a/x11/xproto/Makefile b/x11/xproto/Makefile
index bfc584aadb5..bf7985b4adf 100644
--- a/x11/xproto/Makefile
+++ b/x11/xproto/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2010/09/10 20:07:29 joerg Exp $
+# $NetBSD: Makefile,v 1.18 2012/03/19 19:08:36 bsiegert Exp $
 #
 
 DISTNAME=		xproto-7.0.18
+PKGREVISION=		1
 CATEGORIES=		x11 devel
 MASTER_SITES=		${MASTER_SITE_XORG:=proto/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/x11/xproto/distinfo b/x11/xproto/distinfo
index 1ba50d80c86..d110ea681f2 100644
--- a/x11/xproto/distinfo
+++ b/x11/xproto/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.16 2010/09/10 20:07:29 joerg Exp $
+$NetBSD: distinfo,v 1.17 2012/03/19 19:08:36 bsiegert Exp $
 
 SHA1 (xproto-7.0.18.tar.bz2) = 252596e7264f3174d535bf67fd1b704b1ba8f699
 RMD160 (xproto-7.0.18.tar.bz2) = 526f579590bc7dadbd3967d4e8ac5f174e80c6ac
 Size (xproto-7.0.18.tar.bz2) = 168722 bytes
-SHA1 (patch-aa) = 8060c40ed4280fce4a74fd55e17c014eb2c48e3b
+SHA1 (patch-aa) = f226150c2c23fd3c4f870dd0bcd9704ade6496aa
 SHA1 (patch-ab) = 7ef921ce34ab8ba5de1ea9edfd32034db079c0ea
 SHA1 (patch-ac) = d4d90d2eca33a75e55db463b48a29abecc67eab9
 SHA1 (patch-ad) = 97331290a7c7ee26896c4f6da74ee2b601a93eda
diff --git a/x11/xproto/patches/patch-aa b/x11/xproto/patches/patch-aa
index daae708375c..24206223702 100644
--- a/x11/xproto/patches/patch-aa
+++ b/x11/xproto/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.6 2010/01/15 18:03:32 tnn Exp $
+$NetBSD: patch-aa,v 1.7 2012/03/19 19:08:37 bsiegert Exp $
 
---- Xos_r.h.in.orig	2009-09-23 23:51:43.000000000 +0000
+--- Xos_r.h.in.orig	2010-08-10 14:18:54.000000000 +0000
 +++ Xos_r.h.in
 @@ -73,13 +73,7 @@ in this Software without prior written a
  # include <X11/Xfuncs.h>
@@ -17,7 +17,18 @@ $NetBSD: patch-aa,v 1.6 2010/01/15 18:03:32 tnn Exp $
  #  ifndef LINE_MAX
  #   define X_LINE_MAX 2048
  #  else
-@@ -185,6 +179,13 @@ extern void XtProcessUnlock(
+@@ -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
  
@@ -31,7 +42,7 @@ $NetBSD: patch-aa,v 1.6 2010/01/15 18:03:32 tnn Exp $
  #endif /* !defined WIN32 */
  
  /*
-@@ -214,7 +215,7 @@ extern void XtProcessUnlock(
+@@ -214,7 +219,7 @@ extern void XtProcessUnlock(
  
  #if defined(X_INCLUDE_PWD_H) && !defined(_XOS_INCLUDED_PWD_H)
  # include <pwd.h>
@@ -40,7 +51,7 @@ $NetBSD: patch-aa,v 1.6 2010/01/15 18:03:32 tnn Exp $
  #  define XOS_USE_MTSAFE_PWDAPI 1
  # endif
  #endif
-@@ -318,7 +319,7 @@ static __inline__ void _Xpw_copyPasswd(_
+@@ -318,7 +323,7 @@ static __inline__ void _Xpw_copyPasswd(_
    (_Xos_processUnlock), \
    (p).pwp )
  
@@ -49,7 +60,7 @@ $NetBSD: patch-aa,v 1.6 2010/01/15 18:03:32 tnn Exp $
  # define X_NEEDS_PWPARAMS
  typedef struct {
    struct passwd pws;
-@@ -384,7 +385,7 @@ typedef int _Xgetpwret;
+@@ -384,7 +389,7 @@ typedef int _Xgetpwret;
  #if defined(X_INCLUDE_NETDB_H) && !defined(_XOS_INCLUDED_NETDB_H) \
      && !defined(WIN32)
  # include <netdb.h>
@@ -58,7 +69,7 @@ $NetBSD: patch-aa,v 1.6 2010/01/15 18:03:32 tnn Exp $
  #  define XOS_USE_MTSAFE_NETDBAPI 1
  # endif
  #endif
-@@ -543,7 +544,7 @@ typedef int _Xgetservbynameparams; /* du
+@@ -543,7 +548,7 @@ typedef int _Xgetservbynameparams; /* du
  #   define dirent direct
  #  endif
  # endif
@@ -67,7 +78,7 @@ $NetBSD: patch-aa,v 1.6 2010/01/15 18:03:32 tnn Exp $
  #  define XOS_USE_MTSAFE_DIRENTAPI 1
  # endif
  #endif
-@@ -604,15 +605,8 @@ typedef struct {
+@@ -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
@@ -85,7 +96,7 @@ $NetBSD: patch-aa,v 1.6 2010/01/15 18:03:32 tnn Exp $
  # endif
  #endif /* X_INCLUDE_DIRENT_H */
  
-@@ -639,7 +633,7 @@ typedef struct {
+@@ -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> */
@@ -94,7 +105,7 @@ $NetBSD: patch-aa,v 1.6 2010/01/15 18:03:32 tnn Exp $
  #  define XOS_USE_MTSAFE_UNISTDAPI 1
  # endif
  #endif
-@@ -779,7 +773,7 @@ typedef struct {
+@@ -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> */
@@ -103,7 +114,7 @@ $NetBSD: patch-aa,v 1.6 2010/01/15 18:03:32 tnn Exp $
  #  define XOS_USE_MTSAFE_STRINGAPI 1
  # endif
  #endif
-@@ -831,7 +825,7 @@ typedef char * _Xstrtokparams;
+@@ -831,7 +829,7 @@ typedef char * _Xstrtokparams;
  
  #if defined(X_INCLUDE_TIME_H) && !defined(_XOS_INCLUDED_TIME_H)
  # include <time.h>
@@ -112,7 +123,7 @@ $NetBSD: patch-aa,v 1.6 2010/01/15 18:03:32 tnn Exp $
  #  define XOS_USE_MTSAFE_TIMEAPI 1
  # endif
  #endif
-@@ -987,7 +981,7 @@ typedef struct tm _Xltimeparams;
+@@ -987,7 +985,7 @@ typedef struct tm _Xltimeparams;
  
  #if defined(X_INCLUDE_GRP_H) && !defined(_XOS_INCLUDED_GRP_H)
  # include <grp.h>