Fix two issues in Xos_r.h for DragonFly:

- no thread safe pwd API
- rework the readdir implementation

3 files changed, 35 insertions, 9 deletions

diff --git a/x11/xorg-libs/Makefile b/x11/xorg-libs/Makefile
index 12d63766c0d..c01307da5e2 100644
--- a/x11/xorg-libs/Makefile
+++ b/x11/xorg-libs/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.27 2005/12/08 09:52:17 rillig Exp $
+# $NetBSD: Makefile,v 1.28 2005/12/12 19:52:17 joerg Exp $
 
 DISTNAME=		${DISTFILES}
 PKGNAME=		xorg-libs-${XORG_VER}
-PKGREVISION=		4
+PKGREVISION=		5
 CATEGORIES=		x11
 MASTER_SITES=		${MASTER_SITE_XORG}
 DISTFILES=		X11R${XORG_VER}-src1.tar.gz X11R${XORG_VER}-src2.tar.gz \
diff --git a/x11/xorg-libs/distinfo b/x11/xorg-libs/distinfo
index e223ee87ece..76156534161 100644
--- a/x11/xorg-libs/distinfo
+++ b/x11/xorg-libs/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.24 2005/10/23 20:00:06 rillig Exp $
+$NetBSD: distinfo,v 1.25 2005/12/12 19:52:17 joerg Exp $
 
 SHA1 (X11R6.8.2-src1.tar.gz) = 23c60680274062a1db17f646a8388149309dc45c
 RMD160 (X11R6.8.2-src1.tar.gz) = bb170d7a11416c3d9bd1d23d461ba4cea9b1b2c8
@@ -35,7 +35,7 @@ SHA1 (patch-ay) = b154d0d4e95ea15c79921b605266701ee773d144
 SHA1 (patch-az) = 3fc898c7c91037710b0fd27eff55ca8b55a19b4b
 SHA1 (patch-ba) = 710acb72c80c38e52ba949053a9e43c72c0205f6
 SHA1 (patch-bb) = 126e217b3bb0df8bb072f26f1575af9c610b9ba6
-SHA1 (patch-bc) = 012c6de9d6469c152e7b31799aeaa2b41fa0d4d7
+SHA1 (patch-bc) = 04ccf6c3f718d31f6af3012bed7c7269b6393c4d
 SHA1 (patch-bd) = f370cbbacbd9061f526f3a1d4924c55bd77559fb
 SHA1 (patch-be) = 19573fbc5b27a6fd17366e51801ec5a84bd3a063
 SHA1 (patch-bf) = 0661e6e787e57c865844c10ba27b381f525673b5
diff --git a/x11/xorg-libs/patches/patch-bc b/x11/xorg-libs/patches/patch-bc
index 6e23e8b0c50..1af0c7ec473 100644
--- a/x11/xorg-libs/patches/patch-bc
+++ b/x11/xorg-libs/patches/patch-bc
@@ -1,8 +1,18 @@
-$NetBSD: patch-bc,v 1.1 2005/05/23 19:14:15 xtraeme Exp $
+$NetBSD: patch-bc,v 1.2 2005/12/12 19:52:17 joerg Exp $
 
---- include/Xos_r.h.orig	2005-04-30 23:18:21.000000000 +0200
-+++ include/Xos_r.h	2005-04-30 23:17:52.000000000 +0200
-@@ -257,7 +257,7 @@
+--- include/Xos_r.h.orig	2005-12-12 19:16:02.000000000 +0000
++++ include/Xos_r.h
+@@ -205,6 +205,9 @@ extern void XtProcessUnlock(
+ # undef _POSIX_THREAD_SAFE_FUNCTIONS
+ #endif
+ 
++#if defined(__DragonFly__)
++#define XNO_MTSAFE_PWDAPI 1
++#endif
+ 
+ /***** <pwd.h> wrappers *****/
+ 
+@@ -257,7 +260,7 @@ typedef struct {
   */
  
  #if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) || \
@@ -11,7 +21,7 @@ $NetBSD: patch-bc,v 1.1 2005/05/23 19:14:15 xtraeme Exp $
  static __inline__ void _Xpw_copyPasswd(_Xgetpwparams p)
  {
     memcpy(&(p).pws, (p).pwp, sizeof(struct passwd));
-@@ -427,7 +427,7 @@
+@@ -427,7 +430,7 @@ typedef int _Xgetservbynameparams; /* du
  /* UnixWare 2.0, or other systems with thread support but no _r API. */
  /* WARNING:  The h_addr_list and s_aliases values are *not* copied! */
  
@@ -20,3 +30,19 @@ $NetBSD: patch-bc,v 1.1 2005/05/23 19:14:15 xtraeme Exp $
  #include <sys/param.h>
  #endif
  
+@@ -652,6 +655,15 @@ extern int _Preaddir_r(DIR *, struct dir
+ # elif defined(SVR4)
+ /* Pre-POSIX API, returns non-NULL on success. */
+ #  define _XReaddir(d,p)	(readdir_r((d), &(p).dir_entry))
++#elif defined(__DragonFly__)
++#  define _XReaddir(d,p)        \
++    ( (_Xos_processLock),                                               \
++      (((p).result = readdir((d))) ?                                    \
++       (memcpy(&((p).dir_entry), (p).result, _DIRENT_MINSIZ((p).result)),     \
++        ((p).result = &(p).dir_entry), 0) :                             \
++       0),                                                              \
++      (_Xos_processUnlock),                                             \
++      (p).result )
+ # else
+ /* We have no idea what is going on.  Fake it all using process locks. */
+ #  define _XReaddir(d,p)	\