Update to 1.1, which no longer has the "huge fonts" security bug.

6 files changed, 30 insertions, 38 deletions

diff --git a/www/linux-mozilla-devel/Makefile b/www/linux-mozilla-devel/Makefile
index e8c183e6166c..8baf53be53a6 100644
--- a/www/linux-mozilla-devel/Makefile
+++ b/www/linux-mozilla-devel/Makefile
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	mozilla
-PORTVERSION=	1.0
-PORTREVISION=	1
+PORTVERSION=	1.1
 CATEGORIES=	www linux
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
 MASTER_SITE_SUBDIR=	mozilla/releases/mozilla${PORTVERSION}/linux-xpi
@@ -22,7 +21,6 @@ PATCHFILES=	linux-mozilla-${PORTVERSION}-generated-files.tar.gz
 
 MAINTAINER=	trevor@FreeBSD.org
 
-FORBIDDEN=	"see http://bugzilla.mozilla.org/show_bug.cgi?id=150339 "
 BUILD_DEPENDS=	unzip:${PORTSDIR}/archivers/unzip
 RUN_DEPENDS=	${LINUXBASE}/usr/lib/libgtk-1.2.so.0.5.0:${PORTSDIR}/x11-toolkits/linux-gtk
 
diff --git a/www/linux-mozilla-devel/distinfo b/www/linux-mozilla-devel/distinfo
index 3f4b301c9aaa..ed8e258a7c1e 100644
--- a/www/linux-mozilla-devel/distinfo
+++ b/www/linux-mozilla-devel/distinfo
@@ -1,13 +1,11 @@
-MD5 (linux-mozilla/1.0/browser.xpi) = f773828f035affb022c8989045c690d0
-MD5 (linux-mozilla/1.0/chatzilla.xpi) = a6be6ff71051f94d988ab5b3af8724cc
-MD5 (linux-mozilla/1.0/deflenus.xpi) = 13cd011c36b2b2ff8ec5f5c6b612d106
-MD5 (linux-mozilla/1.0/inspector.xpi) = e5647eca938a877055917ba908392167
-MD5 (linux-mozilla/1.0/langenus.xpi) = 6b28aa34476527ac4c44aa946f38f3fd
-MD5 (linux-mozilla/1.0/linux-mozilla-1.0-generated-files.tar.gz) = 35557f81dd7908e737a810c6f5e3aeef
-MD5 (linux-mozilla/1.0/mail.xpi) = f2c1094e218fee49583726789ab96510
-MD5 (linux-mozilla/1.0/psm.xpi) = 66fed4679661d0c0c640d1dbafa36af7
-MD5 (linux-mozilla/1.0/regus.xpi) = 1c2e0712d07130d88d7253015934a8ce
-MD5 (linux-mozilla/1.0/talkback.xpi) = f99bb9daf49c9e919cde5d54fdcfe059
-MD5 (linux-mozilla/1.0/venkman.xpi) = 94d39361968acbb2f745eddd97263feb
-MD5 (linux-mozilla/1.0/xpcom.xpi) = b85671bdd3fe50b5806a8a11a696ed08
-MD5 (linux-mozilla/1.0/bogus.xpi) = IGNORE
+MD5 (linux-mozilla/1.1/browser.xpi) = 3c94f66af6635f8e1ff1e7b2f802b3ef
+MD5 (linux-mozilla/1.1/deflenus.xpi) = 51c13ec053bbe98ff174aa334b7219cc
+MD5 (linux-mozilla/1.1/inspector.xpi) = d9bbcc6f74b77fcac42db60eee66b295
+MD5 (linux-mozilla/1.1/langenus.xpi) = 433fd09a74f6016a6572cdef35b0a672
+MD5 (linux-mozilla/1.1/linux-mozilla-1.1-generated-files.tar.gz) = 2e58c844fade92b8a2e1b8a87e5e3e9a
+MD5 (linux-mozilla/1.1/mail.xpi) = dad5e353248464a2c150d2bd455a2c09
+MD5 (linux-mozilla/1.1/psm.xpi) = 987f3ea446b925d56c406ecbb42dc367
+MD5 (linux-mozilla/1.1/regus.xpi) = e39f3c56e6cd9eab775e7f65bbb3d987
+MD5 (linux-mozilla/1.1/talkback.xpi) = 25776824c4adc5f69b8dbd147d518a9c
+MD5 (linux-mozilla/1.1/venkman.xpi) = a90987a8ce5566732f821480c9fa4998
+MD5 (linux-mozilla/1.1/xpcom.xpi) = 98b386826f3ca1ff1f3ad277c9c2a8ab
diff --git a/www/linux-mozilla-devel/scripts/configure b/www/linux-mozilla-devel/scripts/configure
index ebcde4af95b5..5c504565ab9d 100644
--- a/www/linux-mozilla-devel/scripts/configure
+++ b/www/linux-mozilla-devel/scripts/configure
@@ -17,10 +17,10 @@ Choose which components of Mozilla to download and install. \n\
 Press the space bar to toggle selections." -1 -1 7 \
 "deflenus"	"American English profile defaults (8 kB)"		ON \
 "inspector"	"DOM inspector (240 kB)"				ON \
-"mail"		"Mozilla Mail and News (1856 kB)"			ON \
-"psm"		"Personal Security Manager--recommended (784 kB)"	ON \
+"mail"		"Mozilla Mail and News (1824 kB)"			ON \
+"psm"		"Personal Security Manager--recommended (768 kB)"	ON \
 "talkback"	"sends crash logs to Mozilla staff (832 kB)"		ON \
-"venkman"	"JavaScript debugger (150 kB)"				ON \
+"venkman"	"JavaScript debugger (256 kB)"				ON \
 2>> /tmp/checklist.tmp.$$
 
 retval=$?
diff --git a/www/linux-mozilla/Makefile b/www/linux-mozilla/Makefile
index e8c183e6166c..8baf53be53a6 100644
--- a/www/linux-mozilla/Makefile
+++ b/www/linux-mozilla/Makefile
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	mozilla
-PORTVERSION=	1.0
-PORTREVISION=	1
+PORTVERSION=	1.1
 CATEGORIES=	www linux
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
 MASTER_SITE_SUBDIR=	mozilla/releases/mozilla${PORTVERSION}/linux-xpi
@@ -22,7 +21,6 @@ PATCHFILES=	linux-mozilla-${PORTVERSION}-generated-files.tar.gz
 
 MAINTAINER=	trevor@FreeBSD.org
 
-FORBIDDEN=	"see http://bugzilla.mozilla.org/show_bug.cgi?id=150339 "
 BUILD_DEPENDS=	unzip:${PORTSDIR}/archivers/unzip
 RUN_DEPENDS=	${LINUXBASE}/usr/lib/libgtk-1.2.so.0.5.0:${PORTSDIR}/x11-toolkits/linux-gtk
 
diff --git a/www/linux-mozilla/distinfo b/www/linux-mozilla/distinfo
index 3f4b301c9aaa..ed8e258a7c1e 100644
--- a/www/linux-mozilla/distinfo
+++ b/www/linux-mozilla/distinfo
@@ -1,13 +1,11 @@
-MD5 (linux-mozilla/1.0/browser.xpi) = f773828f035affb022c8989045c690d0
-MD5 (linux-mozilla/1.0/chatzilla.xpi) = a6be6ff71051f94d988ab5b3af8724cc
-MD5 (linux-mozilla/1.0/deflenus.xpi) = 13cd011c36b2b2ff8ec5f5c6b612d106
-MD5 (linux-mozilla/1.0/inspector.xpi) = e5647eca938a877055917ba908392167
-MD5 (linux-mozilla/1.0/langenus.xpi) = 6b28aa34476527ac4c44aa946f38f3fd
-MD5 (linux-mozilla/1.0/linux-mozilla-1.0-generated-files.tar.gz) = 35557f81dd7908e737a810c6f5e3aeef
-MD5 (linux-mozilla/1.0/mail.xpi) = f2c1094e218fee49583726789ab96510
-MD5 (linux-mozilla/1.0/psm.xpi) = 66fed4679661d0c0c640d1dbafa36af7
-MD5 (linux-mozilla/1.0/regus.xpi) = 1c2e0712d07130d88d7253015934a8ce
-MD5 (linux-mozilla/1.0/talkback.xpi) = f99bb9daf49c9e919cde5d54fdcfe059
-MD5 (linux-mozilla/1.0/venkman.xpi) = 94d39361968acbb2f745eddd97263feb
-MD5 (linux-mozilla/1.0/xpcom.xpi) = b85671bdd3fe50b5806a8a11a696ed08
-MD5 (linux-mozilla/1.0/bogus.xpi) = IGNORE
+MD5 (linux-mozilla/1.1/browser.xpi) = 3c94f66af6635f8e1ff1e7b2f802b3ef
+MD5 (linux-mozilla/1.1/deflenus.xpi) = 51c13ec053bbe98ff174aa334b7219cc
+MD5 (linux-mozilla/1.1/inspector.xpi) = d9bbcc6f74b77fcac42db60eee66b295
+MD5 (linux-mozilla/1.1/langenus.xpi) = 433fd09a74f6016a6572cdef35b0a672
+MD5 (linux-mozilla/1.1/linux-mozilla-1.1-generated-files.tar.gz) = 2e58c844fade92b8a2e1b8a87e5e3e9a
+MD5 (linux-mozilla/1.1/mail.xpi) = dad5e353248464a2c150d2bd455a2c09
+MD5 (linux-mozilla/1.1/psm.xpi) = 987f3ea446b925d56c406ecbb42dc367
+MD5 (linux-mozilla/1.1/regus.xpi) = e39f3c56e6cd9eab775e7f65bbb3d987
+MD5 (linux-mozilla/1.1/talkback.xpi) = 25776824c4adc5f69b8dbd147d518a9c
+MD5 (linux-mozilla/1.1/venkman.xpi) = a90987a8ce5566732f821480c9fa4998
+MD5 (linux-mozilla/1.1/xpcom.xpi) = 98b386826f3ca1ff1f3ad277c9c2a8ab
diff --git a/www/linux-mozilla/scripts/configure b/www/linux-mozilla/scripts/configure
index ebcde4af95b5..5c504565ab9d 100644
--- a/www/linux-mozilla/scripts/configure
+++ b/www/linux-mozilla/scripts/configure
@@ -17,10 +17,10 @@ Choose which components of Mozilla to download and install. \n\
 Press the space bar to toggle selections." -1 -1 7 \
 "deflenus"	"American English profile defaults (8 kB)"		ON \
 "inspector"	"DOM inspector (240 kB)"				ON \
-"mail"		"Mozilla Mail and News (1856 kB)"			ON \
-"psm"		"Personal Security Manager--recommended (784 kB)"	ON \
+"mail"		"Mozilla Mail and News (1824 kB)"			ON \
+"psm"		"Personal Security Manager--recommended (768 kB)"	ON \
 "talkback"	"sends crash logs to Mozilla staff (832 kB)"		ON \
-"venkman"	"JavaScript debugger (150 kB)"				ON \
+"venkman"	"JavaScript debugger (256 kB)"				ON \
 2>> /tmp/checklist.tmp.$$
 
 retval=$?