pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/devel/nspr Add distinfo and patches.
details: https://anonhg.NetBSD.org/pkgsrc/rev/6e5a2ea33247
branches: trunk
changeset: 602722:6e5a2ea33247
user: ryoon <ryoon%pkgsrc.org@localhost>
date: Wed Apr 18 20:57:33 2012 +0000
description:
Add distinfo and patches.
diffstat:
devel/nspr/distinfo | 17 +
devel/nspr/patches/patch-ab | 22 +
devel/nspr/patches/patch-ac | 82 ++++
devel/nspr/patches/patch-ae | 58 ++
devel/nspr/patches/patch-ag | 31 +
devel/nspr/patches/patch-az | 19 +
devel/nspr/patches/patch-ba | 24 +
devel/nspr/patches/patch-nsprpub_pr_include_md__dragonfly.cfg | 199 ++++++++++
devel/nspr/patches/patch-nsprpub_pr_include_md__pth.h | 30 +
devel/nspr/patches/patch-nsprpub_pr_include_md_prosdep.h | 13 +
devel/nspr/patches/patch-nsprpub_pr_src_md_unix_uxrng.c | 13 +
devel/nspr/patches/patch-nsprpub_pr_src_pthreads_ptio.c | 23 +
devel/nspr/patches/patch-nsprpub_pr_src_pthreads_ptsynch.c | 13 +
13 files changed, 544 insertions(+), 0 deletions(-)
diffs (truncated from 596 to 300 lines):
diff -r 1b661c2c033c -r 6e5a2ea33247 devel/nspr/distinfo
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/nspr/distinfo Wed Apr 18 20:57:33 2012 +0000
@@ -0,0 +1,17 @@
+$NetBSD: distinfo,v 1.18 2012/04/18 20:57:33 ryoon Exp $
+
+SHA1 (nspr-4.9.tar.gz) = 57a6bb09ccb90d14303c3d9a6ec2592d8a5c0752
+RMD160 (nspr-4.9.tar.gz) = 35298a4752aa657196b9d2f41ad46f1bef7e22a2
+Size (nspr-4.9.tar.gz) = 1218528 bytes
+SHA1 (patch-ab) = 5d4b7512f8bbdc9e2e05709cec5b36dc12c25997
+SHA1 (patch-ac) = 6aa120769b63efa5869029655f50af901edb9129
+SHA1 (patch-ae) = 470d64f32fe1e619a101486a4bec45d2a06b6cab
+SHA1 (patch-ag) = a924296e6a569eba4229d661fbe5290eeeb999e0
+SHA1 (patch-az) = 5a09ccfa14fab962c4e2916f00669a1fa4a8ade4
+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_src_md_unix_uxrng.c) = df081b19c517b034b0aa37c66fcd5ab8e5bcf67c
+SHA1 (patch-nsprpub_pr_src_pthreads_ptio.c) = f4f6e9b5e24de217665ad3a41ad4f1a24deeb519
+SHA1 (patch-nsprpub_pr_src_pthreads_ptsynch.c) = 9099113a3f783ef410d8fcce5cfc730b98a93bc7
diff -r 1b661c2c033c -r 6e5a2ea33247 devel/nspr/patches/patch-ab
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/nspr/patches/patch-ab Wed Apr 18 20:57:33 2012 +0000
@@ -0,0 +1,22 @@
+$NetBSD: patch-ab,v 1.6 2012/04/18 20:57:33 ryoon Exp $
+
+--- nsprpub/pr/include/md/_netbsd.h.orig 2010-05-03 18:21:00.000000000 +0000
++++ nsprpub/pr/include/md/_netbsd.h
+@@ -79,7 +79,7 @@
+ #define HAVE_DLL
+ #define USE_DLFCN
+ #define _PR_HAVE_SOCKADDR_LEN
+-#define _PR_NO_LARGE_FILES
++#define _PR_HAVE_LARGE_OFF_T
+ #define _PR_STAT_HAS_ST_ATIMESPEC
+ #define _PR_POLL_AVAILABLE
+ #define _PR_USE_POLL
+@@ -107,6 +107,8 @@
+ #define JB_SP_INDEX 2
+ #elif defined(__mips__)
+ #define JB_SP_INDEX 4
++#elif defined(__amd64__)
++#define JB_SP_INDEX 6
+ #elif defined(__alpha__)
+ #define JB_SP_INDEX 34
+ #elif defined(__arm32__)
diff -r 1b661c2c033c -r 6e5a2ea33247 devel/nspr/patches/patch-ac
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/nspr/patches/patch-ac Wed Apr 18 20:57:33 2012 +0000
@@ -0,0 +1,82 @@
+$NetBSD: patch-ac,v 1.6 2012/04/18 20:57:33 ryoon Exp $
+
+--- nsprpub/configure.in.orig 2011-09-02 20:15:44.000000000 +0000
++++ nsprpub/configure.in
+@@ -71,7 +71,7 @@ OBJDIR_NAME=.
+ OBJDIR_SUFFIX=OBJ
+ NSINSTALL='$(MOD_DEPTH)/config/$(OBJDIR_NAME)/nsinstall'
+ NOSUCHFILE=/no-such-file
+-LIBNSPR='-L$(dist_libdir) -lnspr$(MOD_MAJOR_VERSION)'
++LIBNSPR='-Wl,-R${prefix}/lib/${MOZILLA_PKG_NAME} -L$(dist_libdir) -lnspr$(MOD_MAJOR_VERSION)'
+ LIBPLC='-L$(dist_libdir) -lplc$(MOD_MAJOR_VERSION)'
+ CYGWIN_WRAPPER=
+ MACOS_SDK_DIR=
+@@ -1311,6 +1311,33 @@ tools are selected during the Xcode/Deve
+ DSO_LDOPTS='-shared -Wl,-soname -Wl,$(notdir $@)'
+ MDCPUCFG_H=_freebsd.cfg
+ PR_MD_CSRCS=freebsd.c
++ if test "$LIBRUNPATH"; then
++ DSO_LDOPTS="$DSO_LDOPTS -Wl,-R$LIBRUNPATH"
++ fi
++ ;;
++
++*-dragonfly*)
++ if test -z "$USE_NSPR_THREADS"; then
++ USE_PTHREADS=1
++ fi
++ AC_DEFINE(XP_UNIX)
++ AC_DEFINE(HAVE_BSD_FLOCK)
++ AC_DEFINE(HAVE_SOCKLEN_T)
++ CFLAGS="$CFLAGS $(DSO_CFLAGS) -ansi -Wall"
++ MOZ_OBJFORMAT=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
++ if test "$MOZ_OBJFORMAT" = "elf"; then
++ DLL_SUFFIX=so
++ else
++ DLL_SUFFIX=so.1.0
++ fi
++ MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
++ DSO_CFLAGS=-fPIC
++ DSO_LDOPTS='-shared -Wl,-soname -Wl,$(notdir $@)'
++ MDCPUCFG_H=_dragonfly.cfg
++ PR_MD_CSRCS=freebsd.c
++ if test "$LIBRUNPATH"; then
++ DSO_LDOPTS="$DSO_LDOPTS -Wl,-R$LIBRUNPATH"
++ fi
+ ;;
+
+ *-hpux*)
+@@ -1925,6 +1952,7 @@ mips-nec-sysv*)
+ AC_DEFINE(XP_UNIX)
+ AC_DEFINE(NETBSD)
+ AC_DEFINE(HAVE_BSD_FLOCK)
++ AC_DEFINE(HAVE_SOCKLEN_T)
+ if test -z "$USE_NSPR_THREADS"; then
+ USE_PTHREADS=1
+ fi
+@@ -2730,7 +2758,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
+- freebsd*)
++ freebsd* | dragonfly*)
+ # Freebsd doesn't use -pthread for compiles, it uses them for linking
+ ;;
+ *)
+@@ -2768,7 +2796,7 @@ if test -n "$USE_PTHREADS"; then
+ _PTHREAD_LDFLAGS=
+ fi
+ ;;
+- *-freebsd*)
++ *-freebsd* | *-dragonfly*)
+ 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
+ AC_DEFINE(_PR_NEED_PTHREAD_INIT)
+ fi
+ ;;
+-*-freebsd*)
++*-freebsd* | *-dragonfly*)
+ if test -n "$USE_NSPR_THREADS"; then
+ AC_DEFINE(_PR_LOCAL_THREADS_ONLY)
+ fi
diff -r 1b661c2c033c -r 6e5a2ea33247 devel/nspr/patches/patch-ae
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/nspr/patches/patch-ae Wed Apr 18 20:57:33 2012 +0000
@@ -0,0 +1,58 @@
+$NetBSD: patch-ae,v 1.5 2012/04/18 20:57:33 ryoon Exp $
+
+--- nsprpub/pr/src/misc/prnetdb.c.orig 2011-09-22 20:20:37.000000000 +0000
++++ nsprpub/pr/src/misc/prnetdb.c
+@@ -105,7 +105,7 @@ PRLock *_pr_dnsLock = NULL;
+ || defined(AIX4_3_PLUS) || (defined(AIX) && defined(_THREAD_SAFE)) \
+ || (defined(HPUX10_10) && defined(_REENTRANT)) \
+ || (defined(HPUX10_20) && defined(_REENTRANT)) \
+- || defined(OPENBSD)
++ || defined(OPENBSD) || defined(NETBSD)
+ #define _PR_HAVE_GETPROTO_R
+ #define _PR_HAVE_GETPROTO_R_INT
+ #endif
+@@ -115,6 +115,11 @@ PRLock *_pr_dnsLock = NULL;
+ #define _PR_HAVE_5_ARG_GETPROTO_R
+ #endif
+
++#if __DragonFly_version >= 200202
++#define _PR_HAVE_GETPROTO_R
++#define _PR_HAVE_5_ARG_GETPROTO_R
++#endif
++
+ /* 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)
+ }
+
+ #elif (defined(DARWIN) && defined(HAVE_GETIFADDRS)) || defined(FREEBSD) \
+- || defined(NETBSD) || defined(OPENBSD)
++ || defined(NETBSD) || defined(OPENBSD) || defined(DRAGONFLY)
+
+ /*
+ * Use the BSD getifaddrs function.
+@@ -2076,6 +2081,11 @@ PR_IMPLEMENT(PRAddrInfo *) PR_GetAddrInf
+ */
+ hints.ai_socktype = SOCK_STREAM;
+
++/* NetBSD >= 2.99.9 has a thread-safe resolver */
++#if defined(__NetBSD_Version__) && __NetBSD_Version__ < 299000900
++ LOCK_DNS();
++#endif
++
+ 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
+ rv = GETADDRINFO(hostname, NULL, &hints, &res);
+ }
+ #endif
++
++#if defined(__NetBSD_Version__) && __NetBSD_Version__ < 299000900
++ UNLOCK_DNS();
++#endif
++
+ if (rv == 0)
+ return (PRAddrInfo *) res;
+
diff -r 1b661c2c033c -r 6e5a2ea33247 devel/nspr/patches/patch-ag
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/nspr/patches/patch-ag Wed Apr 18 20:57:33 2012 +0000
@@ -0,0 +1,31 @@
+$NetBSD: patch-ag,v 1.3 2012/04/18 20:57:33 ryoon Exp $
+
+--- nsprpub/pr/include/md/_freebsd.h.orig 2010-03-16 01:02:50.000000000 +0000
++++ nsprpub/pr/include/md/_freebsd.h
+@@ -79,7 +79,7 @@
+ #define _PR_HAVE_LARGE_OFF_T
+
+ #if defined(_PR_PTHREADS)
+-#if __FreeBSD_version >= 400008
++#if defined(__DragonFly__) || __FreeBSD_version >= 400008
+ /*
+ * 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 @@
+ #define _PR_POLL_AVAILABLE
+ #endif
+ #else
+-#if __FreeBSD_version >= 300000
++#if defined(__DragonFly__) || __FreeBSD_version >= 300000
+ #define _PR_POLL_AVAILABLE
+ #define _PR_USE_POLL
+ #endif
+@@ -97,7 +97,7 @@
+ #define _PR_HAVE_SYSV_SEMAPHORES
+ #define PR_HAVE_SYSV_NAMED_SHARED_MEMORY
+
+-#if __FreeBSD_version >= 400014
++#if defined(__DragonFly__) || __FreeBSD_version >= 400014
+ #define _PR_INET6
+ #define _PR_HAVE_INET_NTOP
+ #define _PR_HAVE_GETHOSTBYNAME2
diff -r 1b661c2c033c -r 6e5a2ea33247 devel/nspr/patches/patch-az
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/nspr/patches/patch-az Wed Apr 18 20:57:33 2012 +0000
@@ -0,0 +1,19 @@
+$NetBSD: patch-az,v 1.1 2012/04/18 20:57:33 ryoon Exp $
+
+--- nsprpub/pr/src/pthreads/ptthread.c.orig 2009-11-02 22:43:08.000000000 +0100
++++ nsprpub/pr/src/pthreads/ptthread.c
+@@ -1089,12 +1089,12 @@ PR_IMPLEMENT(void) PR_ProcessExit(PRIntn
+ _exit(status);
+ }
+
+-PR_IMPLEMENT(PRUint32) PR_GetThreadID(PRThread *thred)
++PR_IMPLEMENT(pthread_t) PR_GetThreadID(PRThread *thred)
+ {
+ #if defined(_PR_DCETHREADS)
+ return (PRUint32)&thred->id; /* this is really a sham! */
+ #else
+- return (PRUint32)thred->id; /* and I don't know what they will do with it */
++ return thred->id; /* and I don't know what they will do with it */
+ #endif
+ }
+
diff -r 1b661c2c033c -r 6e5a2ea33247 devel/nspr/patches/patch-ba
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/nspr/patches/patch-ba Wed Apr 18 20:57:33 2012 +0000
@@ -0,0 +1,24 @@
+$NetBSD: patch-ba,v 1.1 2012/04/18 20:57:33 ryoon Exp $
+
+pthread_t may be 64-bit, avoid casting it.
+
+--- nsprpub/pr/include/private/pprthred.h.orig 2009-11-02 22:43:08.000000000 +0100
++++ nsprpub/pr/include/private/pprthred.h
+@@ -51,6 +51,8 @@
+ #include <os2.h>
+ #endif
+
++#include <pthread.h>
++
+ PR_BEGIN_EXTERN_C
+
+ /*---------------------------------------------------------------------------
+@@ -91,7 +93,7 @@ NSPR_API(void) PR_DetachThread(void);
+ ** Get the id of the named thread. Each thread is assigned a unique id
+ ** when it is created or attached.
+ */
+-NSPR_API(PRUint32) PR_GetThreadID(PRThread *thread);
++NSPR_API(pthread_t) PR_GetThreadID(PRThread *thread);
+
+ /*
+ ** Set the procedure that is called when a thread is dumped. The procedure
diff -r 1b661c2c033c -r 6e5a2ea33247 devel/nspr/patches/patch-nsprpub_pr_include_md__dragonfly.cfg
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/nspr/patches/patch-nsprpub_pr_include_md__dragonfly.cfg Wed Apr 18 20:57:33 2012 +0000
@@ -0,0 +1,199 @@
+$NetBSD: patch-nsprpub_pr_include_md__dragonfly.cfg,v 1.1 2012/04/18 20:57:33 ryoon Exp $
+
+--- nsprpub/pr/include/md/_dragonfly.cfg.orig 2011-11-21 15:51:33.130151000 +0000
++++ nsprpub/pr/include/md/_dragonfly.cfg
+@@ -0,0 +1,194 @@
++/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
++/* ***** BEGIN LICENSE BLOCK *****
++ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
++ *
++ * The contents of this file are subject to the Mozilla Public License Version
++ * 1.1 (the "License"); you may not use this file except in compliance with
++ * the License. You may obtain a copy of the License at
++ * http://www.mozilla.org/MPL/
++ *
++ * Software distributed under the License is distributed on an "AS IS" basis,
Home |
Main Index |
Thread Index |
Old Index