- update thunderbird, firefox-esr, linux-thunderbird and linux-firefox to

  17.0.5
- update firefox to 20.0
- update seamonkey and linux-seamonkey to 2.17
- update nspr to 4.9.6
- remove mail/thunderbird-esr, Mozilla stopped providing 2 versions of
  thunderbird
- prune support for old FreeBSD versions; users of 8.2, 7.4 or earlier
  are advised to upgrade - http://www.freebsd.org/security/
- add vuln.xml entry

Security:	94976433-9c74-11e2-a9fc-d43d7e0c7c02
Approved by:	portmgr (miwi)
In collaboration with:	Jan Beich <jbeich@tormail.org>

4 files changed, 9 insertions, 25 deletions

diff --git a/devel/nspr/Makefile b/devel/nspr/Makefile
index 66de14202aac..5b8b4bccc4c2 100644
--- a/devel/nspr/Makefile
+++ b/devel/nspr/Makefile
@@ -6,7 +6,7 @@
 #    $MCom: ports-experimental/devel/nspr/Makefile,v 1.6 2008/03/12 13:06:56 ahze Exp $
 
 PORTNAME=	nspr
-DISTVERSION=	4.9.5
+DISTVERSION=	4.9.6
 CATEGORIES=	devel
 MASTER_SITES=	MOZILLA
 MASTER_SITE_SUBDIR=	nspr/releases/v${PORTVERSION}/src
@@ -21,9 +21,7 @@ USE_GMAKE=	yes
 MAKE_JOBS_SAFE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_SCRIPT=../configure
-CONFIGURE_ARGS=	--srcdir=${WRKSRC:H} \
-		--with-pthreads
-CONFIGURE_ENV=	BSD_PTHREAD_LIBS=${PTHREAD_LIBS}
+CONFIGURE_ARGS=	--srcdir=${WRKSRC:H}
 
 MAKE_ENV=	DIST=${WRKSRC}/dist
 
@@ -39,9 +37,6 @@ BROKEN=		Does not compile on arm
 CONFIGURE_ARGS+=--disable-debug
 .endif
 
-post-patch:
-	@${REINPLACE_CMD} -e 's,-lpthread,${PTHREAD_LIBS},g ; s,echo aout,echo elf,g' ${WRKSRC}/${CONFIGURE_SCRIPT}
-
 do-install:
 	${MKDIR} ${PREFIX}/include/nspr
 	${TAR} -C ${WRKSRC}/dist/include --dereference -cf - . | \
@@ -64,7 +59,7 @@ do-install:
 .endfor
 
 prtests:
-	${SETENV} PTHREAD_LIBS="${PTHREAD_LIBS}" ${GMAKE} -C ${WRKSRC}/pr/tests
+	${GMAKE} -C ${WRKSRC}/pr/tests
 	${LN} -sf libmy.so.1 ${WRKSRC}/pr/tests/dll/libmy.so
 	cd ${WRKSRC}/pr/tests && ../../../pr/tests/runtests.sh
 
diff --git a/devel/nspr/distinfo b/devel/nspr/distinfo
index 44cd26314e2e..cbf8c014c8dc 100644
--- a/devel/nspr/distinfo
+++ b/devel/nspr/distinfo
@@ -1,2 +1,2 @@
-SHA256 (nspr-4.9.5.tar.gz) = 616ab65c849155c9ed0e5f502530a241cc9108e278275aa448b417ae632c7604
-SIZE (nspr-4.9.5.tar.gz) = 1156396
+SHA256 (nspr-4.9.6.tar.gz) = 7693fddd3c5cc15d53a50df53ab5dcdaa2eb58f5003302690559471744d6c6f9
+SIZE (nspr-4.9.6.tar.gz) = 1163033
diff --git a/devel/nspr/files/patch-..::configure b/devel/nspr/files/patch-..::configure
index 8d5d0ffebde9..1de6f0641c1a 100644
--- a/devel/nspr/files/patch-..::configure
+++ b/devel/nspr/files/patch-..::configure
@@ -14,15 +14,15 @@
      fi
      MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
      DSO_CFLAGS=-fPIC
-@@ -6271,11 +6271,6 @@
+@@ -6271,11 +6271,9 @@
  #define _THREAD_SAFE 1
  EOF
  
--	    	    if test "$ac_cv_have_dash_pthread" = "yes"; then
--	        _PTHREAD_LDFLAGS="-pthread"
+ 	    	    if test "$ac_cv_have_dash_pthread" = "yes"; then
+ 	        _PTHREAD_LDFLAGS="-pthread"
 -	    else
 -	        _PTHREAD_LDFLAGS="-lc_r"
--	    fi
+ 	    fi
  	    ;;
      *-netbsd*)
  	    if test "$ac_cv_have_dash_pthread" = "yes"; then
diff --git a/devel/nspr/files/patch-.._pr_tests_Makefile b/devel/nspr/files/patch-.._pr_tests_Makefile
deleted file mode 100644
index af796164c9ea..000000000000
--- a/devel/nspr/files/patch-.._pr_tests_Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../../nsprpub/pr/tests/Makefile.in.orig	Mon Apr 26 00:01:02 2004
-+++ ../../nsprpub/pr/tests/Makefile.in	Tue Nov 28 11:08:14 2006
-@@ -418,7 +418,7 @@
- 
- ifeq ($(OS_ARCH),FreeBSD)
- ifeq ($(USE_PTHREADS),1)
--LDOPTS += -pthread
-+LDOPTS += ${PTHREAD_LIBS}
- endif
- LDOPTS += -Xlinker -R $(ABSOLUTE_LIB_DIR)
- endif