From 440b85b2337d3e7d362ca3832d0116c2ea618e6a Mon Sep 17 00:00:00 2001
From: abs <abs>
Date: Fri, 27 Jul 2001 14:26:18 +0000
Subject: Permit netscape to default to mozilla as well as communicator and
 navigator. Leave default as communicator

---
 www/netscape/Makefile                 | 21 +++++++++++++++------
 www/netscape/files/netscape_mozilla   |  9 +++++++++
 www/netscape/files/netscape_navigator |  4 ++--
 3 files changed, 26 insertions(+), 8 deletions(-)
 create mode 100644 www/netscape/files/netscape_mozilla

(limited to 'www/netscape')

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 $@
-- 
cgit v1.2.3