aboutsummaryrefslogtreecommitdiff
path: root/www
diff options
context:
space:
mode:
authorFlorian Smeets <flo@FreeBSD.org>2011-08-31 21:26:12 +0000
committerFlorian Smeets <flo@FreeBSD.org>2011-08-31 21:26:12 +0000
commit565d4b33946741717292e61077dc0235afb6f1bd (patch)
tree2a414cf7a0fc3b2c00214edc0e32af3a1f66aa2c /www
parent01ac6099de50764fc0d47f52ec3e8d39aa68b308 (diff)
downloadports-565d4b33946741717292e61077dc0235afb6f1bd.tar.gz
ports-565d4b33946741717292e61077dc0235afb6f1bd.zip
- update to 6.0.1, which disables the DigiNotar certificate authority
- fixup a patch which was messed up in a previuos commit [1] Submitted by: aakuusta@gmail.com [1]
Notes
Notes: svn path=/head/; revision=280900
Diffstat (limited to 'www')
-rw-r--r--www/firefox-esr/Makefile3
-rw-r--r--www/firefox-esr/distinfo4
-rw-r--r--www/firefox-esr/files/patch-js-src-Makefile.in20
-rw-r--r--www/firefox/Makefile3
-rw-r--r--www/firefox/distinfo4
-rw-r--r--www/firefox/files/patch-js-src-Makefile.in20
6 files changed, 24 insertions, 30 deletions
diff --git a/www/firefox-esr/Makefile b/www/firefox-esr/Makefile
index ccd5f4b229d2..9cfbeb8bdda0 100644
--- a/www/firefox-esr/Makefile
+++ b/www/firefox-esr/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= firefox
-DISTVERSION= 6.0
-PORTREVISION= 1
+DISTVERSION= 6.0.1
PORTEPOCH= 1
CATEGORIES= www ipv6
MASTER_SITES= ${MASTER_SITE_MOZILLA}
diff --git a/www/firefox-esr/distinfo b/www/firefox-esr/distinfo
index 5d9937368802..26bf9e98d628 100644
--- a/www/firefox-esr/distinfo
+++ b/www/firefox-esr/distinfo
@@ -1,2 +1,2 @@
-SHA256 (firefox-6.0.source.tar.bz2) = cc3fb554ca02358e000502a1023d5ba01e6d18ae30c719f5a3b1ce1ad8334973
-SIZE (firefox-6.0.source.tar.bz2) = 67919174
+SHA256 (firefox-6.0.1.source.tar.bz2) = 71accf14b18ab27613459fde93e280d6a279028f14a903b652b19ab5b6a2f322
+SIZE (firefox-6.0.1.source.tar.bz2) = 67876291
diff --git a/www/firefox-esr/files/patch-js-src-Makefile.in b/www/firefox-esr/files/patch-js-src-Makefile.in
index 2aa090fc3b57..75b37bf70bfe 100644
--- a/www/firefox-esr/files/patch-js-src-Makefile.in
+++ b/www/firefox-esr/files/patch-js-src-Makefile.in
@@ -28,14 +28,12 @@
INCLUDES += -I$(srcdir)
-
--@@ -793,7 +796,8 @@
-+@@ -793,7 +796,7 @@
- endif # WINNT
-
- ifeq ($(OS_ARCH),FreeBSD)
- -EXTRA_LIBS += -pthread
--+DEFINES += -DFREEBSD
- +EXTRA_LIBS += -pthread -lc
- endif
- ifeq ($(OS_ARCH),IRIX)
+@@ -793,7 +796,7 @@
+ endif # WINNT
+
+ ifeq ($(OS_ARCH),FreeBSD)
+-EXTRA_LIBS += -pthread
++EXTRA_LIBS += -pthread -lc
+ endif
+ ifeq ($(OS_ARCH),IRIX)
+ ifdef USE_N32
diff --git a/www/firefox/Makefile b/www/firefox/Makefile
index ccd5f4b229d2..9cfbeb8bdda0 100644
--- a/www/firefox/Makefile
+++ b/www/firefox/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= firefox
-DISTVERSION= 6.0
-PORTREVISION= 1
+DISTVERSION= 6.0.1
PORTEPOCH= 1
CATEGORIES= www ipv6
MASTER_SITES= ${MASTER_SITE_MOZILLA}
diff --git a/www/firefox/distinfo b/www/firefox/distinfo
index 5d9937368802..26bf9e98d628 100644
--- a/www/firefox/distinfo
+++ b/www/firefox/distinfo
@@ -1,2 +1,2 @@
-SHA256 (firefox-6.0.source.tar.bz2) = cc3fb554ca02358e000502a1023d5ba01e6d18ae30c719f5a3b1ce1ad8334973
-SIZE (firefox-6.0.source.tar.bz2) = 67919174
+SHA256 (firefox-6.0.1.source.tar.bz2) = 71accf14b18ab27613459fde93e280d6a279028f14a903b652b19ab5b6a2f322
+SIZE (firefox-6.0.1.source.tar.bz2) = 67876291
diff --git a/www/firefox/files/patch-js-src-Makefile.in b/www/firefox/files/patch-js-src-Makefile.in
index 2aa090fc3b57..75b37bf70bfe 100644
--- a/www/firefox/files/patch-js-src-Makefile.in
+++ b/www/firefox/files/patch-js-src-Makefile.in
@@ -28,14 +28,12 @@
INCLUDES += -I$(srcdir)
-
--@@ -793,7 +796,8 @@
-+@@ -793,7 +796,7 @@
- endif # WINNT
-
- ifeq ($(OS_ARCH),FreeBSD)
- -EXTRA_LIBS += -pthread
--+DEFINES += -DFREEBSD
- +EXTRA_LIBS += -pthread -lc
- endif
- ifeq ($(OS_ARCH),IRIX)
+@@ -793,7 +796,7 @@
+ endif # WINNT
+
+ ifeq ($(OS_ARCH),FreeBSD)
+-EXTRA_LIBS += -pthread
++EXTRA_LIBS += -pthread -lc
+ endif
+ ifeq ($(OS_ARCH),IRIX)
+ ifdef USE_N32