Update linux and solaris 2.8 to navigator/communicator 4.8. Package is

named *-4.80. Other platforms not available in this release.

3 files changed, 21 insertions, 12 deletions

diff --git a/www/navigator/Makefile b/www/navigator/Makefile
index 52e3db8a09e..a9d702c5578 100644
--- a/www/navigator/Makefile
+++ b/www/navigator/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.27 2002/04/05 09:33:21 tron Exp $
+# $NetBSD: Makefile,v 1.28 2002/09/20 16:59:27 abs Exp $
 #
 
-COMMENT=	Netscape navigator standalone browser - Digital UNIX/Linux/SunOS binary
+COMMENT=	Netscape navigator browser - Digital UNIX/Linux/SunOS binary
 
 BINNAME=	navigator
 DIST_SDIR_NAME=	navigator_standalone
diff --git a/www/navigator/Makefile.common b/www/navigator/Makefile.common
index 05a7537d0be..e2634b22f33 100644
--- a/www/navigator/Makefile.common
+++ b/www/navigator/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.49 2002/06/30 19:07:18 dmcmahill Exp $
+# $NetBSD: Makefile.common,v 1.50 2002/09/20 16:59:27 abs Exp $
 #
 # Common include file for communicator and navigator packages
 
@@ -6,11 +6,13 @@
 
 # Note - the version will be overridden for certain architectures which
 #	 do not have the latest version available (eg: SunOS sparc)
-NS_VERS=	4.79
+NS_VERS=	4.8
+PKGNAME=	${BINNAME}-4.80
 NS_ENCRYPTION=	us
 LDAP_VERS=	40
 
-MASTER_SITES=	ftp://ftp.netscape.org/pub/communicator/${SUB}/ \
+MASTER_SITES=	ftp://ftp.netscape.com/pub/communicator/${SUB}/ \
+		ftp://ftp.de.netscape.com/pub/communicator/${SUB}/ \
 		ftp://ftp-uk.netscape.com/pub/communicator/${SUB}/ \
 		ftp://sunsite.utk.edu/pub/netscape/communicator/${SUB}/ \
 		ftp://ftp.informatik.rwth-aachen.de/pub/mirror/ftp.netscape.com/pub/communicator/${SUB}/
@@ -26,6 +28,8 @@ MASTER_SITES=	ftp://ftp.netscape.org/pub/communicator/${SUB}/ \
 PLIST_ARCH=	solaris-sparc
 .if (${OS_VERSION} == 5.5.1) || (${OS_VERSION} == 5.6) || \
     (${OS_VERSION} == 5.7)
+NS_VERS=	4.79
+PKGNAME=	${BINNAME}-${NS_VERS}
 DISTUNAME=	sparc-sun-solaris2.5.1
 DIST_DIR_NAME=	supported/sunos551
 WRKNAME=	sparc-sun-solaris2.5.1
@@ -45,6 +49,7 @@ DEPENDS+=	ns-flash>4.0:../../graphics/ns-flash
 IGNORE=	"${PKGNAME} requires Digital UNIX libraries - see compat_osf1(8)"
 .endif
 NS_VERS=	4.78
+PKGNAME=	${BINNAME}-${NS_VERS}
 PLIST_ARCH=	osf-alpha
 DISTUNAME=	alpha-dec-osf4.0
 DIST_DIR_NAME=	supported/dec_unix40
@@ -53,6 +58,7 @@ VENDOR_NAME=	Tru64 UNIX
 #
 .elif (${MACHINE_ARCH} == "i386" && defined(NS_USE_BSDI))
 NS_VERS=	4.75
+PKGNAME=	${BINNAME}-${NS_VERS}
 PLIST_ARCH=	bsdi-i386
 DISTUNAME=	x86-bsdi-bsd2
 DIST_DIR_NAME=	unsupported/bsdi21
@@ -76,6 +82,7 @@ DEPENDS+=	ns-flash>4.0:../../graphics/ns-flash
 IGNORE=	"${PKGNAME} requires SunOS libraries - see compat_sunos(8)"
 .endif
 NS_VERS=	4.61
+PKGNAME=	${BINNAME}-${NS_VERS}
 NS_ENCRYPTION=	export
 LDAP_VERS=	30
 PLIST_ARCH=	sunos-sparc
@@ -103,8 +110,8 @@ IGNORE+=	"install communicator package instead."
 .endif
 DEPENDS+=	linuxppc_lib>=2000.4.2:../../emulators/linuxppc_lib
 NS_VERS=	4.73
-DISTNAME=	netscape-4.7-3.ppc
 PKGNAME=	${BINNAME}-${NS_VERS}
+DISTNAME=	netscape-4.7-3.ppc
 WRKSRC=		${WRKDIR}
 MASTER_SITES=	ftp://ftp.linuxppc.org/linuxppc-halloween/software/
 EXTRACT_SUFX=	.rpm
@@ -121,7 +128,6 @@ PLIST_ARCH=
 .endif
 #
 
-NO_BUILD=	YES
 MAINTAINER=	tron@netbsd.org
 HOMEPAGE?=	http://home.netscape.com/browsers/index.html
 RESTRICTED=	"No re-distribution without agreement from Netscape"
@@ -138,6 +144,8 @@ DISTNAME?=	${BINNAME}-v${NS_VERS_SHORT}-${NS_ENCRYPTION}.${DISTUNAME}
 
 .if (${BINNAME} != "netscape")
 
+NO_BUILD=	YES
+
 .if (${MACHINE_ARCH} == "powerpc")
 
 do-extract:
@@ -219,5 +227,6 @@ do-install:
 .endif
 
 .if (${BINNAME} != "netscape")
+USE_BUILDLINK2=	# defined
 .include "../../emulators/suse_linux/Makefile.application"
 .endif
diff --git a/www/navigator/distinfo b/www/navigator/distinfo
index e9a6948d1c5..7035d528fa3 100644
--- a/www/navigator/distinfo
+++ b/www/navigator/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.7 2001/11/27 14:11:51 abs Exp $
+$NetBSD: distinfo,v 1.8 2002/09/20 16:59:28 abs Exp $
 
-SHA1 (netscape/navigator-v479-us.x86-unknown-linux2.2.tar.gz) = 2a377af5bbdfd94176df10a327ecd77295725e92
-Size (netscape/navigator-v479-us.x86-unknown-linux2.2.tar.gz) = 12508204 bytes
+SHA1 (netscape/navigator-v48-us.x86-unknown-linux2.2.tar.gz) = f5459a84b34129f740bf79534f07a57ac5d4a428
+Size (netscape/navigator-v48-us.x86-unknown-linux2.2.tar.gz) = 12527712 bytes
+SHA1 (netscape/navigator-v48-us.sparc-sun-solaris2.8.tar.gz) = 30c5606e9ee43b2bd945242035a06b3bf97f21f2
+Size (netscape/navigator-v48-us.sparc-sun-solaris2.8.tar.gz) = 9390189 bytes
 SHA1 (netscape/navigator-v479-us.sparc-sun-solaris2.5.1.tar.gz) = 5d258c23d77e7ca089ac0a2486a1b9f9f7458dfc
 Size (netscape/navigator-v479-us.sparc-sun-solaris2.5.1.tar.gz) = 9348880 bytes
-SHA1 (netscape/navigator-v479-us.sparc-sun-solaris2.8.tar.gz) = f972251798c1ea22a782605867d999e3f089fdb7
-Size (netscape/navigator-v479-us.sparc-sun-solaris2.8.tar.gz) = 9381560 bytes
 SHA1 (netscape/navigator-v478-us.alpha-dec-osf4.0.tar.gz) = 3f6e0575284bda79d1c549580491409311c50df4
 Size (netscape/navigator-v478-us.alpha-dec-osf4.0.tar.gz) = 9910790 bytes
 SHA1 (netscape/navigator-v475-us.x86-bsdi-bsd2.tar.gz) = 692313695679be2770e964508d4e52519629c76c