diff options
author | ryoon <ryoon@pkgsrc.org> | 2012-08-28 13:29:15 +0000 |
---|---|---|
committer | ryoon <ryoon@pkgsrc.org> | 2012-08-28 13:29:15 +0000 |
commit | f3d0ede30a16d88f04e2792a61135e043349afd9 (patch) | |
tree | 8d4a1d4d99733436aea07806fcdff453cca01c27 /devel/nspr | |
parent | 9a14cd87dd1b2fc7cbe3c7929060cf0792dafaa7 (diff) | |
download | pkgsrc-f3d0ede30a16d88f04e2792a61135e043349afd9.tar.gz |
Bump PKGREVISION
* Utilize pthread_set_name_np or pthread_setname_np on DragonFly or NetBSD.
Fix build of devel/xulrunner.
* Regen patches
Diffstat (limited to 'devel/nspr')
-rw-r--r-- | devel/nspr/Makefile | 3 | ||||
-rw-r--r-- | devel/nspr/distinfo | 22 | ||||
-rw-r--r-- | devel/nspr/patches/patch-ab | 8 | ||||
-rw-r--r-- | devel/nspr/patches/patch-ac | 16 | ||||
-rw-r--r-- | devel/nspr/patches/patch-ae | 14 | ||||
-rw-r--r-- | devel/nspr/patches/patch-ag | 10 | ||||
-rw-r--r-- | devel/nspr/patches/patch-az | 41 | ||||
-rw-r--r-- | devel/nspr/patches/patch-nsprpub_pr_include_md__dragonfly.cfg | 4 | ||||
-rw-r--r-- | devel/nspr/patches/patch-nsprpub_pr_include_md__pth.h | 10 | ||||
-rw-r--r-- | devel/nspr/patches/patch-nsprpub_pr_include_md_prosdep.h | 6 | ||||
-rw-r--r-- | devel/nspr/patches/patch-nsprpub_pr_src_pthreads_ptio.c | 8 | ||||
-rw-r--r-- | devel/nspr/patches/patch-nsprpub_pr_src_pthreads_ptsynch.c | 6 |
12 files changed, 92 insertions, 56 deletions
diff --git a/devel/nspr/Makefile b/devel/nspr/Makefile index 542371de83c..f18d6778c61 100644 --- a/devel/nspr/Makefile +++ b/devel/nspr/Makefile @@ -1,9 +1,10 @@ -# $NetBSD: Makefile,v 1.51 2012/08/12 15:19:07 ryoon Exp $ +# $NetBSD: Makefile,v 1.52 2012/08/28 13:29:15 ryoon Exp $ # DISTNAME= nspr-${NSPR_RELEASE} PKGNAME= nspr-4.9.3.2 # some reason NSPR_RELEASE= 4.9.2 +PKGREVISION= 1 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_MOZILLA_ALL:=nspr/releases/v${NSPR_RELEASE}/src/} diff --git a/devel/nspr/distinfo b/devel/nspr/distinfo index 7a605b6b368..46bef47da1e 100644 --- a/devel/nspr/distinfo +++ b/devel/nspr/distinfo @@ -1,17 +1,17 @@ -$NetBSD: distinfo,v 1.20 2012/08/12 15:19:07 ryoon Exp $ +$NetBSD: distinfo,v 1.21 2012/08/28 13:29:16 ryoon Exp $ SHA1 (nspr-4.9.2.tar.gz) = 455eab365f8fd732a4b014ca0af685f3c2dec598 RMD160 (nspr-4.9.2.tar.gz) = af95dffa2ef2e92be350a1dd92e44a784a9a6a74 Size (nspr-4.9.2.tar.gz) = 1172193 bytes -SHA1 (patch-ab) = 5d4b7512f8bbdc9e2e05709cec5b36dc12c25997 -SHA1 (patch-ac) = 6aa120769b63efa5869029655f50af901edb9129 -SHA1 (patch-ae) = 470d64f32fe1e619a101486a4bec45d2a06b6cab -SHA1 (patch-ag) = a924296e6a569eba4229d661fbe5290eeeb999e0 -SHA1 (patch-az) = 5a09ccfa14fab962c4e2916f00669a1fa4a8ade4 +SHA1 (patch-ab) = be61b86f8a66dbf92737b02c0e5b1fe514b40f41 +SHA1 (patch-ac) = 97aa60a256db4af9768a7b6645942c9daa63a265 +SHA1 (patch-ae) = 4f04f2a55c88fe2047a50361f85f2393571574dd +SHA1 (patch-ag) = c464669b099bdea548c43c44ec80798a53902586 +SHA1 (patch-az) = c1378dea8e25892b03903b9ae24486f45e23de9e SHA1 (patch-ba) = 9d4058f2a3a290429b26cb8335dd5b188bccc96d -SHA1 (patch-nsprpub_pr_include_md__dragonfly.cfg) = 9888fa5070d2201a8912be33a32ae32f1d26f8ce -SHA1 (patch-nsprpub_pr_include_md__pth.h) = 4bfa7e66ac4017169aca87b2643218d1b1bcddcf -SHA1 (patch-nsprpub_pr_include_md_prosdep.h) = ffbe93d98a2d0c6e9587bdf2b9ccfc81a342c34e +SHA1 (patch-nsprpub_pr_include_md__dragonfly.cfg) = a0271ee172122098ab6c9c91935efead9a373e3f +SHA1 (patch-nsprpub_pr_include_md__pth.h) = 3cec0d00ecd6e04df152a5fb3fd97eb8fabc462b +SHA1 (patch-nsprpub_pr_include_md_prosdep.h) = 12645672eacb116a5cfb51260486d04e9de4449c SHA1 (patch-nsprpub_pr_src_md_unix_uxrng.c) = bd84dfd23b2884106a20fbfaede1d3ae94bc0284 -SHA1 (patch-nsprpub_pr_src_pthreads_ptio.c) = f4f6e9b5e24de217665ad3a41ad4f1a24deeb519 -SHA1 (patch-nsprpub_pr_src_pthreads_ptsynch.c) = 9099113a3f783ef410d8fcce5cfc730b98a93bc7 +SHA1 (patch-nsprpub_pr_src_pthreads_ptio.c) = 1cf8a6e20b35e2969f0e65fba26e853c65d1d9c7 +SHA1 (patch-nsprpub_pr_src_pthreads_ptsynch.c) = c628df7628099d3c93a8b01089971637ec81d471 diff --git a/devel/nspr/patches/patch-ab b/devel/nspr/patches/patch-ab index 898c0472455..afe45e95471 100644 --- a/devel/nspr/patches/patch-ab +++ b/devel/nspr/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.6 2012/04/18 20:57:33 ryoon Exp $ +$NetBSD: patch-ab,v 1.7 2012/08/28 13:29:16 ryoon Exp $ ---- nsprpub/pr/include/md/_netbsd.h.orig 2010-05-03 18:21:00.000000000 +0000 +--- nsprpub/pr/include/md/_netbsd.h.orig 2012-03-06 13:13:52.000000000 +0000 +++ nsprpub/pr/include/md/_netbsd.h -@@ -79,7 +79,7 @@ +@@ -47,7 +47,7 @@ #define HAVE_DLL #define USE_DLFCN #define _PR_HAVE_SOCKADDR_LEN @@ -11,7 +11,7 @@ $NetBSD: patch-ab,v 1.6 2012/04/18 20:57:33 ryoon Exp $ #define _PR_STAT_HAS_ST_ATIMESPEC #define _PR_POLL_AVAILABLE #define _PR_USE_POLL -@@ -107,6 +107,8 @@ +@@ -75,6 +75,8 @@ #define JB_SP_INDEX 2 #elif defined(__mips__) #define JB_SP_INDEX 4 diff --git a/devel/nspr/patches/patch-ac b/devel/nspr/patches/patch-ac index 6d8de6ecdbd..b50ded4f36c 100644 --- a/devel/nspr/patches/patch-ac +++ b/devel/nspr/patches/patch-ac @@ -1,8 +1,8 @@ -$NetBSD: patch-ac,v 1.6 2012/04/18 20:57:33 ryoon Exp $ +$NetBSD: patch-ac,v 1.7 2012/08/28 13:29:16 ryoon Exp $ ---- nsprpub/configure.in.orig 2011-09-02 20:15:44.000000000 +0000 +--- nsprpub/configure.in.orig 2012-05-31 22:48:19.000000000 +0000 +++ nsprpub/configure.in -@@ -71,7 +71,7 @@ OBJDIR_NAME=. +@@ -36,7 +36,7 @@ OBJDIR_NAME=. OBJDIR_SUFFIX=OBJ NSINSTALL='$(MOD_DEPTH)/config/$(OBJDIR_NAME)/nsinstall' NOSUCHFILE=/no-such-file @@ -11,7 +11,7 @@ $NetBSD: patch-ac,v 1.6 2012/04/18 20:57:33 ryoon Exp $ LIBPLC='-L$(dist_libdir) -lplc$(MOD_MAJOR_VERSION)' CYGWIN_WRAPPER= MACOS_SDK_DIR= -@@ -1311,6 +1311,33 @@ tools are selected during the Xcode/Deve +@@ -1519,6 +1519,33 @@ tools are selected during the Xcode/Deve DSO_LDOPTS='-shared -Wl,-soname -Wl,$(notdir $@)' MDCPUCFG_H=_freebsd.cfg PR_MD_CSRCS=freebsd.c @@ -45,7 +45,7 @@ $NetBSD: patch-ac,v 1.6 2012/04/18 20:57:33 ryoon Exp $ ;; *-hpux*) -@@ -1925,6 +1952,7 @@ mips-nec-sysv*) +@@ -2110,6 +2137,7 @@ mips-nec-sysv*) AC_DEFINE(XP_UNIX) AC_DEFINE(NETBSD) AC_DEFINE(HAVE_BSD_FLOCK) @@ -53,7 +53,7 @@ $NetBSD: patch-ac,v 1.6 2012/04/18 20:57:33 ryoon Exp $ if test -z "$USE_NSPR_THREADS"; then USE_PTHREADS=1 fi -@@ -2730,7 +2758,7 @@ if test -n "$USE_PTHREADS"; then +@@ -2918,7 +2946,7 @@ if test -n "$USE_PTHREADS"; then if test -z "`egrep -i '(unrecognize|unknown)' conftest.out | grep pthread`" && test -z "`egrep -i '(error|incorrect)' conftest.out`" ; then ac_cv_have_dash_pthread=yes case "$target_os" in @@ -62,7 +62,7 @@ $NetBSD: patch-ac,v 1.6 2012/04/18 20:57:33 ryoon Exp $ # Freebsd doesn't use -pthread for compiles, it uses them for linking ;; *) -@@ -2768,7 +2796,7 @@ if test -n "$USE_PTHREADS"; then +@@ -2956,7 +2984,7 @@ if test -n "$USE_PTHREADS"; then _PTHREAD_LDFLAGS= fi ;; @@ -71,7 +71,7 @@ $NetBSD: patch-ac,v 1.6 2012/04/18 20:57:33 ryoon Exp $ AC_DEFINE(_REENTRANT) AC_DEFINE(_THREAD_SAFE) dnl -pthread links in -lc_r, so don't specify it explicitly. -@@ -2849,7 +2877,7 @@ case "$target" in +@@ -3037,7 +3065,7 @@ case "$target" in AC_DEFINE(_PR_NEED_PTHREAD_INIT) fi ;; diff --git a/devel/nspr/patches/patch-ae b/devel/nspr/patches/patch-ae index fb621767738..e2175004a4e 100644 --- a/devel/nspr/patches/patch-ae +++ b/devel/nspr/patches/patch-ae @@ -1,8 +1,8 @@ -$NetBSD: patch-ae,v 1.5 2012/04/18 20:57:33 ryoon Exp $ +$NetBSD: patch-ae,v 1.6 2012/08/28 13:29:16 ryoon Exp $ ---- nsprpub/pr/src/misc/prnetdb.c.orig 2011-09-22 20:20:37.000000000 +0000 +--- nsprpub/pr/src/misc/prnetdb.c.orig 2012-03-06 13:14:20.000000000 +0000 +++ nsprpub/pr/src/misc/prnetdb.c -@@ -105,7 +105,7 @@ PRLock *_pr_dnsLock = NULL; +@@ -73,7 +73,7 @@ PRLock *_pr_dnsLock = NULL; || defined(AIX4_3_PLUS) || (defined(AIX) && defined(_THREAD_SAFE)) \ || (defined(HPUX10_10) && defined(_REENTRANT)) \ || (defined(HPUX10_20) && defined(_REENTRANT)) \ @@ -11,7 +11,7 @@ $NetBSD: patch-ae,v 1.5 2012/04/18 20:57:33 ryoon Exp $ #define _PR_HAVE_GETPROTO_R #define _PR_HAVE_GETPROTO_R_INT #endif -@@ -115,6 +115,11 @@ PRLock *_pr_dnsLock = NULL; +@@ -83,6 +83,11 @@ PRLock *_pr_dnsLock = NULL; #define _PR_HAVE_5_ARG_GETPROTO_R #endif @@ -23,7 +23,7 @@ $NetBSD: patch-ae,v 1.5 2012/04/18 20:57:33 ryoon Exp $ /* BeOS has glibc but not the glibc-style getprotobyxxx_r functions. */ #if (defined(__GLIBC__) && __GLIBC__ >= 2 && !defined(XP_BEOS)) #define _PR_HAVE_GETPROTO_R -@@ -332,7 +337,7 @@ _pr_QueryNetIfs(void) +@@ -300,7 +305,7 @@ _pr_QueryNetIfs(void) } #elif (defined(DARWIN) && defined(HAVE_GETIFADDRS)) || defined(FREEBSD) \ @@ -32,7 +32,7 @@ $NetBSD: patch-ae,v 1.5 2012/04/18 20:57:33 ryoon Exp $ /* * Use the BSD getifaddrs function. -@@ -2076,6 +2081,11 @@ PR_IMPLEMENT(PRAddrInfo *) PR_GetAddrInf +@@ -2044,6 +2049,11 @@ PR_IMPLEMENT(PRAddrInfo *) PR_GetAddrInf */ hints.ai_socktype = SOCK_STREAM; @@ -44,7 +44,7 @@ $NetBSD: patch-ae,v 1.5 2012/04/18 20:57:33 ryoon Exp $ rv = GETADDRINFO(hostname, NULL, &hints, &res); #ifdef AI_ADDRCONFIG if (rv == EAI_BADFLAGS && (hints.ai_flags & AI_ADDRCONFIG)) { -@@ -2083,6 +2093,11 @@ PR_IMPLEMENT(PRAddrInfo *) PR_GetAddrInf +@@ -2051,6 +2061,11 @@ PR_IMPLEMENT(PRAddrInfo *) PR_GetAddrInf rv = GETADDRINFO(hostname, NULL, &hints, &res); } #endif diff --git a/devel/nspr/patches/patch-ag b/devel/nspr/patches/patch-ag index a455487677e..9b25efc2812 100644 --- a/devel/nspr/patches/patch-ag +++ b/devel/nspr/patches/patch-ag @@ -1,8 +1,8 @@ -$NetBSD: patch-ag,v 1.3 2012/04/18 20:57:33 ryoon Exp $ +$NetBSD: patch-ag,v 1.4 2012/08/28 13:29:16 ryoon Exp $ ---- nsprpub/pr/include/md/_freebsd.h.orig 2010-03-16 01:02:50.000000000 +0000 +--- nsprpub/pr/include/md/_freebsd.h.orig 2012-03-06 13:13:51.000000000 +0000 +++ nsprpub/pr/include/md/_freebsd.h -@@ -79,7 +79,7 @@ +@@ -47,7 +47,7 @@ #define _PR_HAVE_LARGE_OFF_T #if defined(_PR_PTHREADS) @@ -11,7 +11,7 @@ $NetBSD: patch-ag,v 1.3 2012/04/18 20:57:33 ryoon Exp $ /* * libc_r before this version of FreeBSD doesn't have poll(). * Although libc has poll(), it is not thread-safe so we can't -@@ -88,7 +88,7 @@ +@@ -56,7 +56,7 @@ #define _PR_POLL_AVAILABLE #endif #else @@ -20,7 +20,7 @@ $NetBSD: patch-ag,v 1.3 2012/04/18 20:57:33 ryoon Exp $ #define _PR_POLL_AVAILABLE #define _PR_USE_POLL #endif -@@ -97,7 +97,7 @@ +@@ -65,7 +65,7 @@ #define _PR_HAVE_SYSV_SEMAPHORES #define PR_HAVE_SYSV_NAMED_SHARED_MEMORY diff --git a/devel/nspr/patches/patch-az b/devel/nspr/patches/patch-az index 77d9ffbf0c3..b9d695c334e 100644 --- a/devel/nspr/patches/patch-az +++ b/devel/nspr/patches/patch-az @@ -1,8 +1,21 @@ -$NetBSD: patch-az,v 1.1 2012/04/18 20:57:33 ryoon Exp $ +$NetBSD: patch-az,v 1.2 2012/08/28 13:29:17 ryoon Exp $ ---- nsprpub/pr/src/pthreads/ptthread.c.orig 2009-11-02 22:43:08.000000000 +0100 +https://bugzilla.mozilla.org/show_bug.cgi?id=782111 + +--- nsprpub/pr/src/pthreads/ptthread.c.orig 2012-06-22 01:36:02.000000000 +0000 +++ nsprpub/pr/src/pthreads/ptthread.c -@@ -1089,12 +1089,12 @@ PR_IMPLEMENT(void) PR_ProcessExit(PRIntn +@@ -21,6 +21,10 @@ + #include <signal.h> + #include <dlfcn.h> + ++#if defined(OPENBSD) || defined(FREEBSD) || defined(DRAGONFLY) ++#include <pthread_np.h> ++#endif ++ + #ifdef SYMBIAN + /* In Open C sched_get_priority_min/max do not work properly, so we undefine + * _POSIX_THREAD_PRIORITY_SCHEDULING here. +@@ -1041,12 +1045,12 @@ PR_IMPLEMENT(void) PR_ProcessExit(PRIntn _exit(status); } @@ -17,3 +30,25 @@ $NetBSD: patch-az,v 1.1 2012/04/18 20:57:33 ryoon Exp $ #endif } +@@ -1619,7 +1623,7 @@ PR_IMPLEMENT(PRStatus) PR_SetCurrentThre + { + PRThread *thread; + size_t nameLen; +- int result; ++ int result = 0; + + if (!name) { + PR_SetError(PR_INVALID_ARGUMENT_ERROR, 0); +@@ -1637,8 +1641,10 @@ PR_IMPLEMENT(PRStatus) PR_SetCurrentThre + return PR_FAILURE; + memcpy(thread->name, name, nameLen + 1); + +-#if defined(OPENBSD) || defined(FREEBSD) +- result = pthread_set_name_np(thread->id, name); ++#if defined(OPENBSD) || defined(FREEBSD) || defined(DRAGONFLY) ++ pthread_set_name_np(thread->id, name); ++#elif defined(NETBSD) ++ pthread_setname_np(thread->id, "%s", (void *)name); + #else /* not BSD */ + /* + * On OSX, pthread_setname_np is only available in 10.6 or later, so test diff --git a/devel/nspr/patches/patch-nsprpub_pr_include_md__dragonfly.cfg b/devel/nspr/patches/patch-nsprpub_pr_include_md__dragonfly.cfg index 24cc76fb5ed..9f15fcfceb2 100644 --- a/devel/nspr/patches/patch-nsprpub_pr_include_md__dragonfly.cfg +++ b/devel/nspr/patches/patch-nsprpub_pr_include_md__dragonfly.cfg @@ -1,6 +1,6 @@ -$NetBSD: patch-nsprpub_pr_include_md__dragonfly.cfg,v 1.1 2012/04/18 20:57:33 ryoon Exp $ +$NetBSD: patch-nsprpub_pr_include_md__dragonfly.cfg,v 1.2 2012/08/28 13:29:17 ryoon Exp $ ---- nsprpub/pr/include/md/_dragonfly.cfg.orig 2011-11-21 15:51:33.130151000 +0000 +--- nsprpub/pr/include/md/_dragonfly.cfg.orig 2012-08-15 01:17:50.000000000 +0000 +++ nsprpub/pr/include/md/_dragonfly.cfg @@ -0,0 +1,194 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ diff --git a/devel/nspr/patches/patch-nsprpub_pr_include_md__pth.h b/devel/nspr/patches/patch-nsprpub_pr_include_md__pth.h index 0cef28f654a..ebe2d5cb221 100644 --- a/devel/nspr/patches/patch-nsprpub_pr_include_md__pth.h +++ b/devel/nspr/patches/patch-nsprpub_pr_include_md__pth.h @@ -1,8 +1,8 @@ -$NetBSD: patch-nsprpub_pr_include_md__pth.h,v 1.1 2012/04/18 20:57:33 ryoon Exp $ +$NetBSD: patch-nsprpub_pr_include_md__pth.h,v 1.2 2012/08/28 13:29:17 ryoon Exp $ ---- nsprpub/pr/include/md/_pth.h.orig 2011-09-02 20:15:44.000000000 +0000 +--- nsprpub/pr/include/md/_pth.h.orig 2012-05-18 21:55:29.000000000 +0000 +++ nsprpub/pr/include/md/_pth.h -@@ -146,7 +146,7 @@ +@@ -114,7 +114,7 @@ #define _PT_PTHREAD_COPY_THR_HANDLE(st, dt) (dt) = (st) #elif defined(IRIX) || defined(OSF1) || defined(AIX) || defined(SOLARIS) \ || defined(LINUX) || defined(__GNU__) || defined(__GLIBC__) \ @@ -11,7 +11,7 @@ $NetBSD: patch-nsprpub_pr_include_md__pth.h,v 1.1 2012/04/18 20:57:33 ryoon Exp || defined(NETBSD) || defined(OPENBSD) || defined(BSDI) \ || defined(NTO) || defined(DARWIN) \ || defined(UNIXWARE) || defined(RISCOS) || defined(SYMBIAN) -@@ -237,7 +237,7 @@ +@@ -201,7 +201,7 @@ #endif /* defined(_PR_DCETHREADS) */ #elif defined(LINUX) || defined(__GNU__) || defined(__GLIBC__) \ @@ -20,7 +20,7 @@ $NetBSD: patch-nsprpub_pr_include_md__pth.h,v 1.1 2012/04/18 20:57:33 ryoon Exp #define PT_PRIO_MIN sched_get_priority_min(SCHED_OTHER) #define PT_PRIO_MAX sched_get_priority_max(SCHED_OTHER) #elif defined(NTO) -@@ -296,6 +296,7 @@ extern int (*_PT_aix_yield_fcn)(); +@@ -260,6 +260,7 @@ extern int (*_PT_aix_yield_fcn)(); #elif defined(HPUX) || defined(SOLARIS) \ || defined(LINUX) || defined(__GNU__) || defined(__GLIBC__) \ || defined(FREEBSD) || defined(NETBSD) || defined(OPENBSD) \ diff --git a/devel/nspr/patches/patch-nsprpub_pr_include_md_prosdep.h b/devel/nspr/patches/patch-nsprpub_pr_include_md_prosdep.h index a75e6d0c1a5..45920f6bfed 100644 --- a/devel/nspr/patches/patch-nsprpub_pr_include_md_prosdep.h +++ b/devel/nspr/patches/patch-nsprpub_pr_include_md_prosdep.h @@ -1,8 +1,8 @@ -$NetBSD: patch-nsprpub_pr_include_md_prosdep.h,v 1.1 2012/04/18 20:57:33 ryoon Exp $ +$NetBSD: patch-nsprpub_pr_include_md_prosdep.h,v 1.2 2012/08/28 13:29:17 ryoon Exp $ ---- nsprpub/pr/include/md/prosdep.h.orig 2011-09-02 20:15:44.000000000 +0000 +--- nsprpub/pr/include/md/prosdep.h.orig 2012-03-06 13:13:55.000000000 +0000 +++ nsprpub/pr/include/md/prosdep.h -@@ -66,7 +66,7 @@ PR_BEGIN_EXTERN_C +@@ -34,7 +34,7 @@ PR_BEGIN_EXTERN_C #if defined(AIX) #include "md/_aix.h" diff --git a/devel/nspr/patches/patch-nsprpub_pr_src_pthreads_ptio.c b/devel/nspr/patches/patch-nsprpub_pr_src_pthreads_ptio.c index bcfc5031ce6..cad3a525996 100644 --- a/devel/nspr/patches/patch-nsprpub_pr_src_pthreads_ptio.c +++ b/devel/nspr/patches/patch-nsprpub_pr_src_pthreads_ptio.c @@ -1,8 +1,8 @@ -$NetBSD: patch-nsprpub_pr_src_pthreads_ptio.c,v 1.1 2012/04/18 20:57:33 ryoon Exp $ +$NetBSD: patch-nsprpub_pr_src_pthreads_ptio.c,v 1.2 2012/08/28 13:29:17 ryoon Exp $ ---- nsprpub/pr/src/pthreads/ptio.c.orig 2011-09-02 20:15:44.000000000 +0000 +--- nsprpub/pr/src/pthreads/ptio.c.orig 2012-03-06 13:14:21.000000000 +0000 +++ nsprpub/pr/src/pthreads/ptio.c -@@ -212,7 +212,8 @@ static PRBool _pr_ipv6_v6only_on_by_defa +@@ -180,7 +180,8 @@ static PRBool _pr_ipv6_v6only_on_by_defa || defined(LINUX) || defined(__GNU__) || defined(__GLIBC__) \ || defined(FREEBSD) || defined(NETBSD) || defined(OPENBSD) \ || defined(BSDI) || defined(NTO) || defined(DARWIN) \ @@ -12,7 +12,7 @@ $NetBSD: patch-nsprpub_pr_src_pthreads_ptio.c,v 1.1 2012/04/18 20:57:33 ryoon Ex #define _PRSelectFdSetArg_t fd_set * #else #error "Cannot determine architecture" -@@ -3285,7 +3286,7 @@ static PRIOMethods _pr_socketpollfd_meth +@@ -3254,7 +3255,7 @@ static PRIOMethods _pr_socketpollfd_meth || defined(AIX) || defined(FREEBSD) || defined(NETBSD) \ || defined(OPENBSD) || defined(BSDI) || defined(NTO) \ || defined(DARWIN) || defined(UNIXWARE) || defined(RISCOS) \ diff --git a/devel/nspr/patches/patch-nsprpub_pr_src_pthreads_ptsynch.c b/devel/nspr/patches/patch-nsprpub_pr_src_pthreads_ptsynch.c index d00e4e4fe72..5d5eebbc336 100644 --- a/devel/nspr/patches/patch-nsprpub_pr_src_pthreads_ptsynch.c +++ b/devel/nspr/patches/patch-nsprpub_pr_src_pthreads_ptsynch.c @@ -1,8 +1,8 @@ -$NetBSD: patch-nsprpub_pr_src_pthreads_ptsynch.c,v 1.1 2012/04/18 20:57:33 ryoon Exp $ +$NetBSD: patch-nsprpub_pr_src_pthreads_ptsynch.c,v 1.2 2012/08/28 13:29:17 ryoon Exp $ ---- nsprpub/pr/src/pthreads/ptsynch.c.orig 2011-09-02 20:15:44.000000000 +0000 +--- nsprpub/pr/src/pthreads/ptsynch.c.orig 2012-03-06 13:14:21.000000000 +0000 +++ nsprpub/pr/src/pthreads/ptsynch.c -@@ -842,7 +842,7 @@ PR_IMPLEMENT(PRStatus) PR_DeleteSemaphor +@@ -810,7 +810,7 @@ PR_IMPLEMENT(PRStatus) PR_DeleteSemaphor */ #if (defined(__GNU_LIBRARY__) && !defined(_SEM_SEMUN_UNDEFINED)) \ || defined(FREEBSD) || defined(OPENBSD) || defined(BSDI) \ |