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).

1 files changed, 65 insertions, 28 deletions

diff --git a/www/linux-netscape6/Makefile b/www/linux-netscape6/Makefile
index 395856811dd2..e0671b4ce031 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>