Split netscape4 into communicator and navigator, so the two maintainers

shall never run into each other again.

60 files changed, 141 insertions, 379 deletions

diff --git a/www/Makefile b/www/Makefile
index 3ec42b86dfd9..d2ba82ef703d 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.62 1997/10/11 18:30:19 wosch Exp $
+# $Id: Makefile,v 1.63 1997/11/09 10:18:04 asami Exp $
 #
 
     SUBDIR += Mosaic         # requires Motif
@@ -28,7 +28,8 @@
     SUBDIR += mmm
     SUBDIR += momspider
     SUBDIR += netscape3
-    SUBDIR += netscape4
+    SUBDIR += netscape4-communicator
+    SUBDIR += netscape4-navigator
     SUBDIR += p5-Apache
     SUBDIR += p5-CGI
     SUBDIR += p5-CGI_Lite
diff --git a/www/bsdi-netscape47-communicator/Makefile b/www/bsdi-netscape47-communicator/Makefile
index 38bfe4c9fabd..20f1cdc46ae6 100644
--- a/www/bsdi-netscape47-communicator/Makefile
+++ b/www/bsdi-netscape47-communicator/Makefile
@@ -6,20 +6,14 @@
 # Note: you can make the standalone navigator version by typing
 #       make NAVIGATOR=yes
 #
-# $Id: Makefile,v 1.9 1997/11/14 13:45:39 ache Exp $
+# $Id: Makefile,v 1.10 1997/11/15 01:10:45 asami Exp $
 #
 
-DISTNAME=       netscape-4.04
+DISTNAME=       netscape-communicator-4.04
 CATEGORIES=	www
-.if !defined(NAVIGATOR)
 MASTER_SITES=   ftp://ftp.netscape.com/pub/communicator/4.04/development/english/unix/freebsd/professional_edition/
 DISTFILES=      communicator-v404-export.x86-unknown-freebsd.tar.gz
-.else
-MASTER_SITES=   ftp://ftp.netscape.com/pub/communicator/4.04/development/english/unix/freebsd/navigator_standalone/
-DISTFILES=      navigator-v404-export.x86-unknown-freebsd.tar.gz
-.endif
 
-# responsible for communicator only
 MAINTAINER=     ache@FreeBSD.ORG
 
 RESTRICTED=	"Commercial software"
@@ -33,8 +27,9 @@ BINDIR=		${PREFIX}/bin
 do-install:
 	cd ${WRKSRC} && yes "" | \
 	    LC_TIME=C MOZILLA_HOME="${NDIR}" ./ns-install
-	mv ${NDIR}/netscape ${NDIR}/netscape.bin
-	${INSTALL_SCRIPT} ${WRKSRC}/netscape ${BINDIR}
+	mv ${NDIR}/netscape ${NDIR}/communicator-4.04.bin
+	${INSTALL_SCRIPT} ${WRKSRC}/netscape ${BINDIR}/communicator-4.04
+	ln -sf communicator-4.04 ${BINDIR}/netscape
 	if [ ! -f ${NDIR}/mailcap ] ; then \
 	    ${INSTALL_DATA} ${FILESDIR}/mailcap ${NDIR}; \
 	fi
diff --git a/www/bsdi-netscape47-communicator/pkg-comment b/www/bsdi-netscape47-communicator/pkg-comment
index 85c538ca5e9a..3d907bd7e716 100644
--- a/www/bsdi-netscape47-communicator/pkg-comment
+++ b/www/bsdi-netscape47-communicator/pkg-comment
@@ -1 +1 @@
-netscape ver 4 web-surfboard (navigator or communicator)
+netscape ver 4 communicator web-surfboard
diff --git a/www/bsdi-netscape47-communicator/pkg-descr b/www/bsdi-netscape47-communicator/pkg-descr
index c78edc82b238..e0a83b68e9ae 100644
--- a/www/bsdi-netscape47-communicator/pkg-descr
+++ b/www/bsdi-netscape47-communicator/pkg-descr
@@ -1,12 +1,6 @@
 This is the netscape web-surfboard.  Please read the file
 "/usr/local/lib/netscape/LICENSE" for the licensing terms.
 
-Note: If the standalone navigator hangs on startup eating all CPU
-time, find the user_pref("browser.startup.license_accepted", ...);
-line in your ~/.netscape/preferences.js and move it to the end of
-the file, or remove it, if simply moving doesn't help.
-Don't forget to report this bug to Netscape Team.
-
 Note: If Java applets fail to display.  Type this as root:
 		cd /usr/X11R6/lib/X11/fonts/misc
 		/usr/X11R6/bin/mkfontdir
diff --git a/www/bsdi-netscape47-communicator/pkg-plist b/www/bsdi-netscape47-communicator/pkg-plist
index 329a99412745..c74392ca0eb1 100644
--- a/www/bsdi-netscape47-communicator/pkg-plist
+++ b/www/bsdi-netscape47-communicator/pkg-plist
@@ -1,4 +1,6 @@
-bin/netscape
+bin/communicator-4.04         
+@exec ln -sf %f bin/netscape
+@unexec rm -f bin/netscape
 lib/netscape/README
 lib/netscape/LICENSE
 lib/netscape/Netscape.ad
@@ -118,5 +120,5 @@ lib/netscape/spell/pen4s324.dat
 lib/netscape/spell/netscape.dic
 lib/netscape/vreg
 lib/netscape/registry
-lib/netscape/netscape.bin
+lib/netscape/communicator-4.04.bin
 lib/netscape/mailcap
diff --git a/www/bsdi-netscape47-navigator/Makefile b/www/bsdi-netscape47-navigator/Makefile
index 38bfe4c9fabd..616a26aa54e7 100644
--- a/www/bsdi-netscape47-navigator/Makefile
+++ b/www/bsdi-netscape47-navigator/Makefile
@@ -3,24 +3,15 @@
 # Date created:         24 Feb 1997
 # Whom:                 ache
 #
-# Note: you can make the standalone navigator version by typing
-#       make NAVIGATOR=yes
-#
-# $Id: Makefile,v 1.9 1997/11/14 13:45:39 ache Exp $
+# $Id: Makefile,v 1.10 1997/11/15 01:10:45 asami Exp $
 #
 
-DISTNAME=       netscape-4.04
+DISTNAME=       netscape-navigator-4.04
 CATEGORIES=	www
-.if !defined(NAVIGATOR)
-MASTER_SITES=   ftp://ftp.netscape.com/pub/communicator/4.04/development/english/unix/freebsd/professional_edition/
-DISTFILES=      communicator-v404-export.x86-unknown-freebsd.tar.gz
-.else
 MASTER_SITES=   ftp://ftp.netscape.com/pub/communicator/4.04/development/english/unix/freebsd/navigator_standalone/
 DISTFILES=      navigator-v404-export.x86-unknown-freebsd.tar.gz
-.endif
 
-# responsible for communicator only
-MAINTAINER=     ache@FreeBSD.ORG
+MAINTAINER=     asami@FreeBSD.ORG
 
 RESTRICTED=	"Commercial software"
 
@@ -33,8 +24,9 @@ BINDIR=		${PREFIX}/bin
 do-install:
 	cd ${WRKSRC} && yes "" | \
 	    LC_TIME=C MOZILLA_HOME="${NDIR}" ./ns-install
-	mv ${NDIR}/netscape ${NDIR}/netscape.bin
-	${INSTALL_SCRIPT} ${WRKSRC}/netscape ${BINDIR}
+	mv ${NDIR}/netscape ${NDIR}/navigator-4.04.bin
+	${INSTALL_SCRIPT} ${WRKSRC}/netscape ${BINDIR}/navigator-4.04
+	ln -sf navigator-4.04 ${BINDIR}/netscape
 	if [ ! -f ${NDIR}/mailcap ] ; then \
 	    ${INSTALL_DATA} ${FILESDIR}/mailcap ${NDIR}; \
 	fi
diff --git a/www/bsdi-netscape47-navigator/pkg-comment b/www/bsdi-netscape47-navigator/pkg-comment
index 85c538ca5e9a..9042be219311 100644
--- a/www/bsdi-netscape47-navigator/pkg-comment
+++ b/www/bsdi-netscape47-navigator/pkg-comment
@@ -1 +1 @@
-netscape ver 4 web-surfboard (navigator or communicator)
+netscape ver 4 navigator web-surfboard
diff --git a/www/bsdi-netscape47-navigator/pkg-plist b/www/bsdi-netscape47-navigator/pkg-plist
index 329a99412745..a229296acb02 100644
--- a/www/bsdi-netscape47-navigator/pkg-plist
+++ b/www/bsdi-netscape47-navigator/pkg-plist
@@ -1,11 +1,11 @@
-bin/netscape
+bin/navigator-4.04
+@exec ln -sf %f bin/netscape
+@unexec rm -f bin/netscape
 lib/netscape/README
 lib/netscape/LICENSE
 lib/netscape/Netscape.ad
 lib/netscape/XKeysymDB
-lib/netscape/movemail
 lib/netscape/plugins/libnullplugin.so
-lib/netscape/libjsd.so.1.0
 lib/netscape/bookmark.htm
 lib/netscape/java/classes/ifc11.jar
 lib/netscape/java/classes/iiop10.jar
@@ -55,44 +55,14 @@ lib/netscape/nethelp/Back_up.gif
 lib/netscape/nethelp/Back_sel.gif
 lib/netscape/nethelp/Back_dis.gif
 lib/netscape/nethelp/Utility.js
-lib/netscape/nethelp/netscape/collabra/collabra.gif
-lib/netscape/nethelp/netscape/collabra/discgrps.gif
 lib/netscape/nethelp/netscape/collabra/coll.htm
 lib/netscape/nethelp/netscape/collabra/collHdr.htm
 lib/netscape/nethelp/netscape/collabra/help.hpf
-lib/netscape/nethelp/netscape/composer/composer.gif
-lib/netscape/nethelp/netscape/composer/comtlbr2.gif
-lib/netscape/nethelp/netscape/composer/fmtlbr3.gif
-lib/netscape/nethelp/netscape/composer/tagicon2.gif
-lib/netscape/nethelp/netscape/composer/comp.htm
-lib/netscape/nethelp/netscape/composer/compHdr.htm
-lib/netscape/nethelp/netscape/composer/help.hpf
-lib/netscape/nethelp/netscape/confernc/brws2.gif
-lib/netscape/nethelp/netscape/confernc/chat2.gif
-lib/netscape/nethelp/netscape/confernc/circle2.gif
-lib/netscape/nethelp/netscape/confernc/confernc.gif
-lib/netscape/nethelp/netscape/confernc/eraser2.gif
-lib/netscape/nethelp/netscape/confernc/fhndtl2.gif
-lib/netscape/nethelp/netscape/confernc/filex2.gif
-lib/netscape/nethelp/netscape/confernc/horline2.gif
-lib/netscape/nethelp/netscape/confernc/line2.gif
-lib/netscape/nethelp/netscape/confernc/pointer2.gif
-lib/netscape/nethelp/netscape/confernc/rect2.gif
-lib/netscape/nethelp/netscape/confernc/txttool2.gif
-lib/netscape/nethelp/netscape/confernc/whtbd2.gif
-lib/netscape/nethelp/netscape/confernc/conf.htm
-lib/netscape/nethelp/netscape/confernc/confHdr.htm
-lib/netscape/nethelp/netscape/confernc/help.hpf
+lib/netscape/nethelp/netscape/collabra/security.gif
 lib/netscape/nethelp/netscape/home/home.gif
 lib/netscape/nethelp/netscape/home/home.htm
 lib/netscape/nethelp/netscape/home/homeHdr.htm
 lib/netscape/nethelp/netscape/home/help.hpf
-lib/netscape/nethelp/netscape/messengr/mailbox.gif
-lib/netscape/nethelp/netscape/messengr/messengr.gif
-lib/netscape/nethelp/netscape/messengr/mpctrl.gif
-lib/netscape/nethelp/netscape/messengr/mess.htm
-lib/netscape/nethelp/netscape/messengr/messHdr.htm
-lib/netscape/nethelp/netscape/messengr/help.hpf
 lib/netscape/nethelp/netscape/navigatr/navigatr.gif
 lib/netscape/nethelp/netscape/navigatr/nav.htm
 lib/netscape/nethelp/netscape/navigatr/navHdr.htm
@@ -101,22 +71,13 @@ lib/netscape/nethelp/netscape/netcastr/netcastr.gif
 lib/netscape/nethelp/netscape/netcastr/net.htm
 lib/netscape/nethelp/netscape/netcastr/netHdr.htm
 lib/netscape/nethelp/netscape/netcastr/help.hpf
-lib/netscape/nethelp/netscape/shared/admnIcon.gif
-lib/netscape/nethelp/netscape/shared/calIcon.gif
 lib/netscape/nethelp/netscape/shared/collIcon.gif
 lib/netscape/nethelp/netscape/shared/commIcon.gif
-lib/netscape/nethelp/netscape/shared/compIcon.gif
-lib/netscape/nethelp/netscape/shared/confIcon.gif
-lib/netscape/nethelp/netscape/shared/ibmIcon.gif
-lib/netscape/nethelp/netscape/shared/messIcon.gif
 lib/netscape/nethelp/netscape/shared/navIcon.gif
 lib/netscape/nethelp/netscape/shared/netIcon.gif
 lib/netscape/nethelp/netscape/shared/Contents.htm
 lib/netscape/nethelp/netscape/shared/NetHelp1.css
-lib/netscape/nethelp/netscape/nscal/index.html
-lib/netscape/spell/pen4s324.dat
-lib/netscape/spell/netscape.dic
 lib/netscape/vreg
 lib/netscape/registry
-lib/netscape/netscape.bin
+lib/netscape/navigator-4.04.bin
 lib/netscape/mailcap
diff --git a/www/mozilla+ipv6/Makefile b/www/mozilla+ipv6/Makefile
index 38bfe4c9fabd..20f1cdc46ae6 100644
--- a/www/mozilla+ipv6/Makefile
+++ b/www/mozilla+ipv6/Makefile
@@ -6,20 +6,14 @@
 # Note: you can make the standalone navigator version by typing
 #       make NAVIGATOR=yes
 #
-# $Id: Makefile,v 1.9 1997/11/14 13:45:39 ache Exp $
+# $Id: Makefile,v 1.10 1997/11/15 01:10:45 asami Exp $
 #
 
-DISTNAME=       netscape-4.04
+DISTNAME=       netscape-communicator-4.04
 CATEGORIES=	www
-.if !defined(NAVIGATOR)
 MASTER_SITES=   ftp://ftp.netscape.com/pub/communicator/4.04/development/english/unix/freebsd/professional_edition/
 DISTFILES=      communicator-v404-export.x86-unknown-freebsd.tar.gz
-.else
-MASTER_SITES=   ftp://ftp.netscape.com/pub/communicator/4.04/development/english/unix/freebsd/navigator_standalone/
-DISTFILES=      navigator-v404-export.x86-unknown-freebsd.tar.gz
-.endif
 
-# responsible for communicator only
 MAINTAINER=     ache@FreeBSD.ORG
 
 RESTRICTED=	"Commercial software"
@@ -33,8 +27,9 @@ BINDIR=		${PREFIX}/bin
 do-install:
 	cd ${WRKSRC} && yes "" | \
 	    LC_TIME=C MOZILLA_HOME="${NDIR}" ./ns-install
-	mv ${NDIR}/netscape ${NDIR}/netscape.bin
-	${INSTALL_SCRIPT} ${WRKSRC}/netscape ${BINDIR}
+	mv ${NDIR}/netscape ${NDIR}/communicator-4.04.bin
+	${INSTALL_SCRIPT} ${WRKSRC}/netscape ${BINDIR}/communicator-4.04
+	ln -sf communicator-4.04 ${BINDIR}/netscape
 	if [ ! -f ${NDIR}/mailcap ] ; then \
 	    ${INSTALL_DATA} ${FILESDIR}/mailcap ${NDIR}; \
 	fi
diff --git a/www/mozilla+ipv6/distinfo b/www/mozilla+ipv6/distinfo
index 9112967b577b..7117bdc23907 100644
--- a/www/mozilla+ipv6/distinfo
+++ b/www/mozilla+ipv6/distinfo
@@ -1,2 +1 @@
 MD5 (communicator-v404-export.x86-unknown-freebsd.tar.gz) = 46614e393be01ee82cb9e8a33ae72f74
-MD5 (navigator-v404-export.x86-unknown-freebsd.tar.gz) = 0773f4c0d056bbeb3038f2a8b8ec80d4
diff --git a/www/mozilla+ipv6/pkg-comment b/www/mozilla+ipv6/pkg-comment
index 85c538ca5e9a..3d907bd7e716 100644
--- a/www/mozilla+ipv6/pkg-comment
+++ b/www/mozilla+ipv6/pkg-comment
@@ -1 +1 @@
-netscape ver 4 web-surfboard (navigator or communicator)
+netscape ver 4 communicator web-surfboard
diff --git a/www/mozilla+ipv6/pkg-descr b/www/mozilla+ipv6/pkg-descr
index c78edc82b238..e0a83b68e9ae 100644
--- a/www/mozilla+ipv6/pkg-descr
+++ b/www/mozilla+ipv6/pkg-descr
@@ -1,12 +1,6 @@
 This is the netscape web-surfboard.  Please read the file
 "/usr/local/lib/netscape/LICENSE" for the licensing terms.
 
-Note: If the standalone navigator hangs on startup eating all CPU
-time, find the user_pref("browser.startup.license_accepted", ...);
-line in your ~/.netscape/preferences.js and move it to the end of
-the file, or remove it, if simply moving doesn't help.
-Don't forget to report this bug to Netscape Team.
-
 Note: If Java applets fail to display.  Type this as root:
 		cd /usr/X11R6/lib/X11/fonts/misc
 		/usr/X11R6/bin/mkfontdir
diff --git a/www/mozilla+ipv6/pkg-plist b/www/mozilla+ipv6/pkg-plist
index 329a99412745..c74392ca0eb1 100644
--- a/www/mozilla+ipv6/pkg-plist
+++ b/www/mozilla+ipv6/pkg-plist
@@ -1,4 +1,6 @@
-bin/netscape
+bin/communicator-4.04         
+@exec ln -sf %f bin/netscape
+@unexec rm -f bin/netscape
 lib/netscape/README
 lib/netscape/LICENSE
 lib/netscape/Netscape.ad
@@ -118,5 +120,5 @@ lib/netscape/spell/pen4s324.dat
 lib/netscape/spell/netscape.dic
 lib/netscape/vreg
 lib/netscape/registry
-lib/netscape/netscape.bin
+lib/netscape/communicator-4.04.bin
 lib/netscape/mailcap
diff --git a/www/mozilla-devel/Makefile b/www/mozilla-devel/Makefile
index 38bfe4c9fabd..20f1cdc46ae6 100644
--- a/www/mozilla-devel/Makefile
+++ b/www/mozilla-devel/Makefile
@@ -6,20 +6,14 @@
 # Note: you can make the standalone navigator version by typing
 #       make NAVIGATOR=yes
 #
-# $Id: Makefile,v 1.9 1997/11/14 13:45:39 ache Exp $
+# $Id: Makefile,v 1.10 1997/11/15 01:10:45 asami Exp $
 #
 
-DISTNAME=       netscape-4.04
+DISTNAME=       netscape-communicator-4.04
 CATEGORIES=	www
-.if !defined(NAVIGATOR)
 MASTER_SITES=   ftp://ftp.netscape.com/pub/communicator/4.04/development/english/unix/freebsd/professional_edition/
 DISTFILES=      communicator-v404-export.x86-unknown-freebsd.tar.gz
-.else
-MASTER_SITES=   ftp://ftp.netscape.com/pub/communicator/4.04/development/english/unix/freebsd/navigator_standalone/
-DISTFILES=      navigator-v404-export.x86-unknown-freebsd.tar.gz
-.endif
 
-# responsible for communicator only
 MAINTAINER=     ache@FreeBSD.ORG
 
 RESTRICTED=	"Commercial software"
@@ -33,8 +27,9 @@ BINDIR=		${PREFIX}/bin
 do-install:
 	cd ${WRKSRC} && yes "" | \
 	    LC_TIME=C MOZILLA_HOME="${NDIR}" ./ns-install
-	mv ${NDIR}/netscape ${NDIR}/netscape.bin
-	${INSTALL_SCRIPT} ${WRKSRC}/netscape ${BINDIR}
+	mv ${NDIR}/netscape ${NDIR}/communicator-4.04.bin
+	${INSTALL_SCRIPT} ${WRKSRC}/netscape ${BINDIR}/communicator-4.04
+	ln -sf communicator-4.04 ${BINDIR}/netscape
 	if [ ! -f ${NDIR}/mailcap ] ; then \
 	    ${INSTALL_DATA} ${FILESDIR}/mailcap ${NDIR}; \
 	fi
diff --git a/www/mozilla-devel/distinfo b/www/mozilla-devel/distinfo
index 9112967b577b..7117bdc23907 100644
--- a/www/mozilla-devel/distinfo
+++ b/www/mozilla-devel/distinfo
@@ -1,2 +1 @@
 MD5 (communicator-v404-export.x86-unknown-freebsd.tar.gz) = 46614e393be01ee82cb9e8a33ae72f74
-MD5 (navigator-v404-export.x86-unknown-freebsd.tar.gz) = 0773f4c0d056bbeb3038f2a8b8ec80d4
diff --git a/www/mozilla-devel/pkg-comment b/www/mozilla-devel/pkg-comment
index 85c538ca5e9a..3d907bd7e716 100644
--- a/www/mozilla-devel/pkg-comment
+++ b/www/mozilla-devel/pkg-comment
@@ -1 +1 @@
-netscape ver 4 web-surfboard (navigator or communicator)
+netscape ver 4 communicator web-surfboard
diff --git a/www/mozilla-devel/pkg-descr b/www/mozilla-devel/pkg-descr
index c78edc82b238..e0a83b68e9ae 100644
--- a/www/mozilla-devel/pkg-descr
+++ b/www/mozilla-devel/pkg-descr
@@ -1,12 +1,6 @@
 This is the netscape web-surfboard.  Please read the file
 "/usr/local/lib/netscape/LICENSE" for the licensing terms.
 
-Note: If the standalone navigator hangs on startup eating all CPU
-time, find the user_pref("browser.startup.license_accepted", ...);
-line in your ~/.netscape/preferences.js and move it to the end of
-the file, or remove it, if simply moving doesn't help.
-Don't forget to report this bug to Netscape Team.
-
 Note: If Java applets fail to display.  Type this as root:
 		cd /usr/X11R6/lib/X11/fonts/misc
 		/usr/X11R6/bin/mkfontdir
diff --git a/www/mozilla-devel/pkg-plist b/www/mozilla-devel/pkg-plist
index 329a99412745..c74392ca0eb1 100644
--- a/www/mozilla-devel/pkg-plist
+++ b/www/mozilla-devel/pkg-plist
@@ -1,4 +1,6 @@
-bin/netscape
+bin/communicator-4.04         
+@exec ln -sf %f bin/netscape
+@unexec rm -f bin/netscape
 lib/netscape/README
 lib/netscape/LICENSE
 lib/netscape/Netscape.ad
@@ -118,5 +120,5 @@ lib/netscape/spell/pen4s324.dat
 lib/netscape/spell/netscape.dic
 lib/netscape/vreg
 lib/netscape/registry
-lib/netscape/netscape.bin
+lib/netscape/communicator-4.04.bin
 lib/netscape/mailcap
diff --git a/www/mozilla-vendor/Makefile b/www/mozilla-vendor/Makefile
index 38bfe4c9fabd..20f1cdc46ae6 100644
--- a/www/mozilla-vendor/Makefile
+++ b/www/mozilla-vendor/Makefile
@@ -6,20 +6,14 @@
 # Note: you can make the standalone navigator version by typing
 #       make NAVIGATOR=yes
 #
-# $Id: Makefile,v 1.9 1997/11/14 13:45:39 ache Exp $
+# $Id: Makefile,v 1.10 1997/11/15 01:10:45 asami Exp $
 #
 
-DISTNAME=       netscape-4.04
+DISTNAME=       netscape-communicator-4.04
 CATEGORIES=	www
-.if !defined(NAVIGATOR)
 MASTER_SITES=   ftp://ftp.netscape.com/pub/communicator/4.04/development/english/unix/freebsd/professional_edition/
 DISTFILES=      communicator-v404-export.x86-unknown-freebsd.tar.gz
-.else
-MASTER_SITES=   ftp://ftp.netscape.com/pub/communicator/4.04/development/english/unix/freebsd/navigator_standalone/
-DISTFILES=      navigator-v404-export.x86-unknown-freebsd.tar.gz
-.endif
 
-# responsible for communicator only
 MAINTAINER=     ache@FreeBSD.ORG
 
 RESTRICTED=	"Commercial software"
@@ -33,8 +27,9 @@ BINDIR=		${PREFIX}/bin
 do-install:
 	cd ${WRKSRC} && yes "" | \
 	    LC_TIME=C MOZILLA_HOME="${NDIR}" ./ns-install
-	mv ${NDIR}/netscape ${NDIR}/netscape.bin
-	${INSTALL_SCRIPT} ${WRKSRC}/netscape ${BINDIR}
+	mv ${NDIR}/netscape ${NDIR}/communicator-4.04.bin
+	${INSTALL_SCRIPT} ${WRKSRC}/netscape ${BINDIR}/communicator-4.04
+	ln -sf communicator-4.04 ${BINDIR}/netscape
 	if [ ! -f ${NDIR}/mailcap ] ; then \
 	    ${INSTALL_DATA} ${FILESDIR}/mailcap ${NDIR}; \
 	fi
diff --git a/www/mozilla-vendor/distinfo b/www/mozilla-vendor/distinfo
index 9112967b577b..7117bdc23907 100644
--- a/www/mozilla-vendor/distinfo
+++ b/www/mozilla-vendor/distinfo
@@ -1,2 +1 @@
 MD5 (communicator-v404-export.x86-unknown-freebsd.tar.gz) = 46614e393be01ee82cb9e8a33ae72f74
-MD5 (navigator-v404-export.x86-unknown-freebsd.tar.gz) = 0773f4c0d056bbeb3038f2a8b8ec80d4
diff --git a/www/mozilla-vendor/pkg-comment b/www/mozilla-vendor/pkg-comment
index 85c538ca5e9a..3d907bd7e716 100644
--- a/www/mozilla-vendor/pkg-comment
+++ b/www/mozilla-vendor/pkg-comment
@@ -1 +1 @@
-netscape ver 4 web-surfboard (navigator or communicator)
+netscape ver 4 communicator web-surfboard
diff --git a/www/mozilla-vendor/pkg-descr b/www/mozilla-vendor/pkg-descr
index c78edc82b238..e0a83b68e9ae 100644
--- a/www/mozilla-vendor/pkg-descr
+++ b/www/mozilla-vendor/pkg-descr
@@ -1,12 +1,6 @@
 This is the netscape web-surfboard.  Please read the file
 "/usr/local/lib/netscape/LICENSE" for the licensing terms.
 
-Note: If the standalone navigator hangs on startup eating all CPU
-time, find the user_pref("browser.startup.license_accepted", ...);
-line in your ~/.netscape/preferences.js and move it to the end of
-the file, or remove it, if simply moving doesn't help.
-Don't forget to report this bug to Netscape Team.
-
 Note: If Java applets fail to display.  Type this as root:
 		cd /usr/X11R6/lib/X11/fonts/misc
 		/usr/X11R6/bin/mkfontdir
diff --git a/www/mozilla-vendor/pkg-plist b/www/mozilla-vendor/pkg-plist
index 329a99412745..c74392ca0eb1 100644
--- a/www/mozilla-vendor/pkg-plist
+++ b/www/mozilla-vendor/pkg-plist
@@ -1,4 +1,6 @@
-bin/netscape
+bin/communicator-4.04         
+@exec ln -sf %f bin/netscape
+@unexec rm -f bin/netscape
 lib/netscape/README
 lib/netscape/LICENSE
 lib/netscape/Netscape.ad
@@ -118,5 +120,5 @@ lib/netscape/spell/pen4s324.dat
 lib/netscape/spell/netscape.dic
 lib/netscape/vreg
 lib/netscape/registry
-lib/netscape/netscape.bin
+lib/netscape/communicator-4.04.bin
 lib/netscape/mailcap
diff --git a/www/mozilla/Makefile b/www/mozilla/Makefile
index 38bfe4c9fabd..20f1cdc46ae6 100644
--- a/www/mozilla/Makefile
+++ b/www/mozilla/Makefile
@@ -6,20 +6,14 @@
 # Note: you can make the standalone navigator version by typing
 #       make NAVIGATOR=yes
 #
-# $Id: Makefile,v 1.9 1997/11/14 13:45:39 ache Exp $
+# $Id: Makefile,v 1.10 1997/11/15 01:10:45 asami Exp $
 #
 
-DISTNAME=       netscape-4.04
+DISTNAME=       netscape-communicator-4.04
 CATEGORIES=	www
-.if !defined(NAVIGATOR)
 MASTER_SITES=   ftp://ftp.netscape.com/pub/communicator/4.04/development/english/unix/freebsd/professional_edition/
 DISTFILES=      communicator-v404-export.x86-unknown-freebsd.tar.gz
-.else
-MASTER_SITES=   ftp://ftp.netscape.com/pub/communicator/4.04/development/english/unix/freebsd/navigator_standalone/
-DISTFILES=      navigator-v404-export.x86-unknown-freebsd.tar.gz
-.endif
 
-# responsible for communicator only
 MAINTAINER=     ache@FreeBSD.ORG
 
 RESTRICTED=	"Commercial software"
@@ -33,8 +27,9 @@ BINDIR=		${PREFIX}/bin
 do-install:
 	cd ${WRKSRC} && yes "" | \
 	    LC_TIME=C MOZILLA_HOME="${NDIR}" ./ns-install
-	mv ${NDIR}/netscape ${NDIR}/netscape.bin
-	${INSTALL_SCRIPT} ${WRKSRC}/netscape ${BINDIR}
+	mv ${NDIR}/netscape ${NDIR}/communicator-4.04.bin
+	${INSTALL_SCRIPT} ${WRKSRC}/netscape ${BINDIR}/communicator-4.04
+	ln -sf communicator-4.04 ${BINDIR}/netscape
 	if [ ! -f ${NDIR}/mailcap ] ; then \
 	    ${INSTALL_DATA} ${FILESDIR}/mailcap ${NDIR}; \
 	fi
diff --git a/www/mozilla/distinfo b/www/mozilla/distinfo
index 9112967b577b..7117bdc23907 100644
--- a/www/mozilla/distinfo
+++ b/www/mozilla/distinfo
@@ -1,2 +1 @@
 MD5 (communicator-v404-export.x86-unknown-freebsd.tar.gz) = 46614e393be01ee82cb9e8a33ae72f74
-MD5 (navigator-v404-export.x86-unknown-freebsd.tar.gz) = 0773f4c0d056bbeb3038f2a8b8ec80d4
diff --git a/www/mozilla/pkg-comment b/www/mozilla/pkg-comment
index 85c538ca5e9a..3d907bd7e716 100644
--- a/www/mozilla/pkg-comment
+++ b/www/mozilla/pkg-comment
@@ -1 +1 @@
-netscape ver 4 web-surfboard (navigator or communicator)
+netscape ver 4 communicator web-surfboard
diff --git a/www/mozilla/pkg-descr b/www/mozilla/pkg-descr
index c78edc82b238..e0a83b68e9ae 100644
--- a/www/mozilla/pkg-descr
+++ b/www/mozilla/pkg-descr
@@ -1,12 +1,6 @@
 This is the netscape web-surfboard.  Please read the file
 "/usr/local/lib/netscape/LICENSE" for the licensing terms.
 
-Note: If the standalone navigator hangs on startup eating all CPU
-time, find the user_pref("browser.startup.license_accepted", ...);
-line in your ~/.netscape/preferences.js and move it to the end of
-the file, or remove it, if simply moving doesn't help.
-Don't forget to report this bug to Netscape Team.
-
 Note: If Java applets fail to display.  Type this as root:
 		cd /usr/X11R6/lib/X11/fonts/misc
 		/usr/X11R6/bin/mkfontdir
diff --git a/www/mozilla/pkg-plist b/www/mozilla/pkg-plist
index 329a99412745..c74392ca0eb1 100644
--- a/www/mozilla/pkg-plist
+++ b/www/mozilla/pkg-plist
@@ -1,4 +1,6 @@
-bin/netscape
+bin/communicator-4.04         
+@exec ln -sf %f bin/netscape
+@unexec rm -f bin/netscape
 lib/netscape/README
 lib/netscape/LICENSE
 lib/netscape/Netscape.ad
@@ -118,5 +120,5 @@ lib/netscape/spell/pen4s324.dat
 lib/netscape/spell/netscape.dic
 lib/netscape/vreg
 lib/netscape/registry
-lib/netscape/netscape.bin
+lib/netscape/communicator-4.04.bin
 lib/netscape/mailcap
diff --git a/www/netscape4-communicator/Makefile b/www/netscape4-communicator/Makefile
index 38bfe4c9fabd..20f1cdc46ae6 100644
--- a/www/netscape4-communicator/Makefile
+++ b/www/netscape4-communicator/Makefile
@@ -6,20 +6,14 @@
 # Note: you can make the standalone navigator version by typing
 #       make NAVIGATOR=yes
 #
-# $Id: Makefile,v 1.9 1997/11/14 13:45:39 ache Exp $
+# $Id: Makefile,v 1.10 1997/11/15 01:10:45 asami Exp $
 #
 
-DISTNAME=       netscape-4.04
+DISTNAME=       netscape-communicator-4.04
 CATEGORIES=	www
-.if !defined(NAVIGATOR)
 MASTER_SITES=   ftp://ftp.netscape.com/pub/communicator/4.04/development/english/unix/freebsd/professional_edition/
 DISTFILES=      communicator-v404-export.x86-unknown-freebsd.tar.gz
-.else
-MASTER_SITES=   ftp://ftp.netscape.com/pub/communicator/4.04/development/english/unix/freebsd/navigator_standalone/
-DISTFILES=      navigator-v404-export.x86-unknown-freebsd.tar.gz
-.endif
 
-# responsible for communicator only
 MAINTAINER=     ache@FreeBSD.ORG
 
 RESTRICTED=	"Commercial software"
@@ -33,8 +27,9 @@ BINDIR=		${PREFIX}/bin
 do-install:
 	cd ${WRKSRC} && yes "" | \
 	    LC_TIME=C MOZILLA_HOME="${NDIR}" ./ns-install
-	mv ${NDIR}/netscape ${NDIR}/netscape.bin
-	${INSTALL_SCRIPT} ${WRKSRC}/netscape ${BINDIR}
+	mv ${NDIR}/netscape ${NDIR}/communicator-4.04.bin
+	${INSTALL_SCRIPT} ${WRKSRC}/netscape ${BINDIR}/communicator-4.04
+	ln -sf communicator-4.04 ${BINDIR}/netscape
 	if [ ! -f ${NDIR}/mailcap ] ; then \
 	    ${INSTALL_DATA} ${FILESDIR}/mailcap ${NDIR}; \
 	fi
diff --git a/www/netscape4-communicator/distinfo b/www/netscape4-communicator/distinfo
index 9112967b577b..7117bdc23907 100644
--- a/www/netscape4-communicator/distinfo
+++ b/www/netscape4-communicator/distinfo
@@ -1,2 +1 @@
 MD5 (communicator-v404-export.x86-unknown-freebsd.tar.gz) = 46614e393be01ee82cb9e8a33ae72f74
-MD5 (navigator-v404-export.x86-unknown-freebsd.tar.gz) = 0773f4c0d056bbeb3038f2a8b8ec80d4
diff --git a/www/netscape4-communicator/files/netscape.sh b/www/netscape4-communicator/files/netscape.sh
index b5a3564a8ff6..c74c0035458e 100644
--- a/www/netscape4-communicator/files/netscape.sh
+++ b/www/netscape4-communicator/files/netscape.sh
@@ -1,4 +1,4 @@
 #!/bin/sh
 export MOZILLA_HOME; MOZILLA_HOME=${MOZILLA_HOME:=@PREFIX@/lib/netscape}
 export CLASSPATH ; CLASSPATH=.:$MOZILLA_HOME
-exec $MOZILLA_HOME/netscape.bin $*
+exec $MOZILLA_HOME/communicator-4.04.bin $*
diff --git a/www/netscape4-communicator/pkg-comment b/www/netscape4-communicator/pkg-comment
index 85c538ca5e9a..3d907bd7e716 100644
--- a/www/netscape4-communicator/pkg-comment
+++ b/www/netscape4-communicator/pkg-comment
@@ -1 +1 @@
-netscape ver 4 web-surfboard (navigator or communicator)
+netscape ver 4 communicator web-surfboard
diff --git a/www/netscape4-communicator/pkg-descr b/www/netscape4-communicator/pkg-descr
index c78edc82b238..e0a83b68e9ae 100644
--- a/www/netscape4-communicator/pkg-descr
+++ b/www/netscape4-communicator/pkg-descr
@@ -1,12 +1,6 @@
 This is the netscape web-surfboard.  Please read the file
 "/usr/local/lib/netscape/LICENSE" for the licensing terms.
 
-Note: If the standalone navigator hangs on startup eating all CPU
-time, find the user_pref("browser.startup.license_accepted", ...);
-line in your ~/.netscape/preferences.js and move it to the end of
-the file, or remove it, if simply moving doesn't help.
-Don't forget to report this bug to Netscape Team.
-
 Note: If Java applets fail to display.  Type this as root:
 		cd /usr/X11R6/lib/X11/fonts/misc
 		/usr/X11R6/bin/mkfontdir
diff --git a/www/netscape4-communicator/pkg-plist b/www/netscape4-communicator/pkg-plist
index 329a99412745..c74392ca0eb1 100644
--- a/www/netscape4-communicator/pkg-plist
+++ b/www/netscape4-communicator/pkg-plist
@@ -1,4 +1,6 @@
-bin/netscape
+bin/communicator-4.04         
+@exec ln -sf %f bin/netscape
+@unexec rm -f bin/netscape
 lib/netscape/README
 lib/netscape/LICENSE
 lib/netscape/Netscape.ad
@@ -118,5 +120,5 @@ lib/netscape/spell/pen4s324.dat
 lib/netscape/spell/netscape.dic
 lib/netscape/vreg
 lib/netscape/registry
-lib/netscape/netscape.bin
+lib/netscape/communicator-4.04.bin
 lib/netscape/mailcap
diff --git a/www/netscape4-navigator/Makefile b/www/netscape4-navigator/Makefile
index 38bfe4c9fabd..616a26aa54e7 100644
--- a/www/netscape4-navigator/Makefile
+++ b/www/netscape4-navigator/Makefile
@@ -3,24 +3,15 @@
 # Date created:         24 Feb 1997
 # Whom:                 ache
 #
-# Note: you can make the standalone navigator version by typing
-#       make NAVIGATOR=yes
-#
-# $Id: Makefile,v 1.9 1997/11/14 13:45:39 ache Exp $
+# $Id: Makefile,v 1.10 1997/11/15 01:10:45 asami Exp $
 #
 
-DISTNAME=       netscape-4.04
+DISTNAME=       netscape-navigator-4.04
 CATEGORIES=	www
-.if !defined(NAVIGATOR)
-MASTER_SITES=   ftp://ftp.netscape.com/pub/communicator/4.04/development/english/unix/freebsd/professional_edition/
-DISTFILES=      communicator-v404-export.x86-unknown-freebsd.tar.gz
-.else
 MASTER_SITES=   ftp://ftp.netscape.com/pub/communicator/4.04/development/english/unix/freebsd/navigator_standalone/
 DISTFILES=      navigator-v404-export.x86-unknown-freebsd.tar.gz
-.endif
 
-# responsible for communicator only
-MAINTAINER=     ache@FreeBSD.ORG
+MAINTAINER=     asami@FreeBSD.ORG
 
 RESTRICTED=	"Commercial software"
 
@@ -33,8 +24,9 @@ BINDIR=		${PREFIX}/bin
 do-install:
 	cd ${WRKSRC} && yes "" | \
 	    LC_TIME=C MOZILLA_HOME="${NDIR}" ./ns-install
-	mv ${NDIR}/netscape ${NDIR}/netscape.bin
-	${INSTALL_SCRIPT} ${WRKSRC}/netscape ${BINDIR}
+	mv ${NDIR}/netscape ${NDIR}/navigator-4.04.bin
+	${INSTALL_SCRIPT} ${WRKSRC}/netscape ${BINDIR}/navigator-4.04
+	ln -sf navigator-4.04 ${BINDIR}/netscape
 	if [ ! -f ${NDIR}/mailcap ] ; then \
 	    ${INSTALL_DATA} ${FILESDIR}/mailcap ${NDIR}; \
 	fi
diff --git a/www/netscape4-navigator/pkg-comment b/www/netscape4-navigator/pkg-comment
index 85c538ca5e9a..9042be219311 100644
--- a/www/netscape4-navigator/pkg-comment
+++ b/www/netscape4-navigator/pkg-comment
@@ -1 +1 @@
-netscape ver 4 web-surfboard (navigator or communicator)
+netscape ver 4 navigator web-surfboard
diff --git a/www/netscape4-navigator/pkg-plist b/www/netscape4-navigator/pkg-plist
index 329a99412745..a229296acb02 100644
--- a/www/netscape4-navigator/pkg-plist
+++ b/www/netscape4-navigator/pkg-plist
@@ -1,11 +1,11 @@
-bin/netscape
+bin/navigator-4.04
+@exec ln -sf %f bin/netscape
+@unexec rm -f bin/netscape
 lib/netscape/README
 lib/netscape/LICENSE
 lib/netscape/Netscape.ad
 lib/netscape/XKeysymDB
-lib/netscape/movemail
 lib/netscape/plugins/libnullplugin.so
-lib/netscape/libjsd.so.1.0
 lib/netscape/bookmark.htm
 lib/netscape/java/classes/ifc11.jar
 lib/netscape/java/classes/iiop10.jar
@@ -55,44 +55,14 @@ lib/netscape/nethelp/Back_up.gif
 lib/netscape/nethelp/Back_sel.gif
 lib/netscape/nethelp/Back_dis.gif
 lib/netscape/nethelp/Utility.js
-lib/netscape/nethelp/netscape/collabra/collabra.gif
-lib/netscape/nethelp/netscape/collabra/discgrps.gif
 lib/netscape/nethelp/netscape/collabra/coll.htm
 lib/netscape/nethelp/netscape/collabra/collHdr.htm
 lib/netscape/nethelp/netscape/collabra/help.hpf
-lib/netscape/nethelp/netscape/composer/composer.gif
-lib/netscape/nethelp/netscape/composer/comtlbr2.gif
-lib/netscape/nethelp/netscape/composer/fmtlbr3.gif
-lib/netscape/nethelp/netscape/composer/tagicon2.gif
-lib/netscape/nethelp/netscape/composer/comp.htm
-lib/netscape/nethelp/netscape/composer/compHdr.htm
-lib/netscape/nethelp/netscape/composer/help.hpf
-lib/netscape/nethelp/netscape/confernc/brws2.gif
-lib/netscape/nethelp/netscape/confernc/chat2.gif
-lib/netscape/nethelp/netscape/confernc/circle2.gif
-lib/netscape/nethelp/netscape/confernc/confernc.gif
-lib/netscape/nethelp/netscape/confernc/eraser2.gif
-lib/netscape/nethelp/netscape/confernc/fhndtl2.gif
-lib/netscape/nethelp/netscape/confernc/filex2.gif
-lib/netscape/nethelp/netscape/confernc/horline2.gif
-lib/netscape/nethelp/netscape/confernc/line2.gif
-lib/netscape/nethelp/netscape/confernc/pointer2.gif
-lib/netscape/nethelp/netscape/confernc/rect2.gif
-lib/netscape/nethelp/netscape/confernc/txttool2.gif
-lib/netscape/nethelp/netscape/confernc/whtbd2.gif
-lib/netscape/nethelp/netscape/confernc/conf.htm
-lib/netscape/nethelp/netscape/confernc/confHdr.htm
-lib/netscape/nethelp/netscape/confernc/help.hpf
+lib/netscape/nethelp/netscape/collabra/security.gif
 lib/netscape/nethelp/netscape/home/home.gif
 lib/netscape/nethelp/netscape/home/home.htm
 lib/netscape/nethelp/netscape/home/homeHdr.htm
 lib/netscape/nethelp/netscape/home/help.hpf
-lib/netscape/nethelp/netscape/messengr/mailbox.gif
-lib/netscape/nethelp/netscape/messengr/messengr.gif
-lib/netscape/nethelp/netscape/messengr/mpctrl.gif
-lib/netscape/nethelp/netscape/messengr/mess.htm
-lib/netscape/nethelp/netscape/messengr/messHdr.htm
-lib/netscape/nethelp/netscape/messengr/help.hpf
 lib/netscape/nethelp/netscape/navigatr/navigatr.gif
 lib/netscape/nethelp/netscape/navigatr/nav.htm
 lib/netscape/nethelp/netscape/navigatr/navHdr.htm
@@ -101,22 +71,13 @@ lib/netscape/nethelp/netscape/netcastr/netcastr.gif
 lib/netscape/nethelp/netscape/netcastr/net.htm
 lib/netscape/nethelp/netscape/netcastr/netHdr.htm
 lib/netscape/nethelp/netscape/netcastr/help.hpf
-lib/netscape/nethelp/netscape/shared/admnIcon.gif
-lib/netscape/nethelp/netscape/shared/calIcon.gif
 lib/netscape/nethelp/netscape/shared/collIcon.gif
 lib/netscape/nethelp/netscape/shared/commIcon.gif
-lib/netscape/nethelp/netscape/shared/compIcon.gif
-lib/netscape/nethelp/netscape/shared/confIcon.gif
-lib/netscape/nethelp/netscape/shared/ibmIcon.gif
-lib/netscape/nethelp/netscape/shared/messIcon.gif
 lib/netscape/nethelp/netscape/shared/navIcon.gif
 lib/netscape/nethelp/netscape/shared/netIcon.gif
 lib/netscape/nethelp/netscape/shared/Contents.htm
 lib/netscape/nethelp/netscape/shared/NetHelp1.css
-lib/netscape/nethelp/netscape/nscal/index.html
-lib/netscape/spell/pen4s324.dat
-lib/netscape/spell/netscape.dic
 lib/netscape/vreg
 lib/netscape/registry
-lib/netscape/netscape.bin
+lib/netscape/navigator-4.04.bin
 lib/netscape/mailcap
diff --git a/www/netscape47-communicator/Makefile b/www/netscape47-communicator/Makefile
index 38bfe4c9fabd..20f1cdc46ae6 100644
--- a/www/netscape47-communicator/Makefile
+++ b/www/netscape47-communicator/Makefile
@@ -6,20 +6,14 @@
 # Note: you can make the standalone navigator version by typing
 #       make NAVIGATOR=yes
 #
-# $Id: Makefile,v 1.9 1997/11/14 13:45:39 ache Exp $
+# $Id: Makefile,v 1.10 1997/11/15 01:10:45 asami Exp $
 #
 
-DISTNAME=       netscape-4.04
+DISTNAME=       netscape-communicator-4.04
 CATEGORIES=	www
-.if !defined(NAVIGATOR)
 MASTER_SITES=   ftp://ftp.netscape.com/pub/communicator/4.04/development/english/unix/freebsd/professional_edition/
 DISTFILES=      communicator-v404-export.x86-unknown-freebsd.tar.gz
-.else
-MASTER_SITES=   ftp://ftp.netscape.com/pub/communicator/4.04/development/english/unix/freebsd/navigator_standalone/
-DISTFILES=      navigator-v404-export.x86-unknown-freebsd.tar.gz
-.endif
 
-# responsible for communicator only
 MAINTAINER=     ache@FreeBSD.ORG
 
 RESTRICTED=	"Commercial software"
@@ -33,8 +27,9 @@ BINDIR=		${PREFIX}/bin
 do-install:
 	cd ${WRKSRC} && yes "" | \
 	    LC_TIME=C MOZILLA_HOME="${NDIR}" ./ns-install
-	mv ${NDIR}/netscape ${NDIR}/netscape.bin
-	${INSTALL_SCRIPT} ${WRKSRC}/netscape ${BINDIR}
+	mv ${NDIR}/netscape ${NDIR}/communicator-4.04.bin
+	${INSTALL_SCRIPT} ${WRKSRC}/netscape ${BINDIR}/communicator-4.04
+	ln -sf communicator-4.04 ${BINDIR}/netscape
 	if [ ! -f ${NDIR}/mailcap ] ; then \
 	    ${INSTALL_DATA} ${FILESDIR}/mailcap ${NDIR}; \
 	fi
diff --git a/www/netscape47-communicator/pkg-comment b/www/netscape47-communicator/pkg-comment
index 85c538ca5e9a..3d907bd7e716 100644
--- a/www/netscape47-communicator/pkg-comment
+++ b/www/netscape47-communicator/pkg-comment
@@ -1 +1 @@
-netscape ver 4 web-surfboard (navigator or communicator)
+netscape ver 4 communicator web-surfboard
diff --git a/www/netscape47-communicator/pkg-descr b/www/netscape47-communicator/pkg-descr
index c78edc82b238..e0a83b68e9ae 100644
--- a/www/netscape47-communicator/pkg-descr
+++ b/www/netscape47-communicator/pkg-descr
@@ -1,12 +1,6 @@
 This is the netscape web-surfboard.  Please read the file
 "/usr/local/lib/netscape/LICENSE" for the licensing terms.
 
-Note: If the standalone navigator hangs on startup eating all CPU
-time, find the user_pref("browser.startup.license_accepted", ...);
-line in your ~/.netscape/preferences.js and move it to the end of
-the file, or remove it, if simply moving doesn't help.
-Don't forget to report this bug to Netscape Team.
-
 Note: If Java applets fail to display.  Type this as root:
 		cd /usr/X11R6/lib/X11/fonts/misc
 		/usr/X11R6/bin/mkfontdir
diff --git a/www/netscape47-communicator/pkg-plist b/www/netscape47-communicator/pkg-plist
index 329a99412745..c74392ca0eb1 100644
--- a/www/netscape47-communicator/pkg-plist
+++ b/www/netscape47-communicator/pkg-plist
@@ -1,4 +1,6 @@
-bin/netscape
+bin/communicator-4.04         
+@exec ln -sf %f bin/netscape
+@unexec rm -f bin/netscape
 lib/netscape/README
 lib/netscape/LICENSE
 lib/netscape/Netscape.ad
@@ -118,5 +120,5 @@ lib/netscape/spell/pen4s324.dat
 lib/netscape/spell/netscape.dic
 lib/netscape/vreg
 lib/netscape/registry
-lib/netscape/netscape.bin
+lib/netscape/communicator-4.04.bin
 lib/netscape/mailcap
diff --git a/www/netscape47-navigator/Makefile b/www/netscape47-navigator/Makefile
index 38bfe4c9fabd..616a26aa54e7 100644
--- a/www/netscape47-navigator/Makefile
+++ b/www/netscape47-navigator/Makefile
@@ -3,24 +3,15 @@
 # Date created:         24 Feb 1997
 # Whom:                 ache
 #
-# Note: you can make the standalone navigator version by typing
-#       make NAVIGATOR=yes
-#
-# $Id: Makefile,v 1.9 1997/11/14 13:45:39 ache Exp $
+# $Id: Makefile,v 1.10 1997/11/15 01:10:45 asami Exp $
 #
 
-DISTNAME=       netscape-4.04
+DISTNAME=       netscape-navigator-4.04
 CATEGORIES=	www
-.if !defined(NAVIGATOR)
-MASTER_SITES=   ftp://ftp.netscape.com/pub/communicator/4.04/development/english/unix/freebsd/professional_edition/
-DISTFILES=      communicator-v404-export.x86-unknown-freebsd.tar.gz
-.else
 MASTER_SITES=   ftp://ftp.netscape.com/pub/communicator/4.04/development/english/unix/freebsd/navigator_standalone/
 DISTFILES=      navigator-v404-export.x86-unknown-freebsd.tar.gz
-.endif
 
-# responsible for communicator only
-MAINTAINER=     ache@FreeBSD.ORG
+MAINTAINER=     asami@FreeBSD.ORG
 
 RESTRICTED=	"Commercial software"
 
@@ -33,8 +24,9 @@ BINDIR=		${PREFIX}/bin
 do-install:
 	cd ${WRKSRC} && yes "" | \
 	    LC_TIME=C MOZILLA_HOME="${NDIR}" ./ns-install
-	mv ${NDIR}/netscape ${NDIR}/netscape.bin
-	${INSTALL_SCRIPT} ${WRKSRC}/netscape ${BINDIR}
+	mv ${NDIR}/netscape ${NDIR}/navigator-4.04.bin
+	${INSTALL_SCRIPT} ${WRKSRC}/netscape ${BINDIR}/navigator-4.04
+	ln -sf navigator-4.04 ${BINDIR}/netscape
 	if [ ! -f ${NDIR}/mailcap ] ; then \
 	    ${INSTALL_DATA} ${FILESDIR}/mailcap ${NDIR}; \
 	fi
diff --git a/www/netscape47-navigator/pkg-comment b/www/netscape47-navigator/pkg-comment
index 85c538ca5e9a..9042be219311 100644
--- a/www/netscape47-navigator/pkg-comment
+++ b/www/netscape47-navigator/pkg-comment
@@ -1 +1 @@
-netscape ver 4 web-surfboard (navigator or communicator)
+netscape ver 4 navigator web-surfboard
diff --git a/www/netscape47-navigator/pkg-plist b/www/netscape47-navigator/pkg-plist
index 329a99412745..a229296acb02 100644
--- a/www/netscape47-navigator/pkg-plist
+++ b/www/netscape47-navigator/pkg-plist
@@ -1,11 +1,11 @@
-bin/netscape
+bin/navigator-4.04
+@exec ln -sf %f bin/netscape
+@unexec rm -f bin/netscape
 lib/netscape/README
 lib/netscape/LICENSE
 lib/netscape/Netscape.ad
 lib/netscape/XKeysymDB
-lib/netscape/movemail
 lib/netscape/plugins/libnullplugin.so
-lib/netscape/libjsd.so.1.0
 lib/netscape/bookmark.htm
 lib/netscape/java/classes/ifc11.jar
 lib/netscape/java/classes/iiop10.jar
@@ -55,44 +55,14 @@ lib/netscape/nethelp/Back_up.gif
 lib/netscape/nethelp/Back_sel.gif
 lib/netscape/nethelp/Back_dis.gif
 lib/netscape/nethelp/Utility.js
-lib/netscape/nethelp/netscape/collabra/collabra.gif
-lib/netscape/nethelp/netscape/collabra/discgrps.gif
 lib/netscape/nethelp/netscape/collabra/coll.htm
 lib/netscape/nethelp/netscape/collabra/collHdr.htm
 lib/netscape/nethelp/netscape/collabra/help.hpf
-lib/netscape/nethelp/netscape/composer/composer.gif
-lib/netscape/nethelp/netscape/composer/comtlbr2.gif
-lib/netscape/nethelp/netscape/composer/fmtlbr3.gif
-lib/netscape/nethelp/netscape/composer/tagicon2.gif
-lib/netscape/nethelp/netscape/composer/comp.htm
-lib/netscape/nethelp/netscape/composer/compHdr.htm
-lib/netscape/nethelp/netscape/composer/help.hpf
-lib/netscape/nethelp/netscape/confernc/brws2.gif
-lib/netscape/nethelp/netscape/confernc/chat2.gif
-lib/netscape/nethelp/netscape/confernc/circle2.gif
-lib/netscape/nethelp/netscape/confernc/confernc.gif
-lib/netscape/nethelp/netscape/confernc/eraser2.gif
-lib/netscape/nethelp/netscape/confernc/fhndtl2.gif
-lib/netscape/nethelp/netscape/confernc/filex2.gif
-lib/netscape/nethelp/netscape/confernc/horline2.gif
-lib/netscape/nethelp/netscape/confernc/line2.gif
-lib/netscape/nethelp/netscape/confernc/pointer2.gif
-lib/netscape/nethelp/netscape/confernc/rect2.gif
-lib/netscape/nethelp/netscape/confernc/txttool2.gif
-lib/netscape/nethelp/netscape/confernc/whtbd2.gif
-lib/netscape/nethelp/netscape/confernc/conf.htm
-lib/netscape/nethelp/netscape/confernc/confHdr.htm
-lib/netscape/nethelp/netscape/confernc/help.hpf
+lib/netscape/nethelp/netscape/collabra/security.gif
 lib/netscape/nethelp/netscape/home/home.gif
 lib/netscape/nethelp/netscape/home/home.htm
 lib/netscape/nethelp/netscape/home/homeHdr.htm
 lib/netscape/nethelp/netscape/home/help.hpf
-lib/netscape/nethelp/netscape/messengr/mailbox.gif
-lib/netscape/nethelp/netscape/messengr/messengr.gif
-lib/netscape/nethelp/netscape/messengr/mpctrl.gif
-lib/netscape/nethelp/netscape/messengr/mess.htm
-lib/netscape/nethelp/netscape/messengr/messHdr.htm
-lib/netscape/nethelp/netscape/messengr/help.hpf
 lib/netscape/nethelp/netscape/navigatr/navigatr.gif
 lib/netscape/nethelp/netscape/navigatr/nav.htm
 lib/netscape/nethelp/netscape/navigatr/navHdr.htm
@@ -101,22 +71,13 @@ lib/netscape/nethelp/netscape/netcastr/netcastr.gif
 lib/netscape/nethelp/netscape/netcastr/net.htm
 lib/netscape/nethelp/netscape/netcastr/netHdr.htm
 lib/netscape/nethelp/netscape/netcastr/help.hpf
-lib/netscape/nethelp/netscape/shared/admnIcon.gif
-lib/netscape/nethelp/netscape/shared/calIcon.gif
 lib/netscape/nethelp/netscape/shared/collIcon.gif
 lib/netscape/nethelp/netscape/shared/commIcon.gif
-lib/netscape/nethelp/netscape/shared/compIcon.gif
-lib/netscape/nethelp/netscape/shared/confIcon.gif
-lib/netscape/nethelp/netscape/shared/ibmIcon.gif
-lib/netscape/nethelp/netscape/shared/messIcon.gif
 lib/netscape/nethelp/netscape/shared/navIcon.gif
 lib/netscape/nethelp/netscape/shared/netIcon.gif
 lib/netscape/nethelp/netscape/shared/Contents.htm
 lib/netscape/nethelp/netscape/shared/NetHelp1.css
-lib/netscape/nethelp/netscape/nscal/index.html
-lib/netscape/spell/pen4s324.dat
-lib/netscape/spell/netscape.dic
 lib/netscape/vreg
 lib/netscape/registry
-lib/netscape/netscape.bin
+lib/netscape/navigator-4.04.bin
 lib/netscape/mailcap
diff --git a/www/netscape48-communicator/Makefile b/www/netscape48-communicator/Makefile
index 38bfe4c9fabd..20f1cdc46ae6 100644
--- a/www/netscape48-communicator/Makefile
+++ b/www/netscape48-communicator/Makefile
@@ -6,20 +6,14 @@
 # Note: you can make the standalone navigator version by typing
 #       make NAVIGATOR=yes
 #
-# $Id: Makefile,v 1.9 1997/11/14 13:45:39 ache Exp $
+# $Id: Makefile,v 1.10 1997/11/15 01:10:45 asami Exp $
 #
 
-DISTNAME=       netscape-4.04
+DISTNAME=       netscape-communicator-4.04
 CATEGORIES=	www
-.if !defined(NAVIGATOR)
 MASTER_SITES=   ftp://ftp.netscape.com/pub/communicator/4.04/development/english/unix/freebsd/professional_edition/
 DISTFILES=      communicator-v404-export.x86-unknown-freebsd.tar.gz
-.else
-MASTER_SITES=   ftp://ftp.netscape.com/pub/communicator/4.04/development/english/unix/freebsd/navigator_standalone/
-DISTFILES=      navigator-v404-export.x86-unknown-freebsd.tar.gz
-.endif
 
-# responsible for communicator only
 MAINTAINER=     ache@FreeBSD.ORG
 
 RESTRICTED=	"Commercial software"
@@ -33,8 +27,9 @@ BINDIR=		${PREFIX}/bin
 do-install:
 	cd ${WRKSRC} && yes "" | \
 	    LC_TIME=C MOZILLA_HOME="${NDIR}" ./ns-install
-	mv ${NDIR}/netscape ${NDIR}/netscape.bin
-	${INSTALL_SCRIPT} ${WRKSRC}/netscape ${BINDIR}
+	mv ${NDIR}/netscape ${NDIR}/communicator-4.04.bin
+	${INSTALL_SCRIPT} ${WRKSRC}/netscape ${BINDIR}/communicator-4.04
+	ln -sf communicator-4.04 ${BINDIR}/netscape
 	if [ ! -f ${NDIR}/mailcap ] ; then \
 	    ${INSTALL_DATA} ${FILESDIR}/mailcap ${NDIR}; \
 	fi
diff --git a/www/netscape48-communicator/distinfo b/www/netscape48-communicator/distinfo
index 9112967b577b..7117bdc23907 100644
--- a/www/netscape48-communicator/distinfo
+++ b/www/netscape48-communicator/distinfo
@@ -1,2 +1 @@
 MD5 (communicator-v404-export.x86-unknown-freebsd.tar.gz) = 46614e393be01ee82cb9e8a33ae72f74
-MD5 (navigator-v404-export.x86-unknown-freebsd.tar.gz) = 0773f4c0d056bbeb3038f2a8b8ec80d4
diff --git a/www/netscape48-communicator/files/netscape.sh b/www/netscape48-communicator/files/netscape.sh
index b5a3564a8ff6..c74c0035458e 100644
--- a/www/netscape48-communicator/files/netscape.sh
+++ b/www/netscape48-communicator/files/netscape.sh
@@ -1,4 +1,4 @@
 #!/bin/sh
 export MOZILLA_HOME; MOZILLA_HOME=${MOZILLA_HOME:=@PREFIX@/lib/netscape}
 export CLASSPATH ; CLASSPATH=.:$MOZILLA_HOME
-exec $MOZILLA_HOME/netscape.bin $*
+exec $MOZILLA_HOME/communicator-4.04.bin $*
diff --git a/www/netscape48-communicator/pkg-comment b/www/netscape48-communicator/pkg-comment
index 85c538ca5e9a..3d907bd7e716 100644
--- a/www/netscape48-communicator/pkg-comment
+++ b/www/netscape48-communicator/pkg-comment
@@ -1 +1 @@
-netscape ver 4 web-surfboard (navigator or communicator)
+netscape ver 4 communicator web-surfboard
diff --git a/www/netscape48-communicator/pkg-descr b/www/netscape48-communicator/pkg-descr
index c78edc82b238..e0a83b68e9ae 100644
--- a/www/netscape48-communicator/pkg-descr
+++ b/www/netscape48-communicator/pkg-descr
@@ -1,12 +1,6 @@
 This is the netscape web-surfboard.  Please read the file
 "/usr/local/lib/netscape/LICENSE" for the licensing terms.
 
-Note: If the standalone navigator hangs on startup eating all CPU
-time, find the user_pref("browser.startup.license_accepted", ...);
-line in your ~/.netscape/preferences.js and move it to the end of
-the file, or remove it, if simply moving doesn't help.
-Don't forget to report this bug to Netscape Team.
-
 Note: If Java applets fail to display.  Type this as root:
 		cd /usr/X11R6/lib/X11/fonts/misc
 		/usr/X11R6/bin/mkfontdir
diff --git a/www/netscape48-communicator/pkg-plist b/www/netscape48-communicator/pkg-plist
index 329a99412745..c74392ca0eb1 100644
--- a/www/netscape48-communicator/pkg-plist
+++ b/www/netscape48-communicator/pkg-plist
@@ -1,4 +1,6 @@
-bin/netscape
+bin/communicator-4.04         
+@exec ln -sf %f bin/netscape
+@unexec rm -f bin/netscape
 lib/netscape/README
 lib/netscape/LICENSE
 lib/netscape/Netscape.ad
@@ -118,5 +120,5 @@ lib/netscape/spell/pen4s324.dat
 lib/netscape/spell/netscape.dic
 lib/netscape/vreg
 lib/netscape/registry
-lib/netscape/netscape.bin
+lib/netscape/communicator-4.04.bin
 lib/netscape/mailcap
diff --git a/www/seamonkey/Makefile b/www/seamonkey/Makefile
index 38bfe4c9fabd..20f1cdc46ae6 100644
--- a/www/seamonkey/Makefile
+++ b/www/seamonkey/Makefile
@@ -6,20 +6,14 @@
 # Note: you can make the standalone navigator version by typing
 #       make NAVIGATOR=yes
 #
-# $Id: Makefile,v 1.9 1997/11/14 13:45:39 ache Exp $
+# $Id: Makefile,v 1.10 1997/11/15 01:10:45 asami Exp $
 #
 
-DISTNAME=       netscape-4.04
+DISTNAME=       netscape-communicator-4.04
 CATEGORIES=	www
-.if !defined(NAVIGATOR)
 MASTER_SITES=   ftp://ftp.netscape.com/pub/communicator/4.04/development/english/unix/freebsd/professional_edition/
 DISTFILES=      communicator-v404-export.x86-unknown-freebsd.tar.gz
-.else
-MASTER_SITES=   ftp://ftp.netscape.com/pub/communicator/4.04/development/english/unix/freebsd/navigator_standalone/
-DISTFILES=      navigator-v404-export.x86-unknown-freebsd.tar.gz
-.endif
 
-# responsible for communicator only
 MAINTAINER=     ache@FreeBSD.ORG
 
 RESTRICTED=	"Commercial software"
@@ -33,8 +27,9 @@ BINDIR=		${PREFIX}/bin
 do-install:
 	cd ${WRKSRC} && yes "" | \
 	    LC_TIME=C MOZILLA_HOME="${NDIR}" ./ns-install
-	mv ${NDIR}/netscape ${NDIR}/netscape.bin
-	${INSTALL_SCRIPT} ${WRKSRC}/netscape ${BINDIR}
+	mv ${NDIR}/netscape ${NDIR}/communicator-4.04.bin
+	${INSTALL_SCRIPT} ${WRKSRC}/netscape ${BINDIR}/communicator-4.04
+	ln -sf communicator-4.04 ${BINDIR}/netscape
 	if [ ! -f ${NDIR}/mailcap ] ; then \
 	    ${INSTALL_DATA} ${FILESDIR}/mailcap ${NDIR}; \
 	fi
diff --git a/www/seamonkey/distinfo b/www/seamonkey/distinfo
index 9112967b577b..7117bdc23907 100644
--- a/www/seamonkey/distinfo
+++ b/www/seamonkey/distinfo
@@ -1,2 +1 @@
 MD5 (communicator-v404-export.x86-unknown-freebsd.tar.gz) = 46614e393be01ee82cb9e8a33ae72f74
-MD5 (navigator-v404-export.x86-unknown-freebsd.tar.gz) = 0773f4c0d056bbeb3038f2a8b8ec80d4
diff --git a/www/seamonkey/pkg-comment b/www/seamonkey/pkg-comment
index 85c538ca5e9a..3d907bd7e716 100644
--- a/www/seamonkey/pkg-comment
+++ b/www/seamonkey/pkg-comment
@@ -1 +1 @@
-netscape ver 4 web-surfboard (navigator or communicator)
+netscape ver 4 communicator web-surfboard
diff --git a/www/seamonkey/pkg-descr b/www/seamonkey/pkg-descr
index c78edc82b238..e0a83b68e9ae 100644
--- a/www/seamonkey/pkg-descr
+++ b/www/seamonkey/pkg-descr
@@ -1,12 +1,6 @@
 This is the netscape web-surfboard.  Please read the file
 "/usr/local/lib/netscape/LICENSE" for the licensing terms.
 
-Note: If the standalone navigator hangs on startup eating all CPU
-time, find the user_pref("browser.startup.license_accepted", ...);
-line in your ~/.netscape/preferences.js and move it to the end of
-the file, or remove it, if simply moving doesn't help.
-Don't forget to report this bug to Netscape Team.
-
 Note: If Java applets fail to display.  Type this as root:
 		cd /usr/X11R6/lib/X11/fonts/misc
 		/usr/X11R6/bin/mkfontdir
diff --git a/www/seamonkey/pkg-plist b/www/seamonkey/pkg-plist
index 329a99412745..c74392ca0eb1 100644
--- a/www/seamonkey/pkg-plist
+++ b/www/seamonkey/pkg-plist
@@ -1,4 +1,6 @@
-bin/netscape
+bin/communicator-4.04         
+@exec ln -sf %f bin/netscape
+@unexec rm -f bin/netscape
 lib/netscape/README
 lib/netscape/LICENSE
 lib/netscape/Netscape.ad
@@ -118,5 +120,5 @@ lib/netscape/spell/pen4s324.dat
 lib/netscape/spell/netscape.dic
 lib/netscape/vreg
 lib/netscape/registry
-lib/netscape/netscape.bin
+lib/netscape/communicator-4.04.bin
 lib/netscape/mailcap
diff --git a/www/seamonkey2/Makefile b/www/seamonkey2/Makefile
index 38bfe4c9fabd..20f1cdc46ae6 100644
--- a/www/seamonkey2/Makefile
+++ b/www/seamonkey2/Makefile
@@ -6,20 +6,14 @@
 # Note: you can make the standalone navigator version by typing
 #       make NAVIGATOR=yes
 #
-# $Id: Makefile,v 1.9 1997/11/14 13:45:39 ache Exp $
+# $Id: Makefile,v 1.10 1997/11/15 01:10:45 asami Exp $
 #
 
-DISTNAME=       netscape-4.04
+DISTNAME=       netscape-communicator-4.04
 CATEGORIES=	www
-.if !defined(NAVIGATOR)
 MASTER_SITES=   ftp://ftp.netscape.com/pub/communicator/4.04/development/english/unix/freebsd/professional_edition/
 DISTFILES=      communicator-v404-export.x86-unknown-freebsd.tar.gz
-.else
-MASTER_SITES=   ftp://ftp.netscape.com/pub/communicator/4.04/development/english/unix/freebsd/navigator_standalone/
-DISTFILES=      navigator-v404-export.x86-unknown-freebsd.tar.gz
-.endif
 
-# responsible for communicator only
 MAINTAINER=     ache@FreeBSD.ORG
 
 RESTRICTED=	"Commercial software"
@@ -33,8 +27,9 @@ BINDIR=		${PREFIX}/bin
 do-install:
 	cd ${WRKSRC} && yes "" | \
 	    LC_TIME=C MOZILLA_HOME="${NDIR}" ./ns-install
-	mv ${NDIR}/netscape ${NDIR}/netscape.bin
-	${INSTALL_SCRIPT} ${WRKSRC}/netscape ${BINDIR}
+	mv ${NDIR}/netscape ${NDIR}/communicator-4.04.bin
+	${INSTALL_SCRIPT} ${WRKSRC}/netscape ${BINDIR}/communicator-4.04
+	ln -sf communicator-4.04 ${BINDIR}/netscape
 	if [ ! -f ${NDIR}/mailcap ] ; then \
 	    ${INSTALL_DATA} ${FILESDIR}/mailcap ${NDIR}; \
 	fi
diff --git a/www/seamonkey2/distinfo b/www/seamonkey2/distinfo
index 9112967b577b..7117bdc23907 100644
--- a/www/seamonkey2/distinfo
+++ b/www/seamonkey2/distinfo
@@ -1,2 +1 @@
 MD5 (communicator-v404-export.x86-unknown-freebsd.tar.gz) = 46614e393be01ee82cb9e8a33ae72f74
-MD5 (navigator-v404-export.x86-unknown-freebsd.tar.gz) = 0773f4c0d056bbeb3038f2a8b8ec80d4
diff --git a/www/seamonkey2/pkg-comment b/www/seamonkey2/pkg-comment
index 85c538ca5e9a..3d907bd7e716 100644
--- a/www/seamonkey2/pkg-comment
+++ b/www/seamonkey2/pkg-comment
@@ -1 +1 @@
-netscape ver 4 web-surfboard (navigator or communicator)
+netscape ver 4 communicator web-surfboard
diff --git a/www/seamonkey2/pkg-descr b/www/seamonkey2/pkg-descr
index c78edc82b238..e0a83b68e9ae 100644
--- a/www/seamonkey2/pkg-descr
+++ b/www/seamonkey2/pkg-descr
@@ -1,12 +1,6 @@
 This is the netscape web-surfboard.  Please read the file
 "/usr/local/lib/netscape/LICENSE" for the licensing terms.
 
-Note: If the standalone navigator hangs on startup eating all CPU
-time, find the user_pref("browser.startup.license_accepted", ...);
-line in your ~/.netscape/preferences.js and move it to the end of
-the file, or remove it, if simply moving doesn't help.
-Don't forget to report this bug to Netscape Team.
-
 Note: If Java applets fail to display.  Type this as root:
 		cd /usr/X11R6/lib/X11/fonts/misc
 		/usr/X11R6/bin/mkfontdir
diff --git a/www/seamonkey2/pkg-plist b/www/seamonkey2/pkg-plist
index 329a99412745..c74392ca0eb1 100644
--- a/www/seamonkey2/pkg-plist
+++ b/www/seamonkey2/pkg-plist
@@ -1,4 +1,6 @@
-bin/netscape
+bin/communicator-4.04         
+@exec ln -sf %f bin/netscape
+@unexec rm -f bin/netscape
 lib/netscape/README
 lib/netscape/LICENSE
 lib/netscape/Netscape.ad
@@ -118,5 +120,5 @@ lib/netscape/spell/pen4s324.dat
 lib/netscape/spell/netscape.dic
 lib/netscape/vreg
 lib/netscape/registry
-lib/netscape/netscape.bin
+lib/netscape/communicator-4.04.bin
 lib/netscape/mailcap