Make netscape4 ports use the new wrapper which I've freshly imported

as www/netscape-wrapper.

Approved by:	sada (conditionally), o`brien

12 files changed, 26 insertions, 20 deletions

diff --git a/www/bsdi-netscape47-communicator/pkg-plist b/www/bsdi-netscape47-communicator/pkg-plist
index 19759a3e72f1..42c9b5319482 100644
--- a/www/bsdi-netscape47-communicator/pkg-plist
+++ b/www/bsdi-netscape47-communicator/pkg-plist
@@ -1,7 +1,7 @@
 bin/%%BROWSER%%-%%BROWSER_VER%%
 @exec ln -sf %f %B/%%BROWSER%%-4
-@exec ln -sf %%BROWSER%%-4 %B/netscape
-@unexec rm -f %B/netscape
+@exec ln -sf %%BROWSER%%-4 %B/netscape.run
+@unexec rm -f %B/netscape.run
 @unexec rm -f %B/%%BROWSER%%-4
 %%NSUBDIR%%/LICENSE
 %%NSUBDIR%%/Netscape.ad
diff --git a/www/bsdi-netscape47-navigator/pkg-plist b/www/bsdi-netscape47-navigator/pkg-plist
index aeda30e06a91..8e674cf3a025 100644
--- a/www/bsdi-netscape47-navigator/pkg-plist
+++ b/www/bsdi-netscape47-navigator/pkg-plist
@@ -1,7 +1,7 @@
 bin/navigator-%%BROWSER_VER%%
 @exec ln -sf %f %B/navigator-4
-@exec ln -sf navigator-4 %B/netscape
-@unexec rm -f %B/netscape
+@exec ln -sf navigator-4 %B/netscape.run
+@unexec rm -f %B/netscape.run
 @unexec rm -f %B/navigator-4
 %%NSUBDIR%%/LICENSE
 %%NSUBDIR%%/Netscape.ad
diff --git a/www/linux-netscape4/Makefile b/www/linux-netscape4/Makefile
index 78917f65586a..690720928edb 100644
--- a/www/linux-netscape4/Makefile
+++ b/www/linux-netscape4/Makefile
@@ -16,7 +16,8 @@ DISTNAME=	communicator-v408-export.x86-unknown-linux2.0_libc5
 
 MAINTAINER=	tom@eborcom.com
 
-RUN_DEPENDS=	/compat/linux/lib/ld.so:${PORTSDIR}/emulators/linux_base
+RUN_DEPENDS=	/compat/linux/lib/ld.so:${PORTSDIR}/emulators/linux_base \
+		netscape:${PORTSDIR}/www/netscape-wrapper
 
 ONLY_FOR_ARCHS=	i386
 
@@ -30,7 +31,7 @@ do-install:
 	cd ${WRKSRC} && yes "" | \
 	    LC_TIME=C MOZILLA_HOME="${NDIR}" ./ns-install
 	${MV} -f ${NDIR}/netscape ${NDIR}/netscape.bin
-	${INSTALL_SCRIPT} ${WRKSRC}/netscape ${BINDIR}
+	${INSTALL_SCRIPT} ${WRKSRC}/netscape ${BINDIR}/netscape.run
 	if [ ! -f ${NDIR}/mailcap ] ; then \
 	    ${INSTALL_DATA} ${FILESDIR}/mailcap ${NDIR}; \
 	fi
diff --git a/www/linux-netscape4/pkg-plist b/www/linux-netscape4/pkg-plist
index b565cfbeedf2..5cf4e093113b 100644
--- a/www/linux-netscape4/pkg-plist
+++ b/www/linux-netscape4/pkg-plist
@@ -1,4 +1,4 @@
-bin/netscape
+bin/netscape.run
 lib/netscape/LICENSE
 lib/netscape/Netscape.ad
 lib/netscape/README
diff --git a/www/linux-netscape47-communicator/Makefile b/www/linux-netscape47-communicator/Makefile
index 7c726b17cc2c..7c4b24b7b0f0 100644
--- a/www/linux-netscape47-communicator/Makefile
+++ b/www/linux-netscape47-communicator/Makefile
@@ -15,7 +15,8 @@ DISTFILES=	${BROWSER}-v472-export.x86-unknown-linuxglibc2.0.tar.gz
 
 MAINTAINER=	girgen@partitur.se
 
-RUN_DEPENDS=	/compat/linux/lib/ld.so:${PORTSDIR}/emulators/linux_base
+RUN_DEPENDS=	/compat/linux/lib/ld.so:${PORTSDIR}/emulators/linux_base \
+		netscape:${PORTSDIR}/www/netscape-wrapper
 
 ONLY_FOR_ARCHS=	i386
 
diff --git a/www/linux-netscape47-communicator/pkg-plist b/www/linux-netscape47-communicator/pkg-plist
index d9475d58c903..f1a4ef7a5ce2 100644
--- a/www/linux-netscape47-communicator/pkg-plist
+++ b/www/linux-netscape47-communicator/pkg-plist
@@ -1,7 +1,7 @@
 bin/%%BROWSER%%-%%BROWSER_VER%%
 @exec ln -sf %f %B/%%BROWSER%%-4
-@exec ln -sf %%BROWSER%%-4 %B/netscape
-@unexec rm -f %B/netscape
+@exec ln -sf %%BROWSER%%-4 %B/netscape.run
+@unexec rm -f %B/netscape.run
 @unexec rm -f %B/%%BROWSER%%-4
 %%NSUBDIR%%/java/classes/ifc11.jar
 %%NSUBDIR%%/java/classes/iiop10.jar
diff --git a/www/netscape4-communicator/Makefile b/www/netscape4-communicator/Makefile
index f1e5e3c12e3c..d671d486114d 100644
--- a/www/netscape4-communicator/Makefile
+++ b/www/netscape4-communicator/Makefile
@@ -13,6 +13,8 @@ DISTFILES?=	communicator-v408-export.x86-unknown-freebsd.tar.gz
 
 MAINTAINER?=	sada@FreeBSD.org
 
+RUN_DEPENDS+=	netscape:${PORTSDIR}/www/netscape-wrapper
+
 Y2K=		http://home.netscape.com/products/year2000/faq/client.html
 
 .if !defined(INFILE_HEAD)
@@ -95,7 +97,7 @@ do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/netscape \
 		${BINDIR}/${BROWSER_ARC}-${BROWSER_VER}
 	${LN} -sf ${BROWSER_ARC}-${BROWSER_VER} ${BINDIR}/${BROWSER_ARC}-4
-	${LN} -sf ${BROWSER_ARC}-4 ${BINDIR}/netscape
+	${LN} -sf ${BROWSER_ARC}-4 ${BINDIR}/netscape.run
 	if [ ! -f ${NDIR}/mailcap ] ; then \
 		${INSTALL_DATA} ${MAILCAP} ${NDIR}; \
 	fi
diff --git a/www/netscape4-communicator/pkg-plist b/www/netscape4-communicator/pkg-plist
index 4d60cb1aafaf..560eb8c9e803 100644
--- a/www/netscape4-communicator/pkg-plist
+++ b/www/netscape4-communicator/pkg-plist
@@ -1,7 +1,7 @@
 bin/communicator-%%BROWSER_VER%%
 @exec ln -sf %f %B/communicator-4
-@exec ln -sf communicator-4 %B/netscape
-@unexec rm -f %B/netscape
+@exec ln -sf communicator-4 %B/netscape.run
+@unexec rm -f %B/netscape.run
 @unexec rm -f %B/communicator-4
 %%NSUBDIR%%/README
 %%NSUBDIR%%/LICENSE
diff --git a/www/netscape47-communicator/pkg-plist b/www/netscape47-communicator/pkg-plist
index 19759a3e72f1..42c9b5319482 100644
--- a/www/netscape47-communicator/pkg-plist
+++ b/www/netscape47-communicator/pkg-plist
@@ -1,7 +1,7 @@
 bin/%%BROWSER%%-%%BROWSER_VER%%
 @exec ln -sf %f %B/%%BROWSER%%-4
-@exec ln -sf %%BROWSER%%-4 %B/netscape
-@unexec rm -f %B/netscape
+@exec ln -sf %%BROWSER%%-4 %B/netscape.run
+@unexec rm -f %B/netscape.run
 @unexec rm -f %B/%%BROWSER%%-4
 %%NSUBDIR%%/LICENSE
 %%NSUBDIR%%/Netscape.ad
diff --git a/www/netscape47-navigator/pkg-plist b/www/netscape47-navigator/pkg-plist
index aeda30e06a91..8e674cf3a025 100644
--- a/www/netscape47-navigator/pkg-plist
+++ b/www/netscape47-navigator/pkg-plist
@@ -1,7 +1,7 @@
 bin/navigator-%%BROWSER_VER%%
 @exec ln -sf %f %B/navigator-4
-@exec ln -sf navigator-4 %B/netscape
-@unexec rm -f %B/netscape
+@exec ln -sf navigator-4 %B/netscape.run
+@unexec rm -f %B/netscape.run
 @unexec rm -f %B/navigator-4
 %%NSUBDIR%%/LICENSE
 %%NSUBDIR%%/Netscape.ad
diff --git a/www/netscape48-communicator/Makefile b/www/netscape48-communicator/Makefile
index f1e5e3c12e3c..d671d486114d 100644
--- a/www/netscape48-communicator/Makefile
+++ b/www/netscape48-communicator/Makefile
@@ -13,6 +13,8 @@ DISTFILES?=	communicator-v408-export.x86-unknown-freebsd.tar.gz
 
 MAINTAINER?=	sada@FreeBSD.org
 
+RUN_DEPENDS+=	netscape:${PORTSDIR}/www/netscape-wrapper
+
 Y2K=		http://home.netscape.com/products/year2000/faq/client.html
 
 .if !defined(INFILE_HEAD)
@@ -95,7 +97,7 @@ do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/netscape \
 		${BINDIR}/${BROWSER_ARC}-${BROWSER_VER}
 	${LN} -sf ${BROWSER_ARC}-${BROWSER_VER} ${BINDIR}/${BROWSER_ARC}-4
-	${LN} -sf ${BROWSER_ARC}-4 ${BINDIR}/netscape
+	${LN} -sf ${BROWSER_ARC}-4 ${BINDIR}/netscape.run
 	if [ ! -f ${NDIR}/mailcap ] ; then \
 		${INSTALL_DATA} ${MAILCAP} ${NDIR}; \
 	fi
diff --git a/www/netscape48-communicator/pkg-plist b/www/netscape48-communicator/pkg-plist
index 4d60cb1aafaf..560eb8c9e803 100644
--- a/www/netscape48-communicator/pkg-plist
+++ b/www/netscape48-communicator/pkg-plist
@@ -1,7 +1,7 @@
 bin/communicator-%%BROWSER_VER%%
 @exec ln -sf %f %B/communicator-4
-@exec ln -sf communicator-4 %B/netscape
-@unexec rm -f %B/netscape
+@exec ln -sf communicator-4 %B/netscape.run
+@unexec rm -f %B/netscape.run
 @unexec rm -f %B/communicator-4
 %%NSUBDIR%%/README
 %%NSUBDIR%%/LICENSE