Permit netscape to default to mozilla as well as communicator and navigator.

Leave default as communicator

5 files changed, 30 insertions, 12 deletions

diff --git a/www/netscape/Makefile b/www/netscape/Makefile
index bb99e9ffe88..bfa3ec75b12 100644
--- a/www/netscape/Makefile
+++ b/www/netscape/Makefile
@@ -1,17 +1,21 @@
-# $NetBSD: Makefile,v 1.3 2001/04/12 15:35:40 abs Exp $
+# $NetBSD: Makefile,v 1.4 2001/07/27 14:26:18 abs Exp $
 #
 
-COMMENT=	Open new communicator or navigator window
+COMMENT=	Open new communicator, navigator, or mozilla window
 
 BINNAME=	netscape
 
 .include "../navigator/Makefile.common"
 
 DEPENDS+= ns-remote>=1.3:../../www/ns-remote
-.if defined(NS_NAVIGATOR) && ${NS_NAVIGATOR} == YES
-DEPENDS+= {navigator,communicator}-*:../../www/navigator
+.if defined(NS_PREFERRED) && ${NS_PREFERRED} == mozilla
+DEPENDS+= {mozilla,navigator,communicator}-*:../../www/mozilla
 .else
-DEPENDS+= {communicator,navigator}-*:../../www/communicator
+.if defined(NS_PREFERRED) && ${NS_PREFERRED} == navigator
+DEPENDS+= {navigator,communicator,mozilla}-*:../../www/navigator
+.else
+DEPENDS+= {communicator,navigator,mozilla}-*:../../www/communicator
+.endif
 .endif
 
 DISTFILES=	# empty
@@ -24,10 +28,15 @@ NO_PATCH=	yes
 NO_CONFIGURE=	yes
 
 do-install:
-.if defined(NS_NAVIGATOR) && ${NS_NAVIGATOR} == YES
+
+.if defined(NS_PREFERRED) && ${NS_PREFERRED} == mozilla
+	${INSTALL_SCRIPT} ${FILESDIR}/netscape_mozilla ${PREFIX}/bin/netscape
+.else
+.if defined(NS_PREFERRED) && ${NS_PREFERRED} == navigator
 	${INSTALL_SCRIPT} ${FILESDIR}/netscape_navigator ${PREFIX}/bin/netscape
 .else
 	${LN} -sf ns-open ${PREFIX}/bin/netscape
 .endif
+.endif
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/netscape/files/netscape_mozilla b/www/netscape/files/netscape_mozilla
new file mode 100644
index 00000000000..ff087ca1e1d
--- /dev/null
+++ b/www/netscape/files/netscape_mozilla
@@ -0,0 +1,9 @@
+#!/bin/sh
+# $NetBSD: netscape_mozilla,v 1.1 2001/07/27 14:26:18 abs Exp $
+
+# Simple script used if NS_MOZILLA is set when netscape installed
+
+if [ -z "$NETSCAPE_PREFERRED" ]; then
+    NETSCAPE_PREFERRED=mozilla:navigator:communicator
+fi
+exec ns-open $@
diff --git a/www/netscape/files/netscape_navigator b/www/netscape/files/netscape_navigator
index 281aba3ea39..e4ea581b4ab 100644
--- a/www/netscape/files/netscape_navigator
+++ b/www/netscape/files/netscape_navigator
@@ -1,9 +1,9 @@
 #!/bin/sh
-# $NetBSD: netscape_navigator,v 1.1.1.1 2000/09/02 23:13:58 abs Exp $
+# $NetBSD: netscape_navigator,v 1.2 2001/07/27 14:26:18 abs Exp $
 
 # Simple script used if NS_NAVIGATOR is set when netscape installed
 
 if [ -z "$NETSCAPE_PREFERRED" ]; then
-    NETSCAPE_PREFERRED=navigator:communicator
+    NETSCAPE_PREFERRED=navigator:communicator:mozilla
 fi
 exec ns-open $@
diff --git a/www/ns-remote/Makefile b/www/ns-remote/Makefile
index fdac0c02051..d6a779e202c 100644
--- a/www/ns-remote/Makefile
+++ b/www/ns-remote/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2001/07/22 01:08:12 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2001/07/27 14:26:19 abs Exp $
 
 DISTNAME=	ns-remote
-PKGNAME=	ns-remote-1.3
+PKGNAME=	ns-remote-1.4
 CATEGORIES=	www
 MASTER_SITES=	http://home.netscape.com/newsref/std/
 DISTFILES=	remote.c vroot.h
diff --git a/www/ns-remote/files/ns-open b/www/ns-remote/files/ns-open
index 8510f61eb62..e912e87f21b 100755
--- a/www/ns-remote/files/ns-open
+++ b/www/ns-remote/files/ns-open
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: ns-open,v 1.4 2001/01/12 23:11:05 tron Exp $
+# $NetBSD: ns-open,v 1.5 2001/07/27 14:26:19 abs Exp $
 #
 # Simple script to open a URL in Netscape, starting a new process if necessary
 # If a netscape process is not running it will look for a valid netscape
@@ -8,7 +8,7 @@
 # overridden by the user in the environment.
 
 if [ -z "$NETSCAPE_PREFERRED" ]; then
-    NETSCAPE_PREFERRED=communicator:navigator
+    NETSCAPE_PREFERRED=communicator:navigator:mozilla
 fi
 
 # Locate appropriate netscape binary and set NETSCAPE_BIN