pkgsrc-Bugs archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

pkg/42277: [PATCH] update devel/ns{pr,s} to the latest releases

>Number:         42277
>Category:       pkg
>Synopsis:       [PATCH] update devel/ns{pr,s} to the latest releases
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          support
>Submitter-Id:   net
>Arrival-Date:   Fri Nov 06 11:05:00 +0000 2009
>Originator:     Rumko
>Release:        /
>Organization:
>Environment:
DragonFly rumko.rumko.net 2.5.1-DEVELOPMENT DragonFly 
v2.5.1.181.gd15a4-DEVELOPMENT #31: Wed Nov  4 22:47:29 CET 2009     
root%rumko.rumko.net@localhost:/usr/obj/usr/src/sys/MYPRECIOUS  i386
>Description:
The current versions in pkgsrc are quite old and it seems not usable for some 
newer sw.

A copy of the patches are also available at:
http://www.rumko.net/pkgsrc/0001-Update-nspr-to-4.8.2.patch
http://www.rumko.net/pkgsrc/0002-Update-to-3.12.4-from-3.11.5.patch
http://www.rumko.net/pkgsrc/0003-Change-minimum-required-version.patch

P.S.: Also, with the newest nspr and nss in pkgsrc, maybe xulrunner/firefox 
could depend on these ports instead of building their own versions?
>How-To-Repeat:

>Fix:
From 324aa7fc5de4f15774e96a5aee8a0e7093d9e235 Mon Sep 17 00:00:00 2001
From: Rumko <rumcic%gmail.com@localhost>
Date: Thu, 5 Nov 2009 22:38:56 +0100
Subject: [PATCH 1/3] Update nspr to 4.8.2.

Too many changes since the previous versions to list here.
---
 devel/nspr/Makefile         |    5 +-
 devel/nspr/PLIST            |   44 +---------------
 devel/nspr/distinfo         |   18 +++----
 devel/nspr/patches/patch-aa |  125 -------------------------------------------
 devel/nspr/patches/patch-ab |   40 --------------
 devel/nspr/patches/patch-ac |   27 +++------
 devel/nspr/patches/patch-ad |    4 +-
 devel/nspr/patches/patch-ae |   13 -----
 devel/nspr/patches/patch-ah |   32 +----------
 devel/nspr/patches/patch-al |   36 ------------
 10 files changed, 24 insertions(+), 320 deletions(-)
 delete mode 100644 devel/nspr/patches/patch-aa
 delete mode 100644 devel/nspr/patches/patch-ab
 delete mode 100644 devel/nspr/patches/patch-ae
 delete mode 100644 devel/nspr/patches/patch-al

diff --git a/devel/nspr/Makefile b/devel/nspr/Makefile
index 9283c74..3568398 100644
--- a/devel/nspr/Makefile
+++ b/devel/nspr/Makefile
@@ -1,9 +1,8 @@
 # $NetBSD: Makefile,v 1.30 2009/08/27 11:59:38 tnn Exp $
 
-DISTNAME=              nspr-4.6.7
-PKGREVISION=           2
+DISTNAME=              nspr-4.8.2
 CATEGORIES=            devel
-MASTER_SITES=          ${MASTER_SITE_MOZILLA_ALL:=nspr/releases/v4.6.7/src/}
+MASTER_SITES=          ${MASTER_SITE_MOZILLA_ALL:=nspr/releases/v4.8.2/src/}
 
 MAINTAINER=            pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=              http://www.mozilla.org/projects/nspr/index.html
diff --git a/devel/nspr/PLIST b/devel/nspr/PLIST
index 5f3fdae..e40aaff 100644
--- a/devel/nspr/PLIST
+++ b/devel/nspr/PLIST
@@ -1,79 +1,37 @@
 @comment $NetBSD: PLIST,v 1.9 2009/06/14 17:49:00 joerg Exp $
 bin/nspr-config
-include/nspr/md/_aix.h
 include/nspr/md/_aix32.cfg
 include/nspr/md/_aix64.cfg
 include/nspr/md/_beos.cfg
-include/nspr/md/_beos.h
 include/nspr/md/_bsdi.cfg
-include/nspr/md/_bsdi.h
 include/nspr/md/_darwin.cfg
-include/nspr/md/_darwin.h
 include/nspr/md/_dgux.cfg
-include/nspr/md/_dgux.h
 include/nspr/md/_freebsd.cfg
-include/nspr/md/_freebsd.h
-include/nspr/md/_hpux.h
 include/nspr/md/_hpux32.cfg
 include/nspr/md/_hpux64.cfg
-include/nspr/md/_irix.h
 include/nspr/md/_irix32.cfg
 include/nspr/md/_irix64.cfg
 include/nspr/md/_linux.cfg
-include/nspr/md/_linux.h
-include/nspr/md/_macos.h
 include/nspr/md/_ncr.cfg
-include/nspr/md/_ncr.h
 include/nspr/md/_nec.cfg
-include/nspr/md/_nec.h
 include/nspr/md/_netbsd.cfg
-include/nspr/md/_netbsd.h
 include/nspr/md/_nextstep.cfg
-include/nspr/md/_nextstep.h
-include/nspr/md/_nspr_pthread.h
 include/nspr/md/_nto.cfg
-include/nspr/md/_nto.h
 include/nspr/md/_openbsd.cfg
-include/nspr/md/_openbsd.h
-include/nspr/md/_openvms.cfg
-include/nspr/md/_openvms.h
 include/nspr/md/_os2.cfg
-include/nspr/md/_os2.h
-include/nspr/md/_os2_errors.h
 include/nspr/md/_osf1.cfg
-include/nspr/md/_osf1.h
-include/nspr/md/_pcos.h
-include/nspr/md/_pth.h
 include/nspr/md/_qnx.cfg
-include/nspr/md/_qnx.h
 include/nspr/md/_reliantunix.cfg
-include/nspr/md/_reliantunix.h
-include/nspr/md/_rhapsody.cfg
-include/nspr/md/_rhapsody.h
 include/nspr/md/_riscos.cfg
-include/nspr/md/_riscos.h
 include/nspr/md/_scoos.cfg
-include/nspr/md/_scoos.h
 include/nspr/md/_solaris.cfg
-include/nspr/md/_solaris.h
 include/nspr/md/_sony.cfg
-include/nspr/md/_sony.h
 include/nspr/md/_sunos4.cfg
-include/nspr/md/_sunos4.h
-include/nspr/md/_unix_errors.h
-include/nspr/md/_unixos.h
+include/nspr/md/_symbian.cfg
 include/nspr/md/_unixware.cfg
-include/nspr/md/_unixware.h
 include/nspr/md/_unixware7.cfg
-include/nspr/md/_win16.cfg
-include/nspr/md/_win16.h
-include/nspr/md/_win32_errors.h
 include/nspr/md/_win95.cfg
-include/nspr/md/_win95.h
 include/nspr/md/_winnt.cfg
-include/nspr/md/_winnt.h
-include/nspr/md/prosdep.h
-include/nspr/md/sunos4.h
 include/nspr/nspr.h
 include/nspr/obsolete/pralarm.h
 include/nspr/obsolete/probslet.h
diff --git a/devel/nspr/distinfo b/devel/nspr/distinfo
index a367fd5..d324901 100644
--- a/devel/nspr/distinfo
+++ b/devel/nspr/distinfo
@@ -1,19 +1,15 @@
-$NetBSD: distinfo,v 1.16 2009/08/27 11:59:38 tnn Exp $
+$NetBSD$
 
-SHA1 (nspr-4.6.7.tar.gz) = cf45319d02285ec5479445a1e9adfb9e94f55a6a
-RMD160 (nspr-4.6.7.tar.gz) = 11a0d8b14ebdd441f6899c464b77144704ab638e
-Size (nspr-4.6.7.tar.gz) = 1303759 bytes
-SHA1 (patch-aa) = a5dd0a594ecd4487bb626b656a58a5311c7ec587
-SHA1 (patch-ab) = fc668ceb47f9063ba9b0514a5da31bda0ca23916
-SHA1 (patch-ac) = 365b3a5158db94f1976ecfd2ede120201717ad83
-SHA1 (patch-ad) = fa93b1fa50f8c37062d9474f01e73be245f05330
-SHA1 (patch-ae) = 99f0663770d045d98f99ac602569ea084e741a81
+SHA1 (nspr-4.8.2.tar.gz) = 14af8f12a0975630a13f5aa3c890e92960a0be93
+RMD160 (nspr-4.8.2.tar.gz) = e7447144f3c57a3d195c94ee9465646b360dc60f
+Size (nspr-4.8.2.tar.gz) = 1232677 bytes
+SHA1 (patch-ac) = 2de752c80108c30170baf650e2d793eb617eea51
+SHA1 (patch-ad) = 0b589487b285412d989641f884db8af4d13bb947
 SHA1 (patch-af) = 7a94606109277b5af00197164a854f16d4259c0f
 SHA1 (patch-ag) = 2150cae88a39eaf4588084ad62c611a83e339c75
-SHA1 (patch-ah) = 34749dda8e07d9535ef5e158261d0202b7f0e058
+SHA1 (patch-ah) = d1e2d09a20cf0bebbf8e04f66e8f813a26b3c82b
 SHA1 (patch-ai) = ca4d824540f62a97e2072ef0927b6b8f0a362a0a
 SHA1 (patch-aj) = 93661aed7b6b581fad3cf2382e74121a82bed483
 SHA1 (patch-ak) = b090f571d539cd15f3ebad7c671bb71531e0f817
-SHA1 (patch-al) = 80d75bfcebc271dc222cef982a887cd1735e7692
 SHA1 (patch-am) = 4b4737524d76d32a45e20041b0fc7a3fc2f8f1c9
 SHA1 (patch-an) = e3c0621e0e874dba8d0c574911b841c0784fc58e
diff --git a/devel/nspr/patches/patch-aa b/devel/nspr/patches/patch-aa
deleted file mode 100644
index 185f1b1..0000000
--- a/devel/nspr/patches/patch-aa
+++ /dev/null
@@ -1,125 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2007/09/25 04:21:30 bjs Exp $
-
---- pr/include/md/_netbsd.cfg.orig     2004-04-25 11:00:47.000000000 -0400
-+++ pr/include/md/_netbsd.cfg
-@@ -48,7 +48,8 @@
- 
- #define PR_AF_INET6 24  /* same as AF_INET6 */
- 
--#if defined(__i386__) || defined(__arm32__) || defined(__MIPSEL__)
-+#if defined(__i386__) || defined(__arm32__) || defined(__ARMEL__) || \
-+      defined(__MIPSEL__)
- 
- #define IS_LITTLE_ENDIAN 1
- #undef  IS_BIG_ENDIAN
-@@ -94,7 +95,53 @@
- #define PR_ALIGN_OF_DOUBLE  4
- #define PR_ALIGN_OF_POINTER 4
- 
--#elif defined(__sparc__) || defined(__MIPSEB__)
-+#elif defined(__sparc_v9)
-+
-+#undef IS_LITTLE_ENDIAN
-+#define  IS_BIG_ENDIAN 1
-+#define HAVE_LONG_LONG
-+#define  HAVE_ALIGNED_DOUBLES
-+#define  HAVE_ALIGNED_LONGLONGS
-+
-+#define PR_BYTES_PER_BYTE   1
-+#define PR_BYTES_PER_SHORT  2
-+#define PR_BYTES_PER_INT    4
-+#define PR_BYTES_PER_INT64  8
-+#define PR_BYTES_PER_LONG   8
-+#define PR_BYTES_PER_FLOAT  4
-+#define PR_BYTES_PER_DOUBLE 8
-+#define PR_BYTES_PER_WORD   8
-+#define PR_BYTES_PER_DWORD  8
-+#define PR_BYTES_PER_WORD_LOG2   3
-+#define PR_BYTES_PER_DWORD_LOG2  3
-+
-+#define PR_BITS_PER_BYTE    8
-+#define PR_BITS_PER_SHORT   16
-+#define PR_BITS_PER_INT     32
-+#define PR_BITS_PER_INT64   64
-+#define PR_BITS_PER_LONG    64
-+#define PR_BITS_PER_FLOAT   32
-+#define PR_BITS_PER_DOUBLE  64
-+#define PR_BITS_PER_WORD    64
-+
-+#define PR_BITS_PER_BYTE_LOG2   3
-+#define PR_BITS_PER_SHORT_LOG2  4
-+#define PR_BITS_PER_INT_LOG2    5
-+#define PR_BITS_PER_INT64_LOG2  6
-+#define PR_BITS_PER_LONG_LOG2   6
-+#define PR_BITS_PER_FLOAT_LOG2  5
-+#define PR_BITS_PER_DOUBLE_LOG2 6
-+#define PR_BITS_PER_WORD_LOG2   6
-+
-+#define PR_ALIGN_OF_SHORT   2
-+#define PR_ALIGN_OF_INT     4
-+#define PR_ALIGN_OF_LONG    8
-+#define PR_ALIGN_OF_INT64   8 
-+#define PR_ALIGN_OF_FLOAT   4 
-+#define PR_ALIGN_OF_DOUBLE  8 
-+#define PR_ALIGN_OF_POINTER 8 
-+
-+#elif defined(__sparc) || defined(__MIPSEB__) || defined(__ARMEB__)
- 
- #undef IS_LITTLE_ENDIAN
- #define  IS_BIG_ENDIAN 1
-@@ -187,6 +234,55 @@
- #define PR_BYTES_PER_WORD_LOG2  3
- #define PR_BYTES_PER_DWORD_LOG2 3
- 
-+#elif defined(__amd64__)
-+#define IS_LITTLE_ENDIAN 1
-+#undef  IS_BIG_ENDIAN
-+#define IS_64
-+
-+#define PR_BYTES_PER_BYTE   1
-+#define PR_BYTES_PER_SHORT  2
-+#define PR_BYTES_PER_INT    4
-+#define PR_BYTES_PER_INT64  8
-+#define PR_BYTES_PER_LONG   8
-+#define PR_BYTES_PER_FLOAT  4
-+#define PR_BYTES_PER_DOUBLE 8
-+#define PR_BYTES_PER_WORD   8
-+#define PR_BYTES_PER_DWORD  8
-+
-+#define PR_BITS_PER_BYTE    8
-+#define PR_BITS_PER_SHORT   16
-+#define PR_BITS_PER_INT     32
-+#define PR_BITS_PER_INT64   64
-+#define PR_BITS_PER_LONG    64
-+#define PR_BITS_PER_FLOAT   32
-+#define PR_BITS_PER_DOUBLE  64
-+#define PR_BITS_PER_WORD    64
-+
-+#define PR_BITS_PER_BYTE_LOG2   3
-+#define PR_BITS_PER_SHORT_LOG2  4
-+#define PR_BITS_PER_INT_LOG2    5
-+#define PR_BITS_PER_INT64_LOG2  6
-+#define PR_BITS_PER_LONG_LOG2   6
-+#define PR_BITS_PER_FLOAT_LOG2  5
-+#define PR_BITS_PER_DOUBLE_LOG2 6
-+#define PR_BITS_PER_WORD_LOG2   6
-+
-+#define PR_ALIGN_OF_SHORT   2
-+#define PR_ALIGN_OF_INT     4
-+#define PR_ALIGN_OF_LONG    8
-+#define PR_ALIGN_OF_INT64   8
-+#define PR_ALIGN_OF_FLOAT   4
-+#define PR_ALIGN_OF_DOUBLE  8
-+#define PR_ALIGN_OF_POINTER 8
-+#define PR_ALIGN_OF_WORD    8
-+
-+#define PR_BYTES_PER_WORD_LOG2  3
-+#define PR_BYTES_PER_DWORD_LOG2 3
-+
-+#define HAVE_LONG_LONG
-+#define HAVE_ALIGNED_DOUBLES
-+#define HAVE_ALIGNED_LONGLONGS
-+
- #elif defined(__powerpc__) || defined(__m68k__)
- 
- #undef  IS_LITTLE_ENDIAN
diff --git a/devel/nspr/patches/patch-ab b/devel/nspr/patches/patch-ab
deleted file mode 100644
index cda9e80..0000000
--- a/devel/nspr/patches/patch-ab
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-ab,v 1.4 2007/09/25 04:18:26 bjs Exp $
-
-We really don't want to use getproto reentrant functions.  Also,
-add missing extern decls.
-
---- pr/include/md/_netbsd.h.orig       2006-04-05 17:38:13.000000000 -0400
-+++ pr/include/md/_netbsd.h
-@@ -47,6 +47,8 @@
- #define _PR_SI_ARCHITECTURE "x86"
- #elif defined(__alpha__)
- #define _PR_SI_ARCHITECTURE "alpha"
-+#elif defined(__amd64__)
-+#define _PR_SI_ARCHITECTURE "amd64"
- #elif defined(__m68k__)
- #define _PR_SI_ARCHITECTURE "m68k"
- #elif defined(__powerpc__)
-@@ -92,12 +94,6 @@
- #define _PR_INET6_PROBE
- #endif
- 
--#if __NetBSD_Version__ >= 106370000
--/* NetBSD 1.6ZK */
--#define _PR_HAVE_GETPROTO_R
--#define _PR_HAVE_GETPROTO_R_INT
--#endif
--
- #define USE_SETJMP
- 
- #ifndef _PR_PTHREADS
-@@ -243,6 +239,10 @@ struct _MDCPU {
- 
- #endif /* ! _PR_PTHREADS */
- 
-+extern void _MD_EarlyInit(void);
-+extern PRIntervalTime _PR_UNIX_GetInterval(void);
-+extern PRIntervalTime _PR_UNIX_TicksPerSecond(void);
-+
- #define _MD_EARLY_INIT                  _MD_EarlyInit
- #define _MD_FINAL_INIT                        _PR_UnixInit
- #define _MD_GET_INTERVAL                  _PR_UNIX_GetInterval
diff --git a/devel/nspr/patches/patch-ac b/devel/nspr/patches/patch-ac
index 9de4557..296f36a 100644
--- a/devel/nspr/patches/patch-ac
+++ b/devel/nspr/patches/patch-ac
@@ -2,16 +2,7 @@ $NetBSD: patch-ac,v 1.4 2007/03/18 18:49:47 wiz Exp $
 
 --- configure.in.orig  2007-01-18 23:44:32.000000000 +0000
 +++ configure.in
-@@ -62,7 +62,7 @@ USE_CPLUS=
- USE_IPV6=
- USE_MDUPDATE=
- _MACOSX_DEPLOYMENT_TARGET=
--_OPTIMIZE_FLAGS=-O
-+_OPTIMIZE_FLAGS=
- _DEBUG_FLAGS=-g
- MOZ_DEBUG=1
- MOZ_OPTIMIZE=
-@@ -1113,7 +1113,7 @@ tools are selected during the Xcode/Deve
+@@ -1141,7 +1141,7 @@
      PR_MD_CSRCS=dgux.c
      ;;
  
@@ -20,7 +11,7 @@ $NetBSD: patch-ac,v 1.4 2007/03/18 18:49:47 wiz Exp $
      if test -z "$USE_NSPR_THREADS"; then
          USE_PTHREADS=1
      fi
-@@ -1133,6 +1133,9 @@ tools are selected during the Xcode/Deve
+@@ -1161,6 +1161,9 @@
      DSO_LDOPTS='-shared -Wl,-soname -Wl,$(notdir $@)'
      MDCPUCFG_H=_freebsd.cfg
      PR_MD_CSRCS=freebsd.c
@@ -30,15 +21,15 @@ $NetBSD: patch-ac,v 1.4 2007/03/18 18:49:47 wiz Exp $
      ;;
  
  *-hpux*)
-@@ -1637,6 +1640,7 @@ mips-nec-sysv*)
+@@ -1733,6 +1736,7 @@
      AC_DEFINE(XP_UNIX)
      AC_DEFINE(NETBSD)
      AC_DEFINE(HAVE_BSD_FLOCK)
 +    AC_DEFINE(HAVE_SOCKLEN_T)
-     USE_NSPR_THREADS=1
-     MDCPUCFG_H=_netbsd.cfg
-     PR_MD_CSRCS=netbsd.c
-@@ -1649,13 +1653,16 @@ mips-nec-sysv*)
+     if test -z "$USE_NSPR_THREADS"; then
+         USE_PTHREADS=1
+     fi
+@@ -1747,13 +1751,16 @@
      if test -z "$OBJECT_FMT"; then
          if echo __ELF__ | ${CC-cc} -E - | grep -q __ELF__ 2>/dev/null; then
              OBJECT_FMT=a.out
@@ -58,7 +49,7 @@ $NetBSD: patch-ac,v 1.4 2007/03/18 18:49:47 wiz Exp $
      fi
  
      if test "$LIBRUNPATH"; then
-@@ -2438,7 +2445,7 @@ if test -n "$USE_PTHREADS"; then
+@@ -2552,7 +2559,7 @@
              _PTHREAD_LDFLAGS=
          fi
            ;;
@@ -67,7 +58,7 @@ $NetBSD: patch-ac,v 1.4 2007/03/18 18:49:47 wiz Exp $
            AC_DEFINE(_REENTRANT)
            AC_DEFINE(_THREAD_SAFE)
            dnl -pthread links in -lc_r, so don't specify it explicitly.
-@@ -2519,7 +2526,7 @@ case "$target" in
+@@ -2633,7 +2640,7 @@
          AC_DEFINE(_PR_NEED_PTHREAD_INIT)
      fi
      ;;
diff --git a/devel/nspr/patches/patch-ad b/devel/nspr/patches/patch-ad
index 74ec156..38f1821 100644
--- a/devel/nspr/patches/patch-ad
+++ b/devel/nspr/patches/patch-ad
@@ -11,9 +11,9 @@ $NetBSD: patch-ad,v 1.5 2009/04/07 08:05:50 hasso Exp $
 +#define _PR_HAVE_5_ARG_GETPROTO_R
 +#endif
 +
- #if (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2)
+ /* BeOS has glibc but not the glibc-style getprotobyxxx_r functions. */
+ #if (defined(__GLIBC__) && __GLIBC__ >= 2 && !defined(XP_BEOS))
  #define _PR_HAVE_GETPROTO_R
- #define _PR_HAVE_5_ARG_GETPROTO_R
 @@ -2115,7 +2120,17 @@ PR_IMPLEMENT(PRAddrInfo *) PR_GetAddrInf
           */
          hints.ai_socktype = SOCK_STREAM;
diff --git a/devel/nspr/patches/patch-ae b/devel/nspr/patches/patch-ae
deleted file mode 100644
index b8e48c8..0000000
--- a/devel/nspr/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.3 2008/01/05 19:38:46 tron Exp $
-
---- pr/include/md/_pth.h.orig  2005-07-21 19:22:53.000000000 +0100
-+++ pr/include/md/_pth.h       2008-01-05 19:34:33.000000000 +0000
-@@ -205,7 +205,7 @@
- /*
-  * These platforms don't have pthread_kill()
-  */
--#if defined(DARWIN)
-+#if defined(DARWIN) && !defined(__DARWIN_SUF_UNIX03)
- #define pthread_kill(thread, sig) ENOSYS
- #endif
- 
diff --git a/devel/nspr/patches/patch-ah b/devel/nspr/patches/patch-ah
index 437807f..7eb3cb5 100644
--- a/devel/nspr/patches/patch-ah
+++ b/devel/nspr/patches/patch-ah
@@ -1,23 +1,11 @@
 $NetBSD: patch-ah,v 1.1 2007/09/25 04:18:26 bjs Exp $
 
-Does this package really ever need priority scheduling?  #undef it.
 If _DONT_CAST_PTHREAD_T is defined, then do as the macro says.  After
 all, it could be 64-bit.  From FreeBSD ports.
 
 --- pr/src/pthreads/ptthread.c.orig    2006-11-30 19:34:12.000000000 -0500
 +++ pr/src/pthreads/ptthread.c
-@@ -52,6 +52,10 @@
- #include <string.h>
- #include <signal.h>
- 
-+/* XXX should nspr ever really need to set priority? */
-+
-+#undef _POSIX_THREAD_PRIORITY_SCHEDULING 
-+
- /*
-  * Record whether or not we have the privilege to set the scheduling
-  * policy and priority of threads.  0 means that privilege is available.
-@@ -979,12 +983,20 @@ PR_IMPLEMENT(void) PR_ProcessExit(PRIntn
+@@ -1089,12 +1089,20 @@
      _exit(status);
  }
  
@@ -25,7 +13,7 @@ all, it could be 64-bit.  From FreeBSD ports.
  PR_IMPLEMENT(PRUint32) PR_GetThreadID(PRThread *thred)
 +#else
 +PR_IMPLEMENT(pthread_t) PR_GetThreadID(PRThread *thred)
-+#endif /* _DONT_CAST_PTHREAD_T */
++#endif
  {
  #if defined(_PR_DCETHREADS)
      return (PRUint32)&thred->id;  /* this is really a sham! */
@@ -34,21 +22,7 @@ all, it could be 64-bit.  From FreeBSD ports.
      return (PRUint32)thred->id;  /* and I don't know what they will do with 
it */
 +#else
 +    return thred->id;  /* and I don't know what they will do with it */
-+#endif /* _DONT_CAST_PTHREAD_T */
++#endif
  #endif
  }
  
-@@ -1116,7 +1128,13 @@ PR_IMPLEMENT(PRStatus) PR_EnumerateThrea
-     PRIntn count = 0;
-     PRStatus rv = PR_SUCCESS;
-     PRThread* thred = pt_book.first;
-+#ifdef _DONT_CAST_PTHREAD_T
-+#if !defined(_PR_DCETHREADS) && (defined(DEBUG) || defined(FORCE_PR_ASSERT))
-+#endif /* _DONT_CAST_PTHREAD_T */
-     PRThread *me = PR_CurrentThread();
-+#ifdef _DONT_CAST_PTHREAD_T
-+#endif
-+#endif /* _DONT_CAST_PTHREAD_T */
- 
-     PR_LOG(_pr_gc_lm, PR_LOG_ALWAYS, ("Begin PR_EnumerateThreads\n"));
-     /*
diff --git a/devel/nspr/patches/patch-al b/devel/nspr/patches/patch-al
deleted file mode 100644
index c1e07c4..0000000
--- a/devel/nspr/patches/patch-al
+++ /dev/null
@@ -1,36 +0,0 @@
-$NetBSD: patch-al,v 1.1 2007/09/25 04:18:27 bjs Exp $
-
-Fixup locking order.  From OpenBSD.
-
---- pr/src/misc/prinit.c.orig  2006-11-30 19:34:11.000000000 -0500
-+++ pr/src/misc/prinit.c
-@@ -435,6 +435,12 @@ PR_IMPLEMENT(PRStatus) PR_Cleanup()
-           _PR_LogCleanup();
- 
-         /*
-+         * accesses the current thread
-+         */
-+        _PR_CleanupNet();
-+        _PR_CleanupIO();
-+
-+        /*
-          * This part should look like the end of _PR_NativeRunThread
-          * and _PR_UserRunThread.
-          */
-@@ -446,6 +452,7 @@ PR_IMPLEMENT(PRStatus) PR_Cleanup()
-             PR_DELETE(me->stack);
-             PR_DELETE(me);
-         }
-+        _PR_MD_SET_CURRENT_THREAD(NULL);
- 
-         /*
-          * XXX: We are freeing the heap memory here so that Purify won't
-@@ -454,8 +461,6 @@ PR_IMPLEMENT(PRStatus) PR_Cleanup()
-          * Ideally, for each _PR_InitXXX(), there should be a corresponding
-          * _PR_XXXCleanup() that we can call here.
-          */
--        _PR_CleanupNet();
--        _PR_CleanupIO();
- #ifdef WINNT
-         _PR_CleanupCPUs();
- #endif
-- 
1.6.4

From aa6a181a79fc4ff4dd1e1bd9b03dfbe998697f48 Mon Sep 17 00:00:00 2001
From: Rumko <rumcic%gmail.com@localhost>
Date: Fri, 6 Nov 2009 01:12:57 +0100
Subject: [PATCH 2/3] Update to 3.12.4 from 3.11.5.

Changes too numerous to write ... lots of bug fixes, new features, etc.
---
 devel/nss/Makefile           |   10 ++++------
 devel/nss/PLIST              |    6 +++++-
 devel/nss/distinfo           |   20 ++++++++++----------
 devel/nss/files/DragonFly.mk |   25 ++++++++++---------------
 devel/nss/patches/patch-ab   |    2 +-
 devel/nss/patches/patch-ae   |   22 ++++++++++++----------
 devel/nss/patches/patch-ag   |    2 +-
 devel/nss/patches/patch-ah   |    4 ++--
 devel/nss/patches/patch-an   |   29 ++++++-----------------------
 devel/nss/patches/patch-as   |   40 ++--------------------------------------
 10 files changed, 53 insertions(+), 107 deletions(-)

diff --git a/devel/nss/Makefile b/devel/nss/Makefile
index 8670910..035a7ce 100644
--- a/devel/nss/Makefile
+++ b/devel/nss/Makefile
@@ -1,8 +1,8 @@
 # $NetBSD: Makefile,v 1.33 2009/08/19 15:01:21 joerg Exp $
 
-DISTNAME=              nss-3.11.5
+DISTNAME=              nss-3.12.4
 CATEGORIES=            security
-MASTER_SITES=          
${MASTER_SITE_MOZILLA_ALL:=security/nss/releases/NSS_3_11_5_RTM/src/}
+MASTER_SITES=          
${MASTER_SITE_MOZILLA_ALL:=security/nss/releases/NSS_3_12_4_RTM/src/}
 
 MAINTAINER=            pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=              http://www.mozilla.org/projects/security/pki/nss/
@@ -17,13 +17,11 @@ BUILD_DIRS=         mozilla/security/nss
 USE_TOOLS+=            awk gmake pax perl
 DIST=                  ${WRKSRC}/mozilla/dist
 BUILD_TARGET=          nss_build_all
-MAKE_ENV+=             LD_LIBS="-L${BUILDLINK_PREFIX.nspr}/lib/nspr 
${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.nspr}/lib/nspr 
${COMPILER_RPATH_FLAG}${LOCALBASE}/lib/nss"
-MAKE_ENV+=             LIBRUNPATH=${PREFIX}/lib BUILD_OPT=1
+MAKE_ENV+=             BSD_LDOPTS="-L${BUILDLINK_PREFIX.nspr}/lib/nspr 
${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.nspr}/lib/nspr 
${COMPILER_RPATH_FLAG}${LOCALBASE}/lib/nss"
+MAKE_ENV+=             BUILD_OPT=1 NSS_ENABLE_ECC=1
 
 INSTALLATION_DIRS=     include/nss lib/nss lib/pkgconfig
 
-MAKE_JOBS_SAFE=                no
-
 .include               "../../mk/bsd.prefs.mk"
 
 .if ${OBJECT_FMT} == "ELF"
diff --git a/devel/nss/PLIST b/devel/nss/PLIST
index 5c76678..f829aff 100644
--- a/devel/nss/PLIST
+++ b/devel/nss/PLIST
@@ -47,6 +47,7 @@ include/nss/nss/nssilock.h
 include/nss/nss/nsslocks.h
 include/nss/nss/nssrwlk.h
 include/nss/nss/nssrwlkt.h
+include/nss/nss/nssutil.h
 include/nss/nss/ocsp.h
 include/nss/nss/ocspt.h
 include/nss/nss/p12.h
@@ -92,10 +93,13 @@ include/nss/nss/ssl.h
 include/nss/nss/sslerr.h
 include/nss/nss/sslproto.h
 include/nss/nss/sslt.h
-include/nss/nss/watcomfx.h
+include/nss/nss/utilrename.h
 @comment libfreebl
+lib/nss/libfreebl3.${SO_SUFFIX}
 lib/nss/libnss3.${SO_SUFFIX}
 lib/nss/libnssckbi.${SO_SUFFIX}
+lib/nss/libnssdbm3.${SO_SUFFIX}
+lib/nss/libnssutil3.${SO_SUFFIX}
 lib/nss/libsmime3.${SO_SUFFIX}
 lib/nss/libsoftokn3.${SO_SUFFIX}
 lib/nss/libssl3.${SO_SUFFIX}
diff --git a/devel/nss/distinfo b/devel/nss/distinfo
index fe8f81f..d820797 100644
--- a/devel/nss/distinfo
+++ b/devel/nss/distinfo
@@ -1,16 +1,16 @@
-$NetBSD: distinfo,v 1.19 2009/10/11 07:51:48 sno Exp $
+$NetBSD$
 
-SHA1 (nss-3.11.5.tar.gz) = 2cde010908ab41777e43fda83be0a925010c4a09
-RMD160 (nss-3.11.5.tar.gz) = fe49128857bbc645d6ee8824c96e9ff0461438c0
-Size (nss-3.11.5.tar.gz) = 3696893 bytes
+SHA1 (nss-3.12.4.tar.gz) = a152bf980f3a3dcf575c2d149fb279058ef2e757
+RMD160 (nss-3.12.4.tar.gz) = 4c451f5dd1c5205a6886a3c3abb014638f87395d
+Size (nss-3.12.4.tar.gz) = 5412877 bytes
 SHA1 (patch-aa) = 25b1442791326ba3b4c5cfa299c7a453c77e457e
-SHA1 (patch-ab) = 371e04afd51d4182a1324cbd04c1d93bdbb8949a
-SHA1 (patch-ae) = 71c90bac798706a38634a2883bd1541d76d01861
+SHA1 (patch-ab) = 8cd6a97fd7f0fac176f7bcb8230ceae628672252
+SHA1 (patch-ae) = 5a28148d89164e870030c75e5444288076de9afa
 SHA1 (patch-af) = c0e5a68911eb6503224c569552a5e94cfa036364
-SHA1 (patch-ag) = ead4d79ac6ebe718230ce47fb3e296b2b4f7584b
-SHA1 (patch-ah) = fa302e20163db73a1453b4e360f7f55377b7bea2
+SHA1 (patch-ag) = a15c4c105244cf0323d7af7d7c99aaa04215c1b2
+SHA1 (patch-ah) = 3751e2dff98c9387f1273569b3e4305b0246734e
 SHA1 (patch-ai) = 80a18536703d7f01b28448e503f49da50b07304e
 SHA1 (patch-ak) = 371eb96e2874ef8ec841dc886a70f2b5215f701d
-SHA1 (patch-an) = c9d8f350488cc383a0e9bd25b69b270f678c4736
-SHA1 (patch-as) = 5d1c7f7bfc3f167052985c2714099f82ad8f4e25
+SHA1 (patch-an) = 442f581637b7116c8adf8469d7c3a63ba901fe5a
+SHA1 (patch-as) = 9461f453c4128a1720f807a572f7c5d4311db6cf
 SHA1 (patch-at) = 3c963ca8a6a2ad8c6591d2ec37c431435cd6704a
diff --git a/devel/nss/files/DragonFly.mk b/devel/nss/files/DragonFly.mk
index 69354a9..adb780a 100644
--- a/devel/nss/files/DragonFly.mk
+++ b/devel/nss/files/DragonFly.mk
@@ -35,16 +35,15 @@
 
 include $(CORE_DEPTH)/coreconf/UNIX.mk
 
-DEFAULT_COMPILER       = gcc
-CC                     = gcc
-CCC                    = g++
+DEFAULT_COMPILER       = $(CC)
+CC                     ?= gcc
+CCC                    = $(CXX)
 RANLIB                 = ranlib
 
-ifeq ($(OS_TEST),alpha)
-CPU_ARCH               = alpha
-else
-CPU_ARCH               = x86
+ifeq ($(OS_TEST),x86_64)
+USE_64                 = 1
 endif
+CPU_ARCH               = x86
 
 OS_CFLAGS              = $(DSO_CFLAGS) -ansi -Wall -DFREEBSD -DHAVE_STRERROR 
-DHAVE_BSD_FLOCK
 
@@ -58,20 +57,16 @@ ifndef CLASSIC_NSPR
 USE_PTHREADS           = 1
 DEFINES                        += -D_THREAD_SAFE -D_REENTRANT
 OS_LIBS                        += -pthread $(BSD_LDOPTS)
-DSO_LDOPTS             += -pthread $(BSD_LDOPTS)
+DSO_LDOPTS             += $(BSD_LDOPTS)
 endif
 
 ARCH                   = freebsd
 
-MOZ_OBJFORMAT          := $(shell test -x /usr/bin/objformat && 
/usr/bin/objformat || echo aout)
-
-ifeq ($(MOZ_OBJFORMAT),elf)
+#DLL_SUFFIX            = so.1
 DLL_SUFFIX             = so
-else
-DLL_SUFFIX             = so.1.0
-endif
 
-MKSHLIB                        = $(CC) $(DSO_LDOPTS)
+MKSHLIB                        = $(CC) -Wl,-Bsymbolic $(DSO_LDOPTS)
+
 ifdef MAPFILE
 # Add LD options to restrict exported symbols to those in the map file
 endif
diff --git a/devel/nss/patches/patch-ab b/devel/nss/patches/patch-ab
index a8af032..d81143c 100644
--- a/devel/nss/patches/patch-ab
+++ b/devel/nss/patches/patch-ab
@@ -9,5 +9,5 @@ $NetBSD: patch-ab,v 1.3 2006/07/12 16:30:03 rillig Exp $
 -CFLAGS        = $(OPTIMIZER) $(OS_CFLAGS) $(XP_DEFINE) $(DEFINES) $(INCLUDES) 
\
 +CFLAGS       += $(OPTIMIZER) $(OS_CFLAGS) $(XP_DEFINE) $(DEFINES) $(INCLUDES) 
\
                $(XCFLAGS)
+ PERL          = perl
  RANLIB        = echo
- TAR           = /bin/tar
diff --git a/devel/nss/patches/patch-ae b/devel/nss/patches/patch-ae
index 98b0b8b..b395fb4 100644
--- a/devel/nss/patches/patch-ae
+++ b/devel/nss/patches/patch-ae
@@ -2,20 +2,22 @@ $NetBSD: patch-ae,v 1.5 2007/01/20 18:55:09 wiz Exp $
 
 --- mozilla/security/nss/cmd/platlibs.mk.orig  2006-11-17 02:13:16.000000000 
+0000
 +++ mozilla/security/nss/cmd/platlibs.mk
-@@ -213,7 +213,7 @@ endif
- # If GNU ld is used, we must use the -rpath-link option to tell
- # the linker where to find libsoftokn3.so, an implicit dependency
- # of libnss3.so.
--ifeq (,$(filter-out BSD_OS FreeBSD Linux NetBSD, $(OS_ARCH)))
-+ifeq (,$(filter-out BSD_OS FreeBSD Linux NetBSD DragonFly, $(OS_ARCH)))
- EXTRA_SHARED_LIBS += -Wl,-rpath-link,$(DIST)/lib
+@@ -66,6 +66,10 @@
+ endif
  endif
  
-@@ -236,6 +236,7 @@ EXTRA_SHARED_LIBS += \
++ifeq ($(OS_ARCH), DragonFly)
++EXTRA_SHARED_LIBS += -Wl,-rpath-link,$(DIST)/lib
++endif
++
+ ifeq ($(OS_ARCH), HP-UX) 
+ ifeq ($(OS_TEST), ia64)
+ EXTRA_SHARED_LIBS += -Wl,+b,'$$ORIGIN/../lib'
+@@ -247,6 +251,7 @@
        -L$(DIST)/lib \
        -lssl3 \
        -lsmime3 \
 +      -lsoftokn3 \
        -lnss3 \
-       -L$(NSPR_LIB_DIR) \
-       -lplc4 \
+       -L$(NSSUTIL_LIB_DIR) \
+       -lnssutil3 \
diff --git a/devel/nss/patches/patch-ag b/devel/nss/patches/patch-ag
index 9c13cb6..6797ca4 100644
--- a/devel/nss/patches/patch-ag
+++ b/devel/nss/patches/patch-ag
@@ -2,7 +2,7 @@ $NetBSD: patch-ag,v 1.4 2006/11/20 17:06:03 riz Exp $
 
 --- mozilla/security/nss/cmd/shlibsign/sign.sh.orig    2005-11-15 
18:17:36.000000000 -0800
 +++ mozilla/security/nss/cmd/shlibsign/sign.sh 2006-11-20 00:34:34.000000000 
-0800
-@@ -44,9 +44,9 @@
+@@ -26,9 +26,9 @@
      export LIBPATH
      SHLIB_PATH=${1}/lib:${4}:$SHLIB_PATH
      export SHLIB_PATH
diff --git a/devel/nss/patches/patch-ah b/devel/nss/patches/patch-ah
index 3a6e26d..af659e9 100644
--- a/devel/nss/patches/patch-ah
+++ b/devel/nss/patches/patch-ah
@@ -6,8 +6,8 @@ $NetBSD: patch-ah,v 1.3 2007/01/20 18:55:09 wiz Exp $
  #######################################################################
  
  TARGET_OSES = FreeBSD BSD_OS NetBSD OpenUNIX OS2 QNX Darwin BeOS OpenBSD \
--              OpenVMS AIX
-+              OpenVMS AIX DragonFly
+-              AIX RISCOS WINNT WIN95 WINCE
++              AIX DragonFly RISCOS WINNT WIN95 WINCE
  
  ifeq (,$(filter-out $(TARGET_OSES),$(OS_TARGET)))
  include $(CORE_DEPTH)/coreconf/$(OS_TARGET).mk
diff --git a/devel/nss/patches/patch-an b/devel/nss/patches/patch-an
index 1f6484c..f43c809 100644
--- a/devel/nss/patches/patch-an
+++ b/devel/nss/patches/patch-an
@@ -1,32 +1,15 @@
 $NetBSD: patch-an,v 1.3 2007/01/20 18:55:09 wiz Exp $
 
-https://bugzilla.mozilla.org/show_bug.cgi?id=323977
-https://bugzilla.mozilla.org/attachment.cgi?id=209007&action=view
-
 Added DragonFly.
 
-Also, when building on solaris with gcc, be sure to correctly set the
-flags used by the solaris assembler which is explicitly called out in
-the makefile in a couple of places.  This prevents errors when trying to
-assemble files which contain cpu specific instructions.
-
 --- mozilla/security/nss/lib/freebl/Makefile.orig      2006-08-23 
22:57:26.000000000 +0000
 +++ mozilla/security/nss/lib/freebl/Makefile
-@@ -196,6 +196,17 @@ ifeq (,$(filter-out BSD_OS FreeBSD Linux
+@@ -224,7 +224,7 @@
+ # to bind the blapi function references in FREEBLVector vector
+ # (ldvector.c) to the blapi functions defined in the freebl
+ # shared libraries.
+-ifeq (,$(filter-out BSD_OS FreeBSD Linux NetBSD OpenBSD, $(OS_TARGET)))
++ifeq (,$(filter-out BSD_OS FreeBSD Linux NetBSD OpenBSD DragonFly, 
$(OS_TARGET)))
      MKSHLIB += -Wl,-Bsymbolic
  endif
  
-+# The blapi functions are defined not only in the freebl shared
-+# libraries but also in the shared libraries linked with loader.c
-+# (libsoftokn3.so and libssl3.so).  We need to use GNU ld's
-+# -Bsymbolic option or the equivalent option for other linkers
-+# to bind the blapi function references in FREEBLVector vector
-+# (ldvector.c) to the blapi functions defined in the freebl
-+# shared libraries.
-+ifeq (,$(filter-out BSD_OS FreeBSD Linux NetBSD DragonFly, $(OS_TARGET)))
-+    MKSHLIB += -Wl,-Bsymbolic
-+endif
-+
- ifeq ($(OS_TARGET),SunOS)
- 
- # The -R '$ORIGIN' linker option instructs this library to search for its
diff --git a/devel/nss/patches/patch-as b/devel/nss/patches/patch-as
index c75fa75..1d7966a 100644
--- a/devel/nss/patches/patch-as
+++ b/devel/nss/patches/patch-as
@@ -4,41 +4,11 @@ Apply patches from FreeBSD ports
 
 --- mozilla/security/coreconf/FreeBSD.mk.orig  2009-09-27 13:47:48.000000000 
+0200
 +++ mozilla/security/coreconf/FreeBSD.mk       2009-09-27 14:01:51.000000000 
+0200
-@@ -37,13 +37,25 @@
- 
- include $(CORE_DEPTH)/coreconf/UNIX.mk
- 
--DEFAULT_COMPILER      = gcc
--CC                    = gcc
--CCC                   = g++
-+DEFAULT_COMPILER      = $(CC)
-+CC                    ?= gcc
-+CCC                   = $(CXX)
- RANLIB                        = ranlib
- 
- ifeq ($(OS_TEST),alpha)
- CPU_ARCH              = alpha
-+ifeq ($(OS_TEST),powerpc)
-+CPU_ARCH              = powerpc
-+else
-+ifeq ($(OS_TEST),sparc64)
-+CPU_ARCH              = sparc64
-+USE_64                        = 1
-+else
-+ifeq ($(OS_TEST),amd64)
-+USE_64                        = 1
-+endif
-+endif
-+endif
- else
- CPU_ARCH              = x86
- endif
-@@ -65,15 +77,15 @@
+@@ -65,15 +65,14 @@
  
  ARCH                  = freebsd
  
--MOZ_OBJFORMAT         := $(shell test -x /usr/bin/objformat && 
/usr/bin/objformat || echo aout)
-+#MOZ_OBJFORMAT                := $(shell test -x /usr/bin/objformat && 
/usr/bin/objformat || echo aout)
+-MOZ_OBJFORMAT         := $(shell test -x /usr/bin/objformat && 
/usr/bin/objformat || echo elf)
 +DLL_SUFFIX            = so.1
  
 -ifeq ($(MOZ_OBJFORMAT),elf)
@@ -54,9 +24,3 @@ Apply patches from FreeBSD ports
  ifdef MAPFILE
        MKSHLIB += -Wl,--version-script,$(MAPFILE)
  endif
-@@ -83,3 +95,5 @@
- G++INCLUDES           = -I/usr/include/g++
- 
- INCLUDES              += -I/usr/X11R6/include
-+USE_SYSTEM_ZLIB               = 1
-+ZLIB_LIBS             = -lz
-- 
1.6.4

From 4a79e0427b73ca341476e642663e7606f084ff4a Mon Sep 17 00:00:00 2001
From: Rumko <rumcic%gmail.com@localhost>
Date: Fri, 6 Nov 2009 01:27:20 +0100
Subject: [PATCH 3/3] Change minimum required version.

---
 devel/nspr/buildlink3.mk |    7 +------
 devel/nss/buildlink3.mk  |    3 +--
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/devel/nspr/buildlink3.mk b/devel/nspr/buildlink3.mk
index 7f04497..13da81c 100644
--- a/devel/nspr/buildlink3.mk
+++ b/devel/nspr/buildlink3.mk
@@ -7,12 +7,7 @@ NSPR_BUILDLINK3_MK:=
 
 .  include "../../mk/bsd.fast.prefs.mk"
 
-BUILDLINK_API_DEPENDS.nspr+=   nspr>=4.4.1nb1
-.  if ${OPSYS} == "Darwin"
-BUILDLINK_API_DEPENDS.nspr+=   nspr>=4.6.1nb3
-.  else
-BUILDLINK_API_DEPENDS.nspr+=   nspr>=4.6.1nb1
-.  endif
+BUILDLINK_API_DEPENDS.nspr+=   nspr>=4.8.2
 
 BUILDLINK_PKGSRCDIR.nspr?=     ../../devel/nspr
 BUILDLINK_FILES.nspr+=          lib/nspr/*
diff --git a/devel/nss/buildlink3.mk b/devel/nss/buildlink3.mk
index 3b8b52c..310887b 100644
--- a/devel/nss/buildlink3.mk
+++ b/devel/nss/buildlink3.mk
@@ -5,8 +5,7 @@ BUILDLINK_TREE+=        nss
 .if !defined(NSS_BUILDLINK3_MK)
 NSS_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.nss+=            nss>=3.9.2nb1
-BUILDLINK_ABI_DEPENDS.nss+=    nss>=3.9.2nb4
+BUILDLINK_API_DEPENDS.nss+=    nss>=3.12.4
 BUILDLINK_PKGSRCDIR.nss?=      ../../devel/nss
 
 BUILDLINK_FILES.nss+=          lib/nss/*
-- 
1.6.4
Home | Main Index | Thread Index | Old Index