Add NS_USE_BSDI to allow people to select the i386 BSDI binary for navigator

and communicator. Also rename PLIST files to reflect the real OS, and include
${BINNAME} (navigator/communicator)

12 files changed, 191 insertions, 174 deletions

diff --git a/www/navigator/Makefile.common b/www/navigator/Makefile.common
index 0ab1e310f03..0fe23fe370d 100644
--- a/www/navigator/Makefile.common
+++ b/www/navigator/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.9 2000/05/09 07:12:58 tron Exp $
+# $NetBSD: Makefile.common,v 1.10 2000/05/09 13:23:20 abs Exp $
 #
 # Common include file for communicator and navigator packages
 
@@ -19,6 +19,7 @@ LDAP_VERS=	30
 #	VENDOR_NAME	Only used in '128-bit key version' information message
 #
 .if ${OPSYS} == "SunOS" && ${MACHINE_ARCH} == "sparc"
+PLIST_ARCH=	solaris-sparc
 DISTUNAME=	sparc-sun-solaris2.5.1
 DIST_DIR_NAME=	supported/sunos551
 WRKNAME=	sparc-sun-solaris2.5.1
@@ -28,12 +29,23 @@ VENDOR_NAME=	Solaris 2.5.1
 .if !exists(/emul/osf1/sbin/loader)
 IGNORE=	"requires Digital UNIX libraries - see compat_osf1(8)"
 .endif
+PLIST_ARCH=	osf-alpha
 DISTUNAME=	alpha-dec-osf4.0
 DIST_DIR_NAME=	supported/dec_unix40
 WRKNAME=	alpha-dec-osf4.0
 VENDOR_NAME=	Tru64 UNIX
 #
+.elif (${MACHINE_ARCH} == "i386" && defined(NS_USE_BSDI))
+PLIST_ARCH=	bsdi-i386
+NS_VERS=	4.72
+LDAP_VERS=	40
+DISTUNAME=	x86-bsdi-bsd2
+DIST_DIR_NAME=	unsupported/bsdi21
+WRKNAME=	x86-bsdi-bsd2
+VENDOR_NAME=	BSD/OS 2.1
+#
 .elif (${MACHINE_ARCH} == "i386")
+PLIST_ARCH=	linux-i386
 NS_VERS=	4.72
 LDAP_VERS=	40
 DEPENDS=	suse_linux>=6.1:../../emulators/suse_linux
@@ -47,6 +59,7 @@ VENDOR_NAME=	Linux 2.2
 IGNORE=	"requires SunOS libraries - see compat_sunos(8)"
 .endif
 NS_VERS=	4.61
+PLIST_ARCH=	sunos-sparc
 DISTUNAME=	sparc-sun-sunos4.1.3_U1
 DIST_DIR_NAME=	unsupported/sunos413
 WRKNAME=	${DISTUNAME}
@@ -80,9 +93,9 @@ MOZILLA_HOME=	${PREFIX}/lib/netscape/${PKGNAME}
 NS_PLUGINS_DIR=	${PREFIX}/lib/netscape/plugins
 
 PLIST_SRC=	${PKGDIR}/PLIST.pre \
-		${PKGDIR}/PLIST.${LOWER_OPSYS}-${MACHINE_ARCH} \
+		${PKGDIR}/PLIST.${PLIST_ARCH} \
 		${PKGDIR}/PLIST.post
-PLIST_SUBST+=	NS_VERS=${NS_VERS} LDAP_VERS=${LDAP_VERS}
+PLIST_SUBST+=	NS_VERS=${NS_VERS} LDAP_VERS=${LDAP_VERS} BINNAME=${BINNAME}
 
 .if (${NS_ENCRYPTION} == "us")
 MASTER_SITES=
diff --git a/www/navigator/files/md5 b/www/navigator/files/md5
index 1056608b5d3..a8cbb434b15 100644
--- a/www/navigator/files/md5
+++ b/www/navigator/files/md5
@@ -1,7 +1,8 @@
-$NetBSD: md5,v 1.12 2000/05/07 16:12:07 fredb Exp $
+$NetBSD: md5,v 1.13 2000/05/09 13:23:20 abs Exp $
 
 MD5 (netscape/navigator-v461-export.sparc-sun-sunos4.1.3_U1.tar.gz) = a1bc10d5dfce9f36ddae55930d683b6d
-MD5 (netscape/navigator-v47-export.sparc-sun-solaris2.5.1.tar.gz) = 0c8a97a845456cb260ba58a6717629d9
 MD5 (netscape/navigator-v47-export.alpha-dec-osf4.0.tar.gz) = 91244e06363f0fc8a277c2ebe6ed7b67
+MD5 (netscape/navigator-v47-export.sparc-sun-solaris2.5.1.tar.gz) = 0c8a97a845456cb260ba58a6717629d9
+MD5 (netscape/navigator-v472-export.x86-bsdi-bsd2.tar.gz) = 3123a2c6d8d771911e85f5c3951f4646
 MD5 (netscape/navigator-v472-export.x86-unknown-linux2.2.tar.gz) = e1bab205e701c0bda90df2d7c37f0431
 MD5 (netscape/navigator-v472-us.x86-unknown-linux2.2.tar.gz) = 226b8869ca741527924f7e759c2cac85
diff --git a/www/navigator/pkg/PLIST.bsdi-i386 b/www/navigator/pkg/PLIST.bsdi-i386
new file mode 100644
index 00000000000..4658730f224
--- /dev/null
+++ b/www/navigator/pkg/PLIST.bsdi-i386
@@ -0,0 +1,4 @@
+@comment $NetBSD: PLIST.bsdi-i386,v 1.1 2000/05/09 13:23:21 abs Exp $
+lib/netscape/${BINNAME}-${NS_VERS}/nls/C
+lib/netscape/${BINNAME}-${NS_VERS}/nls/nls.dir
+@dirrm lib/netscape/${BINNAME}-${NS_VERS}/nls
diff --git a/www/navigator/pkg/PLIST.linux-i386 b/www/navigator/pkg/PLIST.linux-i386
new file mode 100644
index 00000000000..59907fc47d0
--- /dev/null
+++ b/www/navigator/pkg/PLIST.linux-i386
@@ -0,0 +1,4 @@
+@comment $NetBSD: PLIST.linux-i386,v 1.1 2000/05/09 13:23:21 abs Exp $
+lib/netscape/${BINNAME}-${NS_VERS}/plugins/libnullplugin.so
+lib/netscape/${BINNAME}-${NS_VERS}/netscape-dynMotif
+lib/netscape/${BINNAME}-${NS_VERS}/libnullplugin-dynMotif.so
diff --git a/www/navigator/pkg/PLIST.netbsd-alpha b/www/navigator/pkg/PLIST.netbsd-alpha
deleted file mode 100644
index a17ee1e6b25..00000000000
--- a/www/navigator/pkg/PLIST.netbsd-alpha
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST.netbsd-alpha,v 1.1 1999/08/13 21:24:12 abs Exp $
-lib/netscape/navigator-${NS_VERS}/plugins/libnullplugin.so
diff --git a/www/navigator/pkg/PLIST.netbsd-i386 b/www/navigator/pkg/PLIST.netbsd-i386
deleted file mode 100644
index 3fa67d41c41..00000000000
--- a/www/navigator/pkg/PLIST.netbsd-i386
+++ /dev/null
@@ -1,4 +0,0 @@
-@comment $NetBSD: PLIST.netbsd-i386,v 1.2 2000/01/05 15:43:36 abs Exp $
-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.netbsd-sparc b/www/navigator/pkg/PLIST.netbsd-sparc
deleted file mode 100644
index 79c3de0a35c..00000000000
--- a/www/navigator/pkg/PLIST.netbsd-sparc
+++ /dev/null
@@ -1,8 +0,0 @@
-@comment $NetBSD: PLIST.netbsd-sparc,v 1.1 1999/08/13 21:24:12 abs Exp $
-lib/netscape/navigator-${NS_VERS}/netscape_nis
-lib/netscape/navigator-${NS_VERS}/dynfonts/libTrueDoc.so
-lib/netscape/navigator-${NS_VERS}/plugins/libnullplugin.so
-lib/netscape/navigator-${NS_VERS}/nls/C
-lib/netscape/navigator-${NS_VERS}/nls/nls.dir
-@dirrm lib/netscape/navigator-${NS_VERS}/dynfonts
-@dirrm lib/netscape/navigator-${NS_VERS}/nls
diff --git a/www/navigator/pkg/PLIST.osf-alpha b/www/navigator/pkg/PLIST.osf-alpha
new file mode 100644
index 00000000000..d6f8253babd
--- /dev/null
+++ b/www/navigator/pkg/PLIST.osf-alpha
@@ -0,0 +1,2 @@
+@comment $NetBSD: PLIST.osf-alpha,v 1.1 2000/05/09 13:23:21 abs Exp $
+lib/netscape/${BINNAME}-${NS_VERS}/plugins/libnullplugin.so
diff --git a/www/navigator/pkg/PLIST.post b/www/navigator/pkg/PLIST.post
index 36a6ebe4097..7da0251c90e 100644
--- a/www/navigator/pkg/PLIST.post
+++ b/www/navigator/pkg/PLIST.post
@@ -1,16 +1,16 @@
-@comment $NetBSD: PLIST.post,v 1.6 1999/09/04 16:38:30 jlam Exp $
-@dirrm lib/netscape/navigator-${NS_VERS}/plugins
-@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
-@dirrm lib/netscape/navigator-${NS_VERS}/nethelp/netscape
-@dirrm lib/netscape/navigator-${NS_VERS}/nethelp
-@dirrm lib/netscape/navigator-${NS_VERS}/java/classes/irix
-@dirrm lib/netscape/navigator-${NS_VERS}/java/classes/hpux
-@dirrm lib/netscape/navigator-${NS_VERS}/java/classes/aix
-@dirrm lib/netscape/navigator-${NS_VERS}/java/classes
-@dirrm lib/netscape/navigator-${NS_VERS}/java
-@dirrm lib/netscape/navigator-${NS_VERS}
+@comment $NetBSD: PLIST.post,v 1.7 2000/05/09 13:23:21 abs Exp $
+@dirrm lib/netscape/${BINNAME}-${NS_VERS}/plugins
+@dirrm lib/netscape/${BINNAME}-${NS_VERS}/nethelp/netscape/shared
+@dirrm lib/netscape/${BINNAME}-${NS_VERS}/nethelp/netscape/navigatr
+@dirrm lib/netscape/${BINNAME}-${NS_VERS}/nethelp/netscape/home
+@dirrm lib/netscape/${BINNAME}-${NS_VERS}/nethelp/netscape
+@dirrm lib/netscape/${BINNAME}-${NS_VERS}/nethelp
+@dirrm lib/netscape/${BINNAME}-${NS_VERS}/java/classes/irix
+@dirrm lib/netscape/${BINNAME}-${NS_VERS}/java/classes/hpux
+@dirrm lib/netscape/${BINNAME}-${NS_VERS}/java/classes/aix
+@dirrm lib/netscape/${BINNAME}-${NS_VERS}/java/classes
+@dirrm lib/netscape/${BINNAME}-${NS_VERS}/java
+@dirrm lib/netscape/${BINNAME}-${NS_VERS}
 @exec mkdir -p %D/lib/netscape/plugins
 @unexec rmdir %D/lib/netscape/plugins 2>/dev/null || true
 @unexec rmdir %D/lib/netscape 2>/dev/null || true
diff --git a/www/navigator/pkg/PLIST.pre b/www/navigator/pkg/PLIST.pre
index d366421ad10..e696fcab24e 100644
--- a/www/navigator/pkg/PLIST.pre
+++ b/www/navigator/pkg/PLIST.pre
@@ -1,136 +1,135 @@
-@comment $NetBSD: PLIST.pre,v 1.6 2000/04/30 14:42:22 sakamoto Exp $
-bin/navigator-${NS_VERS}
-bin/navigator
-lib/netscape/navigator-${NS_VERS}/LICENSE
-lib/netscape/navigator-${NS_VERS}/Netscape.ad
-lib/netscape/navigator-${NS_VERS}/README
-lib/netscape/navigator-${NS_VERS}/XKeysymDB
-lib/netscape/navigator-${NS_VERS}/bookmark.htm
-lib/netscape/navigator-${NS_VERS}/java/classes/aix/font.properties
-lib/netscape/navigator-${NS_VERS}/java/classes/aix/font.properties.cs
-lib/netscape/navigator-${NS_VERS}/java/classes/aix/font.properties.hu
-lib/netscape/navigator-${NS_VERS}/java/classes/aix/font.properties.ja
-lib/netscape/navigator-${NS_VERS}/java/classes/aix/font.properties.ko
-lib/netscape/navigator-${NS_VERS}/java/classes/aix/font.properties.pl
-lib/netscape/navigator-${NS_VERS}/java/classes/aix/font.properties.ru
-lib/netscape/navigator-${NS_VERS}/java/classes/aix/font.properties.zh
-lib/netscape/navigator-${NS_VERS}/java/classes/aix/font.properties.zh_TW
-lib/netscape/navigator-${NS_VERS}/java/classes/awt.properties
-lib/netscape/navigator-${NS_VERS}/java/classes/font.properties
-lib/netscape/navigator-${NS_VERS}/java/classes/font.properties.cs
-lib/netscape/navigator-${NS_VERS}/java/classes/font.properties.el
-lib/netscape/navigator-${NS_VERS}/java/classes/font.properties.hu
-lib/netscape/navigator-${NS_VERS}/java/classes/font.properties.ja
-lib/netscape/navigator-${NS_VERS}/java/classes/font.properties.ko
-lib/netscape/navigator-${NS_VERS}/java/classes/font.properties.lt
-lib/netscape/navigator-${NS_VERS}/java/classes/font.properties.lv
-lib/netscape/navigator-${NS_VERS}/java/classes/font.properties.pl
-lib/netscape/navigator-${NS_VERS}/java/classes/font.properties.ru
-lib/netscape/navigator-${NS_VERS}/java/classes/font.properties.tr
-lib/netscape/navigator-${NS_VERS}/java/classes/font.properties.zh
-lib/netscape/navigator-${NS_VERS}/java/classes/font.properties.zh_GB2312
-lib/netscape/navigator-${NS_VERS}/java/classes/font.properties.zh_TW
-lib/netscape/navigator-${NS_VERS}/java/classes/font.properties.zh_TW_Big5
-lib/netscape/navigator-${NS_VERS}/java/classes/font.properties.zh_TW_CNS11643
-lib/netscape/navigator-${NS_VERS}/java/classes/hpux/font.properties
-lib/netscape/navigator-${NS_VERS}/java/classes/hpux/font.properties.bg
-lib/netscape/navigator-${NS_VERS}/java/classes/hpux/font.properties.cs
-lib/netscape/navigator-${NS_VERS}/java/classes/hpux/font.properties.el
-lib/netscape/navigator-${NS_VERS}/java/classes/hpux/font.properties.hr
-lib/netscape/navigator-${NS_VERS}/java/classes/hpux/font.properties.hu
-lib/netscape/navigator-${NS_VERS}/java/classes/hpux/font.properties.ja
-lib/netscape/navigator-${NS_VERS}/java/classes/hpux/font.properties.ko
-lib/netscape/navigator-${NS_VERS}/java/classes/hpux/font.properties.pl
-lib/netscape/navigator-${NS_VERS}/java/classes/hpux/font.properties.ro
-lib/netscape/navigator-${NS_VERS}/java/classes/hpux/font.properties.ru
-lib/netscape/navigator-${NS_VERS}/java/classes/hpux/font.properties.sk
-lib/netscape/navigator-${NS_VERS}/java/classes/hpux/font.properties.sl
-lib/netscape/navigator-${NS_VERS}/java/classes/hpux/font.properties.tr
-lib/netscape/navigator-${NS_VERS}/java/classes/hpux/font.properties.zh_GB2312
-lib/netscape/navigator-${NS_VERS}/java/classes/hpux/font.properties.zh_TW_Big5
-lib/netscape/navigator-${NS_VERS}/java/classes/hpux/font.properties.zh_TW_CNS11643
-lib/netscape/navigator-${NS_VERS}/java/classes/ifc11.jar
-lib/netscape/navigator-${NS_VERS}/java/classes/iiop10.jar
-lib/netscape/navigator-${NS_VERS}/java/classes/irix/font.properties
-lib/netscape/navigator-${NS_VERS}/java/classes/irix/font.properties.cs
-lib/netscape/navigator-${NS_VERS}/java/classes/irix/font.properties.el
-lib/netscape/navigator-${NS_VERS}/java/classes/irix/font.properties.hu
-lib/netscape/navigator-${NS_VERS}/java/classes/irix/font.properties.ja
-lib/netscape/navigator-${NS_VERS}/java/classes/irix/font.properties.ko
-lib/netscape/navigator-${NS_VERS}/java/classes/irix/font.properties.zh_GB2312
-lib/netscape/navigator-${NS_VERS}/java/classes/irix/font.properties.zh_TW_Big5
-lib/netscape/navigator-${NS_VERS}/java/classes/irix/font.properties.zh_TW_CNS11643
-lib/netscape/navigator-${NS_VERS}/java/classes/jae40.jar
-lib/netscape/navigator-${NS_VERS}/java/classes/java40.jar
-lib/netscape/navigator-${NS_VERS}/java/classes/jio40.jar
-lib/netscape/navigator-${NS_VERS}/java/classes/jsd10.jar
-lib/netscape/navigator-${NS_VERS}/java/classes/ldap${LDAP_VERS}.jar
-lib/netscape/navigator-${NS_VERS}/java/classes/resource.jar
-lib/netscape/navigator-${NS_VERS}/java/classes/scd10.jar
-lib/netscape/navigator-${NS_VERS}/nethelp/Back_dep.gif
-lib/netscape/navigator-${NS_VERS}/nethelp/Back_dis.gif
-lib/netscape/navigator-${NS_VERS}/nethelp/Back_sel.gif
-lib/netscape/navigator-${NS_VERS}/nethelp/Back_up.gif
-lib/netscape/navigator-${NS_VERS}/nethelp/Blank.htm
-lib/netscape/navigator-${NS_VERS}/nethelp/Button.js
-lib/netscape/navigator-${NS_VERS}/nethelp/CntData.js
-lib/netscape/navigator-${NS_VERS}/nethelp/CntTool.htm
-lib/netscape/navigator-${NS_VERS}/nethelp/CntTool.js
-lib/netscape/navigator-${NS_VERS}/nethelp/Exit_dep.gif
-lib/netscape/navigator-${NS_VERS}/nethelp/Exit_sel.gif
-lib/netscape/navigator-${NS_VERS}/nethelp/Exit_up.gif
-lib/netscape/navigator-${NS_VERS}/nethelp/Forw_dep.gif
-lib/netscape/navigator-${NS_VERS}/nethelp/Forw_dis.gif
-lib/netscape/navigator-${NS_VERS}/nethelp/Forw_sel.gif
-lib/netscape/navigator-${NS_VERS}/nethelp/Forw_up.gif
-lib/netscape/navigator-${NS_VERS}/nethelp/Header.js
-lib/netscape/navigator-${NS_VERS}/nethelp/IdxData.js
-lib/netscape/navigator-${NS_VERS}/nethelp/IdxFill.htm
-lib/netscape/navigator-${NS_VERS}/nethelp/IdxKey.htm
-lib/netscape/navigator-${NS_VERS}/nethelp/IdxTool.htm
-lib/netscape/navigator-${NS_VERS}/nethelp/IdxTopic.htm
-lib/netscape/navigator-${NS_VERS}/nethelp/Local-1.js
-lib/netscape/navigator-${NS_VERS}/nethelp/NSHIfrm.htm
-lib/netscape/navigator-${NS_VERS}/nethelp/NavUI.htm
-lib/netscape/navigator-${NS_VERS}/nethelp/NoJSerr.htm
-lib/netscape/navigator-${NS_VERS}/nethelp/Prnt_dep.gif
-lib/netscape/navigator-${NS_VERS}/nethelp/Prnt_sel.gif
-lib/netscape/navigator-${NS_VERS}/nethelp/Prnt_up.gif
-lib/netscape/navigator-${NS_VERS}/nethelp/Stack.js
-lib/netscape/navigator-${NS_VERS}/nethelp/Status.htm
-lib/netscape/navigator-${NS_VERS}/nethelp/System.htm
-lib/netscape/navigator-${NS_VERS}/nethelp/System.js
-lib/netscape/navigator-${NS_VERS}/nethelp/ToolUI.htm
-lib/netscape/navigator-${NS_VERS}/nethelp/Tool_dep.gif
-lib/netscape/navigator-${NS_VERS}/nethelp/Tool_sel.gif
-lib/netscape/navigator-${NS_VERS}/nethelp/Tool_up.gif
-lib/netscape/navigator-${NS_VERS}/nethelp/Topic.js
-lib/netscape/navigator-${NS_VERS}/nethelp/Utility.js
-lib/netscape/navigator-${NS_VERS}/nethelp/Wait.gif
-lib/netscape/navigator-${NS_VERS}/nethelp/netscape/home/help.hpf
-lib/netscape/navigator-${NS_VERS}/nethelp/netscape/home/home.gif
-lib/netscape/navigator-${NS_VERS}/nethelp/netscape/home/home.htm
-lib/netscape/navigator-${NS_VERS}/nethelp/netscape/home/homeHdr.htm
-lib/netscape/navigator-${NS_VERS}/nethelp/netscape/navigatr/help.hpf
-lib/netscape/navigator-${NS_VERS}/nethelp/netscape/navigatr/nav.htm
-lib/netscape/navigator-${NS_VERS}/nethelp/netscape/navigatr/navHdr.htm
-lib/netscape/navigator-${NS_VERS}/nethelp/netscape/navigatr/navigatr.gif
-lib/netscape/navigator-${NS_VERS}/nethelp/netscape/shared/NetHelpm.css
-lib/netscape/navigator-${NS_VERS}/nethelp/netscape/shared/NetHelpu.css
-lib/netscape/navigator-${NS_VERS}/nethelp/netscape/shared/NetHelpw.css
-lib/netscape/navigator-${NS_VERS}/nethelp/netscape/shared/admnIcon.gif
-lib/netscape/navigator-${NS_VERS}/nethelp/netscape/shared/calIcon.gif
-lib/netscape/navigator-${NS_VERS}/nethelp/netscape/shared/collIcon.gif
-lib/netscape/navigator-${NS_VERS}/nethelp/netscape/shared/commIcon.gif
-lib/netscape/navigator-${NS_VERS}/nethelp/netscape/shared/compIcon.gif
-lib/netscape/navigator-${NS_VERS}/nethelp/netscape/shared/confIcon.gif
-lib/netscape/navigator-${NS_VERS}/nethelp/netscape/shared/ibmIcon.gif
-lib/netscape/navigator-${NS_VERS}/nethelp/netscape/shared/messIcon.gif
-lib/netscape/navigator-${NS_VERS}/nethelp/netscape/shared/navIcon.gif
-lib/netscape/navigator-${NS_VERS}/nethelp/netscape/shared/netIcon.gif
-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}/plugins/cpPack1.jar
-lib/netscape/navigator-${NS_VERS}/vreg
+@comment $NetBSD: PLIST.pre,v 1.7 2000/05/09 13:23:21 abs Exp $
+bin/${BINNAME}-${NS_VERS}
+lib/netscape/${BINNAME}-${NS_VERS}/LICENSE
+lib/netscape/${BINNAME}-${NS_VERS}/Netscape.ad
+lib/netscape/${BINNAME}-${NS_VERS}/README
+lib/netscape/${BINNAME}-${NS_VERS}/XKeysymDB
+lib/netscape/${BINNAME}-${NS_VERS}/bookmark.htm
+lib/netscape/${BINNAME}-${NS_VERS}/java/classes/aix/font.properties
+lib/netscape/${BINNAME}-${NS_VERS}/java/classes/aix/font.properties.cs
+lib/netscape/${BINNAME}-${NS_VERS}/java/classes/aix/font.properties.hu
+lib/netscape/${BINNAME}-${NS_VERS}/java/classes/aix/font.properties.ja
+lib/netscape/${BINNAME}-${NS_VERS}/java/classes/aix/font.properties.ko
+lib/netscape/${BINNAME}-${NS_VERS}/java/classes/aix/font.properties.pl
+lib/netscape/${BINNAME}-${NS_VERS}/java/classes/aix/font.properties.ru
+lib/netscape/${BINNAME}-${NS_VERS}/java/classes/aix/font.properties.zh
+lib/netscape/${BINNAME}-${NS_VERS}/java/classes/aix/font.properties.zh_TW
+lib/netscape/${BINNAME}-${NS_VERS}/java/classes/awt.properties
+lib/netscape/${BINNAME}-${NS_VERS}/java/classes/font.properties
+lib/netscape/${BINNAME}-${NS_VERS}/java/classes/font.properties.cs
+lib/netscape/${BINNAME}-${NS_VERS}/java/classes/font.properties.el
+lib/netscape/${BINNAME}-${NS_VERS}/java/classes/font.properties.hu
+lib/netscape/${BINNAME}-${NS_VERS}/java/classes/font.properties.ja
+lib/netscape/${BINNAME}-${NS_VERS}/java/classes/font.properties.ko
+lib/netscape/${BINNAME}-${NS_VERS}/java/classes/font.properties.lt
+lib/netscape/${BINNAME}-${NS_VERS}/java/classes/font.properties.lv
+lib/netscape/${BINNAME}-${NS_VERS}/java/classes/font.properties.pl
+lib/netscape/${BINNAME}-${NS_VERS}/java/classes/font.properties.ru
+lib/netscape/${BINNAME}-${NS_VERS}/java/classes/font.properties.tr
+lib/netscape/${BINNAME}-${NS_VERS}/java/classes/font.properties.zh
+lib/netscape/${BINNAME}-${NS_VERS}/java/classes/font.properties.zh_GB2312
+lib/netscape/${BINNAME}-${NS_VERS}/java/classes/font.properties.zh_TW
+lib/netscape/${BINNAME}-${NS_VERS}/java/classes/font.properties.zh_TW_Big5
+lib/netscape/${BINNAME}-${NS_VERS}/java/classes/font.properties.zh_TW_CNS11643
+lib/netscape/${BINNAME}-${NS_VERS}/java/classes/hpux/font.properties
+lib/netscape/${BINNAME}-${NS_VERS}/java/classes/hpux/font.properties.bg
+lib/netscape/${BINNAME}-${NS_VERS}/java/classes/hpux/font.properties.cs
+lib/netscape/${BINNAME}-${NS_VERS}/java/classes/hpux/font.properties.el
+lib/netscape/${BINNAME}-${NS_VERS}/java/classes/hpux/font.properties.hr
+lib/netscape/${BINNAME}-${NS_VERS}/java/classes/hpux/font.properties.hu
+lib/netscape/${BINNAME}-${NS_VERS}/java/classes/hpux/font.properties.ja
+lib/netscape/${BINNAME}-${NS_VERS}/java/classes/hpux/font.properties.ko
+lib/netscape/${BINNAME}-${NS_VERS}/java/classes/hpux/font.properties.pl
+lib/netscape/${BINNAME}-${NS_VERS}/java/classes/hpux/font.properties.ro
+lib/netscape/${BINNAME}-${NS_VERS}/java/classes/hpux/font.properties.ru
+lib/netscape/${BINNAME}-${NS_VERS}/java/classes/hpux/font.properties.sk
+lib/netscape/${BINNAME}-${NS_VERS}/java/classes/hpux/font.properties.sl
+lib/netscape/${BINNAME}-${NS_VERS}/java/classes/hpux/font.properties.tr
+lib/netscape/${BINNAME}-${NS_VERS}/java/classes/hpux/font.properties.zh_GB2312
+lib/netscape/${BINNAME}-${NS_VERS}/java/classes/hpux/font.properties.zh_TW_Big5
+lib/netscape/${BINNAME}-${NS_VERS}/java/classes/hpux/font.properties.zh_TW_CNS11643
+lib/netscape/${BINNAME}-${NS_VERS}/java/classes/ifc11.jar
+lib/netscape/${BINNAME}-${NS_VERS}/java/classes/iiop10.jar
+lib/netscape/${BINNAME}-${NS_VERS}/java/classes/irix/font.properties
+lib/netscape/${BINNAME}-${NS_VERS}/java/classes/irix/font.properties.cs
+lib/netscape/${BINNAME}-${NS_VERS}/java/classes/irix/font.properties.el
+lib/netscape/${BINNAME}-${NS_VERS}/java/classes/irix/font.properties.hu
+lib/netscape/${BINNAME}-${NS_VERS}/java/classes/irix/font.properties.ja
+lib/netscape/${BINNAME}-${NS_VERS}/java/classes/irix/font.properties.ko
+lib/netscape/${BINNAME}-${NS_VERS}/java/classes/irix/font.properties.zh_GB2312
+lib/netscape/${BINNAME}-${NS_VERS}/java/classes/irix/font.properties.zh_TW_Big5
+lib/netscape/${BINNAME}-${NS_VERS}/java/classes/irix/font.properties.zh_TW_CNS11643
+lib/netscape/${BINNAME}-${NS_VERS}/java/classes/jae40.jar
+lib/netscape/${BINNAME}-${NS_VERS}/java/classes/java40.jar
+lib/netscape/${BINNAME}-${NS_VERS}/java/classes/jio40.jar
+lib/netscape/${BINNAME}-${NS_VERS}/java/classes/jsd10.jar
+lib/netscape/${BINNAME}-${NS_VERS}/java/classes/ldap${LDAP_VERS}.jar
+lib/netscape/${BINNAME}-${NS_VERS}/java/classes/resource.jar
+lib/netscape/${BINNAME}-${NS_VERS}/java/classes/scd10.jar
+lib/netscape/${BINNAME}-${NS_VERS}/nethelp/Back_dep.gif
+lib/netscape/${BINNAME}-${NS_VERS}/nethelp/Back_dis.gif
+lib/netscape/${BINNAME}-${NS_VERS}/nethelp/Back_sel.gif
+lib/netscape/${BINNAME}-${NS_VERS}/nethelp/Back_up.gif
+lib/netscape/${BINNAME}-${NS_VERS}/nethelp/Blank.htm
+lib/netscape/${BINNAME}-${NS_VERS}/nethelp/Button.js
+lib/netscape/${BINNAME}-${NS_VERS}/nethelp/CntData.js
+lib/netscape/${BINNAME}-${NS_VERS}/nethelp/CntTool.htm
+lib/netscape/${BINNAME}-${NS_VERS}/nethelp/CntTool.js
+lib/netscape/${BINNAME}-${NS_VERS}/nethelp/Exit_dep.gif
+lib/netscape/${BINNAME}-${NS_VERS}/nethelp/Exit_sel.gif
+lib/netscape/${BINNAME}-${NS_VERS}/nethelp/Exit_up.gif
+lib/netscape/${BINNAME}-${NS_VERS}/nethelp/Forw_dep.gif
+lib/netscape/${BINNAME}-${NS_VERS}/nethelp/Forw_dis.gif
+lib/netscape/${BINNAME}-${NS_VERS}/nethelp/Forw_sel.gif
+lib/netscape/${BINNAME}-${NS_VERS}/nethelp/Forw_up.gif
+lib/netscape/${BINNAME}-${NS_VERS}/nethelp/Header.js
+lib/netscape/${BINNAME}-${NS_VERS}/nethelp/IdxData.js
+lib/netscape/${BINNAME}-${NS_VERS}/nethelp/IdxFill.htm
+lib/netscape/${BINNAME}-${NS_VERS}/nethelp/IdxKey.htm
+lib/netscape/${BINNAME}-${NS_VERS}/nethelp/IdxTool.htm
+lib/netscape/${BINNAME}-${NS_VERS}/nethelp/IdxTopic.htm
+lib/netscape/${BINNAME}-${NS_VERS}/nethelp/Local-1.js
+lib/netscape/${BINNAME}-${NS_VERS}/nethelp/NSHIfrm.htm
+lib/netscape/${BINNAME}-${NS_VERS}/nethelp/NavUI.htm
+lib/netscape/${BINNAME}-${NS_VERS}/nethelp/NoJSerr.htm
+lib/netscape/${BINNAME}-${NS_VERS}/nethelp/Prnt_dep.gif
+lib/netscape/${BINNAME}-${NS_VERS}/nethelp/Prnt_sel.gif
+lib/netscape/${BINNAME}-${NS_VERS}/nethelp/Prnt_up.gif
+lib/netscape/${BINNAME}-${NS_VERS}/nethelp/Stack.js
+lib/netscape/${BINNAME}-${NS_VERS}/nethelp/Status.htm
+lib/netscape/${BINNAME}-${NS_VERS}/nethelp/System.htm
+lib/netscape/${BINNAME}-${NS_VERS}/nethelp/System.js
+lib/netscape/${BINNAME}-${NS_VERS}/nethelp/ToolUI.htm
+lib/netscape/${BINNAME}-${NS_VERS}/nethelp/Tool_dep.gif
+lib/netscape/${BINNAME}-${NS_VERS}/nethelp/Tool_sel.gif
+lib/netscape/${BINNAME}-${NS_VERS}/nethelp/Tool_up.gif
+lib/netscape/${BINNAME}-${NS_VERS}/nethelp/Topic.js
+lib/netscape/${BINNAME}-${NS_VERS}/nethelp/Utility.js
+lib/netscape/${BINNAME}-${NS_VERS}/nethelp/Wait.gif
+lib/netscape/${BINNAME}-${NS_VERS}/nethelp/netscape/home/help.hpf
+lib/netscape/${BINNAME}-${NS_VERS}/nethelp/netscape/home/home.gif
+lib/netscape/${BINNAME}-${NS_VERS}/nethelp/netscape/home/home.htm
+lib/netscape/${BINNAME}-${NS_VERS}/nethelp/netscape/home/homeHdr.htm
+lib/netscape/${BINNAME}-${NS_VERS}/nethelp/netscape/navigatr/help.hpf
+lib/netscape/${BINNAME}-${NS_VERS}/nethelp/netscape/navigatr/nav.htm
+lib/netscape/${BINNAME}-${NS_VERS}/nethelp/netscape/navigatr/navHdr.htm
+lib/netscape/${BINNAME}-${NS_VERS}/nethelp/netscape/navigatr/navigatr.gif
+lib/netscape/${BINNAME}-${NS_VERS}/nethelp/netscape/shared/NetHelpm.css
+lib/netscape/${BINNAME}-${NS_VERS}/nethelp/netscape/shared/NetHelpu.css
+lib/netscape/${BINNAME}-${NS_VERS}/nethelp/netscape/shared/NetHelpw.css
+lib/netscape/${BINNAME}-${NS_VERS}/nethelp/netscape/shared/admnIcon.gif
+lib/netscape/${BINNAME}-${NS_VERS}/nethelp/netscape/shared/calIcon.gif
+lib/netscape/${BINNAME}-${NS_VERS}/nethelp/netscape/shared/collIcon.gif
+lib/netscape/${BINNAME}-${NS_VERS}/nethelp/netscape/shared/commIcon.gif
+lib/netscape/${BINNAME}-${NS_VERS}/nethelp/netscape/shared/compIcon.gif
+lib/netscape/${BINNAME}-${NS_VERS}/nethelp/netscape/shared/confIcon.gif
+lib/netscape/${BINNAME}-${NS_VERS}/nethelp/netscape/shared/ibmIcon.gif
+lib/netscape/${BINNAME}-${NS_VERS}/nethelp/netscape/shared/messIcon.gif
+lib/netscape/${BINNAME}-${NS_VERS}/nethelp/netscape/shared/navIcon.gif
+lib/netscape/${BINNAME}-${NS_VERS}/nethelp/netscape/shared/netIcon.gif
+lib/netscape/${BINNAME}-${NS_VERS}/nethelp/netwatch.gif
+lib/netscape/${BINNAME}-${NS_VERS}/nethelp/picsfail.htm
+lib/netscape/${BINNAME}-${NS_VERS}/nethelp/picsfail.jar
+lib/netscape/${BINNAME}-${NS_VERS}/netscape
+lib/netscape/${BINNAME}-${NS_VERS}/plugins/cpPack1.jar
+lib/netscape/${BINNAME}-${NS_VERS}/vreg
diff --git a/www/navigator/pkg/PLIST.solaris-sparc b/www/navigator/pkg/PLIST.solaris-sparc
index 29f79d16760..5934acfddbe 100644
--- a/www/navigator/pkg/PLIST.solaris-sparc
+++ b/www/navigator/pkg/PLIST.solaris-sparc
@@ -1,6 +1,6 @@
-@comment $NetBSD: PLIST.solaris-sparc,v 1.2 2000/02/05 14:05:23 wiz Exp $
-lib/netscape/navigator-${NS_VERS}/dynfonts/libTrueDoc.so
-lib/netscape/navigator-${NS_VERS}/plugins/libnullplugin.so
-lib/netscape/navigator-${NS_VERS}/talkback/master.ini
-@dirrm lib/netscape/navigator-${NS_VERS}/dynfonts
-@dirrm lib/netscape/navigator-${NS_VERS}/talkback
+@comment $NetBSD: PLIST.solaris-sparc,v 1.3 2000/05/09 13:23:21 abs Exp $
+lib/netscape/${BINNAME}-${NS_VERS}/dynfonts/libTrueDoc.so
+lib/netscape/${BINNAME}-${NS_VERS}/plugins/libnullplugin.so
+lib/netscape/${BINNAME}-${NS_VERS}/talkback/master.ini
+@dirrm lib/netscape/${BINNAME}-${NS_VERS}/dynfonts
+@dirrm lib/netscape/${BINNAME}-${NS_VERS}/talkback
diff --git a/www/navigator/pkg/PLIST.sunos-sparc b/www/navigator/pkg/PLIST.sunos-sparc
new file mode 100644
index 00000000000..fb47abef6ca
--- /dev/null
+++ b/www/navigator/pkg/PLIST.sunos-sparc
@@ -0,0 +1,8 @@
+@comment $NetBSD: PLIST.sunos-sparc,v 1.1 2000/05/09 13:23:21 abs Exp $
+lib/netscape/${BINNAME}-${NS_VERS}/netscape_nis
+lib/netscape/${BINNAME}-${NS_VERS}/dynfonts/libTrueDoc.so
+lib/netscape/${BINNAME}-${NS_VERS}/plugins/libnullplugin.so
+lib/netscape/${BINNAME}-${NS_VERS}/nls/C
+lib/netscape/${BINNAME}-${NS_VERS}/nls/nls.dir
+@dirrm lib/netscape/${BINNAME}-${NS_VERS}/dynfonts
+@dirrm lib/netscape/${BINNAME}-${NS_VERS}/nls