head 1.6; access; symbols pkgsrc-2013Q2:1.6.0.24 pkgsrc-2013Q2-base:1.6 pkgsrc-2012Q4:1.6.0.22 pkgsrc-2012Q4-base:1.6 pkgsrc-2011Q4:1.6.0.20 pkgsrc-2011Q4-base:1.6 pkgsrc-2011Q2:1.6.0.18 pkgsrc-2011Q2-base:1.6 pkgsrc-2009Q4:1.6.0.16 pkgsrc-2009Q4-base:1.6 pkgsrc-2008Q4:1.6.0.14 pkgsrc-2008Q4-base:1.6 pkgsrc-2008Q3:1.6.0.12 pkgsrc-2008Q3-base:1.6 cube-native-xorg:1.6.0.10 cube-native-xorg-base:1.6 pkgsrc-2008Q2:1.6.0.8 pkgsrc-2008Q2-base:1.6 pkgsrc-2008Q1:1.6.0.6 pkgsrc-2008Q1-base:1.6 pkgsrc-2007Q4:1.6.0.4 pkgsrc-2007Q4-base:1.6 pkgsrc-2007Q3:1.6.0.2 pkgsrc-2007Q3-base:1.6 pkgsrc-2007Q2:1.5.0.12 pkgsrc-2007Q2-base:1.5 pkgsrc-2007Q1:1.5.0.10 pkgsrc-2007Q1-base:1.5 pkgsrc-2006Q4:1.5.0.8 pkgsrc-2006Q4-base:1.5 pkgsrc-2006Q3:1.5.0.6 pkgsrc-2006Q3-base:1.5 pkgsrc-2006Q2:1.5.0.4 pkgsrc-2006Q2-base:1.5 pkgsrc-2006Q1:1.5.0.2 pkgsrc-2006Q1-base:1.5 pkgsrc-2005Q4:1.2.0.2 pkgsrc-2005Q4-base:1.2 pkgsrc-2005Q3:1.1.0.4 pkgsrc-2005Q3-base:1.1 pkgsrc-2005Q2:1.1.0.2 pkgsrc-2005Q2-base:1.1; locks; strict; comment @# @; 1.6 date 2007.08.17.20.25.30; author joerg; state dead; branches; next 1.5; 1.5 date 2006.01.19.00.59.27; author joerg; state Exp; branches; next 1.4; 1.4 date 2006.01.18.23.53.06; author xtraeme; state dead; branches; next 1.3; 1.3 date 2006.01.08.14.51.11; author abs; state Exp; branches; next 1.2; 1.2 date 2005.12.12.19.52.17; author joerg; state Exp; branches; next 1.1; 1.1 date 2005.05.23.19.14.15; author xtraeme; state Exp; branches; next ; desc @@ 1.6 log @To quote Johnny Lam: "In modular-xorg we trust" Remove xorg 6.9 packages from pkgsrc. @ text @$NetBSD: patch-bc,v 1.5 2006/01/19 00:59:27 joerg Exp $ --- include/Xos_r.h.orig 2005-07-13 07:23:56.000000000 +0000 +++ include/Xos_r.h @@@@ -208,6 +208,9 @@@@ extern void XtProcessUnlock( # undef _POSIX_THREAD_SAFE_FUNCTIONS #endif +#if defined(__DragonFly__) +#define XNO_MTSAFE_PWDAPI 1 +#endif /***** wrappers *****/ @@@@ -655,6 +658,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) \ @ 1.5 log @Revive patch-bc (updated) and patch-bl. The former gets the correct readdir and getpwuid handling for DragonFly, avoids the mouse problems due to use of floating point math in a signal handler (xorg-server). @ text @d1 1 a1 1 $NetBSD$ @ 1.4 log @Update meta-pkgs/xorg to 6.9.0. The full list of changes: http://ftp.x.org/pub/X11R7.0/doc/html/RELNOTES2.html Thanks to joerg@@ and reed@@ for testing on DragonFlyBSD. Tested on NetBSD/i386 3.0/-current and DragonFlyBSD-1.4/i386. @ text @d1 1 a1 1 $NetBSD: patch-bc,v 1.3 2006/01/08 14:51:11 abs Exp $ d3 1 a3 1 --- include/Xos_r.h.orig 2004-04-23 19:43:05.000000000 +0100 d5 1 a5 1 @@@@ -205,6 +205,9 @@@@ extern void XtProcessUnlock( d15 1 a15 41 @@@@ -257,7 +260,7 @@@@ typedef struct { */ #if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) || \ - defined(__APPLE__) + defined(__APPLE__) || defined(__DragonFly__) static __inline__ void _Xpw_copyPasswd(_Xgetpwparams p) { memcpy(&(p).pws, (p).pwp, sizeof(struct passwd)); @@@@ -335,7 +338,20 @@@@ typedef struct { char pwbuf[X_LINE_MAX]; } _Xgetpwparams; # if defined(_POSIX_REENTRANT_FUNCTIONS) || !defined(SVR4) || defined(Lynx) -# ifndef Lynx +# if defined(__NetBSD__) +static __inline__ struct passwd * _XGetpwuid(uid_t u, _Xgetpwparams p) +{ + struct passwd *pwp; + return (getpwuid_r(u, &p.pws, p.pwbuf, sizeof((p).pwbuf), &pwp) == -1) + ? NULL : &p.pws; +} +static __inline__ struct passwd * _XGetpwnam(const char *n, _Xgetpwparams p) +{ + struct passwd *pwp; + return (getpwnam_r(n, &p.pws, p.pwbuf, sizeof((p).pwbuf), &pwp) == -1) + ? NULL : &p.pws; +} +# elif !defined(Lynx) # define _XGetpwuid(u,p) \ ((getpwuid_r((u),&(p).pws,(p).pwbuf,sizeof((p).pwbuf)) == -1) ? NULL : &(p).pws) # define _XGetpwnam(u,p) \ @@@@ -427,7 +443,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! */ -#if defined(__NetBSD__) || defined(__FreeBSD__) +#if defined(__DragonFly__) || defined(__NetBSD__) || defined(__FreeBSD__) #include #endif @@@@ -652,6 +668,15 @@@@ extern int _Preaddir_r(DIR *, struct dir @ 1.3 log @Update xorg-libs to 6.8.2nb6 If _POSIX_REENTRANT_FUNCTIONS on NetBSD is defined, use the correct getpwnam_r() and gerpwuid_r() forms. This sidesteps the issue as to whether _POSIX_REENTRANT_FUNCTIONS _should_ be defined on NetBSD. @ text @d1 1 a1 1 $NetBSD: patch-bc,v 1.2 2005/12/12 19:52:17 joerg Exp $ @ 1.2 log @Fix two issues in Xos_r.h for DragonFly: - no thread safe pwd API - rework the readdir implementation @ text @d1 1 a1 1 $NetBSD$ d3 1 a3 1 --- include/Xos_r.h.orig 2005-12-12 19:16:02.000000000 +0000 d24 23 a46 1 @@@@ -427,7 +430,7 @@@@ typedef int _Xgetservbynameparams; /* du d55 1 a55 1 @@@@ -652,6 +655,15 @@@@ extern int _Preaddir_r(DIR *, struct dir @ 1.1 log @Apply patches from Joerg Sonnenberger for DragonFlyBSD and GCC 3.x.x, while I'm here remove redundant DragonFly.cf from xorg-imake/files, we'll use the same file from xorg-libs. @ text @d3 13 a15 3 --- 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 @@@@ d24 1 a24 1 @@@@ -427,7 +427,7 @@@@ d33 16 @