security fix: update Netscape 7 to 7.0 (Netscape 6.2.3 ports remain

forbidden)

6 files changed, 36 insertions, 36 deletions

diff --git a/www/linux-netscape6/Makefile b/www/linux-netscape6/Makefile
index 24b2025a975f..6903ef24f040 100644
--- a/www/linux-netscape6/Makefile
+++ b/www/linux-netscape6/Makefile
@@ -49,7 +49,7 @@ ftp://ftp.informatik.rwth-aachen.de/pub/mirror/ftp.netscape.com/pub/${FTPDIR}/ \
 ftp://ftp.cyf-kr.edu.pl/pub/mirror/netscape/${FTPDIR}/ \
 ftp://ftp.rz.uni-karlsruhe.de/pub/mirror/ftp.netscape.com/pub/${FTPDIR}/
 DIST_SUBDIR=	${MAJ}/${NETSCAPE6_LANG}/${VER}
-FTPDIR=		${DIST_SUBDIR}/unix/linux22/xpi
+FTPDIR?=		${DIST_SUBDIR}/unix/linux22/xpi
 
 PATCH_SITES=	${MASTER_SITE_LOCAL}
 PATCH_SITE_SUBDIR=	trevor
@@ -57,10 +57,9 @@ PATCHFILES=	linux-${MAJ}-${VER}-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.9.0:${PORTSDIR}/x11-toolkits/linux-gtk \
+RUN_DEPENDS=	${LINUXBASE}/usr/lib/libgtk-1.2.so.0:${PORTSDIR}/x11-toolkits/linux-gtk \
 		${LINUXBASE}/usr/lib/libjpeg.so.62.0.0:${PORTSDIR}/graphics/linux-jpeg
 
 LATEST_LINK=	linux-${MAJ}
@@ -85,6 +84,10 @@ IS_INTERACTIVE=	yes
 
 .include <bsd.port.pre.mk>
 
+.if !defined(UNFORBIDDEN)
+FORBIDDEN=	"see <URL:ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SN-02:05.asc>"
+.endif
+
 pre-everything::
 	${MKDIR} ${WRKSRC}/bin/plugins ${WRKSRC}/bin/chrome \
 		${WRKSRC}/plugins
diff --git a/www/netscape7/Makefile b/www/netscape7/Makefile
index f8a7374c1988..19aa36320cab 100644
--- a/www/netscape7/Makefile
+++ b/www/netscape7/Makefile
@@ -6,7 +6,7 @@
 # $FreeBSD$
 #
 
-PORTVERSION=	0.7.1
+PORTVERSION=	7.0
 CATEGORIES=	www linux
 DISTFILES?=	browser.xpi \
 		deflenus.xpi \
@@ -22,7 +22,9 @@ DISTFILES?=	browser.xpi \
 		xpcom.xpi
 
 FILESDIR=	${PORTSDIR}/www/linux-netscape6/files
-MAJ?=	netscape7
-VER=	7.0_PR1
+FTPDIR=		${DIST_SUBDIR}/unix/linux22/ewc9e
+MAJ?=		netscape7
+UNFORBIDDEN=	GOGOGO
+VER=		7.0
 
 .include "../linux-netscape6/Makefile"
diff --git a/www/netscape7/distinfo b/www/netscape7/distinfo
index c45c06a2c52f..2324f2c06f0f 100644
--- a/www/netscape7/distinfo
+++ b/www/netscape7/distinfo
@@ -1,13 +1,13 @@
-MD5 (netscape7/english/7.0_PR1/browser.xpi) = 7106df33614f097cb5597704a15d583c
-MD5 (netscape7/english/7.0_PR1/deflenus.xpi) = 44208fbc1c42fcc02c77e91d3b90398c
-MD5 (netscape7/english/7.0_PR1/flash.xpi) = 1fb00ab686f687f31534882d36f42ec5
-MD5 (netscape7/english/7.0_PR1/jre.xpi) = 2fa7716971c9402e8d3c1632b5b16213
-MD5 (netscape7/english/7.0_PR1/langenus.xpi) = fb05802dec3759da0e3a27fbd47e0eab
-MD5 (netscape7/english/7.0_PR1/linux-netscape7-7.0_PR1-generated-files.tar.gz) = 4d3b4b0ab36b1a69d8c5936976f2b642
-MD5 (netscape7/english/7.0_PR1/mail.xpi) = a0c21af9fab6c7b4e73e9f6fbe93d824
-MD5 (netscape7/english/7.0_PR1/psm.xpi) = e6b50b6add52735b7c3f3f51abe8d866
-MD5 (netscape7/english/7.0_PR1/regca.xpi) = c63020e2ee9cd10596dce26b14fe524f
-MD5 (netscape7/english/7.0_PR1/regus.xpi) = f4a6ef9cf47a65f16973d614758fe965
-MD5 (netscape7/english/7.0_PR1/spellchecker.xpi) = 343c65d657f7b500aaa65f9efff9eaa3
-MD5 (netscape7/english/7.0_PR1/talkback.xpi) = 54b6d716b2da783d301ce983409518e6
-MD5 (netscape7/english/7.0_PR1/xpcom.xpi) = 584a4a690001e57166261289bf1a1bff
+MD5 (netscape7/english/7.0/browser.xpi) = 0ac852189fcce97f998d35e5b8aa9cf9
+MD5 (netscape7/english/7.0/deflenus.xpi) = 39587d9c433e54a11732597616c17635
+MD5 (netscape7/english/7.0/flash.xpi) = 6e8547d6654430f268bdc61a8c251a33
+MD5 (netscape7/english/7.0/jre.xpi) = bfb912644a0dfe310350c872f0f5fc23
+MD5 (netscape7/english/7.0/langenus.xpi) = ac84af8724063a2f20dbaa18b70da5cc
+MD5 (netscape7/english/7.0/linux-netscape7-7.0-generated-files.tar.gz) = e887f87d715bce3f35d30608e8c6fd05
+MD5 (netscape7/english/7.0/mail.xpi) = fed69cd5bc6db67f6936f369522a40e9
+MD5 (netscape7/english/7.0/psm.xpi) = 017e4a1146032bb5c1c5559335e662d4
+MD5 (netscape7/english/7.0/regca.xpi) = fe67e56f693c9f811bcd8c763ae8f96c
+MD5 (netscape7/english/7.0/regus.xpi) = e394702833ddbae069a6486a867fbac8
+MD5 (netscape7/english/7.0/spellchecker.xpi) = 53028acfb5cde7b4de7cd8f83f4f1869
+MD5 (netscape7/english/7.0/talkback.xpi) = 511447c63e3f488d062ce81641aeaf4d
+MD5 (netscape7/english/7.0/xpcom.xpi) = a902c7cbe282968516ade1234ccf82fa
diff --git a/www/netscape7/pkg-descr b/www/netscape7/pkg-descr
index 9471bfc511cf..df073d8f9ab7 100644
--- a/www/netscape7/pkg-descr
+++ b/www/netscape7/pkg-descr
@@ -6,15 +6,10 @@ and Macromedia Flash plugins are included.  AOL Instant Messenger
 is omitted (see ports/net/aim).  The Canadian and United States
 region packs, spell-checker, and talkback are available.
 
-The Java plugin does not work.
+The Java plugin requires linux_base-6.  It does not work with
+linux_base 7.1.
 
-This port installs a preview release of the Netscape browser.
-Historically, such versions have contained a "time bomb" which will
-cause the program to stop working after a predetermined date, usually
-a few months after Netscape first offers the program.  If this is
-unsuitable for you, use a regular release instead.
-
-WWW:  http://channels.netscape.com/ns/browsers/7/default.jsp
+WWW:  http://channels.netscape.com/ns/browsers/default.jsp/
 
 Trevor Johnson
 trevor@FreeBSD.org
diff --git a/www/netscape7/pkg-message b/www/netscape7/pkg-message
index dea10513094c..ed4150c4d9c1 100644
--- a/www/netscape7/pkg-message
+++ b/www/netscape7/pkg-message
@@ -1,4 +1,4 @@
-* WARNING ************************************
-* This is a beta version of Netscape.        *
-* Users should back up their bookmark files. *
-**********************************************
+* WARNING *****************************
+* Users should back up their bookmark *
+* files before running Netscape.      *
+***************************************
diff --git a/www/netscape7/scripts/configure b/www/netscape7/scripts/configure
index e2ddf470df91..f4d35354e453 100644
--- a/www/netscape7/scripts/configure
+++ b/www/netscape7/scripts/configure
@@ -14,16 +14,16 @@ if [ -z "${BATCH}" ]; then
 
 /usr/bin/dialog --title "Netscape 7 component selection" --clear \
 	--checklist "\n\
-Choose components of Netscape 7 to download and install. \n\
+Choose components of Netscape 7 to install. \n\
 Press the space bar to toggle selections." -1 -1 12 \
-"browser"	"Web browser (8208 kB)"				ON \
+"browser"	"Web browser (8448 kB)"				ON \
 "deflenus"	"American English profile defaults (26 kB)"	ON \
 "flash"		"Flash plugin (576 kB)"				ON \
-"jre"		"Java plugin (28592 kB) DOES NOT WORK"		OFF \
+"jre"		"Java plugin (28592 kB) needs linux_base-6"	OFF \
 "langenus"	"American English language pack (800 kB)"	ON \
-"mail"		"e-mail and news (2176 kB)"			ON \
+"mail"		"e-mail and news (2064 kB)"			ON \
 "regca"		"regional settings for Canada (58 kB)"		ON \
-"regus"		"regional settings for the USA (58 kB)"		ON \
+"regus"		"regional settings for the USA (60 kB)"		ON \
 "spellchecker"	"spell-checker (544 kB)"			ON \
 "talkback"	"sends bug reports to Netscape staff (832 kB)"	ON \
 2> /tmp/checklist.tmp.$$