5 files changed, 47 insertions, 208 deletions

diff --git a/www/netscape7/Makefile b/www/netscape7/Makefile
index d90ae3d17731..f8a7374c1988 100644
--- a/www/netscape7/Makefile
+++ b/www/netscape7/Makefile
@@ -1,94 +1,13 @@
-# New ports collection makefile for: netscape-linux-6
-# Date created:			8 April 2000
-# Whom:				sada@FreeBSD.org
+# New ports collection makefile for:		netscape7
+# Date created:					2002-05-22
+# Whom:						trevor
+# based on www/linux-netscape6 port
 #
 # $FreeBSD$
 #
 
-PORTNAME=	linux-netscape
-PORTVERSION?=	6.2.3
-PORTREVISION?=	0
-CATEGORIES?=	www linux
-MASTER_SITES=	\
-ftp://ftp.netscape.com/pub/${FTPDIR}/ \
-ftp://ftp.cica.es/pub6/netscape/${FTPDIR}/ \
-ftp://ftp.ciril.fr/pub2/netscape/${FTPDIR}/ \
-ftp://ftp.cs.tu-berlin.de/pub/net/www/netscape/${FTPDIR}/ \
-ftp://ftp.cuhk.edu.hk/.3/netscape/${FTPDIR}/ \
-ftp://ftp.darenet.dk/mirrors/ftp2.netscape.com/pub/${FTPDIR}/ \
-ftp://ftp.dei.uc.pt/.raid0/netscape/${FTPDIR}/ \
-ftp://ftp.fu-berlin.de/unix/network/www/netscape/${FTPDIR}/ \
-ftp://ftp.hu-berlin.de/pub/www/netscape/${FTPDIR}/ \
-ftp://ftp.informatik.uni-hamburg.de/pub/soft/infosystems/www/clients/netscape/${FTPDIR}/ \
-ftp://ftp.jaist.ac.jp/net/Netscape/${FTPDIR}/ \
-ftp://ftp.nsysu.edu.tw/Netscape/${FTPDIR}/ \
-ftp://ftp.ruhr-uni-bochum.de/mirrors/ftp.netscape.com/pub/${FTPDIR}/ \
-ftp://ftp.sunet.se/pub/www/Netscape/${FTPDIR}/ \
-ftp://ftp.uit.no/pub/www/Netscape/${FTPDIR}/ \
-ftp://ftp.uni-bielefeld.de/pub/netscape/${FTPDIR}/ \
-ftp://ftp.uni-c.dk/mirrors/ftp2.netscape.com/pub/${FTPDIR}/ \
-ftp://ftp.uni-magdeburg.de/pub/mirror/ftp.netscape.com/${FTPDIR}/ \
-ftp://ftp.uniovi.es/pub/netscape/${FTPDIR}/ \
-ftp://ftp.unipi.it/pub/mirror/netscape/${FTPDIR}/ \
-ftp://ftp.uniroma2.it/%7bC/Netscape/${FTPDIR}/ \
-ftp://ftp.ut.ee/pub/WWW/netscape/${FTPDIR}/ \
-ftp://sunsite.cnlab-switch.ch/mirror/netscape/${FTPDIR}/ \
-ftp://sunsite.tus.ac.jp/pub/archives/WWW/netscape/${FTPDIR}/ \
-ftp://ftp.mirror.ac.uk/sites/ftp.netscape.com/pub/${FTPDIR}/ \
-ftp://ftp.ntua.gr/pub/www/Netscape/${FTPDIR}/ \
-ftp://ftp.fct.unl.pt/.1/Netscape/${FTPDIR}/ \
-ftp://ftp.sunsite.auc.dk/disk3/netscape/${FTPDIR}/ \
-ftp://ftp.skynet.be/mirror2/netscape/${FTPDIR}/ \
-ftp://ftp.etse.urv.es/netscape/${FTPDIR}/ \
-ftp://sunsite.tut.fi/pub/Mirror/mirrorsite.netscape.com/pub/${FTPDIR}/ \
-ftp://sunfreeware.unam.mx/pub/Netscape/${FTPDIR}/ \
-ftp://ftp.fh-wolfenbuettel.de/pub/www/netscape/${FTPDIR}/ \
-ftp://ftp.tu-darmstadt.de/pub/networking/www/netscape/${FTPDIR}/ \
-ftp://ftp.uni-bremen.de/pub/mirrors/ftp.netscape.com/pub/${FTPDIR}/ \
-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
-
-PATCH_SITES=	${MASTER_SITE_LOCAL}
-PATCH_SITE_SUBDIR=	trevor
-PATCHFILES=	linux-${MAJ}-${VER}-generated-files.tar.gz
-
-MAINTAINER?=	trevor@FreeBSD.org
-
-BUILD_DEPENDS=	unzip:${PORTSDIR}/archivers/unzip
-RUN_DEPENDS=	${LINUXBASE}/usr/lib/libgtk-1.2.so.0.5.0:${PORTSDIR}/x11-toolkits/linux-gtk \
-		${LINUXBASE}/usr/lib/libjpeg.so.62.0.0:${PORTSDIR}/graphics/linux-jpeg
-
-LATEST_LINK=	linux-${MAJ}
-MAJ?=		netscape6
-NETSCAPE6_LANG?=english
-NO_BUILD=	yes
-NO_FILTER_SHLIBS=	yes
-ONLY_FOR_ARCHS=	i386
-RESTRICTED=	"License for Java plugin allows internal use only.  Also see license for Netscape itself"
-NO_CDROM=	${RESTRICTED}
-USE_LINUX=	yes
-USE_XLIB=	yes
-VER?=		${PORTVERSION}
-WRKSRC=	${WRKDIR}/netscape-installer/xpi
-INSTALL_DIR=	lib/linux-${MAJ}-${NETSCAPE6_LANG}
-PLIST=		${WRKDIR}/pkg-plist
-STARTUP_CMD=	${WRKDIR}/${MAJ}${NETSCAPE6_LANG}
-
-.if !defined(BATCH)
-IS_INTERACTIVE=	yes
-.endif
-
-.include <bsd.port.pre.mk>
-
-pre-everything::
-	${MKDIR} ${WRKSRC}/bin/plugins ${WRKSRC}/bin/chrome \
-		${WRKSRC}/plugins
-.if !defined(BATCH)
-	${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure
-.endif
+PORTVERSION=	0.7.1
+CATEGORIES=	www linux
 DISTFILES?=	browser.xpi \
 		deflenus.xpi \
 		flash.xpi \
@@ -97,94 +16,13 @@ DISTFILES?=	browser.xpi \
 		mail.xpi \
 		psm.xpi \
 		regca.xpi \
-		reges.xpi \
-		reggb.xpi \
 		regus.xpi \
 		spellchecker.xpi \
 		talkback.xpi \
 		xpcom.xpi
-.if exists(${WRKDIRPREFIX}${.CURDIR}/work/netscape-installer/xpi/components.conf)
-DISTFILES!=${CAT} ${WRKDIRPREFIX}${.CURDIR}/work/netscape-installer/xpi/components.conf
-.endif
-
-checksum:
-.if !defined(REAL_EXTRACT)
-	@cd ${.CURDIR} && ${MAKE} ${__softMAKEFLAGS} fetch
-.endif
-	@if [ ! -f ${MD5_FILE} ]; then \
-		${ECHO_MSG} ">> No MD5 checksum file."; \
-	else \
-		(cd ${DISTDIR}; OK="true"; \
-		  for file in ${_CKSUMFILES}; do \
-			if [ -r $$file ]; then \
-				CKSUM=`${MD5} < $$file`; \
-				CKSUM2=`${GREP} "^MD5 ($$file)" ${MD5_FILE} | ${AWK} '{print $$4}'`; \
-				if [ "$$CKSUM2" = "" ]; then \
-					${ECHO_MSG} ">> No checksum recorded for $$file."; \
-					OK="false"; \
-				elif ${EXPR} "$$CKSUM2" : ".*$$CKSUM" > /dev/null; then \
-					${ECHO_MSG} ">> Checksum OK for $$file."; \
-			else \
-					${ECHO_MSG} ">> Checksum mismatch for $$file."; \
-					OK="false"; \
-				fi; \
-			fi; \
-		  done; \
-		  if [ "$$OK" != "true" ]; then \
-			${ECHO_MSG} "Make sure the Makefile and distinfo file (${MD5_FILE})"; \
-			${ECHO_MSG} "are up to date.  If you are absolutely sure you want to override this"; \
-			${ECHO_MSG} "check, type \"make NO_CHECKSUM=yes [other args]\"."; \
-			exit 1; \
-		  fi) ; \
-	fi
-
-do-extract:
-.for i in ${DISTFILES}
-	unzip -qo ${DISTDIR}/${DIST_SUBDIR}/${i} -d ${WRKSRC}
-.endfor
-	- ${MV} ${WRKSRC}/jre-image-i386 ${WRKSRC}/bin/plugins/java2
-	- ${MV} ${WRKSRC}/jre1.3.1_02 ${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
-	${TAR} -C ${WRKSRC}/bin -xzf ${DISTDIR}/${DIST_SUBDIR}/${PATCHFILES}
-
-do-configure:
-#	- kldload linux
-#	${SETENV} $DISPLAY="NONE" ${WRKSRC}/bin/netscape file:///dev/null
-#	@${ECHO} \"Factory not found\" and \"cannot open display\" errors here are normal.
-	${ECHO_CMD}	"#!/bin/sh"		>  ${STARTUP_CMD}
-	${ECHO_CMD} -n	"cd "			>> ${STARTUP_CMD}
-	${ECHO_CMD}	${PREFIX}/${INSTALL_DIR}		>> ${STARTUP_CMD}
-	${ECHO_CMD}	'exec ./netscape $$*'	>> ${STARTUP_CMD}
-
-pre-install:
-	${ECHO_CMD} bin/${MAJ}${NETSCAPE6_LANG} > ${PLIST}
-	cd ${WRKSRC}/bin; for i in `find * \! -type d | sort`; do \
-		${ECHO_CMD} ${INSTALL_DIR}/$${i} >> ${PLIST}; \
-	done
-	cd ${WRKSRC}/plugins; for i in `find * \! -type d | sort`; do \
-		${ECHO_CMD} ${INSTALL_DIR}/plugins/$${i} >> ${PLIST}; \
-	done
-	cd ${WRKSRC}/bin; \
-	for i in `find -d * -type d`; do \
-		${ECHO_CMD} @dirrm ${INSTALL_DIR}/$${i} >> ${PLIST}; \
-	done
-	${ECHO_CMD} @dirrm ${INSTALL_DIR} >> ${PLIST}
-
-pre-package:
-	@${ECHO_MSG} "*** WARNING ***"
-	@${ECHO_MSG} "* Do not distribute packages outside your organization."
-	@${ECHO_MSG} "* It is prohibited by the licensing."
-
-do-install:
-	${MKDIR} ${PREFIX}/${INSTALL_DIR}
-	${CP} -Rp ${WRKSRC}/bin/* ${WRKSRC}/plugins ${PREFIX}/${INSTALL_DIR}
-	${INSTALL_SCRIPT} ${STARTUP_CMD} ${PREFIX}/bin
 
-post-install:
-	${CAT} ${PKGMESSAGE}
+FILESDIR=	${PORTSDIR}/www/linux-netscape6/files
+MAJ?=	netscape7
+VER=	7.0_PR1
 
-.include <bsd.port.post.mk>
+.include "../linux-netscape6/Makefile"
diff --git a/www/netscape7/distinfo b/www/netscape7/distinfo
index 38f674441bf2..c45c06a2c52f 100644
--- a/www/netscape7/distinfo
+++ b/www/netscape7/distinfo
@@ -1,15 +1,13 @@
-MD5 (netscape6/english/6.2.3/browser.xpi) = cfafd9e144f0bc917a7cda5fa158a889
-MD5 (netscape6/english/6.2.3/deflenus.xpi) = 67fb7f953ae6318b8a570555a8f067f7
-MD5 (netscape6/english/6.2.3/flash.xpi) = d859b60eaa7cc503095228b48a5ce9a5
-MD5 (netscape6/english/6.2.3/jre.xpi) = c14a6a642d6592e60c40f000cbffbdcc
-MD5 (netscape6/english/6.2.3/langenus.xpi) = 9c9c467f91c21bc4d270f55be81c4606
-MD5 (netscape6/english/6.2.3/linux-netscape6-6.2.3-generated-files.tar.gz) = 8345bae84e99f264fd1ff9517f3b8128
-MD5 (netscape6/english/6.2.3/mail.xpi) = 065cb248b38fddc6378ee02714725560
-MD5 (netscape6/english/6.2.3/psm.xpi) = 97c6901cdc96ea0a311d2a5f439665c9
-MD5 (netscape6/english/6.2.3/regca.xpi) = 92d33d24c591f4ba55f5dc91b90f4649
-MD5 (netscape6/english/6.2.3/reges.xpi) = 1ee3e514130c032e633c88ecb6bdaf2c
-MD5 (netscape6/english/6.2.3/reggb.xpi) = 81c2152eed4e95a858088a42039ca03b
-MD5 (netscape6/english/6.2.3/regus.xpi) = 6b7a2786cc016ed62961ea7ba748cee2
-MD5 (netscape6/english/6.2.3/spellchecker.xpi) = 279493cd91fd1bf34f568ab7558e7c73
-MD5 (netscape6/english/6.2.3/talkback.xpi) = 72c45f4322d574ef9d3746bb7c07a656
-MD5 (netscape6/english/6.2.3/xpcom.xpi) = 0298012ec9fac8bc748a06c78fa82454
+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
diff --git a/www/netscape7/pkg-descr b/www/netscape7/pkg-descr
index 4fdc575da580..9471bfc511cf 100644
--- a/www/netscape7/pkg-descr
+++ b/www/netscape7/pkg-descr
@@ -3,13 +3,18 @@ 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.  The Sun Java
 and Macromedia Flash plugins are included.  AOL Instant Messenger
-is omitted (see ports/net/aim).  The Canadian, Latin American and
-British region packs, spell-checker, and talkback are enabled.
+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 with linux_base-7, only linux_base-61
-or linux_base-62.
+The Java plugin does not work.
 
-WWW: http://browsers.netscape.com/browsers/6/
+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
 
 Trevor Johnson
 trevor@FreeBSD.org
diff --git a/www/netscape7/pkg-message b/www/netscape7/pkg-message
index c7199a81701e..dea10513094c 100644
--- a/www/netscape7/pkg-message
+++ b/www/netscape7/pkg-message
@@ -1,5 +1,4 @@
-* WARNING ************************************************
-* Users should back up their bookmark files.  There have *
-* been reports that the bookmark file can be clobbered   *
-* the first time this version of Netscape is run.        *
-**********************************************************
+* WARNING ************************************
+* This is a beta version of Netscape.        *
+* Users should back up their bookmark files. *
+**********************************************
diff --git a/www/netscape7/scripts/configure b/www/netscape7/scripts/configure
index 60720828763c..e2ddf470df91 100644
--- a/www/netscape7/scripts/configure
+++ b/www/netscape7/scripts/configure
@@ -1,6 +1,7 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: ports/www/netscape7/scripts/configure,v 1.3 2002/05/23 13:00:10 tre
+vor Exp $
 
 echo ${WRKSRC}/components.conf
 if [ -f ${WRKSRC}/components.conf ]; then
@@ -11,20 +12,18 @@ tempfile=`/usr/bin/mktemp -t checklist`
 
 if [ -z "${BATCH}" ]; then
 
-/usr/bin/dialog --title "Netscape 6 component selection" --clear \
+/usr/bin/dialog --title "Netscape 7 component selection" --clear \
 	--checklist "\n\
-Choose components of Netscape 6 to download and install. \n\
+Choose components of Netscape 7 to download and install. \n\
 Press the space bar to toggle selections." -1 -1 12 \
-"browser"	"Web browser (6576 kB)"				ON \
+"browser"	"Web browser (8208 kB)"				ON \
 "deflenus"	"American English profile defaults (26 kB)"	ON \
 "flash"		"Flash plugin (576 kB)"				ON \
-"jre"		"Java plugin (13808 kB)"			ON \
-"langenus"	"American English language pack (608 kB)"	ON \
-"mail"		"e-mail and news (1824 kB)"			ON \
-"regca"		"regional settings for Canada (56 kB)"		ON \
-"reges"		"regional settings for Latin America (54 kB)"	ON \
-"reggb"		"regional settings for the UK (58 kB)"		ON \
-"regus"		"regional settings for the USA (56 kB)"		ON \
+"jre"		"Java plugin (28592 kB) DOES NOT WORK"		OFF \
+"langenus"	"American English language pack (800 kB)"	ON \
+"mail"		"e-mail and news (2176 kB)"			ON \
+"regca"		"regional settings for Canada (58 kB)"		ON \
+"regus"		"regional settings for the USA (58 kB)"		ON \
 "spellchecker"	"spell-checker (544 kB)"			ON \
 "talkback"	"sends bug reports to Netscape staff (832 kB)"	ON \
 2> /tmp/checklist.tmp.$$