summaryrefslogtreecommitdiff
path: root/www
diff options
context:
space:
mode:
authorabs <abs@pkgsrc.org>2002-09-20 17:00:41 +0000
committerabs <abs@pkgsrc.org>2002-09-20 17:00:41 +0000
commit7062c43fe07c852dac4c68e42cd32abda64611f7 (patch)
tree1942cebc6dc0137ad5e8d7d4ca3eb48135dbb374 /www
parent0efa57e8419039e5f0fc79682b197e720921c78b (diff)
downloadpkgsrc-7062c43fe07c852dac4c68e42cd32abda64611f7.tar.gz
Handle netscape7, and used sed rather than what would need to be four
versions of the startup script. The versioning here depends on the navigator package and is difficult to fix cleanly...
Diffstat (limited to 'www')
-rw-r--r--www/netscape/Makefile34
-rw-r--r--www/netscape/files/netscape (renamed from www/netscape/files/netscape_mozilla)4
-rw-r--r--www/netscape/files/netscape_navigator9
3 files changed, 17 insertions, 30 deletions
diff --git a/www/netscape/Makefile b/www/netscape/Makefile
index 512f226f6a9..141ba882bf2 100644
--- a/www/netscape/Makefile
+++ b/www/netscape/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2002/08/25 21:52:18 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2002/09/20 17:00:41 abs Exp $
#
COMMENT= Open new communicator, navigator, or mozilla window
@@ -7,38 +7,34 @@ BINNAME= netscape
.include "../navigator/Makefile.common"
-DEPENDS+= ns-remote>=1.3:../../www/ns-remote
.if defined(NS_PREFERRED) && ${NS_PREFERRED} == mozilla
-DEPENDS+= {mozilla,navigator,communicator}-[0-9]*:../../www/mozilla
-.else
-.if defined(NS_PREFERRED) && ${NS_PREFERRED} == navigator
-DEPENDS+= {navigator,communicator,mozilla}-[0-9]*:../../www/navigator
+NETSCAPE_PREFERRED=mozilla:navigator:communicator:netscape7
+.elif defined(NS_PREFERRED) && ${NS_PREFERRED} == netscape7
+NETSCAPE_PREFERRED=netscape7:navigator:communicator:mozilla
+.elif defined(NS_PREFERRED) && ${NS_PREFERRED} == navigator
+NETSCAPE_PREFERRED=navigator:communicator:mozilla:netscape7
.else
-DEPENDS+= {communicator,navigator,mozilla}-[0-9]*:../../www/communicator
-.endif
+NETSCAPE_PREFERRED=communicator:navigator:mozilla:netscape7
.endif
+DEPENDS+= ns-remote>=1.3:../../www/ns-remote
+DEPENDS+={${NETSCAPE_PREFERRED:C:\::,:g}}-[0-9]*:../../www/${NETSCAPE_PREFERRED:S:\:.*::}
+
DISTFILES= # empty
MASTER_SITES= # empty
USE_BUILDLINK2= # defined
-EXTRACT_ONLY= # empty
WRKSRC= ${WRKDIR}
NO_CHECKSUM= yes
NO_PATCH= yes
NO_CONFIGURE= yes
-do-install:
+do-build:
+ ${SED} "s/@NETSCAPE_PREFERRED@/${NETSCAPE_PREFERRED}/" \
+ ${FILESDIR}/netscape > ${WRKSRC}/netscape
-.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
+do-install:
+ ${INSTALL_SCRIPT} ${WRKSRC}/netscape ${PREFIX}/bin/netscape
.include "../../emulators/suse_linux/Makefile.application"
diff --git a/www/netscape/files/netscape_mozilla b/www/netscape/files/netscape
index 5d8ce18a066..3f495dea32c 100644
--- a/www/netscape/files/netscape_mozilla
+++ b/www/netscape/files/netscape
@@ -1,9 +1,9 @@
#!/bin/sh
-# $NetBSD: netscape_mozilla,v 1.2 2002/03/11 10:18:25 abs Exp $
+# $NetBSD: netscape,v 1.1 2002/09/20 17:00:41 abs Exp $
# Simple script used if NS_MOZILLA is set when netscape installed
if [ -z "$NETSCAPE_PREFERRED" ]; then
- NETSCAPE_PREFERRED=mozilla:navigator:communicator
+ export NETSCAPE_PREFERRED=@NETSCAPE_PREFERRED@
fi
exec ns-open "$@"
diff --git a/www/netscape/files/netscape_navigator b/www/netscape/files/netscape_navigator
deleted file mode 100644
index a3eef5d7a87..00000000000
--- a/www/netscape/files/netscape_navigator
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-# $NetBSD: netscape_navigator,v 1.3 2002/03/11 10:18:25 abs Exp $
-
-# Simple script used if NS_NAVIGATOR is set when netscape installed
-
-if [ -z "$NETSCAPE_PREFERRED" ]; then
- NETSCAPE_PREFERRED=navigator:communicator:mozilla
-fi
-exec ns-open "$@"