Use the Linux/glibc2.0 version on the i386 port; unlike the BSD/OS 2.1

version, it requires compat libs.  But, plugins work on the Linux version.

15 files changed, 61 insertions, 36 deletions

diff --git a/www/communicator/Makefile b/www/communicator/Makefile
index 590178c818f..f6a117c5970 100644
--- a/www/communicator/Makefile
+++ b/www/communicator/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 1999/05/25 01:34:24 jlam Exp $
+# $NetBSD: Makefile,v 1.9 1999/06/04 18:07:40 thorpej Exp $
 #
 # Every effort has been made to keep the communicator and navigator
 # Makefiles as similar as possible.
@@ -8,14 +8,19 @@ NS_VERS=	4.6
 NS_VERS_SHORT=	46
 #
 .if (${MACHINE_ARCH} == "i386")
-UNAME=		x86-bsdi-bsd2
-UNAME_SHORT=	bsdi21
+.if !exists(/emul/linux/lib/ld-linux.so.2)
+IGNORE=You must have Linux libraries installed - see compat_linux(8)
+.endif
+UNAME=		x86-unknown-linuxglibc2.0
+UNAME_SHORT=	linux20_glibc2
+WRKNAME=	x86-unknown-linux2.0
 .elif (${MACHINE_ARCH} == "sparc")
 .if !exists(/emul/sunos/usr/lib/ld.so)
 IGNORE=You must have SunOS libraries installed - see compat_sunos(8)
 .endif
 UNAME=		sparc-sun-sunos4.1.3_U1
 UNAME_SHORT=	sunos413
+WRKNAME=	${UNAME}
 .endif
 #
 DISTNAME=	${BINNAME}-v${NS_VERS_SHORT}-export.${UNAME}
@@ -33,7 +38,7 @@ HOMEPAGE=	http://home.netscape.com/browsers/index.html
 
 NO_BUILD=	yes
 
-WRKSRC=         ${WRKDIR}/${BINNAME}-v${NS_VERS_SHORT}.${UNAME}
+WRKSRC=         ${WRKDIR}/${BINNAME}-v${NS_VERS_SHORT}.${WRKNAME}
 MOZILLA_HOME=	${PREFIX}/lib/netscape/${PKGNAME}
 PLIST_SRC=	${WRKDIR}/.PLIST_SRC
 NS_PLIST_SED=	"s,\$${NS_VERS},${NS_VERS},g"
@@ -64,8 +69,11 @@ do-install:
 	${LN} -sf ${PKGNAME}_nis ${PREFIX}/bin/netscape_nis
 	${MV} ${MOZILLA_HOME}/netscape ${MOZILLA_HOME}/netscape_nis
 	${MV} ${MOZILLA_HOME}/netscape_dns ${MOZILLA_HOME}/netscape
-	${SED} -e ${NS_PLIST_SED} ${PKGDIR}/PLIST.sparc >>${PLIST_SRC}
 .endif
+
+	${SED} -e ${NS_PLIST_SED} ${PKGDIR}/PLIST.${MACHINE_ARCH} \
+	    >>${PLIST_SRC}
+
 	${CHOWN} -R 0:0 ${MOZILLA_HOME}
 	${CHMOD} -R go-w ${MOZILLA_HOME}
 
diff --git a/www/communicator/files/md5 b/www/communicator/files/md5
index b7d1ebde9d1..88175e7ed85 100644
--- a/www/communicator/files/md5
+++ b/www/communicator/files/md5
@@ -1,4 +1,4 @@
-$NetBSD: md5,v 1.3 1999/05/25 01:34:24 jlam Exp $
+$NetBSD: md5,v 1.4 1999/06/04 18:07:40 thorpej Exp $
 
 MD5 (communicator-v46-export.sparc-sun-sunos4.1.3_U1.tar.gz) = 5979e5a1d4096973388334d2606d2677
-MD5 (communicator-v46-export.x86-bsdi-bsd2.tar.gz) = 9102c8c61ca2523afbcaca8506a1cb28
+MD5 (communicator-v46-export.x86-unknown-linuxglibc2.0.tar.gz) = 5d9be47cb503e9e7f27e206852b591bc
diff --git a/www/communicator/pkg/COMMENT b/www/communicator/pkg/COMMENT
index 84b286ef37b..fd122dc4b0b 100644
--- a/www/communicator/pkg/COMMENT
+++ b/www/communicator/pkg/COMMENT
@@ -1 +1 @@
-Netscape communicator complete install - BSDi/SunOS binary
+Netscape communicator complete install - Linux/SunOS binary
diff --git a/www/communicator/pkg/MESSAGE b/www/communicator/pkg/MESSAGE
index 64f3f7a9346..61b4925bd38 100644
--- a/www/communicator/pkg/MESSAGE
+++ b/www/communicator/pkg/MESSAGE
@@ -1,9 +1,8 @@
 ==========================================================================
-$NetBSD: MESSAGE,v 1.1.1.1 1999/02/22 07:44:48 abs Exp $
+$NetBSD: MESSAGE,v 1.2 1999/06/04 18:07:40 thorpej Exp $
 
-i386:	To run the BSDi version of Netscape, you do not need any compat
-	libraries, but you must have all of COMPAT_43, COMPAT_NOMID, COMPAT_09,
-	COMPAT_10, COMPAT_12 (and COMPAT_13, if applicable) in your kernel.
+i386:	To run the Linux version of Netscape, you need COMPAT_LINUX and
+	EXEC_ELF32 in your kernel, plus a full set of /emul/linux libraries.
 
 sparc:	To run the SunOS version of Netscape, you need COMPAT_SUNOS in your
 	kernel, plus a full set of /emul/sunos/usr/lib libraries.
diff --git a/www/communicator/pkg/PLIST.i386 b/www/communicator/pkg/PLIST.i386
new file mode 100644
index 00000000000..9d53cead6b3
--- /dev/null
+++ b/www/communicator/pkg/PLIST.i386
@@ -0,0 +1,6 @@
+@comment $NetBSD: PLIST.i386,v 1.1 1999/06/04 18:07:40 thorpej Exp $
+lib/netscape/communicator-${NS_VERS}/libjsd.so
+lib/netscape/communicator-${NS_VERS}/dynfonts/libTrueDoc.so
+lib/netscape/communicator-${NS_VERS}/plugins/libnullplugin.so
+lib/netscape/communicator-${NS_VERS}/netscape-dynMotif
+lib/netscape/communicator-${NS_VERS}/libnullplugin-dynMotif.so
diff --git a/www/communicator/pkg/PLIST.post b/www/communicator/pkg/PLIST.post
index eff873a4856..a45c6511e33 100644
--- a/www/communicator/pkg/PLIST.post
+++ b/www/communicator/pkg/PLIST.post
@@ -1,7 +1,7 @@
-@comment $NetBSD: PLIST.post,v 1.3 1999/05/25 01:34:24 jlam Exp $
+@comment $NetBSD: PLIST.post,v 1.4 1999/06/04 18:07:40 thorpej Exp $
+@dirrm lib/netscape/communicator-${NS_VERS}/dynfonts
 @dirrm lib/netscape/communicator-${NS_VERS}/spell
 @dirrm lib/netscape/communicator-${NS_VERS}/plugins
-@dirrm lib/netscape/communicator-${NS_VERS}/nls
 @dirrm lib/netscape/communicator-${NS_VERS}/nethelp/netscape/trouble
 @dirrm lib/netscape/communicator-${NS_VERS}/nethelp/netscape/shared
 @dirrm lib/netscape/communicator-${NS_VERS}/nethelp/netscape/news
diff --git a/www/communicator/pkg/PLIST.pre b/www/communicator/pkg/PLIST.pre
index ce418c434d6..a5555ed9c8f 100644
--- a/www/communicator/pkg/PLIST.pre
+++ b/www/communicator/pkg/PLIST.pre
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.pre,v 1.3 1999/05/25 01:34:24 jlam Exp $
+@comment $NetBSD: PLIST.pre,v 1.4 1999/06/04 18:07:41 thorpej Exp $
 bin/communicator-${NS_VERS}
 bin/netscape
 lib/netscape/communicator-${NS_VERS}/java/classes/ifc11.jar
@@ -172,7 +172,5 @@ lib/netscape/communicator-${NS_VERS}/movemail-src/COPYING
 lib/netscape/communicator-${NS_VERS}/movemail-src/README
 lib/netscape/communicator-${NS_VERS}/plugins/cpPack1.jar
 lib/netscape/communicator-${NS_VERS}/bookmark.htm
-lib/netscape/communicator-${NS_VERS}/nls/C
-lib/netscape/communicator-${NS_VERS}/nls/nls.dir
 lib/netscape/communicator-${NS_VERS}/spell/pen4s324.dat
 lib/netscape/communicator-${NS_VERS}/spell/netscape.dic
diff --git a/www/communicator/pkg/PLIST.sparc b/www/communicator/pkg/PLIST.sparc
index aebf3047ea7..324e54f53f3 100644
--- a/www/communicator/pkg/PLIST.sparc
+++ b/www/communicator/pkg/PLIST.sparc
@@ -1,8 +1,10 @@
-@comment $NetBSD: PLIST.sparc,v 1.3 1999/05/25 01:34:24 jlam Exp $
+@comment $NetBSD: PLIST.sparc,v 1.4 1999/06/04 18:07:41 thorpej Exp $
 bin/communicator-${NS_VERS}_nis
 bin/netscape_nis
 lib/netscape/communicator-${NS_VERS}/netscape_nis
 lib/netscape/communicator-${NS_VERS}/libjsd.so.1.0
 lib/netscape/communicator-${NS_VERS}/dynfonts/libTrueDoc.so
 lib/netscape/communicator-${NS_VERS}/plugins/libnullplugin.so
-@dirrm lib/netscape/communicator-${NS_VERS}/dynfonts
+lib/netscape/communicator-${NS_VERS}/nls/C
+lib/netscape/communicator-${NS_VERS}/nls/nls.dir
+@dirrm lib/netscape/communicator-${NS_VERS}/nls
diff --git a/www/navigator/Makefile b/www/navigator/Makefile
index 0d345c2cd50..3481b182d64 100644
--- a/www/navigator/Makefile
+++ b/www/navigator/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 1999/05/25 01:34:53 jlam Exp $
+# $NetBSD: Makefile,v 1.7 1999/06/04 18:07:41 thorpej Exp $
 #
 # Every effort has been made to keep the communicator and navigator
 # Makefiles as similar as possible.
@@ -8,14 +8,19 @@ NS_VERS=	4.6
 NS_VERS_SHORT=	46
 #
 .if (${MACHINE_ARCH} == "i386")
-UNAME=		x86-bsdi-bsd2
-UNAME_SHORT=	bsdi21
+.if !exists(/emul/linux/lib/ld-linux.so.2)
+IGNORE=You must have Linux libraries installed - see compat_linux(8)
+.endif
+UNAME=		x86-unknown-linuxglibc2.0
+UNAME_SHORT=	linux20_glibc2
+WRKNAME=	x86-unknown-linux2.0
 .elif (${MACHINE_ARCH} == "sparc")
 .if !exists(/emul/sunos/usr/lib/ld.so)
 IGNORE=You must have SunOS libraries installed - see compat_sunos(8)
 .endif
 UNAME=		sparc-sun-sunos4.1.3_U1
 UNAME_SHORT=	sunos413
+WRKNAME=	${UNAME}
 .endif
 #
 DISTNAME=	${BINNAME}-v${NS_VERS_SHORT}-export.${UNAME}
@@ -32,7 +37,7 @@ HOMEPAGE=	http://home.netscape.com/browsers/index.html
 
 NO_BUILD=	yes
 
-WRKSRC=         ${WRKDIR}/${BINNAME}-v${NS_VERS_SHORT}.${UNAME}
+WRKSRC=         ${WRKDIR}/${BINNAME}-v${NS_VERS_SHORT}.${WRKNAME}
 MOZILLA_HOME=	${PREFIX}/lib/netscape/${PKGNAME}
 PLIST_SRC=	${WRKDIR}/.PLIST_SRC
 NS_PLIST_SED=   "s,\$${NS_VERS},${NS_VERS},g"
@@ -60,8 +65,11 @@ do-install:
 	    ${PREFIX}/bin/${PKGNAME}_nis
 	${MV} ${MOZILLA_HOME}/netscape ${MOZILLA_HOME}/netscape_nis
 	${MV} ${MOZILLA_HOME}/netscape_dns ${MOZILLA_HOME}/netscape
-	${SED} -e ${NS_PLIST_SED} ${PKGDIR}/PLIST.sparc >>${PLIST_SRC}
 .endif
+
+	${SED} -e ${NS_PLIST_SED} ${PKGDIR}/PLIST.${MACHINE_ARCH} \
+	    >>${PLIST_SRC}
+
 	${CHOWN} -R 0:0 ${MOZILLA_HOME}
 	${CHMOD} -R go-w ${MOZILLA_HOME}
 
diff --git a/www/navigator/pkg/COMMENT b/www/navigator/pkg/COMMENT
index ea419b34c91..5acc835e887 100644
--- a/www/navigator/pkg/COMMENT
+++ b/www/navigator/pkg/COMMENT
@@ -1 +1 @@
-Netscape navigator standalone browser - BSDi/SunOS binary
+Netscape navigator standalone browser - Linux/SunOS binary
diff --git a/www/navigator/pkg/MESSAGE b/www/navigator/pkg/MESSAGE
index 5b6b5f7121b..1651bf4f5c4 100644
--- a/www/navigator/pkg/MESSAGE
+++ b/www/navigator/pkg/MESSAGE
@@ -1,9 +1,8 @@
 ==========================================================================
-$NetBSD: MESSAGE,v 1.1.1.1 1999/02/22 07:45:22 abs Exp $
+$NetBSD: MESSAGE,v 1.2 1999/06/04 18:07:41 thorpej Exp $
 
-i386:	To run the BSDi version of Netscape, you do not need any compat
-	libraries, but you must have all of COMPAT_43, COMPAT_NOMID, COMPAT_09,
-	COMPAT_10, COMPAT_12 (and COMPAT_13, if applicable) in your kernel.
+i386:	To run the Linux version of Netscape, you need COMPAT_LINUX and
+	EXEC_ELF32 in your kernel, plus a full set of /emul/linux libraries.
 
 sparc:	To run the SunOS version of Netscape, you need COMPAT_SUNOS in your
 	kernel, plus a full set of /emul/sunos/usr/lib libraries.
diff --git a/www/navigator/pkg/PLIST.i386 b/www/navigator/pkg/PLIST.i386
new file mode 100644
index 00000000000..26f33c6b4c9
--- /dev/null
+++ b/www/navigator/pkg/PLIST.i386
@@ -0,0 +1,5 @@
+@comment $NetBSD: PLIST.i386,v 1.1 1999/06/04 18:07:41 thorpej Exp $
+lib/netscape/navigator-${NS_VERS}/dynfonts/libTrueDoc.so
+lib/netscape/navigator-${NS_VERS}/plugins/libnullplugin.so
+lib/netscape/navigator-${NS_VERS}/netscape-dynMotif
+lib/netscape/navigator-${NS_VERS}/libnullplugin-dynMotif.so
diff --git a/www/navigator/pkg/PLIST.post b/www/navigator/pkg/PLIST.post
index 315860793a0..46898e9302a 100644
--- a/www/navigator/pkg/PLIST.post
+++ b/www/navigator/pkg/PLIST.post
@@ -1,6 +1,6 @@
-@comment $NetBSD: PLIST.post,v 1.3 1999/05/25 01:34:53 jlam Exp $
+@comment $NetBSD: PLIST.post,v 1.4 1999/06/04 18:07:41 thorpej Exp $
+@dirrm lib/netscape/navigator-${NS_VERS}/dynfonts
 @dirrm lib/netscape/navigator-${NS_VERS}/plugins
-@dirrm lib/netscape/navigator-${NS_VERS}/nls
 @dirrm lib/netscape/navigator-${NS_VERS}/nethelp/netscape/shared
 @dirrm lib/netscape/navigator-${NS_VERS}/nethelp/netscape/navigatr
 @dirrm lib/netscape/navigator-${NS_VERS}/nethelp/netscape/home
diff --git a/www/navigator/pkg/PLIST.pre b/www/navigator/pkg/PLIST.pre
index 66d20a24641..2b949beeca5 100644
--- a/www/navigator/pkg/PLIST.pre
+++ b/www/navigator/pkg/PLIST.pre
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.pre,v 1.3 1999/05/25 01:34:53 jlam Exp $
+@comment $NetBSD: PLIST.pre,v 1.4 1999/06/04 18:07:41 thorpej Exp $
 bin/navigator-${NS_VERS}
 lib/netscape/navigator-${NS_VERS}/LICENSE
 lib/netscape/navigator-${NS_VERS}/Netscape.ad
@@ -131,7 +131,5 @@ lib/netscape/navigator-${NS_VERS}/nethelp/netwatch.gif
 lib/netscape/navigator-${NS_VERS}/nethelp/picsfail.htm
 lib/netscape/navigator-${NS_VERS}/nethelp/picsfail.jar
 lib/netscape/navigator-${NS_VERS}/netscape
-lib/netscape/navigator-${NS_VERS}/nls/C
-lib/netscape/navigator-${NS_VERS}/nls/nls.dir
 lib/netscape/navigator-${NS_VERS}/plugins/cpPack1.jar
 lib/netscape/navigator-${NS_VERS}/vreg
diff --git a/www/navigator/pkg/PLIST.sparc b/www/navigator/pkg/PLIST.sparc
index bcad181caef..f46b0cbc8e7 100644
--- a/www/navigator/pkg/PLIST.sparc
+++ b/www/navigator/pkg/PLIST.sparc
@@ -1,5 +1,7 @@
-@comment $NetBSD: PLIST.sparc,v 1.3 1999/05/25 01:34:54 jlam Exp $
+@comment $NetBSD: PLIST.sparc,v 1.4 1999/06/04 18:07:41 thorpej Exp $
 lib/netscape/navigator-${NS_VERS}/netscape_nis
 lib/netscape/navigator-${NS_VERS}/dynfonts/libTrueDoc.so
 lib/netscape/navigator-${NS_VERS}/plugins/libnullplugin.so
-@dirrm lib/netscape/navigator-${NS_VERS}/dynfonts
+lib/netscape/navigator-${NS_VERS}/nls/C
+lib/netscape/navigator-${NS_VERS}/nls/nls.dir
+@dirrm lib/netscape/navigator-${NS_VERS}/nls