Update to 6.01. Install from .xpi (zip archive) distfiles. Don't

download or try to set up the JRE.

Since linux.ko may not be loaded (reported by Brian Dean,
<bsd@bsdhome.com>), try to load it.

Change master sites to ones with the .xpi files (obtained from FAST
FTP Search).

6 files changed, 154 insertions, 66 deletions

diff --git a/www/linux-netscape6/Makefile b/www/linux-netscape6/Makefile
index 3958568..e0671b4 100644
--- a/www/linux-netscape6/Makefile
+++ b/www/linux-netscape6/Makefile
@@ -6,24 +6,66 @@
 #
 
 PORTNAME=	linux-netscape
-PORTVERSION=	6.0
+PORTVERSION=	6.01
 CATEGORIES=	www linux
-MASTER_SITES=	ftp://ftp.netscape.com/pub/netscape6/english/${PORTVERSION}/unix/linux22/sea/ \
-		ftp://ftp.cadvision.com/pub/linuxberg/files/ \
-		ftp://ftp.proxad.net/mirrors/ftp.linuxberg.com/files/ \
-		ftp://ftp.datacomm.ch/.3/linuxberg/files/ \
-		ftp://ftp.inter-i.uni-mainz.de/pub/Software/windows9x/Netz/Browser/Netscape_Communicator_6_linux22_english/ \
-		ftp://ftp.ptb.de/pub/WWW/Netscape/unix/ \
-		ftp://ftp.darenet.dk/mirrors/mirror.linuxberg.com/files/ \
-		ftp://ftp.info.univ-angers.fr/pub/linux/netscape6-english/ \
-		ftp://ftp.chemo.tuniv.szczecin.pl/dsk4/www.linuxberg.com/files/ \
-		ftp://ftp.uakom.sk/pub/linuxberg/files/ \
-		ftp://ftp.dei.uc.pt/.disk2/linuxberg/files/ \
-		ftp://ftp.is.co.za/packages/linuxberg/files/ \
-		ftp://ftp.matrix.com.br/pub/linuxberg/files/ \
-		ftp://ftp.duth.gr/pub/linuxberg/files/ \
-		ftp://ftp.rndavia.ru/pub/linux/
-DISTNAME=	netscape-i686-pc-linux-gnu-sea
+MASTER_SITES=	ftp://ftp.netscape.com/pub/netscape6/english/${PORTVERSION}/unix/linux22/xpi/ \
+		ftp://ftp.bu.edu/pub/mirrors/ftp.netscape.com/pub/netscape6/english/${PORTVERSION}/unix/linux22/xpi/ \
+		ftp://ftp.the.net/dev/local1/ftp.netscape.com/pub/netscape6/english/${PORTVERSION}/unix/linux22/xpi/ \
+		ftp://ftp.cica.es/pub6/netscape/netscape6/english/${PORTVERSION}/unix/linux22/xpi/ \
+		ftp://ftp.ciril.fr/pub2/netscape/netscape6/english/${PORTVERSION}/unix/linux22/xpi/ \
+		ftp://ftp.cs.tu-berlin.de/pub/net/www/netscape/netscape6/english/${PORTVERSION}/unix/linux22/xpi/ \
+		ftp://ftp.cuhk.edu.hk/.3/netscape/netscape6/english/${PORTVERSION}/unix/linux22/xpi/ \
+		ftp://ftp.darenet.dk/mirrors/ftp2.netscape.com/pub/netscape6/english/${PORTVERSION}/unix/linux22/xpi/ \
+		ftp://ftp.dei.uc.pt/.disk3/netscape/netscape6/english/${PORTVERSION}/unix/linux22/xpi/ \
+		ftp://ftp.fh-brandenburg.de/pub/Infosystems/Netscape/netscape6/english/${PORTVERSION}/unix/linux22/xpi/ \
+		ftp://ftp.fh-giessen.de/pub/networking/netscape/netscape6/english/${PORTVERSION}/unix/linux22/xpi/ \
+		ftp://ftp.fu-berlin.de/unix/network/www/netscape/netscape6/english/${PORTVERSION}/unix/linux22/xpi/ \
+		ftp://ftp.hh.schule.de/pub/win3/tcpip/www/infosystems/www/clients/netscape/netscape6/english/${PORTVERSION}/unix/linux22/ \
+		ftp://ftp.hi.is/pub/mirrors/ftp.netscape.com/pub/netscape6/english/${PORTVERSION}/unix/linux22/xpi/ \
+		ftp://ftp.hu-berlin.de/pub/www/netscape/netscape6/english/${PORTVERSION}/unix/linux22/xpi/ \
+		ftp://ftp.informatik.rwth-aachen.de/pub/mirror/ftp.netscape.com/pub/netscape6/english/${PORTVERSION}/unix/linux22/xpi/ \
+		ftp://ftp.informatik.uni-hamburg.de/pub/soft/infosystems/www/clients/netscape/netscape6/english/${PORTVERSION}/unix/linux22/xpi/ \
+		ftp://ftp.jaist.ac.jp/net/Netscape/netscape6/english/${PORTVERSION}/unix/linux22/xpi/ \
+		ftp://ftp.kmitl.ac.th/pub/netscape/netscape6/english/${PORTVERSION}/unix/linux22/xpi/ \
+		ftp://ftp.loxinfo.co.th/netscape/${PORTVERSION}/unix/linux22/xpi/ \
+		ftp://ftp.nluug.nl/vol/1/netscape/netscape6/english/${PORTVERSION}/unix/linux22/xpi/ \
+		ftp://ftp.nsysu.edu.tw/Netscape/netscape6/english/${PORTVERSION}/unix/linux22/xpi/ \
+		ftp://ftp.ntnu.no/pub/www/Netscape/netscape6/english/${PORTVERSION}/unix/linux22/xpi/ \
+		ftp://ftp.ruhr-uni-bochum.de/mirrors/ftp.netscape.com/pub/netscape6/english/${PORTVERSION}/unix/linux22/xpi/ \
+		ftp://ftp.rz.uni-karlsruhe.de/pub/mirror/ftp.fu-berlin.de/pub/unix/network/www/netscape/netscape6/english/${PORTVERSION}/ \
+		ftp://ftp.sektornet.dk/mirrors/ftp2.netscape.com/pub/netscape6/english/${PORTVERSION}/unix/linux22/xpi/ \
+		ftp://ftp.spin.ad.jp/pub/WWW/netscape/netscape6/english/${PORTVERSION}/unix/linux22/xpi/ \
+		ftp://ftp.sunet.se/pub/www/Netscape/netscape6/english/${PORTVERSION}/unix/linux22/xpi/ \
+		ftp://ftp.sunsite.auc.dk/disk2/netscape/netscape6/english/${PORTVERSION}/unix/linux22/xpi/ \
+		ftp://ftp.task.gda.pl/vol/d31/ftp.netscape.com/pub/netscape6/english/${PORTVERSION}/unix/linux22/xpi/ \
+		ftp://ftp.tu-darmstadt.de/pub/networking/www/netscape/netscape6/english/${PORTVERSION}/unix/linux22/xpi/ \
+		ftp://ftp.uit.no/pub/www/Netscape/netscape6/english/${PORTVERSION}/unix/linux22/xpi/ \
+		ftp://ftp.uni-bielefeld.de/pub/netscape/netscape6/english/${PORTVERSION}/unix/linux22/xpi/ \
+		ftp://ftp.uni-c.dk/mirrors/ftp2.netscape.com/pub/netscape6/english/${PORTVERSION}/unix/linux22/xpi/ \
+		ftp://ftp.uni-hannover.de/pub/mirror/info-systems/netscape/pub/netscape6/english/${PORTVERSION}/unix/linux22/xpi/ \
+		ftp://ftp.uni-magdeburg.de/pub/mirror/ftp.netscape.com/netscape6/english/${PORTVERSION}/unix/linux22/xpi/ \
+		ftp://ftp.uni-tuebingen.de/pub/mirrors/ftp.netscape.com/pub/netscape6/english/${PORTVERSION}/unix/linux22/xpi/ \
+		ftp://ftp.unina.it/pub/Other/WWW/Netscape/netscape6/english/${PORTVERSION}/unix/linux22/xpi/ \
+		ftp://ftp.uniovi.es/pub/netscape/netscape6/english/${PORTVERSION}/unix/linux22/xpi/ \
+		ftp://ftp.unipi.it/pub/mirror/netscape/netscape6/english/${PORTVERSION}/unix/linux22/xpi/ \
+		ftp://ftp.uniroma2.it/%7bC/Netscape/netscape6/english/${PORTVERSION}/unix/linux22/xpi/ \
+		ftp://ftp.upc.es/mirror/Netscape/netscape6/english/${PORTVERSION}/unix/linux22/xpi/ \
+		ftp://ftp.upc.es/pub/Netscape/netscape6/english/${PORTVERSION}/unix/linux22/xpi/ \
+		ftp://ftp.ut.ee/pub/WWW/netscape/netscape6/english/${PORTVERSION}/unix/linux22/xpi/ \
+		ftp://sunsite.cnlab-switch.ch/mirror/netscape/netscape6/english/${PORTVERSION}/unix/linux22/xpi/ \
+		ftp://sunsite.sut.ac.jp/pub/archives/WWW/netscape/netscape6/english/${PORTVERSION}/unix/linux22/xpi/ \
+		ftp://sunsite.uio.no/pub/network/web/netscape/netscape6/english/${PORTVERSION}/unix/linux22/xpi/ \
+		ftp://ftp.ntua.gr/pub/www/Netscape/netscape6/english/${PORTVERSION}/unix/linux22/xpi/ \
+		ftp://ftp.curtin.edu.au/pub/internet/netscape/netscape6/english/${PORTVERSION}/unix/linux22/xpi/ \
+		ftp://ftp.newcastle.edu.au/pub/netscape/netscape6/english/${PORTVERSION}/unix/linux22/xpi/
+DISTFILES=	browser.xpi \
+		deflenus.xpi \
+		langenus.xpi \
+		mail.xpi \
+		psm.xpi \
+		spellchecker.xpi \
+		xpcom.xpi
+# langende.xpi langenfr.xpi langengb.xpi langenjp.xpi talkback.xpi jre.xpi AIM.xpi
 DIST_SUBDIR=	netscape6/english/${PORTVERSION}
 
 MAINTAINER=	trevor@FreeBSD.org
@@ -46,25 +88,21 @@ STARTUP_CMD=	netscape6
 
 do-extract:
 	${MKDIR} ${WRKSRC}
-	@${TAR} xzf ${DISTDIR}/${DIST_SUBDIR}/${DISTFILES} -C ${WRKDIR}
-.for i in browser deflenus jre langenus mail psm spellchecker xpcom
-	unzip -qo ${WRKSRC}/${i}.xpi -d ${WRKSRC}
+.for i in ${DISTFILES}
+	unzip -qo ${DISTDIR}/${DIST_SUBDIR}/${i} -d ${WRKSRC}
 .endfor
 	${MV} ${WRKSRC}/psm ${WRKSRC}/bin
-	${MV} ${WRKSRC}/jre-image-i386 ${WRKSRC}/bin/plugins/java2
-	cd ${WRKSRC}/bin/plugins && ${LN} -s java2/plugin/i386/ns600/libjavaplugin_oji.so;
-	${MV} ${WRKSRC}/../license.txt ${WRKSRC}
-.if !defined(NOPORTDOCS)
-	${MV} ${WRKSRC}/../README ${WRKSRC}
-.endif
+#	${MV} ${WRKSRC}/jre-image-i386 ${WRKSRC}/bin/plugins/java2
+#	cd ${WRKSRC}/bin/plugins && ${LN} -s java2/plugin/i386/ns600/libjavaplugin_oji.so;
 
 do-patch:
 	${TOUCH} ${TOUCH_FLAGS} ${WRKSRC}/bin/chrome/user-skins.rdf ${WRKSRC}/bin/chrome/user-locales.rdf
 	${CP} -p ${FILESDIR}/*rdf ${WRKSRC}/bin/chrome
 
 do-configure:
+	- kldload linux
 	${SETENV} $DISPLAY="NONE" ${WRKSRC}/bin/netscape file:///dev/null
-	@${ECHO} A \"cannot open display\" error here is normal.
+	@${ECHO} \"Factory not found\" and \"cannot open display\" errors here are normal.
 	${SED} -e "s;%%INSTALL_DIR%%;${INSTALL_DIR};g" \
 	${FILESDIR}/start.sh >${WRKDIR}/${STARTUP_CMD}
 
@@ -83,6 +121,5 @@ do-install:
 	${MKDIR} ${INSTALL_DIR}
 	${CP} -Rp ${WRKSRC}/bin/* ${INSTALL_DIR}
 	${INSTALL_SCRIPT} ${WRKDIR}/${STARTUP_CMD} ${PREFIX}/bin
-	${CAT} ${WRKSRC}/license.txt
 
 .include <bsd.port.mk>
diff --git a/www/linux-netscape6/distinfo b/www/linux-netscape6/distinfo
index 7ea2ef8..68a540d 100644
--- a/www/linux-netscape6/distinfo
+++ b/www/linux-netscape6/distinfo
@@ -1 +1,7 @@
-MD5 (netscape6/english/6.0/netscape-i686-pc-linux-gnu-sea.tar.gz) = 8ed6dd0c331153dc95c0e72bc098ff3b
+MD5 (netscape6/english/6.01/browser.xpi) = c6191b41e1d8c5d3cd2d5ff7729ab30e
+MD5 (netscape6/english/6.01/deflenus.xpi) = 05003295922eba7c61e8a3bd10b0942c
+MD5 (netscape6/english/6.01/langenus.xpi) = 278525a104e8f839f7ffebda229bc0ee
+MD5 (netscape6/english/6.01/mail.xpi) = 84fe2c90d392af7efbc1203dfb119edb
+MD5 (netscape6/english/6.01/psm.xpi) = f3ebf86a9bef797cdd73d54c377c2a24
+MD5 (netscape6/english/6.01/spellchecker.xpi) = 10f02b57ce76fe1c2aeac90c326f5cd1
+MD5 (netscape6/english/6.01/xpcom.xpi) = 3802f2b572d61565367e7d720f2552ff
diff --git a/www/linux-netscape6/pkg-descr b/www/linux-netscape6/pkg-descr
index 0650fd0..1df562a 100644
--- a/www/linux-netscape6/pkg-descr
+++ b/www/linux-netscape6/pkg-descr
@@ -3,10 +3,11 @@ editor, mail user agent and news reader). Using the Linux version
 on FreeBSD is necessary if you want to use Linux versions of plugins.
 Many plugins are distributed only as Linux binaries.
 
-In this port/package, the Java virtual machine does not work.  AOL
-Instant Messenger is omitted because of security problems (see
-http://www.atstake.com/research/advisories/2000/a121200-1.txt).
-Only the U.S. English locale is installed.
+In this port/package, the Java virtual machine is omitted because
+it does not work.  AOL Instant Messenger is also omitted.  Only
+the U.S. English locale is installed.
+
+WWW:  http://home.netscape.com/eng/mozilla/ns6/relnotes/6.0.html
 
 Trevor Johnson
 trevor@FreeBSD.org
diff --git a/www/netscape7/Makefile b/www/netscape7/Makefile
index 3958568..e0671b4 100644
--- a/www/netscape7/Makefile
+++ b/www/netscape7/Makefile
@@ -6,24 +6,66 @@
 #
 
 PORTNAME=	linux-netscape
-PORTVERSION=	6.0
+PORTVERSION=	6.01
 CATEGORIES=	www linux
-MASTER_SITES=	ftp://ftp.netscape.com/pub/netscape6/english/${PORTVERSION}/unix/linux22/sea/ \
-		ftp://ftp.cadvision.com/pub/linuxberg/files/ \
-		ftp://ftp.proxad.net/mirrors/ftp.linuxberg.com/files/ \
-		ftp://ftp.datacomm.ch/.3/linuxberg/files/ \
-		ftp://ftp.inter-i.uni-mainz.de/pub/Software/windows9x/Netz/Browser/Netscape_Communicator_6_linux22_english/ \
-		ftp://ftp.ptb.de/pub/WWW/Netscape/unix/ \
-		ftp://ftp.darenet.dk/mirrors/mirror.linuxberg.com/files/ \
-		ftp://ftp.info.univ-angers.fr/pub/linux/netscape6-english/ \
-		ftp://ftp.chemo.tuniv.szczecin.pl/dsk4/www.linuxberg.com/files/ \
-		ftp://ftp.uakom.sk/pub/linuxberg/files/ \
-		ftp://ftp.dei.uc.pt/.disk2/linuxberg/files/ \
-		ftp://ftp.is.co.za/packages/linuxberg/files/ \
-		ftp://ftp.matrix.com.br/pub/linuxberg/files/ \
-		ftp://ftp.duth.gr/pub/linuxberg/files/ \
-		ftp://ftp.rndavia.ru/pub/linux/
-DISTNAME=	netscape-i686-pc-linux-gnu-sea
+MASTER_SITES=	ftp://ftp.netscape.com/pub/netscape6/english/${PORTVERSION}/unix/linux22/xpi/ \
+		ftp://ftp.bu.edu/pub/mirrors/ftp.netscape.com/pub/netscape6/english/${PORTVERSION}/unix/linux22/xpi/ \
+		ftp://ftp.the.net/dev/local1/ftp.netscape.com/pub/netscape6/english/${PORTVERSION}/unix/linux22/xpi/ \
+		ftp://ftp.cica.es/pub6/netscape/netscape6/english/${PORTVERSION}/unix/linux22/xpi/ \
+		ftp://ftp.ciril.fr/pub2/netscape/netscape6/english/${PORTVERSION}/unix/linux22/xpi/ \
+		ftp://ftp.cs.tu-berlin.de/pub/net/www/netscape/netscape6/english/${PORTVERSION}/unix/linux22/xpi/ \
+		ftp://ftp.cuhk.edu.hk/.3/netscape/netscape6/english/${PORTVERSION}/unix/linux22/xpi/ \
+		ftp://ftp.darenet.dk/mirrors/ftp2.netscape.com/pub/netscape6/english/${PORTVERSION}/unix/linux22/xpi/ \
+		ftp://ftp.dei.uc.pt/.disk3/netscape/netscape6/english/${PORTVERSION}/unix/linux22/xpi/ \
+		ftp://ftp.fh-brandenburg.de/pub/Infosystems/Netscape/netscape6/english/${PORTVERSION}/unix/linux22/xpi/ \
+		ftp://ftp.fh-giessen.de/pub/networking/netscape/netscape6/english/${PORTVERSION}/unix/linux22/xpi/ \
+		ftp://ftp.fu-berlin.de/unix/network/www/netscape/netscape6/english/${PORTVERSION}/unix/linux22/xpi/ \
+		ftp://ftp.hh.schule.de/pub/win3/tcpip/www/infosystems/www/clients/netscape/netscape6/english/${PORTVERSION}/unix/linux22/ \
+		ftp://ftp.hi.is/pub/mirrors/ftp.netscape.com/pub/netscape6/english/${PORTVERSION}/unix/linux22/xpi/ \
+		ftp://ftp.hu-berlin.de/pub/www/netscape/netscape6/english/${PORTVERSION}/unix/linux22/xpi/ \
+		ftp://ftp.informatik.rwth-aachen.de/pub/mirror/ftp.netscape.com/pub/netscape6/english/${PORTVERSION}/unix/linux22/xpi/ \
+		ftp://ftp.informatik.uni-hamburg.de/pub/soft/infosystems/www/clients/netscape/netscape6/english/${PORTVERSION}/unix/linux22/xpi/ \
+		ftp://ftp.jaist.ac.jp/net/Netscape/netscape6/english/${PORTVERSION}/unix/linux22/xpi/ \
+		ftp://ftp.kmitl.ac.th/pub/netscape/netscape6/english/${PORTVERSION}/unix/linux22/xpi/ \
+		ftp://ftp.loxinfo.co.th/netscape/${PORTVERSION}/unix/linux22/xpi/ \
+		ftp://ftp.nluug.nl/vol/1/netscape/netscape6/english/${PORTVERSION}/unix/linux22/xpi/ \
+		ftp://ftp.nsysu.edu.tw/Netscape/netscape6/english/${PORTVERSION}/unix/linux22/xpi/ \
+		ftp://ftp.ntnu.no/pub/www/Netscape/netscape6/english/${PORTVERSION}/unix/linux22/xpi/ \
+		ftp://ftp.ruhr-uni-bochum.de/mirrors/ftp.netscape.com/pub/netscape6/english/${PORTVERSION}/unix/linux22/xpi/ \
+		ftp://ftp.rz.uni-karlsruhe.de/pub/mirror/ftp.fu-berlin.de/pub/unix/network/www/netscape/netscape6/english/${PORTVERSION}/ \
+		ftp://ftp.sektornet.dk/mirrors/ftp2.netscape.com/pub/netscape6/english/${PORTVERSION}/unix/linux22/xpi/ \
+		ftp://ftp.spin.ad.jp/pub/WWW/netscape/netscape6/english/${PORTVERSION}/unix/linux22/xpi/ \
+		ftp://ftp.sunet.se/pub/www/Netscape/netscape6/english/${PORTVERSION}/unix/linux22/xpi/ \
+		ftp://ftp.sunsite.auc.dk/disk2/netscape/netscape6/english/${PORTVERSION}/unix/linux22/xpi/ \
+		ftp://ftp.task.gda.pl/vol/d31/ftp.netscape.com/pub/netscape6/english/${PORTVERSION}/unix/linux22/xpi/ \
+		ftp://ftp.tu-darmstadt.de/pub/networking/www/netscape/netscape6/english/${PORTVERSION}/unix/linux22/xpi/ \
+		ftp://ftp.uit.no/pub/www/Netscape/netscape6/english/${PORTVERSION}/unix/linux22/xpi/ \
+		ftp://ftp.uni-bielefeld.de/pub/netscape/netscape6/english/${PORTVERSION}/unix/linux22/xpi/ \
+		ftp://ftp.uni-c.dk/mirrors/ftp2.netscape.com/pub/netscape6/english/${PORTVERSION}/unix/linux22/xpi/ \
+		ftp://ftp.uni-hannover.de/pub/mirror/info-systems/netscape/pub/netscape6/english/${PORTVERSION}/unix/linux22/xpi/ \
+		ftp://ftp.uni-magdeburg.de/pub/mirror/ftp.netscape.com/netscape6/english/${PORTVERSION}/unix/linux22/xpi/ \
+		ftp://ftp.uni-tuebingen.de/pub/mirrors/ftp.netscape.com/pub/netscape6/english/${PORTVERSION}/unix/linux22/xpi/ \
+		ftp://ftp.unina.it/pub/Other/WWW/Netscape/netscape6/english/${PORTVERSION}/unix/linux22/xpi/ \
+		ftp://ftp.uniovi.es/pub/netscape/netscape6/english/${PORTVERSION}/unix/linux22/xpi/ \
+		ftp://ftp.unipi.it/pub/mirror/netscape/netscape6/english/${PORTVERSION}/unix/linux22/xpi/ \
+		ftp://ftp.uniroma2.it/%7bC/Netscape/netscape6/english/${PORTVERSION}/unix/linux22/xpi/ \
+		ftp://ftp.upc.es/mirror/Netscape/netscape6/english/${PORTVERSION}/unix/linux22/xpi/ \
+		ftp://ftp.upc.es/pub/Netscape/netscape6/english/${PORTVERSION}/unix/linux22/xpi/ \
+		ftp://ftp.ut.ee/pub/WWW/netscape/netscape6/english/${PORTVERSION}/unix/linux22/xpi/ \
+		ftp://sunsite.cnlab-switch.ch/mirror/netscape/netscape6/english/${PORTVERSION}/unix/linux22/xpi/ \
+		ftp://sunsite.sut.ac.jp/pub/archives/WWW/netscape/netscape6/english/${PORTVERSION}/unix/linux22/xpi/ \
+		ftp://sunsite.uio.no/pub/network/web/netscape/netscape6/english/${PORTVERSION}/unix/linux22/xpi/ \
+		ftp://ftp.ntua.gr/pub/www/Netscape/netscape6/english/${PORTVERSION}/unix/linux22/xpi/ \
+		ftp://ftp.curtin.edu.au/pub/internet/netscape/netscape6/english/${PORTVERSION}/unix/linux22/xpi/ \
+		ftp://ftp.newcastle.edu.au/pub/netscape/netscape6/english/${PORTVERSION}/unix/linux22/xpi/
+DISTFILES=	browser.xpi \
+		deflenus.xpi \
+		langenus.xpi \
+		mail.xpi \
+		psm.xpi \
+		spellchecker.xpi \
+		xpcom.xpi
+# langende.xpi langenfr.xpi langengb.xpi langenjp.xpi talkback.xpi jre.xpi AIM.xpi
 DIST_SUBDIR=	netscape6/english/${PORTVERSION}
 
 MAINTAINER=	trevor@FreeBSD.org
@@ -46,25 +88,21 @@ STARTUP_CMD=	netscape6
 
 do-extract:
 	${MKDIR} ${WRKSRC}
-	@${TAR} xzf ${DISTDIR}/${DIST_SUBDIR}/${DISTFILES} -C ${WRKDIR}
-.for i in browser deflenus jre langenus mail psm spellchecker xpcom
-	unzip -qo ${WRKSRC}/${i}.xpi -d ${WRKSRC}
+.for i in ${DISTFILES}
+	unzip -qo ${DISTDIR}/${DIST_SUBDIR}/${i} -d ${WRKSRC}
 .endfor
 	${MV} ${WRKSRC}/psm ${WRKSRC}/bin
-	${MV} ${WRKSRC}/jre-image-i386 ${WRKSRC}/bin/plugins/java2
-	cd ${WRKSRC}/bin/plugins && ${LN} -s java2/plugin/i386/ns600/libjavaplugin_oji.so;
-	${MV} ${WRKSRC}/../license.txt ${WRKSRC}
-.if !defined(NOPORTDOCS)
-	${MV} ${WRKSRC}/../README ${WRKSRC}
-.endif
+#	${MV} ${WRKSRC}/jre-image-i386 ${WRKSRC}/bin/plugins/java2
+#	cd ${WRKSRC}/bin/plugins && ${LN} -s java2/plugin/i386/ns600/libjavaplugin_oji.so;
 
 do-patch:
 	${TOUCH} ${TOUCH_FLAGS} ${WRKSRC}/bin/chrome/user-skins.rdf ${WRKSRC}/bin/chrome/user-locales.rdf
 	${CP} -p ${FILESDIR}/*rdf ${WRKSRC}/bin/chrome
 
 do-configure:
+	- kldload linux
 	${SETENV} $DISPLAY="NONE" ${WRKSRC}/bin/netscape file:///dev/null
-	@${ECHO} A \"cannot open display\" error here is normal.
+	@${ECHO} \"Factory not found\" and \"cannot open display\" errors here are normal.
 	${SED} -e "s;%%INSTALL_DIR%%;${INSTALL_DIR};g" \
 	${FILESDIR}/start.sh >${WRKDIR}/${STARTUP_CMD}
 
@@ -83,6 +121,5 @@ do-install:
 	${MKDIR} ${INSTALL_DIR}
 	${CP} -Rp ${WRKSRC}/bin/* ${INSTALL_DIR}
 	${INSTALL_SCRIPT} ${WRKDIR}/${STARTUP_CMD} ${PREFIX}/bin
-	${CAT} ${WRKSRC}/license.txt
 
 .include <bsd.port.mk>
diff --git a/www/netscape7/distinfo b/www/netscape7/distinfo
index 7ea2ef8..68a540d 100644
--- a/www/netscape7/distinfo
+++ b/www/netscape7/distinfo
@@ -1 +1,7 @@
-MD5 (netscape6/english/6.0/netscape-i686-pc-linux-gnu-sea.tar.gz) = 8ed6dd0c331153dc95c0e72bc098ff3b
+MD5 (netscape6/english/6.01/browser.xpi) = c6191b41e1d8c5d3cd2d5ff7729ab30e
+MD5 (netscape6/english/6.01/deflenus.xpi) = 05003295922eba7c61e8a3bd10b0942c
+MD5 (netscape6/english/6.01/langenus.xpi) = 278525a104e8f839f7ffebda229bc0ee
+MD5 (netscape6/english/6.01/mail.xpi) = 84fe2c90d392af7efbc1203dfb119edb
+MD5 (netscape6/english/6.01/psm.xpi) = f3ebf86a9bef797cdd73d54c377c2a24
+MD5 (netscape6/english/6.01/spellchecker.xpi) = 10f02b57ce76fe1c2aeac90c326f5cd1
+MD5 (netscape6/english/6.01/xpcom.xpi) = 3802f2b572d61565367e7d720f2552ff
diff --git a/www/netscape7/pkg-descr b/www/netscape7/pkg-descr
index 0650fd0..1df562a 100644
--- a/www/netscape7/pkg-descr
+++ b/www/netscape7/pkg-descr
@@ -3,10 +3,11 @@ editor, mail user agent and news reader). Using the Linux version
 on FreeBSD is necessary if you want to use Linux versions of plugins.
 Many plugins are distributed only as Linux binaries.
 
-In this port/package, the Java virtual machine does not work.  AOL
-Instant Messenger is omitted because of security problems (see
-http://www.atstake.com/research/advisories/2000/a121200-1.txt).
-Only the U.S. English locale is installed.
+In this port/package, the Java virtual machine is omitted because
+it does not work.  AOL Instant Messenger is also omitted.  Only
+the U.S. English locale is installed.
+
+WWW:  http://home.netscape.com/eng/mozilla/ns6/relnotes/6.0.html
 
 Trevor Johnson
 trevor@FreeBSD.org