Update to 4.7 - this is except for the SunOS version which seems to have ended

at 4.61.
Since the Makefiles for navigator and communicator contained so much duplicate
magic, move all the magic to navigator/Makefile.common.

9 files changed, 174 insertions, 278 deletions

diff --git a/www/communicator/Makefile b/www/communicator/Makefile
index f7d8baf57bf..c527238d7e3 100644
--- a/www/communicator/Makefile
+++ b/www/communicator/Makefile
@@ -1,126 +1,8 @@
-# $NetBSD: Makefile,v 1.24 1999/11/25 01:26:14 hubertf Exp $
+# $NetBSD: Makefile,v 1.25 2000/01/05 15:43:36 abs Exp $
 #
-# Every effort has been made to keep the communicator and navigator
-# Makefiles as similar as possible.
 
 BINNAME=	communicator
-NS_VERS=	4.61
-NS_VERS_SHORT=	461
+DIST_SDIR_NAME=	complete_install
 NS_ENCRYPTION?=	export
-
-BUILD_DEFS+=	NS_ENCRYPTION
-
 #
-.include "../../mk/bsd.prefs.mk"
-.if ${OPSYS} == "SunOS" && ${MACHINE_ARCH} == "sparc"
-DISTUNAME=	sparc-sun-solaris2.5.1
-DIST_DIR_NAME=	supported/sunos551
-WRKNAME=	sparc-sun-solaris2.5.1
-VENDOR_NAME=	Solaris 2.5.1
-.elif (${MACHINE_ARCH} == "alpha")
-.if !exists(/emul/osf1/sbin/loader)
-IGNORE=	requires Digital UNIX libraries - see compat_osf1(8)
-.endif
-DISTUNAME=	alpha-dec-osf4.0
-DIST_DIR_NAME=	supported/dec_unix40
-WRKNAME=	alpha-dec-osf4.0
-VENDOR_NAME=	Tru64 UNIX
-.elif (${MACHINE_ARCH} == "i386")
-DEPENDS=        suse_linux-6.1p1:../../emulators/suse_linux
-DISTUNAME=	x86-unknown-linuxglibc2.0
-DIST_DIR_NAME=	supported/linux20_glibc2
-WRKNAME=	x86-unknown-linux2.0
-VENDOR_NAME=	Linux 2.0 (glibc)
-.elif (${MACHINE_ARCH} == "sparc")
-.if !exists(/emul/sunos/usr/lib/ld.so)
-IGNORE=	requires SunOS libraries - see compat_sunos(8)
-.endif
-DISTUNAME=	sparc-sun-sunos4.1.3_U1
-DIST_DIR_NAME=	unsupported/sunos413
-WRKNAME=	${DISTUNAME}
-VENDOR_NAME=	SunOS 4.1.3
-.endif
-#
-DISTNAME=	${BINNAME}-v${NS_VERS_SHORT}-${NS_ENCRYPTION}.${DISTUNAME}
-PKGNAME=	${BINNAME}-${NS_VERS}
-CATEGORIES=	www
-SUB=		english/${NS_VERS}/unix/${DIST_DIR_NAME}/complete_install
-MASTER_SITES=	ftp://ftp.netscape.org/pub/communicator/${SUB}/ \
-		ftp://sunsite.utk.edu/pub/netscape/communicator/${SUB}/ \
-		ftp://ftp-uk.netscape.com/pub/communicator/${SUB}/ \
-		ftp.informatik.rwth-aachen.de:/pub/mirror/ftp.netscape.com/pub/communicator/${SUB}/
-ONLY_FOR_PLATFORM= *-*-alpha *-*-i386 *-*-sparc
-
-MAINTAINER=	packages@netbsd.org
-HOMEPAGE=	http://home.netscape.com/browsers/index.html
-
-NO_BUILD=	yes
-
-WRKSRC=         ${WRKDIR}/${BINNAME}-v${NS_VERS_SHORT}.${WRKNAME}
-MOZILLA_HOME=	${PREFIX}/lib/netscape/${PKGNAME}
-NS_PLUGINS_DIR=	${PREFIX}/lib/netscape/plugins
-
-.include "../../mk/bsd.prefs.mk"
-
-PLIST_SRC=	${PKGDIR}/PLIST.pre \
-		${PKGDIR}/PLIST.${LOWER_OPSYS}-${MACHINE_ARCH} \
-		${PKGDIR}/PLIST.post
-PLIST_SUBST+=	NS_VERS=${NS_VERS}
-
-.if (${NS_ENCRYPTION} == "us")
-MASTER_SITES=
-RESTRICTED=		"128-bit key strong encryption; export-controlled"
-MIRROR_DISTFILE=	no
-ONLY_FOR_PLATFORM=	*-*-alpha *-*-i386 # *-*-sparc
-DOWNLOAD=		http://www.netscape.com/download/
-
-do-fetch:
-	@if [ ! -f ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} ]; then \
-	    ${ECHO_MSG} "==============================================================="; \
-	    ${ECHO_MSG} "    The 128-bit key strong encryption version of"; \
-	    ${ECHO_MSG} "    Netscape for ${VENDOR_NAME} must be fetched"; \
-	    ${ECHO_MSG} "    into \"${DISTDIR}\" from the following URL:"; \
-	    ${ECHO_MSG} "    ${DOWNLOAD}"; \
-	    ${ECHO_MSG} "==============================================================="; \
-	    ${FALSE}; \
-	fi
-.endif
-
-do-install:
-	${MKDIR} ${MOZILLA_HOME}/java/classes
-	${INSTALL_SCRIPT} ${WRKSRC}/vreg ${MOZILLA_HOME}
-.for file in ifc11.jar iiop10.jar jae40.jar java40.jar jio40.jar jsd10.jar \
-    ldap30.jar resource.jar scd10.jar
-	${INSTALL_DATA} ${WRKSRC}/${file} ${MOZILLA_HOME}/java/classes
-.endfor
-	cd ${MOZILLA_HOME} ; ${GTAR} xpzf ${WRKSRC}/nethelp-v${NS_VERS_SHORT}.nif
-	cd ${MOZILLA_HOME} ; ${GTAR} xpzf ${WRKSRC}/netscape-v${NS_VERS_SHORT}.nif
-	cd ${MOZILLA_HOME} ; ${GTAR} xpzf ${WRKSRC}/spellchk-v${NS_VERS_SHORT}.nif
-
-	${SED} -e 's#@@MOZILLA_HOME@@#${MOZILLA_HOME}#g' \
-	       -e 's#@@NS_PLUGINS_DIR@@#${NS_PLUGINS_DIR}#g' \
-	    <${FILESDIR}/${BINNAME}.sh >${WRKDIR}/${BINNAME}.sh
-	${INSTALL_SCRIPT} ${WRKDIR}/${BINNAME}.sh ${PREFIX}/bin/${PKGNAME}
-	${RM} -f ${PREFIX}/bin/${BINNAME}
-	${LN} -sf ${PKGNAME} ${PREFIX}/bin/${BINNAME}
-	${RM} -f ${PREFIX}/bin/netscape
-	${LN} -sf ${PKGNAME} ${PREFIX}/bin/netscape
-
-.if ${OPSYS} == "NetBSD" && ${MACHINE_ARCH} == "sparc"
-	# Bizarre magic to handle the NIS and DNS versions. Make DNS default.
-	@${SED} -e 's#MOZILLA_HOME/netscape#MOZILLA_HOME/netscape_nis#g' \
-	    <${WRKDIR}/${BINNAME}.sh >${WRKDIR}/${BINNAME}_nis.sh
-	${INSTALL_SCRIPT} ${WRKDIR}/${BINNAME}_nis.sh \
-	    ${PREFIX}/bin/${PKGNAME}_nis
-	${LN} -sf ${PKGNAME}_nis ${PREFIX}/bin/netscape_nis
-	${MV} ${MOZILLA_HOME}/netscape ${MOZILLA_HOME}/netscape_nis
-	${MV} ${MOZILLA_HOME}/netscape_dns ${MOZILLA_HOME}/netscape
-.endif
-	${INSTALL_DATA_DIR} ${NS_PLUGINS_DIR}
-
-	${CHOWN} -R 0:0 ${MOZILLA_HOME}
-	${CHMOD} -R go-w ${MOZILLA_HOME}
-	cd ${MOZILLA_HOME} ; patch -s < ${FILESDIR}/bookmarks.patch
-	@rm -f ${MOZILLA_HOME}/bookmark.htm.orig
-
-.include "../../mk/bsd.pkg.mk"
+.include "../navigator/Makefile.common"
diff --git a/www/communicator/files/md5 b/www/communicator/files/md5
index 27b65d54b18..6eade5e6f60 100644
--- a/www/communicator/files/md5
+++ b/www/communicator/files/md5
@@ -1,8 +1,6 @@
-$NetBSD: md5,v 1.8 1999/08/13 21:24:12 abs Exp $
+$NetBSD: md5,v 1.9 2000/01/05 15:43:36 abs Exp $
 
-MD5 (communicator-v461-export.alpha-dec-osf4.0.tar.gz) = b431d2de9d6340779f8bc82e7a5ceb82
-MD5 (communicator-v461-export.sparc-sun-solaris2.5.1.tar.gz) = da9ccf8189d7cd4ab0960c944c2179b6
-MD5 (communicator-v461-export.sparc-sun-sunos4.1.3_U1.tar.gz) = 26d2944a58d6fa8c73ff5a4a2f3d7258
-MD5 (communicator-v461-export.x86-unknown-linuxglibc2.0.tar.gz) = 2716a95847687cdb1cda0a52c0cbb1ff
-MD5 (communicator-v461-us.alpha-dec-osf4.0.tar.gz) = af72f7a77ee590ab550a1623f0879c99
-MD5 (communicator-v461-us.x86-unknown-linuxglibc2.0.tar.gz) = 4081666aff1bb73c28f8c87dbc4b2d7b
+MD5 (netscape/communicator-v461-export.sparc-sun-sunos4.1.3_U1.tar.gz) = 26d2944a58d6fa8c73ff5a4a2f3d7258
+MD5 (netscape/communicator-v47-export.alpha-dec-osf4.0.tar.gz) = 649fcbb91589553599bc707caff35a9e
+MD5 (netscape/communicator-v47-export.sparc-sun-solaris2.5.1.tar.gz) = 1e3cf250174b97aaf4091b96c4648c40
+MD5 (netscape/communicator-v47-export.x86-unknown-linuxglibc2.0.tar.gz) = b4c1de5f30ceb158021805cc201b4121
diff --git a/www/communicator/pkg/MESSAGE b/www/communicator/pkg/MESSAGE
index da53359cd57..abdd0b3db92 100644
--- a/www/communicator/pkg/MESSAGE
+++ b/www/communicator/pkg/MESSAGE
@@ -1,15 +1,15 @@
 ==========================================================================
-$NetBSD: MESSAGE,v 1.4 1999/07/07 04:53:55 abs Exp $
+$NetBSD: MESSAGE,v 1.5 2000/01/05 15:43:36 abs Exp $
 
-alpha:	To run the Digital UNIX version of Netscape, you need COMPAT_OSF1
-	in your kernel, plus a full set of /emul/osf1 libraries.
+alpha:	The Digital UNIX version of Netscape requires COMPAT_OSF1 in your
+	kernel, plus /emul/osf1 libraries.
 
-i386:	To run the Linux version of Netscape, you need COMPAT_LINUX and
-	EXEC_ELF32 in your kernel, plus a full set of /emul/linux libraries,
-	as provided by emulators/suse_compat and emulators/suse_x11.
+i386:	The Linux version of Netscape requires COMPAT_LINUX and EXEC_ELF32 in
+	your kernel, plus /emul/linux libraries (pksrc/emulators/suse_linux).
 
-sparc:	To run the SunOS version of Netscape, you need COMPAT_SUNOS in your
-	kernel, plus a full set of /emul/sunos/usr/lib libraries.
-	The default version uses DNS, the NIS version is 'netscape_nis'.
+sparc:	The SunOS version of Netscape requires COMPAT_SUNOS in your kernel,
+	plus /emul/sunos libraries. The default version is DNS, the NIS
+	version is 'netscape_nis'. Netscape appears to have stopped with 4.61.
+	SunOS 'navigator' has problems saving files, 'communicator' does not.
 
 ==========================================================================
diff --git a/www/communicator/pkg/PLIST.netbsd-i386 b/www/communicator/pkg/PLIST.netbsd-i386
index cb5cc98b73b..08a96e3a8ae 100644
--- a/www/communicator/pkg/PLIST.netbsd-i386
+++ b/www/communicator/pkg/PLIST.netbsd-i386
@@ -1,7 +1,5 @@
-@comment $NetBSD: PLIST.netbsd-i386,v 1.1 1999/08/13 21:24:13 abs Exp $
+@comment $NetBSD: PLIST.netbsd-i386,v 1.2 2000/01/05 15:43:37 abs Exp $
 lib/netscape/communicator-${NS_VERS}/libjsd.so
-lib/netscape/communicator-${NS_VERS}/dynfonts/libTrueDoc.so
 lib/netscape/communicator-${NS_VERS}/plugins/libnullplugin.so
 lib/netscape/communicator-${NS_VERS}/netscape-dynMotif
 lib/netscape/communicator-${NS_VERS}/libnullplugin-dynMotif.so
-@dirrm lib/netscape/communicator-${NS_VERS}/dynfonts
diff --git a/www/navigator/Makefile b/www/navigator/Makefile
index fbbd09bb5df..994540b9a85 100644
--- a/www/navigator/Makefile
+++ b/www/navigator/Makefile
@@ -1,122 +1,8 @@
-# $NetBSD: Makefile,v 1.22 1999/11/25 01:26:12 hubertf Exp $
+# $NetBSD: Makefile,v 1.23 2000/01/05 15:43:34 abs Exp $
 #
-# Every effort has been made to keep the communicator and navigator
-# Makefiles as similar as possible.
 
 BINNAME=	navigator
-NS_VERS=	4.61
-NS_VERS_SHORT=	461
+DIST_SDIR_NAME=	navigator_standalone
 NS_ENCRYPTION?=	export
-
-BUILD_DEFS+=	NS_ENCRYPTION
-
 #
-.include "../../mk/bsd.prefs.mk"
-.if ${OPSYS} == "SunOS" && ${MACHINE_ARCH} == "sparc"
-DISTUNAME=	sparc-sun-solaris2.5.1
-DIST_DIR_NAME=	supported/sunos551
-WRKNAME=	sparc-sun-solaris2.5.1
-VENDOR_NAME=	Solaris 2.5.1
-.elif (${MACHINE_ARCH} == "alpha")
-.if !exists(/emul/osf1/sbin/loader)
-IGNORE=	requires Digital UNIX libraries - see compat_osf1(8)
-.endif
-DISTUNAME=	alpha-dec-osf4.0
-DIST_DIR_NAME=	supported/dec_unix40
-WRKNAME=	alpha-dec-osf4.0
-VENDOR_NAME=	Tru64 UNIX
-.elif (${MACHINE_ARCH} == "i386")
-DEPENDS=	suse_linux-6.1p1:../../emulators/suse_linux
-DISTUNAME=	x86-unknown-linuxglibc2.0
-DIST_DIR_NAME=	supported/linux20_glibc2
-WRKNAME=	x86-unknown-linux2.0
-VENDOR_NAME=	Linux 2.0 (glibc)
-.elif (${MACHINE_ARCH} == "sparc")
-.if !exists(/emul/sunos/usr/lib/ld.so)
-IGNORE=	requires SunOS libraries - see compat_sunos(8)
-.endif
-DISTUNAME=	sparc-sun-sunos4.1.3_U1
-DIST_DIR_NAME=	unsupported/sunos413
-WRKNAME=	${DISTUNAME}
-VENDOR_NAME=	SunOS 4.1.3
-.endif
-#
-DISTNAME=	${BINNAME}-v${NS_VERS_SHORT}-${NS_ENCRYPTION}.${DISTUNAME}
-PKGNAME=	${BINNAME}-${NS_VERS}
-CATEGORIES=	www
-SUB=		english/${NS_VERS}/unix/${DIST_DIR_NAME}/navigator_standalone
-MASTER_SITES=	ftp://ftp.netscape.org/pub/communicator/${SUB}/ \
-		ftp://sunsite.utk.edu/pub/netscape/communicator/${SUB}/ \
-		ftp://ftp-uk.netscape.com/pub/communicator/${SUB}/ \
-		ftp.informatik.rwth-aachen.de:/pub/mirror/ftp.netscape.com/pub/communicator/${SUB}/
-ONLY_FOR_PLATFORM= *-*-alpha *-*-i386 *-*-sparc
-
-MAINTAINER=	packages@netbsd.org
-HOMEPAGE=	http://home.netscape.com/browsers/index.html
-
-NO_BUILD=	yes
-
-WRKSRC=         ${WRKDIR}/${BINNAME}-v${NS_VERS_SHORT}.${WRKNAME}
-MOZILLA_HOME=	${PREFIX}/lib/netscape/${PKGNAME}
-NS_PLUGINS_DIR=	${PREFIX}/lib/netscape/plugins
-
-.include "../../mk/bsd.prefs.mk"
-
-PLIST_SRC=	${PKGDIR}/PLIST.pre \
-		${PKGDIR}/PLIST.${LOWER_OPSYS}-${MACHINE_ARCH} \
-		${PKGDIR}/PLIST.post
-PLIST_SUBST+=	NS_VERS=${NS_VERS}
-
-.if (${NS_ENCRYPTION} == "us")
-MASTER_SITES=
-RESTRICTED=		"128-bit key strong encryption; export-controlled"
-MIRROR_DISTFILE=	no
-ONLY_FOR_PLATFORM=	*-*-alpha *-*-i386 # *-*-sparc
-DOWNLOAD=		http://www.netscape.com/download/
-
-do-fetch:
-	@if [ ! -f ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} ]; then \
-	    ${ECHO_MSG} "==============================================================="; \
-	    ${ECHO_MSG} "    The 128-bit key strong encryption version of"; \
-	    ${ECHO_MSG} "    Netscape for ${VENDOR_NAME} must be fetched"; \
-	    ${ECHO_MSG} "    into \"${DISTDIR}\" from the following URL:"; \
-	    ${ECHO_MSG} "    ${DOWNLOAD}"; \
-	    ${ECHO_MSG} "==============================================================="; \
-	    ${FALSE}; \
-	fi
-.endif
-
-do-install:
-	${MKDIR} ${MOZILLA_HOME}/java/classes
-	${INSTALL_SCRIPT} ${WRKSRC}/vreg ${MOZILLA_HOME}
-.for file in ifc11.jar iiop10.jar jae40.jar java40.jar jio40.jar jsd10.jar \
-    ldap30.jar resource.jar scd10.jar
-	${INSTALL_DATA} ${WRKSRC}/${file} ${MOZILLA_HOME}/java/classes
-.endfor
-	cd ${MOZILLA_HOME} ; ${GTAR} xpzf ${WRKSRC}/nethelp-v${NS_VERS_SHORT}.nif
-	cd ${MOZILLA_HOME} ; ${GTAR} xpzf ${WRKSRC}/netscape-v${NS_VERS_SHORT}.nif
-
-	${SED} -e 's#@@MOZILLA_HOME@@#${MOZILLA_HOME}#g' \
-	       -e 's#@@NS_PLUGINS_DIR@@#${NS_PLUGINS_DIR}#g' \
-	    <${FILESDIR}/${BINNAME}.sh >${WRKDIR}/${BINNAME}.sh
-	${INSTALL_SCRIPT} ${WRKDIR}/${BINNAME}.sh ${PREFIX}/bin/${PKGNAME}
-	${RM} -f ${PREFIX}/bin/${BINNAME}
-	${LN} -sf ${PKGNAME} ${PREFIX}/bin/${BINNAME}
-
-.if ${OPSYS} == "NetBSD" && ${MACHINE_ARCH} == "sparc"
-	# Bizarre magic to handle the NIS and DNS versions. Make DNS default.
-	@${SED} -e 's#MOZILLA_HOME/netscape#MOZILLA_HOME/netscape_nis#g' \
-	    <${WRKDIR}/${BINNAME}.sh >${WRKDIR}/${BINNAME}_nis.sh
-	${INSTALL_SCRIPT} ${WRKDIR}/${BINNAME}_nis.sh \
-	    ${PREFIX}/bin/${PKGNAME}_nis
-	${MV} ${MOZILLA_HOME}/netscape ${MOZILLA_HOME}/netscape_nis
-	${MV} ${MOZILLA_HOME}/netscape_dns ${MOZILLA_HOME}/netscape
-.endif
-	${INSTALL_DATA_DIR} ${NS_PLUGINS_DIR}
-
-	${CHOWN} -R 0:0 ${MOZILLA_HOME}
-	${CHMOD} -R go-w ${MOZILLA_HOME}
-	cd ${MOZILLA_HOME} ; patch -s < ${FILESDIR}/bookmarks.patch
-	@rm -f ${MOZILLA_HOME}/bookmark.htm.orig
-
-.include "../../mk/bsd.pkg.mk"
+.include "../navigator/Makefile.common"
diff --git a/www/navigator/Makefile.common b/www/navigator/Makefile.common
new file mode 100644
index 00000000000..15018d549de
--- /dev/null
+++ b/www/navigator/Makefile.common
@@ -0,0 +1,138 @@
+# $NetBSD: Makefile.common,v 1.1 2000/01/05 15:43:34 abs Exp $
+#
+# Common include file for communicator and navigator packages
+
+.include "../../mk/bsd.prefs.mk"
+
+# Note - the version will be overridden for certain architectures which
+#	 do not have the latest version available (eg: SunOS sparc)
+NS_VERS=	4.7
+#
+# Based on OPSYS and MACHINE_ARCH, define:
+#	DISTUNAME	Used to determine DISTNAME (tarfile on ftp server)
+#	DIST_DIR_NAME	Directory on ftp site from which to download
+#	WRKNAME		Used to determine WRKSRC (directoryname in tarfile)
+#	VENDOR_NAME	Only used in '128-bit key version' information message
+#
+.if ${OPSYS} == "SunOS" && ${MACHINE_ARCH} == "sparc"
+DISTUNAME=	sparc-sun-solaris2.5.1
+DIST_DIR_NAME=	supported/sunos551
+WRKNAME=	sparc-sun-solaris2.5.1
+VENDOR_NAME=	Solaris 2.5.1
+#
+.elif (${MACHINE_ARCH} == "alpha")
+.if !exists(/emul/osf1/sbin/loader)
+IGNORE=	"requires Digital UNIX libraries - see compat_osf1(8)"
+.endif
+DISTUNAME=	alpha-dec-osf4.0
+DIST_DIR_NAME=	supported/dec_unix40
+WRKNAME=	alpha-dec-osf4.0
+VENDOR_NAME=	Tru64 UNIX
+#
+.elif (${MACHINE_ARCH} == "i386")
+DEPENDS=	suse_linux-6.1p1:../../emulators/suse_linux
+DISTUNAME=	x86-unknown-linuxglibc2.0
+DIST_DIR_NAME=	supported/linux20_glibc2
+WRKNAME=	x86-unknown-linux2.0
+VENDOR_NAME=	Linux 2.0 (glibc)
+#
+.elif (${MACHINE_ARCH} == "sparc")
+.if !exists(/emul/sunos/usr/lib/ld.so)
+IGNORE=	"requires SunOS libraries - see compat_sunos(8)"
+.endif
+NS_VERS=	4.61
+DISTUNAME=	sparc-sun-sunos4.1.3_U1
+DIST_DIR_NAME=	unsupported/sunos413
+WRKNAME=	${DISTUNAME}
+VENDOR_NAME=	SunOS 4.1.3
+.endif
+#
+
+NS_VERS_SHORT=	${NS_VERS:S/.//}
+DISTNAME=	${BINNAME}-v${NS_VERS_SHORT}-${NS_ENCRYPTION}.${DISTUNAME}
+PKGNAME=	${BINNAME}-${NS_VERS}
+CATEGORIES=	www
+SUB=		english/${NS_VERS}/unix/${DIST_DIR_NAME}/${DIST_SDIR_NAME}
+MASTER_SITES=	ftp://ftp.netscape.org/pub/communicator/${SUB}/ \
+		ftp://ftp-uk.netscape.com/pub/communicator/${SUB}/ \
+		ftp://sunsite.utk.edu/pub/netscape/communicator/${SUB}/ \
+		ftp.informatik.rwth-aachen.de:/pub/mirror/ftp.netscape.com/pub/communicator/${SUB}/
+ONLY_FOR_PLATFORM= *-*-alpha *-*-i386 *-*-sparc
+
+MAINTAINER=	abs@netbsd.org
+HOMEPAGE=	http://home.netscape.com/browsers/index.html
+
+BUILD_DEFS+=	NS_ENCRYPTION
+DIST_SUBDIR=	netscape
+NO_BUILD=	yes
+
+WRKSRC=         ${WRKDIR}/${BINNAME}-v${NS_VERS_SHORT}.${WRKNAME}
+MOZILLA_HOME=	${PREFIX}/lib/netscape/${PKGNAME}
+NS_PLUGINS_DIR=	${PREFIX}/lib/netscape/plugins
+
+PLIST_SRC=	${PKGDIR}/PLIST.pre \
+		${PKGDIR}/PLIST.${LOWER_OPSYS}-${MACHINE_ARCH} \
+		${PKGDIR}/PLIST.post
+PLIST_SUBST+=	NS_VERS=${NS_VERS}
+
+.if (${NS_ENCRYPTION} == "us")
+MASTER_SITES=
+RESTRICTED=		"128-bit key strong encryption; export-controlled"
+MIRROR_DISTFILE=	no
+ONLY_FOR_PLATFORM=	*-*-alpha *-*-i386 # *-*-sparc
+DOWNLOAD=		http://www.netscape.com/download/
+
+do-fetch:
+	@if [ ! -f ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} ]; then \
+	    ${ECHO_MSG} "==============================================================="; \
+	    ${ECHO_MSG} "    The 128-bit key strong encryption version of"; \
+	    ${ECHO_MSG} "    Netscape for ${VENDOR_NAME} must be fetched"; \
+	    ${ECHO_MSG} "    into \"${DISTDIR}\" from the following URL:"; \
+	    ${ECHO_MSG} "    ${DOWNLOAD}"; \
+	    ${ECHO_MSG} "==============================================================="; \
+	    ${FALSE}; \
+	fi
+.endif
+
+do-install:
+	${MKDIR} ${MOZILLA_HOME}/java/classes
+	${INSTALL_SCRIPT} ${WRKSRC}/vreg ${MOZILLA_HOME}
+.for file in ifc11.jar iiop10.jar jae40.jar java40.jar jio40.jar jsd10.jar \
+    ldap30.jar resource.jar scd10.jar
+	${INSTALL_DATA} ${WRKSRC}/${file} ${MOZILLA_HOME}/java/classes
+.endfor
+	cd ${MOZILLA_HOME} ; ${GTAR} xpzf ${WRKSRC}/nethelp-v${NS_VERS_SHORT}.nif
+	cd ${MOZILLA_HOME} ; ${GTAR} xpzf ${WRKSRC}/netscape-v${NS_VERS_SHORT}.nif
+.if (${BINNAME} == "communicator")
+	cd ${MOZILLA_HOME} ; ${GTAR} xpzf ${WRKSRC}/spellchk-v${NS_VERS_SHORT}.nif
+	${RM} -f ${PREFIX}/bin/netscape
+	${LN} -sf ${PKGNAME} ${PREFIX}/bin/netscape
+.endif
+
+	${SED} -e 's#@@MOZILLA_HOME@@#${MOZILLA_HOME}#g' \
+	       -e 's#@@NS_PLUGINS_DIR@@#${NS_PLUGINS_DIR}#g' \
+	    <${FILESDIR}/${BINNAME}.sh >${WRKDIR}/${BINNAME}.sh
+	${INSTALL_SCRIPT} ${WRKDIR}/${BINNAME}.sh ${PREFIX}/bin/${PKGNAME}
+	${RM} -f ${PREFIX}/bin/${BINNAME}
+	${LN} -sf ${PKGNAME} ${PREFIX}/bin/${BINNAME}
+
+.if ${OPSYS} == "NetBSD" && ${MACHINE_ARCH} == "sparc"
+	# Bizarre magic to handle the NIS and DNS versions. Make DNS default.
+	@${SED} -e 's#MOZILLA_HOME/netscape#MOZILLA_HOME/netscape_nis#g' \
+	    <${WRKDIR}/${BINNAME}.sh >${WRKDIR}/${BINNAME}_nis.sh
+	${INSTALL_SCRIPT} ${WRKDIR}/${BINNAME}_nis.sh \
+	    ${PREFIX}/bin/${PKGNAME}_nis
+.if (${BINNAME} == "communicator")
+	${LN} -sf ${PKGNAME}_nis ${PREFIX}/bin/netscape_nis
+.endif
+	${MV} ${MOZILLA_HOME}/netscape ${MOZILLA_HOME}/netscape_nis
+	${MV} ${MOZILLA_HOME}/netscape_dns ${MOZILLA_HOME}/netscape
+.endif
+	${INSTALL_DATA_DIR} ${NS_PLUGINS_DIR}
+
+	${CHOWN} -R 0:0 ${MOZILLA_HOME}
+	${CHMOD} -R go-w ${MOZILLA_HOME}
+	cd ${MOZILLA_HOME} ; patch -s < ${FILESDIR}/bookmarks.patch
+	@rm -f ${MOZILLA_HOME}/bookmark.htm.orig
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/www/navigator/files/md5 b/www/navigator/files/md5
index 6d00e13cab9..3a8323664ee 100644
--- a/www/navigator/files/md5
+++ b/www/navigator/files/md5
@@ -1,8 +1,6 @@
-$NetBSD: md5,v 1.8 1999/08/13 21:24:11 abs Exp $
+$NetBSD: md5,v 1.9 2000/01/05 15:43:35 abs Exp $
 
-MD5 (navigator-v461-export.alpha-dec-osf4.0.tar.gz) = c044e2d82b043254de019875ca0ce91d
-MD5 (navigator-v461-export.sparc-sun-solaris2.5.1.tar.gz) = 14405703ab2c25354b77516eef52fe21
-MD5 (navigator-v461-export.sparc-sun-sunos4.1.3_U1.tar.gz) = a1bc10d5dfce9f36ddae55930d683b6d
-MD5 (navigator-v461-export.x86-unknown-linuxglibc2.0.tar.gz) = 420a7618848a884e7b408a80fe283b80
-MD5 (navigator-v461-us.alpha-dec-osf4.0.tar.gz) = 043592386899a96a94c3530c32488660
-MD5 (navigator-v461-us.x86-unknown-linuxglibc2.0.tar.gz) = f405154046261003d6b3d4a4f9499c50
+MD5 (netscape/navigator-v461-export.sparc-sun-sunos4.1.3_U1.tar.gz) = a1bc10d5dfce9f36ddae55930d683b6d
+MD5 (netscape/navigator-v47-export.sparc-sun-solaris2.5.1.tar.gz) = 0c8a97a845456cb260ba58a6717629d9
+MD5 (netscape/navigator-v47-export.x86-unknown-linuxglibc2.0.tar.gz) = 50a51a4ce99ebfdba52c9bd91ca492b7
+MD5 (netscape/navigator-v47-export.alpha-dec-osf4.0.tar.gz) = 91244e06363f0fc8a277c2ebe6ed7b67
diff --git a/www/navigator/pkg/MESSAGE b/www/navigator/pkg/MESSAGE
index dda499a7f69..4e14b83b5b0 100644
--- a/www/navigator/pkg/MESSAGE
+++ b/www/navigator/pkg/MESSAGE
@@ -1,17 +1,15 @@
 ==========================================================================
-$NetBSD: MESSAGE,v 1.5 1999/07/07 04:53:55 abs Exp $
+$NetBSD: MESSAGE,v 1.6 2000/01/05 15:43:36 abs Exp $
 
-alpha:	To run the Digital UNIX version of Netscape, you need COMPAT_OSF1
-	in your kernel, plus a full set of /emul/osf1 libraries.
+alpha:	The Digital UNIX version of Netscape requires COMPAT_OSF1 in your
+	kernel, plus /emul/osf1 libraries.
 
-i386:	To run the Linux version of Netscape, you need COMPAT_LINUX and
-	EXEC_ELF32 in your kernel, plus a full set of /emul/linux libraries,
-	as provided by emulators/suse_compat and emulators/suse_x11.
+i386:	The Linux version of Netscape requires COMPAT_LINUX and EXEC_ELF32 in
+	your kernel, plus /emul/linux libraries (pksrc/emulators/suse_linux).
 
-sparc:	To run the SunOS version of Netscape, you need COMPAT_SUNOS in your
-	kernel, plus a full set of /emul/sunos/usr/lib libraries.
-	The default version uses DNS, the NIS version is 'navigator-4.5_nis'.
-	Note: The SunOS version has problems saving files - you may want to
-	      use the 'communicator' package instead.
+sparc:	The SunOS version of Netscape requires COMPAT_SUNOS in your kernel,
+	plus /emul/sunos libraries. The default version is DNS, the NIS
+	version is 'netscape_nis'. Netscape appears to have stopped with 4.61.
+	SunOS 'navigator' has problems saving files, 'communicator' does not.
 
 ==========================================================================
diff --git a/www/navigator/pkg/PLIST.netbsd-i386 b/www/navigator/pkg/PLIST.netbsd-i386
index cfb744547b7..3fa67d41c41 100644
--- a/www/navigator/pkg/PLIST.netbsd-i386
+++ b/www/navigator/pkg/PLIST.netbsd-i386
@@ -1,6 +1,4 @@
-@comment $NetBSD: PLIST.netbsd-i386,v 1.1 1999/08/13 21:24:12 abs Exp $
-lib/netscape/navigator-${NS_VERS}/dynfonts/libTrueDoc.so
+@comment $NetBSD: PLIST.netbsd-i386,v 1.2 2000/01/05 15:43:36 abs Exp $
 lib/netscape/navigator-${NS_VERS}/plugins/libnullplugin.so
 lib/netscape/navigator-${NS_VERS}/netscape-dynMotif
 lib/netscape/navigator-${NS_VERS}/libnullplugin-dynMotif.so
-@dirrm lib/netscape/navigator-${NS_VERS}/dynfonts