diff options
| author | joerg <joerg> | 2006-12-30 11:50:11 +0000 |
|---|---|---|
| committer | joerg <joerg> | 2006-12-30 11:50:11 +0000 |
| commit | 89c3d649dd014b1d88659f94169a1ca33cb7227d (patch) | |
| tree | fe7c08faa8ebf2e766228ced7d34738222332477 /x11 | |
| parent | 564a4660c4abc9163a598c41bc048c021e7942a8 (diff) | |
| download | pkgsrc-89c3d649dd014b1d88659f94169a1ca33cb7227d.tar.gz | |
NetBSD doesn't provide _POSIX_THREAD_SAFE_FUNCTIONS, which broke
the pwent/grent accessor functions. Fix and bump revision.
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/xproto/Makefile | 4 | ||||
| -rw-r--r-- | x11/xproto/distinfo | 4 | ||||
| -rw-r--r-- | x11/xproto/patches/patch-aa | 13 |
3 files changed, 15 insertions, 6 deletions
diff --git a/x11/xproto/Makefile b/x11/xproto/Makefile index 480b37ac092..65c0b7cda45 100644 --- a/x11/xproto/Makefile +++ b/x11/xproto/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.6 2006/12/23 15:31:29 joerg Exp $ +# $NetBSD: Makefile,v 1.7 2006/12/30 11:50:11 joerg Exp $ # DISTNAME= xproto-7.0.9 -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= x11 devel MASTER_SITES= http://xorg.freedesktop.org/releases/individual/proto/ EXTRACT_SUFX= .tar.bz2 diff --git a/x11/xproto/distinfo b/x11/xproto/distinfo index 3ac8ce7a64c..930a1813a18 100644 --- a/x11/xproto/distinfo +++ b/x11/xproto/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.5 2006/12/23 15:31:29 joerg Exp $ +$NetBSD: distinfo,v 1.6 2006/12/30 11:50:11 joerg Exp $ SHA1 (xproto-7.0.9.tar.bz2) = 89f62bd846654377706446ec63b98050ce268f86 RMD160 (xproto-7.0.9.tar.bz2) = 158260d12444514ace88d385160bf284e70f54d3 Size (xproto-7.0.9.tar.bz2) = 141941 bytes -SHA1 (patch-aa) = 643bca74cb65e79efa63a7dc42ae79b3deca9408 +SHA1 (patch-aa) = d3afb9b492c36d360fba129925f5a5e504400282 SHA1 (patch-ab) = c1ab51ee280b41f17f7780b880ae6cb70c0e4150 SHA1 (patch-ac) = f53e93c62711b7c12c525b1267951b63c8783875 diff --git a/x11/xproto/patches/patch-aa b/x11/xproto/patches/patch-aa index 8954f2c3ed1..8a7aa7814ec 100644 --- a/x11/xproto/patches/patch-aa +++ b/x11/xproto/patches/patch-aa @@ -1,6 +1,6 @@ -$NetBSD: patch-aa,v 1.3 2006/12/23 15:31:29 joerg Exp $ +$NetBSD: patch-aa,v 1.4 2006/12/30 11:50:11 joerg Exp $ ---- Xos_r.h.in.orig 2006-09-20 17:59:42.000000000 +0000 +--- Xos_r.h.in.orig 2006-09-20 19:59:42.000000000 +0200 +++ Xos_r.h.in @@ -76,13 +76,7 @@ in this Software without prior written a # include <X11/Xfuncs.h> @@ -40,6 +40,15 @@ $NetBSD: patch-aa,v 1.3 2006/12/23 15:31:29 joerg Exp $ # define XOS_USE_MTSAFE_PWDAPI 1 # endif #endif +@@ -330,7 +331,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__) + /* SVR4 threads, AIX 4.2.0 and earlier and OSF/1 3.2 and earlier pthreads */ + # define X_NEEDS_PWPARAMS + typedef struct { @@ -410,7 +411,7 @@ typedef int _Xgetpwret; #if defined(X_INCLUDE_NETDB_H) && !defined(_XOS_INCLUDED_NETDB_H) \ && !defined(WIN32) |