Update "navigator" package to version 4.74 and always use strong

encryption except sunos_sparc.

4 files changed, 14 insertions, 33 deletions

diff --git a/www/navigator/Makefile.common b/www/navigator/Makefile.common
index 25dfcde6cca..ab6e058252e 100644
--- a/www/navigator/Makefile.common
+++ b/www/navigator/Makefile.common
@@ -1,15 +1,13 @@
-# $NetBSD: Makefile.common,v 1.11 2000/05/11 21:35:04 abs Exp $
+# $NetBSD: Makefile.common,v 1.12 2000/07/25 06:27:33 tron Exp $
 #
 # Common include file for communicator and navigator packages
 
 .include "../../mk/bsd.prefs.mk"
 
-# Use export version by default.
-NS_ENCRYPTION?=	export
-
 # Note - the version will be overridden for certain architectures which
 #	 do not have the latest version available (eg: SunOS sparc)
-NS_VERS=	4.73
+NS_VERS=	4.74
+NS_ENCRYPTION=	us
 LDAP_VERS=	40
 #
 # Based on OPSYS and MACHINE_ARCH, define:
@@ -56,6 +54,7 @@ VENDOR_NAME=	Linux 2.2
 IGNORE=	"requires SunOS libraries - see compat_sunos(8)"
 .endif
 NS_VERS=	4.61
+NS_ENCRYPTION=	export
 LDAP_VERS=	30
 PLIST_ARCH=	sunos-sparc
 DISTUNAME=	sparc-sun-sunos4.1.3_U1
@@ -95,25 +94,6 @@ PLIST_SRC=	${PKGDIR}/PLIST.pre \
 		${PKGDIR}/PLIST.post
 PLIST_SUBST+=	NS_VERS=${NS_VERS} LDAP_VERS=${LDAP_VERS} BINNAME=${BINNAME}
 
-.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}/${DIST_SUBDIR}/${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}/${DIST_SUBDIR}\" 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}
diff --git a/www/navigator/files/md5 b/www/navigator/files/md5
index 0d1cf8f68cf..c094bb1dcca 100644
--- a/www/navigator/files/md5
+++ b/www/navigator/files/md5
@@ -1,9 +1,7 @@
-$NetBSD: md5,v 1.16 2000/05/28 09:25:50 fredb Exp $
+$NetBSD: md5,v 1.17 2000/07/25 06:27:34 tron Exp $
 
 MD5 (netscape/navigator-v461-export.sparc-sun-sunos4.1.3_U1.tar.gz) = a1bc10d5dfce9f36ddae55930d683b6d
-MD5 (netscape/navigator-v473-export.alpha-dec-osf4.0.tar.gz) = 06f248469991b8110fc367799d160de1
-MD5 (netscape/navigator-v473-export.sparc-sun-solaris2.5.1.tar.gz) = b2df6cf1c044008bee8490e07663b25c
-MD5 (netscape/navigator-v473-export.x86-bsdi-bsd2.tar.gz) = af6995971ae513e25ac760c9c8d3565b
-MD5 (netscape/navigator-v473-export.x86-unknown-linux2.2.tar.gz) = e3894b44860e225258bb9749172956bb
-MD5 (netscape/navigator-v473-us.x86-bsdi-bsd2.tar.gz) = 2c611a53c5a9b9e9cf5e4ff8b44d6551
-MD5 (netscape/navigator-v473-us.x86-unknown-linux2.2.tar.gz) = ca7ae294b00ef8f4c19c5dede5a0861e
+MD5 (netscape/navigator-v474-us.alpha-dec-osf4.0.tar.gz) = 9ab854c02062e7351b938a651210674d
+MD5 (netscape/navigator-v474-us.sparc-sun-solaris2.5.1.tar.gz) = 5b719831ed8a10882b1f4763576e7771
+MD5 (netscape/navigator-v474-us.x86-bsdi-bsd2.tar.gz) = 859b024aec21cf440608b8631a9ac475
+MD5 (netscape/navigator-v474-us.x86-unknown-linux2.2.tar.gz) = 04faccc952e0d5a78a3c13e0f04e6c5b
diff --git a/www/navigator/pkg/PLIST.linux-i386 b/www/navigator/pkg/PLIST.linux-i386
index 59907fc47d0..d6467cedc69 100644
--- a/www/navigator/pkg/PLIST.linux-i386
+++ b/www/navigator/pkg/PLIST.linux-i386
@@ -1,4 +1,6 @@
-@comment $NetBSD: PLIST.linux-i386,v 1.1 2000/05/09 13:23:21 abs Exp $
+@comment $NetBSD: PLIST.linux-i386,v 1.2 2000/07/25 06:27:34 tron Exp $
+lib/netscape/${BINNAME}-${NS_VERS}/plugins/ShockwaveFlash.class
+lib/netscape/${BINNAME}-${NS_VERS}/plugins/libflashplayer.so
 lib/netscape/${BINNAME}-${NS_VERS}/plugins/libnullplugin.so
 lib/netscape/${BINNAME}-${NS_VERS}/netscape-dynMotif
 lib/netscape/${BINNAME}-${NS_VERS}/libnullplugin-dynMotif.so
diff --git a/www/navigator/pkg/PLIST.pre b/www/navigator/pkg/PLIST.pre
index e696fcab24e..27133974c8a 100644
--- a/www/navigator/pkg/PLIST.pre
+++ b/www/navigator/pkg/PLIST.pre
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST.pre,v 1.7 2000/05/09 13:23:21 abs Exp $
+@comment $NetBSD: PLIST.pre,v 1.8 2000/07/25 06:27:35 tron Exp $
+bin/${BINNAME}
 bin/${BINNAME}-${NS_VERS}
 lib/netscape/${BINNAME}-${NS_VERS}/LICENSE
 lib/netscape/${BINNAME}-${NS_VERS}/Netscape.ad