Upgrade to v4.6.

v4.08 ports are changed because v.4.6 ports' Makefile includes v4.08s'.

19 files changed, 787 insertions, 972 deletions

diff --git a/www/bsdi-netscape47-communicator/Makefile b/www/bsdi-netscape47-communicator/Makefile
index adccacd5dc73..fdb79b4e3ee7 100644
--- a/www/bsdi-netscape47-communicator/Makefile
+++ b/www/bsdi-netscape47-communicator/Makefile
@@ -1,65 +1,23 @@
-# New ports collection makefile for:	netscape (communicator suite)
-# Version required:     4.5*
-# Date created:         24 Feb 1997
-# Whom:                 thepish
+# New ports collection makefile for: netscape (communicator suite)
+# Version required:	4.6*
+# Date created:		24 Feb 1997
+# Whom:			thepish
 #
-# $Id: Makefile,v 1.39 1999/04/18 21:26:34 dirk Exp $
+# $Id$
 #
 
-DISTNAME=       communicator-v451-export.x86-unknown-freebsd
-PKGNAME=        netscape-communicator-4.51
-CATEGORIES=	www
-MASTER_SITES=   ftp://ftp.netscape.com/pub/communicator/4.51/english/unix/unsupported/freebsd/complete_install/
-# DISTFILES must be set to begin with so USE_128BIT can add on to it.
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
+MASTER_SITES?=	ftp://ftp.netscape.com/pub/communicator/4.6/english/unix/unsupported/freebsd/complete_install/
+DISTFILES?=	communicator-v46-export.x86-unknown-freebsd.tar.gz
 
 MAINTAINER=	thepish@FreeBSD.ORG
 
-Y2K=		http://home.netscape.com/products/year2000/faq/client.html
-
-ONLY_FOR_ARCHS=	i386
-
+MASTERDIR=	${.CURDIR}/../netscape4-communicator
 NO_LATEST_LINK=	yes
-WRKSRC=         ${WRKDIR}/communicator-v451.x86-unknown-freebsd
-NO_BUILD=	Yes
-PLIST_SUB=	NDIRBASE=${NDIRBASE}
-NO_FILTER_SHLIBS=yes
-
-NDIRBASE=       netscape-4.51
-NDIR=		${PREFIX}/${NDIRBASE}
-BINDIR=		${PREFIX}/bin
-NBIN=           communicator-4.51.bin
-
-.if defined(USE_128BIT)
-MASTER_SITES+=	ftp://ftp.fortify.net/pub/Fortify/ \
-		ftp://ftp.za.freebsd.org/pub/Fortify/
-DISTFILES+=	Fortify-1.4.1-unix-x86.tar.gz
-RESTRICTED=	"Contains strong cryptography"
-.else
-pre-extract:
-		@${ECHO} "You can make Netscape use 128-bit encryption by defining USE_128BIT"
-.endif	# USE_128BIT
-
-post-configure:
-	${SED}	-e "s;@NDIR@;${NDIR};g" \
-		-e "s;@NBIN@;${NBIN};g" \
-		${FILESDIR}/netscape.sh >${WRKSRC}/netscape
+WRKSRC=		${WRKDIR}/${BROWSER}-v46.x86-unknown-freebsd
 
-do-install:
-	cd ${WRKSRC} && \
-		yes "" | LC_TIME=C MOZILLA_HOME="${NDIR}" ./ns-install
-	${MV} -f ${NDIR}/netscape ${NDIR}/communicator-4.51.bin
-	${INSTALL_SCRIPT} ${WRKSRC}/netscape ${BINDIR}/communicator-4.51
-	${LN} -sf communicator-4.51 ${BINDIR}/communicator-4
-	${LN} -sf communicator-4 ${BINDIR}/netscape
-	if [ ! -f ${NDIR}/mailcap ] ; then \
-		${INSTALL_DATA} ${FILESDIR}/mailcap ${NDIR}; \
-	fi
-	${RM} -rf ${NDIR}/movemail-src
-.if defined(USE_128BIT)
-	cd ${WRKDIR}/Fortify-1.4.1-unix-x86 && \
-		(${ECHO} yes ; ${ECHO} no ; ${ECHO} no) | ./Fortify.sh ${NDIR}/communicator-4.51.bin
-.endif
-	chown -R ${BINOWN}.${BINGRP} ${NDIR}
+BROWSER_VER=	4.6
+INFILE_HEAD?=	'Communicator,4.6.0.99124'
+NO_AUTOADMIN=	yes
+NO_FORTIFY=	yes
 
-.include <bsd.port.mk>
+.include "${MASTERDIR}/Makefile"
diff --git a/www/bsdi-netscape47-communicator/pkg-comment b/www/bsdi-netscape47-communicator/pkg-comment
index 6cf0af9ecf54..3d907bd7e716 100644
--- a/www/bsdi-netscape47-communicator/pkg-comment
+++ b/www/bsdi-netscape47-communicator/pkg-comment
@@ -1 +1 @@
-Netscape Communicator suite
+netscape ver 4 communicator web-surfboard
diff --git a/www/bsdi-netscape47-communicator/pkg-descr b/www/bsdi-netscape47-communicator/pkg-descr
index 8ad80c73c386..e0a83b68e9ae 100644
--- a/www/bsdi-netscape47-communicator/pkg-descr
+++ b/www/bsdi-netscape47-communicator/pkg-descr
@@ -1,23 +1,8 @@
-New features in 4.5 since 4.0x:
-
-Smart Browsing 
-3-Pane Integrated Mail / News Interface 
-Pinpoint Addressing and Scalable Address Book 
-Greatly improved IMAP mail performance, network efficiency & interoperability. 
-Palm Pilot address book, calendar and mail synchronization 
-New Calendar with simplified user interface
-Mail and address import from text, Outlook Express and Eudora 
-SmartUpdate uninstall 
-Netscape Quality Feedback System for bug reporting 
-
-See "/usr/local/lib/netscape/LICENSE" for the licensing terms.
+This is the netscape web-surfboard.  Please read the file
+"/usr/local/lib/netscape/LICENSE" for the licensing terms.
 
 Note: If Java applets fail to display.  Type this as root:
 		cd /usr/X11R6/lib/X11/fonts/misc
 		/usr/X11R6/bin/mkfontdir
 		chmod 444 fonts.dir
       And then exit and restart your X server.
-
-Peter Hawkins <thepish@FreeBSD.org>
-
-Thanks to: ache@freebsd.org (for original port)
diff --git a/www/bsdi-netscape47-communicator/pkg-plist b/www/bsdi-netscape47-communicator/pkg-plist
index 2ce3a340e635..357ea2f307dc 100644
--- a/www/bsdi-netscape47-communicator/pkg-plist
+++ b/www/bsdi-netscape47-communicator/pkg-plist
@@ -1,197 +1,197 @@
-bin/communicator-4.51
+bin/communicator-%%BROWSER_VER%%
 @exec ln -sf %f %B/communicator-4
 @exec ln -sf communicator-4 %B/netscape
 @unexec rm -f %B/netscape
 @unexec rm -f %B/communicator-4
-%%NDIRBASE%%/LICENSE
-%%NDIRBASE%%/Netscape.ad
-%%NDIRBASE%%/README
-%%NDIRBASE%%/XKeysymDB
-%%NDIRBASE%%/bookmark.htm
-%%NDIRBASE%%/communicator-4.51.bin
-%%NDIRBASE%%/java/classes/aix/font.properties
-%%NDIRBASE%%/java/classes/aix/font.properties.cs
-%%NDIRBASE%%/java/classes/aix/font.properties.hu
-%%NDIRBASE%%/java/classes/aix/font.properties.ja
-%%NDIRBASE%%/java/classes/aix/font.properties.ko
-%%NDIRBASE%%/java/classes/aix/font.properties.pl
-%%NDIRBASE%%/java/classes/aix/font.properties.ru
-%%NDIRBASE%%/java/classes/aix/font.properties.zh
-%%NDIRBASE%%/java/classes/aix/font.properties.zh_TW
-%%NDIRBASE%%/java/classes/awt.properties
-%%NDIRBASE%%/java/classes/font.properties
-%%NDIRBASE%%/java/classes/font.properties.cs
-%%NDIRBASE%%/java/classes/font.properties.el
-%%NDIRBASE%%/java/classes/font.properties.hu
-%%NDIRBASE%%/java/classes/font.properties.ja
-%%NDIRBASE%%/java/classes/font.properties.ko
-%%NDIRBASE%%/java/classes/font.properties.lt
-%%NDIRBASE%%/java/classes/font.properties.lv
-%%NDIRBASE%%/java/classes/font.properties.pl
-%%NDIRBASE%%/java/classes/font.properties.ru
-%%NDIRBASE%%/java/classes/font.properties.tr
-%%NDIRBASE%%/java/classes/font.properties.zh
-%%NDIRBASE%%/java/classes/font.properties.zh_GB2312
-%%NDIRBASE%%/java/classes/font.properties.zh_TW
-%%NDIRBASE%%/java/classes/font.properties.zh_TW_Big5
-%%NDIRBASE%%/java/classes/font.properties.zh_TW_CNS11643
-%%NDIRBASE%%/java/classes/hpux/font.properties
-%%NDIRBASE%%/java/classes/hpux/font.properties.bg
-%%NDIRBASE%%/java/classes/hpux/font.properties.cs
-%%NDIRBASE%%/java/classes/hpux/font.properties.el
-%%NDIRBASE%%/java/classes/hpux/font.properties.hr
-%%NDIRBASE%%/java/classes/hpux/font.properties.hu
-%%NDIRBASE%%/java/classes/hpux/font.properties.ja
-%%NDIRBASE%%/java/classes/hpux/font.properties.ko
-%%NDIRBASE%%/java/classes/hpux/font.properties.pl
-%%NDIRBASE%%/java/classes/hpux/font.properties.ro
-%%NDIRBASE%%/java/classes/hpux/font.properties.ru
-%%NDIRBASE%%/java/classes/hpux/font.properties.sk
-%%NDIRBASE%%/java/classes/hpux/font.properties.sl
-%%NDIRBASE%%/java/classes/hpux/font.properties.tr
-%%NDIRBASE%%/java/classes/hpux/font.properties.zh_GB2312
-%%NDIRBASE%%/java/classes/hpux/font.properties.zh_TW_Big5
-%%NDIRBASE%%/java/classes/hpux/font.properties.zh_TW_CNS11643
-%%NDIRBASE%%/java/classes/ifc11.jar
-%%NDIRBASE%%/java/classes/iiop10.jar
-%%NDIRBASE%%/java/classes/irix/font.properties
-%%NDIRBASE%%/java/classes/irix/font.properties.cs
-%%NDIRBASE%%/java/classes/irix/font.properties.el
-%%NDIRBASE%%/java/classes/irix/font.properties.hu
-%%NDIRBASE%%/java/classes/irix/font.properties.ja
-%%NDIRBASE%%/java/classes/irix/font.properties.ko
-%%NDIRBASE%%/java/classes/irix/font.properties.zh_GB2312
-%%NDIRBASE%%/java/classes/irix/font.properties.zh_TW_Big5
-%%NDIRBASE%%/java/classes/irix/font.properties.zh_TW_CNS11643
-%%NDIRBASE%%/java/classes/jae40.jar
-%%NDIRBASE%%/java/classes/java40.jar
-%%NDIRBASE%%/java/classes/jio40.jar
-%%NDIRBASE%%/java/classes/jsd10.jar
-%%NDIRBASE%%/java/classes/ldap10.jar
-%%NDIRBASE%%/java/classes/resource.jar
-%%NDIRBASE%%/java/classes/scd10.jar
-%%NDIRBASE%%/libjsd.so.1.0
-%%NDIRBASE%%/mailcap
-%%NDIRBASE%%/movemail
-%%NDIRBASE%%/nethelp/Back_dep.gif
-%%NDIRBASE%%/nethelp/Back_dis.gif
-%%NDIRBASE%%/nethelp/Back_sel.gif
-%%NDIRBASE%%/nethelp/Back_up.gif
-%%NDIRBASE%%/nethelp/Blank.htm
-%%NDIRBASE%%/nethelp/Button.js
-%%NDIRBASE%%/nethelp/CntData.js
-%%NDIRBASE%%/nethelp/CntTool.htm
-%%NDIRBASE%%/nethelp/CntTool.js
-%%NDIRBASE%%/nethelp/Exit_dep.gif
-%%NDIRBASE%%/nethelp/Exit_sel.gif
-%%NDIRBASE%%/nethelp/Exit_up.gif
-%%NDIRBASE%%/nethelp/Forw_dep.gif
-%%NDIRBASE%%/nethelp/Forw_dis.gif
-%%NDIRBASE%%/nethelp/Forw_sel.gif
-%%NDIRBASE%%/nethelp/Forw_up.gif
-%%NDIRBASE%%/nethelp/Header.js
-%%NDIRBASE%%/nethelp/IdxData.js
-%%NDIRBASE%%/nethelp/IdxFill.htm
-%%NDIRBASE%%/nethelp/IdxKey.htm
-%%NDIRBASE%%/nethelp/IdxTool.htm
-%%NDIRBASE%%/nethelp/IdxTopic.htm
-%%NDIRBASE%%/nethelp/Local-1.js
-%%NDIRBASE%%/nethelp/NSHIfrm.htm
-%%NDIRBASE%%/nethelp/NavUI.htm
-%%NDIRBASE%%/nethelp/NoJSerr.htm
-%%NDIRBASE%%/nethelp/Prnt_dep.gif
-%%NDIRBASE%%/nethelp/Prnt_sel.gif
-%%NDIRBASE%%/nethelp/Prnt_up.gif
-%%NDIRBASE%%/nethelp/Stack.js
-%%NDIRBASE%%/nethelp/Status.htm
-%%NDIRBASE%%/nethelp/System.htm
-%%NDIRBASE%%/nethelp/System.js
-%%NDIRBASE%%/nethelp/ToolUI.htm
-%%NDIRBASE%%/nethelp/Tool_dep.gif
-%%NDIRBASE%%/nethelp/Tool_sel.gif
-%%NDIRBASE%%/nethelp/Tool_up.gif
-%%NDIRBASE%%/nethelp/Topic.js
-%%NDIRBASE%%/nethelp/Utility.js
-%%NDIRBASE%%/nethelp/Wait.gif
-%%NDIRBASE%%/nethelp/netscape/collabra/coll.htm
-%%NDIRBASE%%/nethelp/netscape/collabra/collHdr.htm
-%%NDIRBASE%%/nethelp/netscape/collabra/collabra.gif
-%%NDIRBASE%%/nethelp/netscape/collabra/discgrps.gif
-%%NDIRBASE%%/nethelp/netscape/collabra/help.hpf
-%%NDIRBASE%%/nethelp/netscape/collabra/mailbox2.gif
-%%NDIRBASE%%/nethelp/netscape/composer/comp.htm
-%%NDIRBASE%%/nethelp/netscape/composer/compHdr.htm
-%%NDIRBASE%%/nethelp/netscape/composer/composer.gif
-%%NDIRBASE%%/nethelp/netscape/composer/comtlbr2.gif
-%%NDIRBASE%%/nethelp/netscape/composer/fmtlbr3.gif
-%%NDIRBASE%%/nethelp/netscape/composer/help.hpf
-%%NDIRBASE%%/nethelp/netscape/composer/tagicon2.gif
-%%NDIRBASE%%/nethelp/netscape/home/help.hpf
-%%NDIRBASE%%/nethelp/netscape/home/home.gif
-%%NDIRBASE%%/nethelp/netscape/home/home.htm
-%%NDIRBASE%%/nethelp/netscape/home/homeHdr.htm
-%%NDIRBASE%%/nethelp/netscape/messengr/abook.gif
-%%NDIRBASE%%/nethelp/netscape/messengr/compbar.gif
-%%NDIRBASE%%/nethelp/netscape/messengr/help.hpf
-%%NDIRBASE%%/nethelp/netscape/messengr/mailbox.gif
-%%NDIRBASE%%/nethelp/netscape/messengr/mailbox2.gif
-%%NDIRBASE%%/nethelp/netscape/messengr/mess.htm
-%%NDIRBASE%%/nethelp/netscape/messengr/messHdr.htm
-%%NDIRBASE%%/nethelp/netscape/messengr/messengr.gif
-%%NDIRBASE%%/nethelp/netscape/messengr/mpctrl.gif
-%%NDIRBASE%%/nethelp/netscape/messengr/newsgrp.gif
-%%NDIRBASE%%/nethelp/netscape/messengr/tabs.gif
-%%NDIRBASE%%/nethelp/netscape/navigatr/help.hpf
-%%NDIRBASE%%/nethelp/netscape/navigatr/nav.htm
-%%NDIRBASE%%/nethelp/netscape/navigatr/navHdr.htm
-%%NDIRBASE%%/nethelp/netscape/navigatr/navigatr.gif
-%%NDIRBASE%%/nethelp/netscape/news/abook.gif
-%%NDIRBASE%%/nethelp/netscape/news/collabra.gif
-%%NDIRBASE%%/nethelp/netscape/news/compbar.gif
-%%NDIRBASE%%/nethelp/netscape/news/discgrps.gif
-%%NDIRBASE%%/nethelp/netscape/news/help.hpf
-%%NDIRBASE%%/nethelp/netscape/news/mailbox2.gif
-%%NDIRBASE%%/nethelp/netscape/news/news.htm
-%%NDIRBASE%%/nethelp/netscape/news/newsgrp.gif
-%%NDIRBASE%%/nethelp/netscape/shared/NetHelpm.css
-%%NDIRBASE%%/nethelp/netscape/shared/NetHelpu.css
-%%NDIRBASE%%/nethelp/netscape/shared/NetHelpw.css
-%%NDIRBASE%%/nethelp/netscape/shared/admnIcon.gif
-%%NDIRBASE%%/nethelp/netscape/shared/calIcon.gif
-%%NDIRBASE%%/nethelp/netscape/shared/collIcon.gif
-%%NDIRBASE%%/nethelp/netscape/shared/commIcon.gif
-%%NDIRBASE%%/nethelp/netscape/shared/compIcon.gif
-%%NDIRBASE%%/nethelp/netscape/shared/confIcon.gif
-%%NDIRBASE%%/nethelp/netscape/shared/ibmIcon.gif
-%%NDIRBASE%%/nethelp/netscape/shared/messIcon.gif
-%%NDIRBASE%%/nethelp/netscape/shared/navIcon.gif
-%%NDIRBASE%%/nethelp/netscape/shared/netIcon.gif
-%%NDIRBASE%%/nethelp/netscape/trouble/help.hpf
-%%NDIRBASE%%/nethelp/netscape/trouble/trouble.htm
-%%NDIRBASE%%/nethelp/netwatch.gif
-%%NDIRBASE%%/nethelp/picsfail.htm
-%%NDIRBASE%%/nethelp/picsfail.jar
-%%NDIRBASE%%/plugins/cpPack1.jar
-%%NDIRBASE%%/plugins/libnullplugin.so
-%%NDIRBASE%%/registry
-%%NDIRBASE%%/spell/netscape.dic
-%%NDIRBASE%%/spell/pen4s324.dat
-%%NDIRBASE%%/vreg
-@dirrm %%NDIRBASE%%/spell
-@dirrm %%NDIRBASE%%/plugins
-@dirrm %%NDIRBASE%%/nethelp/netscape/trouble
-@dirrm %%NDIRBASE%%/nethelp/netscape/shared
-@dirrm %%NDIRBASE%%/nethelp/netscape/news
-@dirrm %%NDIRBASE%%/nethelp/netscape/navigatr
-@dirrm %%NDIRBASE%%/nethelp/netscape/messengr
-@dirrm %%NDIRBASE%%/nethelp/netscape/home
-@dirrm %%NDIRBASE%%/nethelp/netscape/composer
-@dirrm %%NDIRBASE%%/nethelp/netscape/collabra
-@dirrm %%NDIRBASE%%/nethelp/netscape
-@dirrm %%NDIRBASE%%/nethelp
-@dirrm %%NDIRBASE%%/java/classes/irix
-@dirrm %%NDIRBASE%%/java/classes/hpux
-@dirrm %%NDIRBASE%%/java/classes/aix
-@dirrm %%NDIRBASE%%/java/classes
-@dirrm %%NDIRBASE%%/java
-@dirrm %%NDIRBASE%%
+%%NSUBDIR%%/LICENSE
+%%NSUBDIR%%/Netscape.ad
+%%NSUBDIR%%/README
+%%NSUBDIR%%/XKeysymDB
+%%NSUBDIR%%/bookmark.htm
+%%NSUBDIR%%/communicator-4.6.bin
+%%NSUBDIR%%/java/classes/aix/font.properties
+%%NSUBDIR%%/java/classes/aix/font.properties.cs
+%%NSUBDIR%%/java/classes/aix/font.properties.hu
+%%NSUBDIR%%/java/classes/aix/font.properties.ja
+%%NSUBDIR%%/java/classes/aix/font.properties.ko
+%%NSUBDIR%%/java/classes/aix/font.properties.pl
+%%NSUBDIR%%/java/classes/aix/font.properties.ru
+%%NSUBDIR%%/java/classes/aix/font.properties.zh
+%%NSUBDIR%%/java/classes/aix/font.properties.zh_TW
+%%NSUBDIR%%/java/classes/awt.properties
+%%NSUBDIR%%/java/classes/font.properties
+%%NSUBDIR%%/java/classes/font.properties.cs
+%%NSUBDIR%%/java/classes/font.properties.el
+%%NSUBDIR%%/java/classes/font.properties.hu
+%%NSUBDIR%%/java/classes/font.properties.ja
+%%NSUBDIR%%/java/classes/font.properties.ko
+%%NSUBDIR%%/java/classes/font.properties.lt
+%%NSUBDIR%%/java/classes/font.properties.lv
+%%NSUBDIR%%/java/classes/font.properties.pl
+%%NSUBDIR%%/java/classes/font.properties.ru
+%%NSUBDIR%%/java/classes/font.properties.tr
+%%NSUBDIR%%/java/classes/font.properties.zh
+%%NSUBDIR%%/java/classes/font.properties.zh_GB2312
+%%NSUBDIR%%/java/classes/font.properties.zh_TW
+%%NSUBDIR%%/java/classes/font.properties.zh_TW_Big5
+%%NSUBDIR%%/java/classes/font.properties.zh_TW_CNS11643
+%%NSUBDIR%%/java/classes/hpux/font.properties
+%%NSUBDIR%%/java/classes/hpux/font.properties.bg
+%%NSUBDIR%%/java/classes/hpux/font.properties.cs
+%%NSUBDIR%%/java/classes/hpux/font.properties.el
+%%NSUBDIR%%/java/classes/hpux/font.properties.hr
+%%NSUBDIR%%/java/classes/hpux/font.properties.hu
+%%NSUBDIR%%/java/classes/hpux/font.properties.ja
+%%NSUBDIR%%/java/classes/hpux/font.properties.ko
+%%NSUBDIR%%/java/classes/hpux/font.properties.pl
+%%NSUBDIR%%/java/classes/hpux/font.properties.ro
+%%NSUBDIR%%/java/classes/hpux/font.properties.ru
+%%NSUBDIR%%/java/classes/hpux/font.properties.sk
+%%NSUBDIR%%/java/classes/hpux/font.properties.sl
+%%NSUBDIR%%/java/classes/hpux/font.properties.tr
+%%NSUBDIR%%/java/classes/hpux/font.properties.zh_GB2312
+%%NSUBDIR%%/java/classes/hpux/font.properties.zh_TW_Big5
+%%NSUBDIR%%/java/classes/hpux/font.properties.zh_TW_CNS11643
+%%NSUBDIR%%/java/classes/ifc11.jar
+%%NSUBDIR%%/java/classes/iiop10.jar
+%%NSUBDIR%%/java/classes/irix/font.properties
+%%NSUBDIR%%/java/classes/irix/font.properties.cs
+%%NSUBDIR%%/java/classes/irix/font.properties.el
+%%NSUBDIR%%/java/classes/irix/font.properties.hu
+%%NSUBDIR%%/java/classes/irix/font.properties.ja
+%%NSUBDIR%%/java/classes/irix/font.properties.ko
+%%NSUBDIR%%/java/classes/irix/font.properties.zh_GB2312
+%%NSUBDIR%%/java/classes/irix/font.properties.zh_TW_Big5
+%%NSUBDIR%%/java/classes/irix/font.properties.zh_TW_CNS11643
+%%NSUBDIR%%/java/classes/jae40.jar
+%%NSUBDIR%%/java/classes/java40.jar
+%%NSUBDIR%%/java/classes/jio40.jar
+%%NSUBDIR%%/java/classes/jsd10.jar
+%%NSUBDIR%%/java/classes/ldap30.jar
+%%NSUBDIR%%/java/classes/resource.jar
+%%NSUBDIR%%/java/classes/scd10.jar
+%%NSUBDIR%%/libjsd.so.1.0
+%%NSUBDIR%%/mailcap
+%%NSUBDIR%%/movemail
+%%NSUBDIR%%/nethelp/Back_dep.gif
+%%NSUBDIR%%/nethelp/Back_dis.gif
+%%NSUBDIR%%/nethelp/Back_sel.gif
+%%NSUBDIR%%/nethelp/Back_up.gif
+%%NSUBDIR%%/nethelp/Blank.htm
+%%NSUBDIR%%/nethelp/Button.js
+%%NSUBDIR%%/nethelp/CntData.js
+%%NSUBDIR%%/nethelp/CntTool.htm
+%%NSUBDIR%%/nethelp/CntTool.js
+%%NSUBDIR%%/nethelp/Exit_dep.gif
+%%NSUBDIR%%/nethelp/Exit_sel.gif
+%%NSUBDIR%%/nethelp/Exit_up.gif
+%%NSUBDIR%%/nethelp/Forw_dep.gif
+%%NSUBDIR%%/nethelp/Forw_dis.gif
+%%NSUBDIR%%/nethelp/Forw_sel.gif
+%%NSUBDIR%%/nethelp/Forw_up.gif
+%%NSUBDIR%%/nethelp/Header.js
+%%NSUBDIR%%/nethelp/IdxData.js
+%%NSUBDIR%%/nethelp/IdxFill.htm
+%%NSUBDIR%%/nethelp/IdxKey.htm
+%%NSUBDIR%%/nethelp/IdxTool.htm
+%%NSUBDIR%%/nethelp/IdxTopic.htm
+%%NSUBDIR%%/nethelp/Local-1.js
+%%NSUBDIR%%/nethelp/NSHIfrm.htm
+%%NSUBDIR%%/nethelp/NavUI.htm
+%%NSUBDIR%%/nethelp/NoJSerr.htm
+%%NSUBDIR%%/nethelp/Prnt_dep.gif
+%%NSUBDIR%%/nethelp/Prnt_sel.gif
+%%NSUBDIR%%/nethelp/Prnt_up.gif
+%%NSUBDIR%%/nethelp/Stack.js
+%%NSUBDIR%%/nethelp/Status.htm
+%%NSUBDIR%%/nethelp/System.htm
+%%NSUBDIR%%/nethelp/System.js
+%%NSUBDIR%%/nethelp/ToolUI.htm
+%%NSUBDIR%%/nethelp/Tool_dep.gif
+%%NSUBDIR%%/nethelp/Tool_sel.gif
+%%NSUBDIR%%/nethelp/Tool_up.gif
+%%NSUBDIR%%/nethelp/Topic.js
+%%NSUBDIR%%/nethelp/Utility.js
+%%NSUBDIR%%/nethelp/Wait.gif
+%%NSUBDIR%%/nethelp/netscape/collabra/coll.htm
+%%NSUBDIR%%/nethelp/netscape/collabra/collHdr.htm
+%%NSUBDIR%%/nethelp/netscape/collabra/collabra.gif
+%%NSUBDIR%%/nethelp/netscape/collabra/discgrps.gif
+%%NSUBDIR%%/nethelp/netscape/collabra/help.hpf
+%%NSUBDIR%%/nethelp/netscape/collabra/mailbox2.gif
+%%NSUBDIR%%/nethelp/netscape/composer/comp.htm
+%%NSUBDIR%%/nethelp/netscape/composer/compHdr.htm
+%%NSUBDIR%%/nethelp/netscape/composer/composer.gif
+%%NSUBDIR%%/nethelp/netscape/composer/comtlbr2.gif
+%%NSUBDIR%%/nethelp/netscape/composer/fmtlbr3.gif
+%%NSUBDIR%%/nethelp/netscape/composer/help.hpf
+%%NSUBDIR%%/nethelp/netscape/composer/tagicon2.gif
+%%NSUBDIR%%/nethelp/netscape/home/help.hpf
+%%NSUBDIR%%/nethelp/netscape/home/home.gif
+%%NSUBDIR%%/nethelp/netscape/home/home.htm
+%%NSUBDIR%%/nethelp/netscape/home/homeHdr.htm
+%%NSUBDIR%%/nethelp/netscape/messengr/abook.gif
+%%NSUBDIR%%/nethelp/netscape/messengr/compbar.gif
+%%NSUBDIR%%/nethelp/netscape/messengr/help.hpf
+%%NSUBDIR%%/nethelp/netscape/messengr/mailbox.gif
+%%NSUBDIR%%/nethelp/netscape/messengr/mailbox2.gif
+%%NSUBDIR%%/nethelp/netscape/messengr/mess.htm
+%%NSUBDIR%%/nethelp/netscape/messengr/messHdr.htm
+%%NSUBDIR%%/nethelp/netscape/messengr/messengr.gif
+%%NSUBDIR%%/nethelp/netscape/messengr/mpctrl.gif
+%%NSUBDIR%%/nethelp/netscape/messengr/newsgrp.gif
+%%NSUBDIR%%/nethelp/netscape/messengr/tabs.gif
+%%NSUBDIR%%/nethelp/netscape/navigatr/help.hpf
+%%NSUBDIR%%/nethelp/netscape/navigatr/nav.htm
+%%NSUBDIR%%/nethelp/netscape/navigatr/navHdr.htm
+%%NSUBDIR%%/nethelp/netscape/navigatr/navigatr.gif
+%%NSUBDIR%%/nethelp/netscape/news/abook.gif
+%%NSUBDIR%%/nethelp/netscape/news/collabra.gif
+%%NSUBDIR%%/nethelp/netscape/news/compbar.gif
+%%NSUBDIR%%/nethelp/netscape/news/discgrps.gif
+%%NSUBDIR%%/nethelp/netscape/news/help.hpf
+%%NSUBDIR%%/nethelp/netscape/news/mailbox2.gif
+%%NSUBDIR%%/nethelp/netscape/news/news.htm
+%%NSUBDIR%%/nethelp/netscape/news/newsgrp.gif
+%%NSUBDIR%%/nethelp/netscape/shared/NetHelpm.css
+%%NSUBDIR%%/nethelp/netscape/shared/NetHelpu.css
+%%NSUBDIR%%/nethelp/netscape/shared/NetHelpw.css
+%%NSUBDIR%%/nethelp/netscape/shared/admnIcon.gif
+%%NSUBDIR%%/nethelp/netscape/shared/calIcon.gif
+%%NSUBDIR%%/nethelp/netscape/shared/collIcon.gif
+%%NSUBDIR%%/nethelp/netscape/shared/commIcon.gif
+%%NSUBDIR%%/nethelp/netscape/shared/compIcon.gif
+%%NSUBDIR%%/nethelp/netscape/shared/confIcon.gif
+%%NSUBDIR%%/nethelp/netscape/shared/ibmIcon.gif
+%%NSUBDIR%%/nethelp/netscape/shared/messIcon.gif
+%%NSUBDIR%%/nethelp/netscape/shared/navIcon.gif
+%%NSUBDIR%%/nethelp/netscape/shared/netIcon.gif
+%%NSUBDIR%%/nethelp/netscape/trouble/help.hpf
+%%NSUBDIR%%/nethelp/netscape/trouble/trouble.htm
+%%NSUBDIR%%/nethelp/netwatch.gif
+%%NSUBDIR%%/nethelp/picsfail.htm
+%%NSUBDIR%%/nethelp/picsfail.jar
+%%NSUBDIR%%/plugins/cpPack1.jar
+%%NSUBDIR%%/plugins/libnullplugin.so
+%%NSUBDIR%%/registry
+%%NSUBDIR%%/spell/netscape.dic
+%%NSUBDIR%%/spell/pen4s324.dat
+%%NSUBDIR%%/vreg
+@dirrm %%NSUBDIR%%/spell
+@dirrm %%NSUBDIR%%/plugins
+@dirrm %%NSUBDIR%%/nethelp/netscape/trouble
+@dirrm %%NSUBDIR%%/nethelp/netscape/shared
+@dirrm %%NSUBDIR%%/nethelp/netscape/news
+@dirrm %%NSUBDIR%%/nethelp/netscape/navigatr
+@dirrm %%NSUBDIR%%/nethelp/netscape/messengr
+@dirrm %%NSUBDIR%%/nethelp/netscape/home
+@dirrm %%NSUBDIR%%/nethelp/netscape/composer
+@dirrm %%NSUBDIR%%/nethelp/netscape/collabra
+@dirrm %%NSUBDIR%%/nethelp/netscape
+@dirrm %%NSUBDIR%%/nethelp
+@dirrm %%NSUBDIR%%/java/classes/irix
+@dirrm %%NSUBDIR%%/java/classes/hpux
+@dirrm %%NSUBDIR%%/java/classes/aix
+@dirrm %%NSUBDIR%%/java/classes
+@dirrm %%NSUBDIR%%/java
+@dirrm %%NSUBDIR%%
diff --git a/www/bsdi-netscape47-navigator/Makefile b/www/bsdi-netscape47-navigator/Makefile
index 82cef4efa414..6ad972734b8e 100644
--- a/www/bsdi-netscape47-navigator/Makefile
+++ b/www/bsdi-netscape47-navigator/Makefile
@@ -1,56 +1,17 @@
-# New ports collection makefile for:	netscape (navigator only)
-# Version required:     4.5
-# Date created:         20 Sept 1998
-# Whom:                 brett@peloton.physics.montana.edu
+# New ports collection makefile for: netscape (navigator only)
+# Version required:	4.6*
+# Date created:		20 Sept 1998
+# Whom:			brett@peloton.physics.montana.edu
 #
-# $Id: Makefile,v 1.34 1999/01/13 04:00:10 scrappy Exp $
+# $Id$
 #
 
-DISTNAME=       netscape-navigator-4.5.1
-CATEGORIES=	www
-MASTER_SITES=   ftp://ftp.netscape.com/pub/communicator/4.51/english/unix/unsupported/freebsd/navigator_standalone/
-DISTFILES=      navigator-v451-export.x86-unknown-freebsd.tar.gz
+MASTER_SITES=	ftp://ftp.netscape.com/pub/communicator/4.6/english/unix/unsupported/freebsd/navigator_standalone/
+DISTFILES=	navigator-v46-export.x86-unknown-freebsd.tar.gz
 
-MAINTAINER=     ports@FreeBSD.ORG
+MAINTAINER=	sada@FreeBSD.ORG
 
-Y2K=		http://home.netscape.com/products/year2000/faq/client.html
+BROWSER=	navigator
+INFILE_HEAD=	'Navigator,4.6.0.99124'
 
-ONLY_FOR_ARCHS=	i386
-
-NO_LATEST_LINK=	yes
-WRKSRC=         ${WRKDIR}/navigator-v451.x86-unknown-freebsd
-NO_BUILD=       Yes
-
-NDIR=           ${PREFIX}/lib/netscape
-BINDIR=		${PREFIX}/bin
-
-.if defined(USE_128BIT)
-MASTER_SITES+=	ftp://ftp.fortify.net/pub/Fortify/ \
-		ftp://ftp.za.freebsd.org/pub/Fortify/
-DISTFILES+=	Fortify-1.4.1-unix-x86.tar.gz
-RESTRICTED=     "Contains strong cryptography"
-.else
-pre-extract:
-		@${ECHO} "You can make Netscape use 128-bit encryption by defining USE_128BIT"
-.endif
-
-do-install:
-	cd ${WRKSRC} && yes "" | \
-	    LC_TIME=C MOZILLA_HOME="${NDIR}" ./ns-install
-	${MV} -f ${NDIR}/netscape ${NDIR}/navigator-4.5.1.bin
-	${INSTALL_SCRIPT} ${WRKSRC}/netscape ${BINDIR}/navigator-4.5.1
-	ln -sf navigator-4.5.1 ${BINDIR}/navigator-4
-	ln -sf navigator-4 ${BINDIR}/netscape
-	if [ ! -f ${NDIR}/mailcap ] ; then \
-	    ${INSTALL_DATA} ${FILESDIR}/mailcap ${NDIR}; \
-	fi
-.if defined(USE_128BIT)
-	cd ${WRKDIR}/Fortify-1.4.1-unix-x86 && \
-		(${ECHO} yes ; ${ECHO} no ; ${ECHO} no) | ./Fortify.sh ${NDIR}/navigator-4.5.1.bin
-.endif
-	chown -R ${BINOWN}.${BINGRP} ${NDIR}
-
-post-install:
-	@${CAT} ${PKGDIR}/DESCR
-
-.include <bsd.port.mk>
+.include "${.CURDIR}/../netscape46-communicator/Makefile"
diff --git a/www/bsdi-netscape47-navigator/pkg-comment b/www/bsdi-netscape47-navigator/pkg-comment
index 13bd0434277c..05c830e43fb2 100644
--- a/www/bsdi-netscape47-navigator/pkg-comment
+++ b/www/bsdi-netscape47-navigator/pkg-comment
@@ -1 +1 @@
-netscape navigator ver 4.5.1
+netscape ver 4.6 navigator web-surfboard
diff --git a/www/bsdi-netscape47-navigator/pkg-descr b/www/bsdi-netscape47-navigator/pkg-descr
index f9d523cf0e6e..e0a83b68e9ae 100644
--- a/www/bsdi-netscape47-navigator/pkg-descr
+++ b/www/bsdi-netscape47-navigator/pkg-descr
@@ -1,8 +1,5 @@
-This is the Netscape Navigator-only 4.5.1 release.
-
-It appears to be more stable than 4.0x
-
-See "/usr/local/lib/netscape/LICENSE" for the licensing terms.
+This is the netscape web-surfboard.  Please read the file
+"/usr/local/lib/netscape/LICENSE" for the licensing terms.
 
 Note: If Java applets fail to display.  Type this as root:
 		cd /usr/X11R6/lib/X11/fonts/misc
diff --git a/www/bsdi-netscape47-navigator/pkg-plist b/www/bsdi-netscape47-navigator/pkg-plist
index b742def53fcf..c825b01285ea 100644
--- a/www/bsdi-netscape47-navigator/pkg-plist
+++ b/www/bsdi-netscape47-navigator/pkg-plist
@@ -1,153 +1,153 @@
-bin/navigator-4.5.1
+bin/navigator-%%BROWSER_VER%%
 @exec ln -sf %f %B/navigator-4
 @exec ln -sf navigator-4 %B/netscape
 @unexec rm -f %B/netscape
 @unexec rm -f %B/navigator-4
-lib/netscape/README
-lib/netscape/LICENSE
-lib/netscape/Netscape.ad
-lib/netscape/XKeysymDB
-lib/netscape/plugins/libnullplugin.so
-lib/netscape/bookmark.htm
-lib/netscape/vreg
-lib/netscape/navigator-4.5.1.bin
-lib/netscape/mailcap
-lib/netscape/registry
-lib/netscape/java/classes/ifc11.jar
-lib/netscape/java/classes/iiop10.jar
-lib/netscape/java/classes/jae40.jar
-lib/netscape/java/classes/java40.jar
-lib/netscape/java/classes/jio40.jar
-lib/netscape/java/classes/jsd10.jar
-lib/netscape/java/classes/ldap10.jar
-lib/netscape/java/classes/resource.jar
-lib/netscape/java/classes/scd10.jar
-lib/netscape/java/classes/awt.properties
-lib/netscape/java/classes/font.properties
-lib/netscape/java/classes/font.properties.cs
-lib/netscape/java/classes/font.properties.el
-lib/netscape/java/classes/font.properties.hu
-lib/netscape/java/classes/font.properties.ja
-lib/netscape/java/classes/font.properties.ko
-lib/netscape/java/classes/font.properties.lt
-lib/netscape/java/classes/font.properties.lv
-lib/netscape/java/classes/font.properties.pl
-lib/netscape/java/classes/font.properties.ru
-lib/netscape/java/classes/font.properties.tr
-lib/netscape/java/classes/font.properties.zh
-lib/netscape/java/classes/font.properties.zh_GB2312
-lib/netscape/java/classes/font.properties.zh_TW
-lib/netscape/java/classes/font.properties.zh_TW_Big5
-lib/netscape/java/classes/font.properties.zh_TW_CNS11643
-lib/netscape/java/classes/aix/font.properties
-lib/netscape/java/classes/aix/font.properties.cs
-lib/netscape/java/classes/aix/font.properties.hu
-lib/netscape/java/classes/aix/font.properties.ja
-lib/netscape/java/classes/aix/font.properties.ko
-lib/netscape/java/classes/aix/font.properties.pl
-lib/netscape/java/classes/aix/font.properties.ru
-lib/netscape/java/classes/aix/font.properties.zh
-lib/netscape/java/classes/aix/font.properties.zh_TW
-lib/netscape/java/classes/hpux/font.properties
-lib/netscape/java/classes/hpux/font.properties.bg
-lib/netscape/java/classes/hpux/font.properties.cs
-lib/netscape/java/classes/hpux/font.properties.el
-lib/netscape/java/classes/hpux/font.properties.hr
-lib/netscape/java/classes/hpux/font.properties.hu
-lib/netscape/java/classes/hpux/font.properties.ja
-lib/netscape/java/classes/hpux/font.properties.ko
-lib/netscape/java/classes/hpux/font.properties.pl
-lib/netscape/java/classes/hpux/font.properties.ro
-lib/netscape/java/classes/hpux/font.properties.ru
-lib/netscape/java/classes/hpux/font.properties.sk
-lib/netscape/java/classes/hpux/font.properties.sl
-lib/netscape/java/classes/hpux/font.properties.tr
-lib/netscape/java/classes/hpux/font.properties.zh_GB2312
-lib/netscape/java/classes/hpux/font.properties.zh_TW_Big5
-lib/netscape/java/classes/hpux/font.properties.zh_TW_CNS11643
-lib/netscape/java/classes/irix/font.properties
-lib/netscape/java/classes/irix/font.properties.cs
-lib/netscape/java/classes/irix/font.properties.el
-lib/netscape/java/classes/irix/font.properties.hu
-lib/netscape/java/classes/irix/font.properties.ja
-lib/netscape/java/classes/irix/font.properties.ko
-lib/netscape/java/classes/irix/font.properties.zh_GB2312
-lib/netscape/java/classes/irix/font.properties.zh_TW_Big5
-lib/netscape/java/classes/irix/font.properties.zh_TW_CNS11643
-lib/netscape/nethelp/Back_dep.gif
-lib/netscape/nethelp/Topic.js
-lib/netscape/nethelp/System.js
-lib/netscape/nethelp/Stack.js
-lib/netscape/nethelp/Local-1.js
-lib/netscape/nethelp/IdxData.js
-lib/netscape/nethelp/Header.js
-lib/netscape/nethelp/CntTool.js
-lib/netscape/nethelp/CntData.js
-lib/netscape/nethelp/Button.js
-lib/netscape/nethelp/ToolUI.htm
-lib/netscape/nethelp/System.htm
-lib/netscape/nethelp/Status.htm
-lib/netscape/nethelp/NoJSerr.htm
-lib/netscape/nethelp/NavUI.htm
-lib/netscape/nethelp/NSHIfrm.htm
-lib/netscape/nethelp/IdxTopic.htm
-lib/netscape/nethelp/IdxTool.htm
-lib/netscape/nethelp/IdxKey.htm
-lib/netscape/nethelp/IdxFill.htm
-lib/netscape/nethelp/CntTool.htm
-lib/netscape/nethelp/Blank.htm
-lib/netscape/nethelp/Wait.gif
-lib/netscape/nethelp/Tool_up.gif
-lib/netscape/nethelp/Tool_sel.gif
-lib/netscape/nethelp/Tool_dep.gif
-lib/netscape/nethelp/Prnt_up.gif
-lib/netscape/nethelp/Prnt_sel.gif
-lib/netscape/nethelp/Prnt_dep.gif
-lib/netscape/nethelp/Forw_up.gif
-lib/netscape/nethelp/Forw_sel.gif
-lib/netscape/nethelp/Forw_dis.gif
-lib/netscape/nethelp/Forw_dep.gif
-lib/netscape/nethelp/Exit_up.gif
-lib/netscape/nethelp/Exit_sel.gif
-lib/netscape/nethelp/Exit_dep.gif
-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/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/navigatr/navigatr.gif
-lib/netscape/nethelp/netscape/navigatr/nav.htm
-lib/netscape/nethelp/netscape/navigatr/navHdr.htm
-lib/netscape/nethelp/netscape/navigatr/help.hpf
-lib/netscape/nethelp/netscape/shared/NetHelpm.css
-lib/netscape/nethelp/netscape/shared/NetHelpu.css
-lib/netscape/nethelp/netscape/shared/NetHelpw.css
-lib/netscape/nethelp/netscape/shared/admnIcon.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/calIcon.gif
-lib/netscape/nethelp/netwatch.gif
-lib/netscape/nethelp/picsfail.htm
-lib/netscape/nethelp/picsfail.jar
-lib/netscape/plugins/cpPack1.jar
-@dirrm lib/netscape/plugins
-@dirrm lib/netscape/nethelp/netscape/shared
-@dirrm lib/netscape/nethelp/netscape/navigatr
-@dirrm lib/netscape/nethelp/netscape/home
-@dirrm lib/netscape/nethelp/netscape
-@dirrm lib/netscape/nethelp
-@dirrm lib/netscape/java/classes/irix
-@dirrm lib/netscape/java/classes/hpux
-@dirrm lib/netscape/java/classes/aix
-@dirrm lib/netscape/java/classes
-@dirrm lib/netscape/java
-@dirrm lib/netscape
+%%NSUBDIR%%/LICENSE
+%%NSUBDIR%%/Netscape.ad
+%%NSUBDIR%%/README
+%%NSUBDIR%%/XKeysymDB
+%%NSUBDIR%%/bookmark.htm
+%%NSUBDIR%%/java/classes/aix/font.properties
+%%NSUBDIR%%/java/classes/aix/font.properties.cs
+%%NSUBDIR%%/java/classes/aix/font.properties.hu
+%%NSUBDIR%%/java/classes/aix/font.properties.ja
+%%NSUBDIR%%/java/classes/aix/font.properties.ko
+%%NSUBDIR%%/java/classes/aix/font.properties.pl
+%%NSUBDIR%%/java/classes/aix/font.properties.ru
+%%NSUBDIR%%/java/classes/aix/font.properties.zh
+%%NSUBDIR%%/java/classes/aix/font.properties.zh_TW
+%%NSUBDIR%%/java/classes/awt.properties
+%%NSUBDIR%%/java/classes/font.properties
+%%NSUBDIR%%/java/classes/font.properties.cs
+%%NSUBDIR%%/java/classes/font.properties.el
+%%NSUBDIR%%/java/classes/font.properties.hu
+%%NSUBDIR%%/java/classes/font.properties.ja
+%%NSUBDIR%%/java/classes/font.properties.ko
+%%NSUBDIR%%/java/classes/font.properties.lt
+%%NSUBDIR%%/java/classes/font.properties.lv
+%%NSUBDIR%%/java/classes/font.properties.pl
+%%NSUBDIR%%/java/classes/font.properties.ru
+%%NSUBDIR%%/java/classes/font.properties.tr
+%%NSUBDIR%%/java/classes/font.properties.zh
+%%NSUBDIR%%/java/classes/font.properties.zh_GB2312
+%%NSUBDIR%%/java/classes/font.properties.zh_TW
+%%NSUBDIR%%/java/classes/font.properties.zh_TW_Big5
+%%NSUBDIR%%/java/classes/font.properties.zh_TW_CNS11643
+%%NSUBDIR%%/java/classes/hpux/font.properties
+%%NSUBDIR%%/java/classes/hpux/font.properties.bg
+%%NSUBDIR%%/java/classes/hpux/font.properties.cs
+%%NSUBDIR%%/java/classes/hpux/font.properties.el
+%%NSUBDIR%%/java/classes/hpux/font.properties.hr
+%%NSUBDIR%%/java/classes/hpux/font.properties.hu
+%%NSUBDIR%%/java/classes/hpux/font.properties.ja
+%%NSUBDIR%%/java/classes/hpux/font.properties.ko
+%%NSUBDIR%%/java/classes/hpux/font.properties.pl
+%%NSUBDIR%%/java/classes/hpux/font.properties.ro
+%%NSUBDIR%%/java/classes/hpux/font.properties.ru
+%%NSUBDIR%%/java/classes/hpux/font.properties.sk
+%%NSUBDIR%%/java/classes/hpux/font.properties.sl
+%%NSUBDIR%%/java/classes/hpux/font.properties.tr
+%%NSUBDIR%%/java/classes/hpux/font.properties.zh_GB2312
+%%NSUBDIR%%/java/classes/hpux/font.properties.zh_TW_Big5
+%%NSUBDIR%%/java/classes/hpux/font.properties.zh_TW_CNS11643
+%%NSUBDIR%%/java/classes/ifc11.jar
+%%NSUBDIR%%/java/classes/iiop10.jar
+%%NSUBDIR%%/java/classes/irix/font.properties
+%%NSUBDIR%%/java/classes/irix/font.properties.cs
+%%NSUBDIR%%/java/classes/irix/font.properties.el
+%%NSUBDIR%%/java/classes/irix/font.properties.hu
+%%NSUBDIR%%/java/classes/irix/font.properties.ja
+%%NSUBDIR%%/java/classes/irix/font.properties.ko
+%%NSUBDIR%%/java/classes/irix/font.properties.zh_GB2312
+%%NSUBDIR%%/java/classes/irix/font.properties.zh_TW_Big5
+%%NSUBDIR%%/java/classes/irix/font.properties.zh_TW_CNS11643
+%%NSUBDIR%%/java/classes/jae40.jar
+%%NSUBDIR%%/java/classes/java40.jar
+%%NSUBDIR%%/java/classes/jio40.jar
+%%NSUBDIR%%/java/classes/jsd10.jar
+%%NSUBDIR%%/java/classes/ldap30.jar
+%%NSUBDIR%%/java/classes/resource.jar
+%%NSUBDIR%%/java/classes/scd10.jar
+%%NSUBDIR%%/mailcap
+%%NSUBDIR%%/navigator-4.6.bin
+%%NSUBDIR%%/nethelp/Back_dep.gif
+%%NSUBDIR%%/nethelp/Back_dis.gif
+%%NSUBDIR%%/nethelp/Back_sel.gif
+%%NSUBDIR%%/nethelp/Back_up.gif
+%%NSUBDIR%%/nethelp/Blank.htm
+%%NSUBDIR%%/nethelp/Button.js
+%%NSUBDIR%%/nethelp/CntData.js
+%%NSUBDIR%%/nethelp/CntTool.htm
+%%NSUBDIR%%/nethelp/CntTool.js
+%%NSUBDIR%%/nethelp/Exit_dep.gif
+%%NSUBDIR%%/nethelp/Exit_sel.gif
+%%NSUBDIR%%/nethelp/Exit_up.gif
+%%NSUBDIR%%/nethelp/Forw_dep.gif
+%%NSUBDIR%%/nethelp/Forw_dis.gif
+%%NSUBDIR%%/nethelp/Forw_sel.gif
+%%NSUBDIR%%/nethelp/Forw_up.gif
+%%NSUBDIR%%/nethelp/Header.js
+%%NSUBDIR%%/nethelp/IdxData.js
+%%NSUBDIR%%/nethelp/IdxFill.htm
+%%NSUBDIR%%/nethelp/IdxKey.htm
+%%NSUBDIR%%/nethelp/IdxTool.htm
+%%NSUBDIR%%/nethelp/IdxTopic.htm
+%%NSUBDIR%%/nethelp/Local-1.js
+%%NSUBDIR%%/nethelp/NSHIfrm.htm
+%%NSUBDIR%%/nethelp/NavUI.htm
+%%NSUBDIR%%/nethelp/NoJSerr.htm
+%%NSUBDIR%%/nethelp/Prnt_dep.gif
+%%NSUBDIR%%/nethelp/Prnt_sel.gif
+%%NSUBDIR%%/nethelp/Prnt_up.gif
+%%NSUBDIR%%/nethelp/Stack.js
+%%NSUBDIR%%/nethelp/Status.htm
+%%NSUBDIR%%/nethelp/System.htm
+%%NSUBDIR%%/nethelp/System.js
+%%NSUBDIR%%/nethelp/ToolUI.htm
+%%NSUBDIR%%/nethelp/Tool_dep.gif
+%%NSUBDIR%%/nethelp/Tool_sel.gif
+%%NSUBDIR%%/nethelp/Tool_up.gif
+%%NSUBDIR%%/nethelp/Topic.js
+%%NSUBDIR%%/nethelp/Utility.js
+%%NSUBDIR%%/nethelp/Wait.gif
+%%NSUBDIR%%/nethelp/netscape/home/help.hpf
+%%NSUBDIR%%/nethelp/netscape/home/home.gif
+%%NSUBDIR%%/nethelp/netscape/home/home.htm
+%%NSUBDIR%%/nethelp/netscape/home/homeHdr.htm
+%%NSUBDIR%%/nethelp/netscape/navigatr/help.hpf
+%%NSUBDIR%%/nethelp/netscape/navigatr/nav.htm
+%%NSUBDIR%%/nethelp/netscape/navigatr/navHdr.htm
+%%NSUBDIR%%/nethelp/netscape/navigatr/navigatr.gif
+%%NSUBDIR%%/nethelp/netscape/shared/NetHelpm.css
+%%NSUBDIR%%/nethelp/netscape/shared/NetHelpu.css
+%%NSUBDIR%%/nethelp/netscape/shared/NetHelpw.css
+%%NSUBDIR%%/nethelp/netscape/shared/admnIcon.gif
+%%NSUBDIR%%/nethelp/netscape/shared/calIcon.gif
+%%NSUBDIR%%/nethelp/netscape/shared/collIcon.gif
+%%NSUBDIR%%/nethelp/netscape/shared/commIcon.gif
+%%NSUBDIR%%/nethelp/netscape/shared/compIcon.gif
+%%NSUBDIR%%/nethelp/netscape/shared/confIcon.gif
+%%NSUBDIR%%/nethelp/netscape/shared/ibmIcon.gif
+%%NSUBDIR%%/nethelp/netscape/shared/messIcon.gif
+%%NSUBDIR%%/nethelp/netscape/shared/navIcon.gif
+%%NSUBDIR%%/nethelp/netscape/shared/netIcon.gif
+%%NSUBDIR%%/nethelp/netwatch.gif
+%%NSUBDIR%%/nethelp/picsfail.htm
+%%NSUBDIR%%/nethelp/picsfail.jar
+%%NSUBDIR%%/plugins/cpPack1.jar
+%%NSUBDIR%%/plugins/libnullplugin.so
+%%NSUBDIR%%/registry
+%%NSUBDIR%%/vreg
+@dirrm %%NSUBDIR%%/plugins
+@dirrm %%NSUBDIR%%/nethelp/netscape/shared
+@dirrm %%NSUBDIR%%/nethelp/netscape/navigatr
+@dirrm %%NSUBDIR%%/nethelp/netscape/home
+@dirrm %%NSUBDIR%%/nethelp/netscape
+@dirrm %%NSUBDIR%%/nethelp
+@dirrm %%NSUBDIR%%/java/classes/irix
+@dirrm %%NSUBDIR%%/java/classes/hpux
+@dirrm %%NSUBDIR%%/java/classes/aix
+@dirrm %%NSUBDIR%%/java/classes
+@dirrm %%NSUBDIR%%/java
+@dirrm %%NSUBDIR%%
diff --git a/www/netscape4-communicator/Makefile b/www/netscape4-communicator/Makefile
index cef6ac4031fa..622f360f185c 100644
--- a/www/netscape4-communicator/Makefile
+++ b/www/netscape4-communicator/Makefile
@@ -3,14 +3,13 @@
 # Date created:         24 Feb 1997
 # Whom:                 ache
 #
-# $Id: Makefile,v 1.32 1999/02/12 16:01:22 sada Exp $
+# $Id: Makefile,v 1.33 1999/04/25 13:34:56 markm Exp $
 #
 
-DISTNAME=	netscape-${BROWSER}-${BROWSER_VER}
+DISTNAME?=	netscape-${BROWSER}-${BROWSER_VER}
 CATEGORIES=	www
 MASTER_SITES?=	ftp://ftp.netscape.com/pub/communicator/4.08/english/unix/unsupported/freebsd/professional_edition/
-DISTFILES?=	communicator-v408-export.x86-unknown-freebsd.tar.gz ${AUTOADMIN}
-AUTOADMIN=	autoadmin-v408.x86-unknown-freebsd.tar.gz
+DISTFILES?=	communicator-v408-export.x86-unknown-freebsd.tar.gz
 
 MAINTAINER=     ache@FreeBSD.ORG
 
@@ -18,13 +17,17 @@ Y2K=		http://home.netscape.com/products/year2000/faq/client.html
 
 ONLY_FOR_ARCHS=	i386
 
+NO_BUILD=	yes
 NO_FILTER_SHLIBS=	yes
-WRKSRC?=	${WRKDIR}/${BROWSER}-v408.x86-unknown-freebsd
-NO_BUILD=	Yes
 STRIP=
+WRKSRC?=	${WRKDIR}/${BROWSER}-v408.x86-unknown-freebsd
+FILESDIR=	${.CURDIR}/files
+PKGDIR=		${.CURDIR}/pkg
+PKGREQ=		${MASTERDIR}/pkg/REQ
 
+AUTOADMIN?=	autoadmin-v408.x86-unknown-freebsd.tar.gz
 BROWSER?=	communicator
-BROWSER_VER=	4.08
+BROWSER_VER?=	4.08
 NDIR=		${PREFIX}/${NSUBDIR}
 NSUBDIR=	lib/netscape
 BINDIR=		${PREFIX}/bin
@@ -35,7 +38,11 @@ MAILCAP=	${MASTERDIR}/files/mailcap
 PLIST_SUB=	BROWSER=${BROWSER} BROWSER_VER=${BROWSER_VER} \
 		NSUBDIR=${NSUBDIR}
 
-.if defined(USE_128BIT)
+.if (${BROWSER} == "communicator") && !defined(NO_AUTOADMIN)
+DISTFILES+=	${AUTOADMIN}
+.endif
+
+.if defined(USE_128BIT) && !defined(NO_FORTIFY)
 MASTER_SITES+=	ftp://ftp.fortify.net/pub/Fortify/ \
 		ftp://ftp.za.freebsd.org/pub/Fortify/
 DISTFILES+=	Fortify-1.4.1-unix-x86.tar.gz
@@ -44,12 +51,12 @@ RESTRICTED=     "Contains strong cryptography"
 
 .SILENT:
 
-.if !defined(USE_128BIT)
+.if !defined(USE_128BIT) && !defined(NO_FORTIFY)
 pre-extract:
 	${ECHO} "You can make Netscape use 128-bit encryption by defining USE_128BIT"
 .endif
 
-do-configure:
+post-configure:
 	${SED}	-e "s;@PREFIX@;${PREFIX};g" -e "s;@NSUBDIR@;${NSUBDIR};g" \
 		-e "s;@BROWSER@;${BROWSER};g" \
 		-e "s;@BROWSER_VER@;${BROWSER_VER};g" \
@@ -77,10 +84,11 @@ do-install:
 		${INSTALL_DATA} ${MAILCAP} ${NDIR}; \
 	fi
 	${RM} -rf ${NDIR}/movemail-src
-.if (${BROWSER} == "communicator")
+.if (${BROWSER} == "communicator") && !defined(NO_AUTOADMIN)
 	tar zxf ${DISTDIR}/${AUTOADMIN} -C ${NDIR}
 .endif
-.if defined(USE_128BIT) && defined(USA_RESIDENT) && ${USA_RESIDENT} == NO
+.if defined(USE_128BIT) && defined(USA_RESIDENT) && ${USA_RESIDENT} == NO \
+ && !defined(NO_FORTIFY)
 	cd ${WRKDIR}/Fortify-1.4.1-unix-x86 && \
 		(${ECHO} yes ; ${ECHO} no ; ${ECHO} no) \
 		| ./Fortify.sh ${NDIR}/${BROWSER}-${BROWSER_VER}.bin
diff --git a/www/netscape4-navigator/Makefile b/www/netscape4-navigator/Makefile
index 814e1bebfbb2..42e24d48bfcd 100644
--- a/www/netscape4-navigator/Makefile
+++ b/www/netscape4-navigator/Makefile
@@ -3,7 +3,7 @@
 # Date created:         24 Feb 1997
 # Whom:                 ache
 #
-# $Id$
+# $Id: Makefile,v 1.38 1999/02/12 16:01:24 sada Exp $
 #
 
 MASTER_SITES=	ftp://ftp.netscape.com/pub/communicator/${BROWSER_VER}/english/unix/unsupported/freebsd/navigator_standalone/
@@ -12,9 +12,6 @@ DISTFILES=	navigator-v408-export.x86-unknown-freebsd.tar.gz
 MAINTAINER=     sada@FreeBSD.ORG
 
 MASTERDIR=	${.CURDIR}/../netscape4-communicator
-FILESDIR=	${.CURDIR}/files
-PKGDIR=		${.CURDIR}/pkg
-PKGREQ=		${MASTERDIR}/pkg/REQ
 
 BROWSER=	navigator
 INFILE_HEAD=	'Navigator,4.08.0.98306'
diff --git a/www/netscape47-communicator/Makefile b/www/netscape47-communicator/Makefile
index adccacd5dc73..fdb79b4e3ee7 100644
--- a/www/netscape47-communicator/Makefile
+++ b/www/netscape47-communicator/Makefile
@@ -1,65 +1,23 @@
-# New ports collection makefile for:	netscape (communicator suite)
-# Version required:     4.5*
-# Date created:         24 Feb 1997
-# Whom:                 thepish
+# New ports collection makefile for: netscape (communicator suite)
+# Version required:	4.6*
+# Date created:		24 Feb 1997
+# Whom:			thepish
 #
-# $Id: Makefile,v 1.39 1999/04/18 21:26:34 dirk Exp $
+# $Id$
 #
 
-DISTNAME=       communicator-v451-export.x86-unknown-freebsd
-PKGNAME=        netscape-communicator-4.51
-CATEGORIES=	www
-MASTER_SITES=   ftp://ftp.netscape.com/pub/communicator/4.51/english/unix/unsupported/freebsd/complete_install/
-# DISTFILES must be set to begin with so USE_128BIT can add on to it.
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
+MASTER_SITES?=	ftp://ftp.netscape.com/pub/communicator/4.6/english/unix/unsupported/freebsd/complete_install/
+DISTFILES?=	communicator-v46-export.x86-unknown-freebsd.tar.gz
 
 MAINTAINER=	thepish@FreeBSD.ORG
 
-Y2K=		http://home.netscape.com/products/year2000/faq/client.html
-
-ONLY_FOR_ARCHS=	i386
-
+MASTERDIR=	${.CURDIR}/../netscape4-communicator
 NO_LATEST_LINK=	yes
-WRKSRC=         ${WRKDIR}/communicator-v451.x86-unknown-freebsd
-NO_BUILD=	Yes
-PLIST_SUB=	NDIRBASE=${NDIRBASE}
-NO_FILTER_SHLIBS=yes
-
-NDIRBASE=       netscape-4.51
-NDIR=		${PREFIX}/${NDIRBASE}
-BINDIR=		${PREFIX}/bin
-NBIN=           communicator-4.51.bin
-
-.if defined(USE_128BIT)
-MASTER_SITES+=	ftp://ftp.fortify.net/pub/Fortify/ \
-		ftp://ftp.za.freebsd.org/pub/Fortify/
-DISTFILES+=	Fortify-1.4.1-unix-x86.tar.gz
-RESTRICTED=	"Contains strong cryptography"
-.else
-pre-extract:
-		@${ECHO} "You can make Netscape use 128-bit encryption by defining USE_128BIT"
-.endif	# USE_128BIT
-
-post-configure:
-	${SED}	-e "s;@NDIR@;${NDIR};g" \
-		-e "s;@NBIN@;${NBIN};g" \
-		${FILESDIR}/netscape.sh >${WRKSRC}/netscape
+WRKSRC=		${WRKDIR}/${BROWSER}-v46.x86-unknown-freebsd
 
-do-install:
-	cd ${WRKSRC} && \
-		yes "" | LC_TIME=C MOZILLA_HOME="${NDIR}" ./ns-install
-	${MV} -f ${NDIR}/netscape ${NDIR}/communicator-4.51.bin
-	${INSTALL_SCRIPT} ${WRKSRC}/netscape ${BINDIR}/communicator-4.51
-	${LN} -sf communicator-4.51 ${BINDIR}/communicator-4
-	${LN} -sf communicator-4 ${BINDIR}/netscape
-	if [ ! -f ${NDIR}/mailcap ] ; then \
-		${INSTALL_DATA} ${FILESDIR}/mailcap ${NDIR}; \
-	fi
-	${RM} -rf ${NDIR}/movemail-src
-.if defined(USE_128BIT)
-	cd ${WRKDIR}/Fortify-1.4.1-unix-x86 && \
-		(${ECHO} yes ; ${ECHO} no ; ${ECHO} no) | ./Fortify.sh ${NDIR}/communicator-4.51.bin
-.endif
-	chown -R ${BINOWN}.${BINGRP} ${NDIR}
+BROWSER_VER=	4.6
+INFILE_HEAD?=	'Communicator,4.6.0.99124'
+NO_AUTOADMIN=	yes
+NO_FORTIFY=	yes
 
-.include <bsd.port.mk>
+.include "${MASTERDIR}/Makefile"
diff --git a/www/netscape47-communicator/pkg-comment b/www/netscape47-communicator/pkg-comment
index 6cf0af9ecf54..3d907bd7e716 100644
--- a/www/netscape47-communicator/pkg-comment
+++ b/www/netscape47-communicator/pkg-comment
@@ -1 +1 @@
-Netscape Communicator suite
+netscape ver 4 communicator web-surfboard
diff --git a/www/netscape47-communicator/pkg-descr b/www/netscape47-communicator/pkg-descr
index 8ad80c73c386..e0a83b68e9ae 100644
--- a/www/netscape47-communicator/pkg-descr
+++ b/www/netscape47-communicator/pkg-descr
@@ -1,23 +1,8 @@
-New features in 4.5 since 4.0x:
-
-Smart Browsing 
-3-Pane Integrated Mail / News Interface 
-Pinpoint Addressing and Scalable Address Book 
-Greatly improved IMAP mail performance, network efficiency & interoperability. 
-Palm Pilot address book, calendar and mail synchronization 
-New Calendar with simplified user interface
-Mail and address import from text, Outlook Express and Eudora 
-SmartUpdate uninstall 
-Netscape Quality Feedback System for bug reporting 
-
-See "/usr/local/lib/netscape/LICENSE" for the licensing terms.
+This is the netscape web-surfboard.  Please read the file
+"/usr/local/lib/netscape/LICENSE" for the licensing terms.
 
 Note: If Java applets fail to display.  Type this as root:
 		cd /usr/X11R6/lib/X11/fonts/misc
 		/usr/X11R6/bin/mkfontdir
 		chmod 444 fonts.dir
       And then exit and restart your X server.
-
-Peter Hawkins <thepish@FreeBSD.org>
-
-Thanks to: ache@freebsd.org (for original port)
diff --git a/www/netscape47-communicator/pkg-plist b/www/netscape47-communicator/pkg-plist
index 2ce3a340e635..357ea2f307dc 100644
--- a/www/netscape47-communicator/pkg-plist
+++ b/www/netscape47-communicator/pkg-plist
@@ -1,197 +1,197 @@
-bin/communicator-4.51
+bin/communicator-%%BROWSER_VER%%
 @exec ln -sf %f %B/communicator-4
 @exec ln -sf communicator-4 %B/netscape
 @unexec rm -f %B/netscape
 @unexec rm -f %B/communicator-4
-%%NDIRBASE%%/LICENSE
-%%NDIRBASE%%/Netscape.ad
-%%NDIRBASE%%/README
-%%NDIRBASE%%/XKeysymDB
-%%NDIRBASE%%/bookmark.htm
-%%NDIRBASE%%/communicator-4.51.bin
-%%NDIRBASE%%/java/classes/aix/font.properties
-%%NDIRBASE%%/java/classes/aix/font.properties.cs
-%%NDIRBASE%%/java/classes/aix/font.properties.hu
-%%NDIRBASE%%/java/classes/aix/font.properties.ja
-%%NDIRBASE%%/java/classes/aix/font.properties.ko
-%%NDIRBASE%%/java/classes/aix/font.properties.pl
-%%NDIRBASE%%/java/classes/aix/font.properties.ru
-%%NDIRBASE%%/java/classes/aix/font.properties.zh
-%%NDIRBASE%%/java/classes/aix/font.properties.zh_TW
-%%NDIRBASE%%/java/classes/awt.properties
-%%NDIRBASE%%/java/classes/font.properties
-%%NDIRBASE%%/java/classes/font.properties.cs
-%%NDIRBASE%%/java/classes/font.properties.el
-%%NDIRBASE%%/java/classes/font.properties.hu
-%%NDIRBASE%%/java/classes/font.properties.ja
-%%NDIRBASE%%/java/classes/font.properties.ko
-%%NDIRBASE%%/java/classes/font.properties.lt
-%%NDIRBASE%%/java/classes/font.properties.lv
-%%NDIRBASE%%/java/classes/font.properties.pl
-%%NDIRBASE%%/java/classes/font.properties.ru
-%%NDIRBASE%%/java/classes/font.properties.tr
-%%NDIRBASE%%/java/classes/font.properties.zh
-%%NDIRBASE%%/java/classes/font.properties.zh_GB2312
-%%NDIRBASE%%/java/classes/font.properties.zh_TW
-%%NDIRBASE%%/java/classes/font.properties.zh_TW_Big5
-%%NDIRBASE%%/java/classes/font.properties.zh_TW_CNS11643
-%%NDIRBASE%%/java/classes/hpux/font.properties
-%%NDIRBASE%%/java/classes/hpux/font.properties.bg
-%%NDIRBASE%%/java/classes/hpux/font.properties.cs
-%%NDIRBASE%%/java/classes/hpux/font.properties.el
-%%NDIRBASE%%/java/classes/hpux/font.properties.hr
-%%NDIRBASE%%/java/classes/hpux/font.properties.hu
-%%NDIRBASE%%/java/classes/hpux/font.properties.ja
-%%NDIRBASE%%/java/classes/hpux/font.properties.ko
-%%NDIRBASE%%/java/classes/hpux/font.properties.pl
-%%NDIRBASE%%/java/classes/hpux/font.properties.ro
-%%NDIRBASE%%/java/classes/hpux/font.properties.ru
-%%NDIRBASE%%/java/classes/hpux/font.properties.sk
-%%NDIRBASE%%/java/classes/hpux/font.properties.sl
-%%NDIRBASE%%/java/classes/hpux/font.properties.tr
-%%NDIRBASE%%/java/classes/hpux/font.properties.zh_GB2312
-%%NDIRBASE%%/java/classes/hpux/font.properties.zh_TW_Big5
-%%NDIRBASE%%/java/classes/hpux/font.properties.zh_TW_CNS11643
-%%NDIRBASE%%/java/classes/ifc11.jar
-%%NDIRBASE%%/java/classes/iiop10.jar
-%%NDIRBASE%%/java/classes/irix/font.properties
-%%NDIRBASE%%/java/classes/irix/font.properties.cs
-%%NDIRBASE%%/java/classes/irix/font.properties.el
-%%NDIRBASE%%/java/classes/irix/font.properties.hu
-%%NDIRBASE%%/java/classes/irix/font.properties.ja
-%%NDIRBASE%%/java/classes/irix/font.properties.ko
-%%NDIRBASE%%/java/classes/irix/font.properties.zh_GB2312
-%%NDIRBASE%%/java/classes/irix/font.properties.zh_TW_Big5
-%%NDIRBASE%%/java/classes/irix/font.properties.zh_TW_CNS11643
-%%NDIRBASE%%/java/classes/jae40.jar
-%%NDIRBASE%%/java/classes/java40.jar
-%%NDIRBASE%%/java/classes/jio40.jar
-%%NDIRBASE%%/java/classes/jsd10.jar
-%%NDIRBASE%%/java/classes/ldap10.jar
-%%NDIRBASE%%/java/classes/resource.jar
-%%NDIRBASE%%/java/classes/scd10.jar
-%%NDIRBASE%%/libjsd.so.1.0
-%%NDIRBASE%%/mailcap
-%%NDIRBASE%%/movemail
-%%NDIRBASE%%/nethelp/Back_dep.gif
-%%NDIRBASE%%/nethelp/Back_dis.gif
-%%NDIRBASE%%/nethelp/Back_sel.gif
-%%NDIRBASE%%/nethelp/Back_up.gif
-%%NDIRBASE%%/nethelp/Blank.htm
-%%NDIRBASE%%/nethelp/Button.js
-%%NDIRBASE%%/nethelp/CntData.js
-%%NDIRBASE%%/nethelp/CntTool.htm
-%%NDIRBASE%%/nethelp/CntTool.js
-%%NDIRBASE%%/nethelp/Exit_dep.gif
-%%NDIRBASE%%/nethelp/Exit_sel.gif
-%%NDIRBASE%%/nethelp/Exit_up.gif
-%%NDIRBASE%%/nethelp/Forw_dep.gif
-%%NDIRBASE%%/nethelp/Forw_dis.gif
-%%NDIRBASE%%/nethelp/Forw_sel.gif
-%%NDIRBASE%%/nethelp/Forw_up.gif
-%%NDIRBASE%%/nethelp/Header.js
-%%NDIRBASE%%/nethelp/IdxData.js
-%%NDIRBASE%%/nethelp/IdxFill.htm
-%%NDIRBASE%%/nethelp/IdxKey.htm
-%%NDIRBASE%%/nethelp/IdxTool.htm
-%%NDIRBASE%%/nethelp/IdxTopic.htm
-%%NDIRBASE%%/nethelp/Local-1.js
-%%NDIRBASE%%/nethelp/NSHIfrm.htm
-%%NDIRBASE%%/nethelp/NavUI.htm
-%%NDIRBASE%%/nethelp/NoJSerr.htm
-%%NDIRBASE%%/nethelp/Prnt_dep.gif
-%%NDIRBASE%%/nethelp/Prnt_sel.gif
-%%NDIRBASE%%/nethelp/Prnt_up.gif
-%%NDIRBASE%%/nethelp/Stack.js
-%%NDIRBASE%%/nethelp/Status.htm
-%%NDIRBASE%%/nethelp/System.htm
-%%NDIRBASE%%/nethelp/System.js
-%%NDIRBASE%%/nethelp/ToolUI.htm
-%%NDIRBASE%%/nethelp/Tool_dep.gif
-%%NDIRBASE%%/nethelp/Tool_sel.gif
-%%NDIRBASE%%/nethelp/Tool_up.gif
-%%NDIRBASE%%/nethelp/Topic.js
-%%NDIRBASE%%/nethelp/Utility.js
-%%NDIRBASE%%/nethelp/Wait.gif
-%%NDIRBASE%%/nethelp/netscape/collabra/coll.htm
-%%NDIRBASE%%/nethelp/netscape/collabra/collHdr.htm
-%%NDIRBASE%%/nethelp/netscape/collabra/collabra.gif
-%%NDIRBASE%%/nethelp/netscape/collabra/discgrps.gif
-%%NDIRBASE%%/nethelp/netscape/collabra/help.hpf
-%%NDIRBASE%%/nethelp/netscape/collabra/mailbox2.gif
-%%NDIRBASE%%/nethelp/netscape/composer/comp.htm
-%%NDIRBASE%%/nethelp/netscape/composer/compHdr.htm
-%%NDIRBASE%%/nethelp/netscape/composer/composer.gif
-%%NDIRBASE%%/nethelp/netscape/composer/comtlbr2.gif
-%%NDIRBASE%%/nethelp/netscape/composer/fmtlbr3.gif
-%%NDIRBASE%%/nethelp/netscape/composer/help.hpf
-%%NDIRBASE%%/nethelp/netscape/composer/tagicon2.gif
-%%NDIRBASE%%/nethelp/netscape/home/help.hpf
-%%NDIRBASE%%/nethelp/netscape/home/home.gif
-%%NDIRBASE%%/nethelp/netscape/home/home.htm
-%%NDIRBASE%%/nethelp/netscape/home/homeHdr.htm
-%%NDIRBASE%%/nethelp/netscape/messengr/abook.gif
-%%NDIRBASE%%/nethelp/netscape/messengr/compbar.gif
-%%NDIRBASE%%/nethelp/netscape/messengr/help.hpf
-%%NDIRBASE%%/nethelp/netscape/messengr/mailbox.gif
-%%NDIRBASE%%/nethelp/netscape/messengr/mailbox2.gif
-%%NDIRBASE%%/nethelp/netscape/messengr/mess.htm
-%%NDIRBASE%%/nethelp/netscape/messengr/messHdr.htm
-%%NDIRBASE%%/nethelp/netscape/messengr/messengr.gif
-%%NDIRBASE%%/nethelp/netscape/messengr/mpctrl.gif
-%%NDIRBASE%%/nethelp/netscape/messengr/newsgrp.gif
-%%NDIRBASE%%/nethelp/netscape/messengr/tabs.gif
-%%NDIRBASE%%/nethelp/netscape/navigatr/help.hpf
-%%NDIRBASE%%/nethelp/netscape/navigatr/nav.htm
-%%NDIRBASE%%/nethelp/netscape/navigatr/navHdr.htm
-%%NDIRBASE%%/nethelp/netscape/navigatr/navigatr.gif
-%%NDIRBASE%%/nethelp/netscape/news/abook.gif
-%%NDIRBASE%%/nethelp/netscape/news/collabra.gif
-%%NDIRBASE%%/nethelp/netscape/news/compbar.gif
-%%NDIRBASE%%/nethelp/netscape/news/discgrps.gif
-%%NDIRBASE%%/nethelp/netscape/news/help.hpf
-%%NDIRBASE%%/nethelp/netscape/news/mailbox2.gif
-%%NDIRBASE%%/nethelp/netscape/news/news.htm
-%%NDIRBASE%%/nethelp/netscape/news/newsgrp.gif
-%%NDIRBASE%%/nethelp/netscape/shared/NetHelpm.css
-%%NDIRBASE%%/nethelp/netscape/shared/NetHelpu.css
-%%NDIRBASE%%/nethelp/netscape/shared/NetHelpw.css
-%%NDIRBASE%%/nethelp/netscape/shared/admnIcon.gif
-%%NDIRBASE%%/nethelp/netscape/shared/calIcon.gif
-%%NDIRBASE%%/nethelp/netscape/shared/collIcon.gif
-%%NDIRBASE%%/nethelp/netscape/shared/commIcon.gif
-%%NDIRBASE%%/nethelp/netscape/shared/compIcon.gif
-%%NDIRBASE%%/nethelp/netscape/shared/confIcon.gif
-%%NDIRBASE%%/nethelp/netscape/shared/ibmIcon.gif
-%%NDIRBASE%%/nethelp/netscape/shared/messIcon.gif
-%%NDIRBASE%%/nethelp/netscape/shared/navIcon.gif
-%%NDIRBASE%%/nethelp/netscape/shared/netIcon.gif
-%%NDIRBASE%%/nethelp/netscape/trouble/help.hpf
-%%NDIRBASE%%/nethelp/netscape/trouble/trouble.htm
-%%NDIRBASE%%/nethelp/netwatch.gif
-%%NDIRBASE%%/nethelp/picsfail.htm
-%%NDIRBASE%%/nethelp/picsfail.jar
-%%NDIRBASE%%/plugins/cpPack1.jar
-%%NDIRBASE%%/plugins/libnullplugin.so
-%%NDIRBASE%%/registry
-%%NDIRBASE%%/spell/netscape.dic
-%%NDIRBASE%%/spell/pen4s324.dat
-%%NDIRBASE%%/vreg
-@dirrm %%NDIRBASE%%/spell
-@dirrm %%NDIRBASE%%/plugins
-@dirrm %%NDIRBASE%%/nethelp/netscape/trouble
-@dirrm %%NDIRBASE%%/nethelp/netscape/shared
-@dirrm %%NDIRBASE%%/nethelp/netscape/news
-@dirrm %%NDIRBASE%%/nethelp/netscape/navigatr
-@dirrm %%NDIRBASE%%/nethelp/netscape/messengr
-@dirrm %%NDIRBASE%%/nethelp/netscape/home
-@dirrm %%NDIRBASE%%/nethelp/netscape/composer
-@dirrm %%NDIRBASE%%/nethelp/netscape/collabra
-@dirrm %%NDIRBASE%%/nethelp/netscape
-@dirrm %%NDIRBASE%%/nethelp
-@dirrm %%NDIRBASE%%/java/classes/irix
-@dirrm %%NDIRBASE%%/java/classes/hpux
-@dirrm %%NDIRBASE%%/java/classes/aix
-@dirrm %%NDIRBASE%%/java/classes
-@dirrm %%NDIRBASE%%/java
-@dirrm %%NDIRBASE%%
+%%NSUBDIR%%/LICENSE
+%%NSUBDIR%%/Netscape.ad
+%%NSUBDIR%%/README
+%%NSUBDIR%%/XKeysymDB
+%%NSUBDIR%%/bookmark.htm
+%%NSUBDIR%%/communicator-4.6.bin
+%%NSUBDIR%%/java/classes/aix/font.properties
+%%NSUBDIR%%/java/classes/aix/font.properties.cs
+%%NSUBDIR%%/java/classes/aix/font.properties.hu
+%%NSUBDIR%%/java/classes/aix/font.properties.ja
+%%NSUBDIR%%/java/classes/aix/font.properties.ko
+%%NSUBDIR%%/java/classes/aix/font.properties.pl
+%%NSUBDIR%%/java/classes/aix/font.properties.ru
+%%NSUBDIR%%/java/classes/aix/font.properties.zh
+%%NSUBDIR%%/java/classes/aix/font.properties.zh_TW
+%%NSUBDIR%%/java/classes/awt.properties
+%%NSUBDIR%%/java/classes/font.properties
+%%NSUBDIR%%/java/classes/font.properties.cs
+%%NSUBDIR%%/java/classes/font.properties.el
+%%NSUBDIR%%/java/classes/font.properties.hu
+%%NSUBDIR%%/java/classes/font.properties.ja
+%%NSUBDIR%%/java/classes/font.properties.ko
+%%NSUBDIR%%/java/classes/font.properties.lt
+%%NSUBDIR%%/java/classes/font.properties.lv
+%%NSUBDIR%%/java/classes/font.properties.pl
+%%NSUBDIR%%/java/classes/font.properties.ru
+%%NSUBDIR%%/java/classes/font.properties.tr
+%%NSUBDIR%%/java/classes/font.properties.zh
+%%NSUBDIR%%/java/classes/font.properties.zh_GB2312
+%%NSUBDIR%%/java/classes/font.properties.zh_TW
+%%NSUBDIR%%/java/classes/font.properties.zh_TW_Big5
+%%NSUBDIR%%/java/classes/font.properties.zh_TW_CNS11643
+%%NSUBDIR%%/java/classes/hpux/font.properties
+%%NSUBDIR%%/java/classes/hpux/font.properties.bg
+%%NSUBDIR%%/java/classes/hpux/font.properties.cs
+%%NSUBDIR%%/java/classes/hpux/font.properties.el
+%%NSUBDIR%%/java/classes/hpux/font.properties.hr
+%%NSUBDIR%%/java/classes/hpux/font.properties.hu
+%%NSUBDIR%%/java/classes/hpux/font.properties.ja
+%%NSUBDIR%%/java/classes/hpux/font.properties.ko
+%%NSUBDIR%%/java/classes/hpux/font.properties.pl
+%%NSUBDIR%%/java/classes/hpux/font.properties.ro
+%%NSUBDIR%%/java/classes/hpux/font.properties.ru
+%%NSUBDIR%%/java/classes/hpux/font.properties.sk
+%%NSUBDIR%%/java/classes/hpux/font.properties.sl
+%%NSUBDIR%%/java/classes/hpux/font.properties.tr
+%%NSUBDIR%%/java/classes/hpux/font.properties.zh_GB2312
+%%NSUBDIR%%/java/classes/hpux/font.properties.zh_TW_Big5
+%%NSUBDIR%%/java/classes/hpux/font.properties.zh_TW_CNS11643
+%%NSUBDIR%%/java/classes/ifc11.jar
+%%NSUBDIR%%/java/classes/iiop10.jar
+%%NSUBDIR%%/java/classes/irix/font.properties
+%%NSUBDIR%%/java/classes/irix/font.properties.cs
+%%NSUBDIR%%/java/classes/irix/font.properties.el
+%%NSUBDIR%%/java/classes/irix/font.properties.hu
+%%NSUBDIR%%/java/classes/irix/font.properties.ja
+%%NSUBDIR%%/java/classes/irix/font.properties.ko
+%%NSUBDIR%%/java/classes/irix/font.properties.zh_GB2312
+%%NSUBDIR%%/java/classes/irix/font.properties.zh_TW_Big5
+%%NSUBDIR%%/java/classes/irix/font.properties.zh_TW_CNS11643
+%%NSUBDIR%%/java/classes/jae40.jar
+%%NSUBDIR%%/java/classes/java40.jar
+%%NSUBDIR%%/java/classes/jio40.jar
+%%NSUBDIR%%/java/classes/jsd10.jar
+%%NSUBDIR%%/java/classes/ldap30.jar
+%%NSUBDIR%%/java/classes/resource.jar
+%%NSUBDIR%%/java/classes/scd10.jar
+%%NSUBDIR%%/libjsd.so.1.0
+%%NSUBDIR%%/mailcap
+%%NSUBDIR%%/movemail
+%%NSUBDIR%%/nethelp/Back_dep.gif
+%%NSUBDIR%%/nethelp/Back_dis.gif
+%%NSUBDIR%%/nethelp/Back_sel.gif
+%%NSUBDIR%%/nethelp/Back_up.gif
+%%NSUBDIR%%/nethelp/Blank.htm
+%%NSUBDIR%%/nethelp/Button.js
+%%NSUBDIR%%/nethelp/CntData.js
+%%NSUBDIR%%/nethelp/CntTool.htm
+%%NSUBDIR%%/nethelp/CntTool.js
+%%NSUBDIR%%/nethelp/Exit_dep.gif
+%%NSUBDIR%%/nethelp/Exit_sel.gif
+%%NSUBDIR%%/nethelp/Exit_up.gif
+%%NSUBDIR%%/nethelp/Forw_dep.gif
+%%NSUBDIR%%/nethelp/Forw_dis.gif
+%%NSUBDIR%%/nethelp/Forw_sel.gif
+%%NSUBDIR%%/nethelp/Forw_up.gif
+%%NSUBDIR%%/nethelp/Header.js
+%%NSUBDIR%%/nethelp/IdxData.js
+%%NSUBDIR%%/nethelp/IdxFill.htm
+%%NSUBDIR%%/nethelp/IdxKey.htm
+%%NSUBDIR%%/nethelp/IdxTool.htm
+%%NSUBDIR%%/nethelp/IdxTopic.htm
+%%NSUBDIR%%/nethelp/Local-1.js
+%%NSUBDIR%%/nethelp/NSHIfrm.htm
+%%NSUBDIR%%/nethelp/NavUI.htm
+%%NSUBDIR%%/nethelp/NoJSerr.htm
+%%NSUBDIR%%/nethelp/Prnt_dep.gif
+%%NSUBDIR%%/nethelp/Prnt_sel.gif
+%%NSUBDIR%%/nethelp/Prnt_up.gif
+%%NSUBDIR%%/nethelp/Stack.js
+%%NSUBDIR%%/nethelp/Status.htm
+%%NSUBDIR%%/nethelp/System.htm
+%%NSUBDIR%%/nethelp/System.js
+%%NSUBDIR%%/nethelp/ToolUI.htm
+%%NSUBDIR%%/nethelp/Tool_dep.gif
+%%NSUBDIR%%/nethelp/Tool_sel.gif
+%%NSUBDIR%%/nethelp/Tool_up.gif
+%%NSUBDIR%%/nethelp/Topic.js
+%%NSUBDIR%%/nethelp/Utility.js
+%%NSUBDIR%%/nethelp/Wait.gif
+%%NSUBDIR%%/nethelp/netscape/collabra/coll.htm
+%%NSUBDIR%%/nethelp/netscape/collabra/collHdr.htm
+%%NSUBDIR%%/nethelp/netscape/collabra/collabra.gif
+%%NSUBDIR%%/nethelp/netscape/collabra/discgrps.gif
+%%NSUBDIR%%/nethelp/netscape/collabra/help.hpf
+%%NSUBDIR%%/nethelp/netscape/collabra/mailbox2.gif
+%%NSUBDIR%%/nethelp/netscape/composer/comp.htm
+%%NSUBDIR%%/nethelp/netscape/composer/compHdr.htm
+%%NSUBDIR%%/nethelp/netscape/composer/composer.gif
+%%NSUBDIR%%/nethelp/netscape/composer/comtlbr2.gif
+%%NSUBDIR%%/nethelp/netscape/composer/fmtlbr3.gif
+%%NSUBDIR%%/nethelp/netscape/composer/help.hpf
+%%NSUBDIR%%/nethelp/netscape/composer/tagicon2.gif
+%%NSUBDIR%%/nethelp/netscape/home/help.hpf
+%%NSUBDIR%%/nethelp/netscape/home/home.gif
+%%NSUBDIR%%/nethelp/netscape/home/home.htm
+%%NSUBDIR%%/nethelp/netscape/home/homeHdr.htm
+%%NSUBDIR%%/nethelp/netscape/messengr/abook.gif
+%%NSUBDIR%%/nethelp/netscape/messengr/compbar.gif
+%%NSUBDIR%%/nethelp/netscape/messengr/help.hpf
+%%NSUBDIR%%/nethelp/netscape/messengr/mailbox.gif
+%%NSUBDIR%%/nethelp/netscape/messengr/mailbox2.gif
+%%NSUBDIR%%/nethelp/netscape/messengr/mess.htm
+%%NSUBDIR%%/nethelp/netscape/messengr/messHdr.htm
+%%NSUBDIR%%/nethelp/netscape/messengr/messengr.gif
+%%NSUBDIR%%/nethelp/netscape/messengr/mpctrl.gif
+%%NSUBDIR%%/nethelp/netscape/messengr/newsgrp.gif
+%%NSUBDIR%%/nethelp/netscape/messengr/tabs.gif
+%%NSUBDIR%%/nethelp/netscape/navigatr/help.hpf
+%%NSUBDIR%%/nethelp/netscape/navigatr/nav.htm
+%%NSUBDIR%%/nethelp/netscape/navigatr/navHdr.htm
+%%NSUBDIR%%/nethelp/netscape/navigatr/navigatr.gif
+%%NSUBDIR%%/nethelp/netscape/news/abook.gif
+%%NSUBDIR%%/nethelp/netscape/news/collabra.gif
+%%NSUBDIR%%/nethelp/netscape/news/compbar.gif
+%%NSUBDIR%%/nethelp/netscape/news/discgrps.gif
+%%NSUBDIR%%/nethelp/netscape/news/help.hpf
+%%NSUBDIR%%/nethelp/netscape/news/mailbox2.gif
+%%NSUBDIR%%/nethelp/netscape/news/news.htm
+%%NSUBDIR%%/nethelp/netscape/news/newsgrp.gif
+%%NSUBDIR%%/nethelp/netscape/shared/NetHelpm.css
+%%NSUBDIR%%/nethelp/netscape/shared/NetHelpu.css
+%%NSUBDIR%%/nethelp/netscape/shared/NetHelpw.css
+%%NSUBDIR%%/nethelp/netscape/shared/admnIcon.gif
+%%NSUBDIR%%/nethelp/netscape/shared/calIcon.gif
+%%NSUBDIR%%/nethelp/netscape/shared/collIcon.gif
+%%NSUBDIR%%/nethelp/netscape/shared/commIcon.gif
+%%NSUBDIR%%/nethelp/netscape/shared/compIcon.gif
+%%NSUBDIR%%/nethelp/netscape/shared/confIcon.gif
+%%NSUBDIR%%/nethelp/netscape/shared/ibmIcon.gif
+%%NSUBDIR%%/nethelp/netscape/shared/messIcon.gif
+%%NSUBDIR%%/nethelp/netscape/shared/navIcon.gif
+%%NSUBDIR%%/nethelp/netscape/shared/netIcon.gif
+%%NSUBDIR%%/nethelp/netscape/trouble/help.hpf
+%%NSUBDIR%%/nethelp/netscape/trouble/trouble.htm
+%%NSUBDIR%%/nethelp/netwatch.gif
+%%NSUBDIR%%/nethelp/picsfail.htm
+%%NSUBDIR%%/nethelp/picsfail.jar
+%%NSUBDIR%%/plugins/cpPack1.jar
+%%NSUBDIR%%/plugins/libnullplugin.so
+%%NSUBDIR%%/registry
+%%NSUBDIR%%/spell/netscape.dic
+%%NSUBDIR%%/spell/pen4s324.dat
+%%NSUBDIR%%/vreg
+@dirrm %%NSUBDIR%%/spell
+@dirrm %%NSUBDIR%%/plugins
+@dirrm %%NSUBDIR%%/nethelp/netscape/trouble
+@dirrm %%NSUBDIR%%/nethelp/netscape/shared
+@dirrm %%NSUBDIR%%/nethelp/netscape/news
+@dirrm %%NSUBDIR%%/nethelp/netscape/navigatr
+@dirrm %%NSUBDIR%%/nethelp/netscape/messengr
+@dirrm %%NSUBDIR%%/nethelp/netscape/home
+@dirrm %%NSUBDIR%%/nethelp/netscape/composer
+@dirrm %%NSUBDIR%%/nethelp/netscape/collabra
+@dirrm %%NSUBDIR%%/nethelp/netscape
+@dirrm %%NSUBDIR%%/nethelp
+@dirrm %%NSUBDIR%%/java/classes/irix
+@dirrm %%NSUBDIR%%/java/classes/hpux
+@dirrm %%NSUBDIR%%/java/classes/aix
+@dirrm %%NSUBDIR%%/java/classes
+@dirrm %%NSUBDIR%%/java
+@dirrm %%NSUBDIR%%
diff --git a/www/netscape47-navigator/Makefile b/www/netscape47-navigator/Makefile
index 82cef4efa414..6ad972734b8e 100644
--- a/www/netscape47-navigator/Makefile
+++ b/www/netscape47-navigator/Makefile
@@ -1,56 +1,17 @@
-# New ports collection makefile for:	netscape (navigator only)
-# Version required:     4.5
-# Date created:         20 Sept 1998
-# Whom:                 brett@peloton.physics.montana.edu
+# New ports collection makefile for: netscape (navigator only)
+# Version required:	4.6*
+# Date created:		20 Sept 1998
+# Whom:			brett@peloton.physics.montana.edu
 #
-# $Id: Makefile,v 1.34 1999/01/13 04:00:10 scrappy Exp $
+# $Id$
 #
 
-DISTNAME=       netscape-navigator-4.5.1
-CATEGORIES=	www
-MASTER_SITES=   ftp://ftp.netscape.com/pub/communicator/4.51/english/unix/unsupported/freebsd/navigator_standalone/
-DISTFILES=      navigator-v451-export.x86-unknown-freebsd.tar.gz
+MASTER_SITES=	ftp://ftp.netscape.com/pub/communicator/4.6/english/unix/unsupported/freebsd/navigator_standalone/
+DISTFILES=	navigator-v46-export.x86-unknown-freebsd.tar.gz
 
-MAINTAINER=     ports@FreeBSD.ORG
+MAINTAINER=	sada@FreeBSD.ORG
 
-Y2K=		http://home.netscape.com/products/year2000/faq/client.html
+BROWSER=	navigator
+INFILE_HEAD=	'Navigator,4.6.0.99124'
 
-ONLY_FOR_ARCHS=	i386
-
-NO_LATEST_LINK=	yes
-WRKSRC=         ${WRKDIR}/navigator-v451.x86-unknown-freebsd
-NO_BUILD=       Yes
-
-NDIR=           ${PREFIX}/lib/netscape
-BINDIR=		${PREFIX}/bin
-
-.if defined(USE_128BIT)
-MASTER_SITES+=	ftp://ftp.fortify.net/pub/Fortify/ \
-		ftp://ftp.za.freebsd.org/pub/Fortify/
-DISTFILES+=	Fortify-1.4.1-unix-x86.tar.gz
-RESTRICTED=     "Contains strong cryptography"
-.else
-pre-extract:
-		@${ECHO} "You can make Netscape use 128-bit encryption by defining USE_128BIT"
-.endif
-
-do-install:
-	cd ${WRKSRC} && yes "" | \
-	    LC_TIME=C MOZILLA_HOME="${NDIR}" ./ns-install
-	${MV} -f ${NDIR}/netscape ${NDIR}/navigator-4.5.1.bin
-	${INSTALL_SCRIPT} ${WRKSRC}/netscape ${BINDIR}/navigator-4.5.1
-	ln -sf navigator-4.5.1 ${BINDIR}/navigator-4
-	ln -sf navigator-4 ${BINDIR}/netscape
-	if [ ! -f ${NDIR}/mailcap ] ; then \
-	    ${INSTALL_DATA} ${FILESDIR}/mailcap ${NDIR}; \
-	fi
-.if defined(USE_128BIT)
-	cd ${WRKDIR}/Fortify-1.4.1-unix-x86 && \
-		(${ECHO} yes ; ${ECHO} no ; ${ECHO} no) | ./Fortify.sh ${NDIR}/navigator-4.5.1.bin
-.endif
-	chown -R ${BINOWN}.${BINGRP} ${NDIR}
-
-post-install:
-	@${CAT} ${PKGDIR}/DESCR
-
-.include <bsd.port.mk>
+.include "${.CURDIR}/../netscape46-communicator/Makefile"
diff --git a/www/netscape47-navigator/pkg-comment b/www/netscape47-navigator/pkg-comment
index 13bd0434277c..05c830e43fb2 100644
--- a/www/netscape47-navigator/pkg-comment
+++ b/www/netscape47-navigator/pkg-comment
@@ -1 +1 @@
-netscape navigator ver 4.5.1
+netscape ver 4.6 navigator web-surfboard
diff --git a/www/netscape47-navigator/pkg-descr b/www/netscape47-navigator/pkg-descr
index f9d523cf0e6e..e0a83b68e9ae 100644
--- a/www/netscape47-navigator/pkg-descr
+++ b/www/netscape47-navigator/pkg-descr
@@ -1,8 +1,5 @@
-This is the Netscape Navigator-only 4.5.1 release.
-
-It appears to be more stable than 4.0x
-
-See "/usr/local/lib/netscape/LICENSE" for the licensing terms.
+This is the netscape web-surfboard.  Please read the file
+"/usr/local/lib/netscape/LICENSE" for the licensing terms.
 
 Note: If Java applets fail to display.  Type this as root:
 		cd /usr/X11R6/lib/X11/fonts/misc
diff --git a/www/netscape47-navigator/pkg-plist b/www/netscape47-navigator/pkg-plist
index b742def53fcf..c825b01285ea 100644
--- a/www/netscape47-navigator/pkg-plist
+++ b/www/netscape47-navigator/pkg-plist
@@ -1,153 +1,153 @@
-bin/navigator-4.5.1
+bin/navigator-%%BROWSER_VER%%
 @exec ln -sf %f %B/navigator-4
 @exec ln -sf navigator-4 %B/netscape
 @unexec rm -f %B/netscape
 @unexec rm -f %B/navigator-4
-lib/netscape/README
-lib/netscape/LICENSE
-lib/netscape/Netscape.ad
-lib/netscape/XKeysymDB
-lib/netscape/plugins/libnullplugin.so
-lib/netscape/bookmark.htm
-lib/netscape/vreg
-lib/netscape/navigator-4.5.1.bin
-lib/netscape/mailcap
-lib/netscape/registry
-lib/netscape/java/classes/ifc11.jar
-lib/netscape/java/classes/iiop10.jar
-lib/netscape/java/classes/jae40.jar
-lib/netscape/java/classes/java40.jar
-lib/netscape/java/classes/jio40.jar
-lib/netscape/java/classes/jsd10.jar
-lib/netscape/java/classes/ldap10.jar
-lib/netscape/java/classes/resource.jar
-lib/netscape/java/classes/scd10.jar
-lib/netscape/java/classes/awt.properties
-lib/netscape/java/classes/font.properties
-lib/netscape/java/classes/font.properties.cs
-lib/netscape/java/classes/font.properties.el
-lib/netscape/java/classes/font.properties.hu
-lib/netscape/java/classes/font.properties.ja
-lib/netscape/java/classes/font.properties.ko
-lib/netscape/java/classes/font.properties.lt
-lib/netscape/java/classes/font.properties.lv
-lib/netscape/java/classes/font.properties.pl
-lib/netscape/java/classes/font.properties.ru
-lib/netscape/java/classes/font.properties.tr
-lib/netscape/java/classes/font.properties.zh
-lib/netscape/java/classes/font.properties.zh_GB2312
-lib/netscape/java/classes/font.properties.zh_TW
-lib/netscape/java/classes/font.properties.zh_TW_Big5
-lib/netscape/java/classes/font.properties.zh_TW_CNS11643
-lib/netscape/java/classes/aix/font.properties
-lib/netscape/java/classes/aix/font.properties.cs
-lib/netscape/java/classes/aix/font.properties.hu
-lib/netscape/java/classes/aix/font.properties.ja
-lib/netscape/java/classes/aix/font.properties.ko
-lib/netscape/java/classes/aix/font.properties.pl
-lib/netscape/java/classes/aix/font.properties.ru
-lib/netscape/java/classes/aix/font.properties.zh
-lib/netscape/java/classes/aix/font.properties.zh_TW
-lib/netscape/java/classes/hpux/font.properties
-lib/netscape/java/classes/hpux/font.properties.bg
-lib/netscape/java/classes/hpux/font.properties.cs
-lib/netscape/java/classes/hpux/font.properties.el
-lib/netscape/java/classes/hpux/font.properties.hr
-lib/netscape/java/classes/hpux/font.properties.hu
-lib/netscape/java/classes/hpux/font.properties.ja
-lib/netscape/java/classes/hpux/font.properties.ko
-lib/netscape/java/classes/hpux/font.properties.pl
-lib/netscape/java/classes/hpux/font.properties.ro
-lib/netscape/java/classes/hpux/font.properties.ru
-lib/netscape/java/classes/hpux/font.properties.sk
-lib/netscape/java/classes/hpux/font.properties.sl
-lib/netscape/java/classes/hpux/font.properties.tr
-lib/netscape/java/classes/hpux/font.properties.zh_GB2312
-lib/netscape/java/classes/hpux/font.properties.zh_TW_Big5
-lib/netscape/java/classes/hpux/font.properties.zh_TW_CNS11643
-lib/netscape/java/classes/irix/font.properties
-lib/netscape/java/classes/irix/font.properties.cs
-lib/netscape/java/classes/irix/font.properties.el
-lib/netscape/java/classes/irix/font.properties.hu
-lib/netscape/java/classes/irix/font.properties.ja
-lib/netscape/java/classes/irix/font.properties.ko
-lib/netscape/java/classes/irix/font.properties.zh_GB2312
-lib/netscape/java/classes/irix/font.properties.zh_TW_Big5
-lib/netscape/java/classes/irix/font.properties.zh_TW_CNS11643
-lib/netscape/nethelp/Back_dep.gif
-lib/netscape/nethelp/Topic.js
-lib/netscape/nethelp/System.js
-lib/netscape/nethelp/Stack.js
-lib/netscape/nethelp/Local-1.js
-lib/netscape/nethelp/IdxData.js
-lib/netscape/nethelp/Header.js
-lib/netscape/nethelp/CntTool.js
-lib/netscape/nethelp/CntData.js
-lib/netscape/nethelp/Button.js
-lib/netscape/nethelp/ToolUI.htm
-lib/netscape/nethelp/System.htm
-lib/netscape/nethelp/Status.htm
-lib/netscape/nethelp/NoJSerr.htm
-lib/netscape/nethelp/NavUI.htm
-lib/netscape/nethelp/NSHIfrm.htm
-lib/netscape/nethelp/IdxTopic.htm
-lib/netscape/nethelp/IdxTool.htm
-lib/netscape/nethelp/IdxKey.htm
-lib/netscape/nethelp/IdxFill.htm
-lib/netscape/nethelp/CntTool.htm
-lib/netscape/nethelp/Blank.htm
-lib/netscape/nethelp/Wait.gif
-lib/netscape/nethelp/Tool_up.gif
-lib/netscape/nethelp/Tool_sel.gif
-lib/netscape/nethelp/Tool_dep.gif
-lib/netscape/nethelp/Prnt_up.gif
-lib/netscape/nethelp/Prnt_sel.gif
-lib/netscape/nethelp/Prnt_dep.gif
-lib/netscape/nethelp/Forw_up.gif
-lib/netscape/nethelp/Forw_sel.gif
-lib/netscape/nethelp/Forw_dis.gif
-lib/netscape/nethelp/Forw_dep.gif
-lib/netscape/nethelp/Exit_up.gif
-lib/netscape/nethelp/Exit_sel.gif
-lib/netscape/nethelp/Exit_dep.gif
-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/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/navigatr/navigatr.gif
-lib/netscape/nethelp/netscape/navigatr/nav.htm
-lib/netscape/nethelp/netscape/navigatr/navHdr.htm
-lib/netscape/nethelp/netscape/navigatr/help.hpf
-lib/netscape/nethelp/netscape/shared/NetHelpm.css
-lib/netscape/nethelp/netscape/shared/NetHelpu.css
-lib/netscape/nethelp/netscape/shared/NetHelpw.css
-lib/netscape/nethelp/netscape/shared/admnIcon.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/calIcon.gif
-lib/netscape/nethelp/netwatch.gif
-lib/netscape/nethelp/picsfail.htm
-lib/netscape/nethelp/picsfail.jar
-lib/netscape/plugins/cpPack1.jar
-@dirrm lib/netscape/plugins
-@dirrm lib/netscape/nethelp/netscape/shared
-@dirrm lib/netscape/nethelp/netscape/navigatr
-@dirrm lib/netscape/nethelp/netscape/home
-@dirrm lib/netscape/nethelp/netscape
-@dirrm lib/netscape/nethelp
-@dirrm lib/netscape/java/classes/irix
-@dirrm lib/netscape/java/classes/hpux
-@dirrm lib/netscape/java/classes/aix
-@dirrm lib/netscape/java/classes
-@dirrm lib/netscape/java
-@dirrm lib/netscape
+%%NSUBDIR%%/LICENSE
+%%NSUBDIR%%/Netscape.ad
+%%NSUBDIR%%/README
+%%NSUBDIR%%/XKeysymDB
+%%NSUBDIR%%/bookmark.htm
+%%NSUBDIR%%/java/classes/aix/font.properties
+%%NSUBDIR%%/java/classes/aix/font.properties.cs
+%%NSUBDIR%%/java/classes/aix/font.properties.hu
+%%NSUBDIR%%/java/classes/aix/font.properties.ja
+%%NSUBDIR%%/java/classes/aix/font.properties.ko
+%%NSUBDIR%%/java/classes/aix/font.properties.pl
+%%NSUBDIR%%/java/classes/aix/font.properties.ru
+%%NSUBDIR%%/java/classes/aix/font.properties.zh
+%%NSUBDIR%%/java/classes/aix/font.properties.zh_TW
+%%NSUBDIR%%/java/classes/awt.properties
+%%NSUBDIR%%/java/classes/font.properties
+%%NSUBDIR%%/java/classes/font.properties.cs
+%%NSUBDIR%%/java/classes/font.properties.el
+%%NSUBDIR%%/java/classes/font.properties.hu
+%%NSUBDIR%%/java/classes/font.properties.ja
+%%NSUBDIR%%/java/classes/font.properties.ko
+%%NSUBDIR%%/java/classes/font.properties.lt
+%%NSUBDIR%%/java/classes/font.properties.lv
+%%NSUBDIR%%/java/classes/font.properties.pl
+%%NSUBDIR%%/java/classes/font.properties.ru
+%%NSUBDIR%%/java/classes/font.properties.tr
+%%NSUBDIR%%/java/classes/font.properties.zh
+%%NSUBDIR%%/java/classes/font.properties.zh_GB2312
+%%NSUBDIR%%/java/classes/font.properties.zh_TW
+%%NSUBDIR%%/java/classes/font.properties.zh_TW_Big5
+%%NSUBDIR%%/java/classes/font.properties.zh_TW_CNS11643
+%%NSUBDIR%%/java/classes/hpux/font.properties
+%%NSUBDIR%%/java/classes/hpux/font.properties.bg
+%%NSUBDIR%%/java/classes/hpux/font.properties.cs
+%%NSUBDIR%%/java/classes/hpux/font.properties.el
+%%NSUBDIR%%/java/classes/hpux/font.properties.hr
+%%NSUBDIR%%/java/classes/hpux/font.properties.hu
+%%NSUBDIR%%/java/classes/hpux/font.properties.ja
+%%NSUBDIR%%/java/classes/hpux/font.properties.ko
+%%NSUBDIR%%/java/classes/hpux/font.properties.pl
+%%NSUBDIR%%/java/classes/hpux/font.properties.ro
+%%NSUBDIR%%/java/classes/hpux/font.properties.ru
+%%NSUBDIR%%/java/classes/hpux/font.properties.sk
+%%NSUBDIR%%/java/classes/hpux/font.properties.sl
+%%NSUBDIR%%/java/classes/hpux/font.properties.tr
+%%NSUBDIR%%/java/classes/hpux/font.properties.zh_GB2312
+%%NSUBDIR%%/java/classes/hpux/font.properties.zh_TW_Big5
+%%NSUBDIR%%/java/classes/hpux/font.properties.zh_TW_CNS11643
+%%NSUBDIR%%/java/classes/ifc11.jar
+%%NSUBDIR%%/java/classes/iiop10.jar
+%%NSUBDIR%%/java/classes/irix/font.properties
+%%NSUBDIR%%/java/classes/irix/font.properties.cs
+%%NSUBDIR%%/java/classes/irix/font.properties.el
+%%NSUBDIR%%/java/classes/irix/font.properties.hu
+%%NSUBDIR%%/java/classes/irix/font.properties.ja
+%%NSUBDIR%%/java/classes/irix/font.properties.ko
+%%NSUBDIR%%/java/classes/irix/font.properties.zh_GB2312
+%%NSUBDIR%%/java/classes/irix/font.properties.zh_TW_Big5
+%%NSUBDIR%%/java/classes/irix/font.properties.zh_TW_CNS11643
+%%NSUBDIR%%/java/classes/jae40.jar
+%%NSUBDIR%%/java/classes/java40.jar
+%%NSUBDIR%%/java/classes/jio40.jar
+%%NSUBDIR%%/java/classes/jsd10.jar
+%%NSUBDIR%%/java/classes/ldap30.jar
+%%NSUBDIR%%/java/classes/resource.jar
+%%NSUBDIR%%/java/classes/scd10.jar
+%%NSUBDIR%%/mailcap
+%%NSUBDIR%%/navigator-4.6.bin
+%%NSUBDIR%%/nethelp/Back_dep.gif
+%%NSUBDIR%%/nethelp/Back_dis.gif
+%%NSUBDIR%%/nethelp/Back_sel.gif
+%%NSUBDIR%%/nethelp/Back_up.gif
+%%NSUBDIR%%/nethelp/Blank.htm
+%%NSUBDIR%%/nethelp/Button.js
+%%NSUBDIR%%/nethelp/CntData.js
+%%NSUBDIR%%/nethelp/CntTool.htm
+%%NSUBDIR%%/nethelp/CntTool.js
+%%NSUBDIR%%/nethelp/Exit_dep.gif
+%%NSUBDIR%%/nethelp/Exit_sel.gif
+%%NSUBDIR%%/nethelp/Exit_up.gif
+%%NSUBDIR%%/nethelp/Forw_dep.gif
+%%NSUBDIR%%/nethelp/Forw_dis.gif
+%%NSUBDIR%%/nethelp/Forw_sel.gif
+%%NSUBDIR%%/nethelp/Forw_up.gif
+%%NSUBDIR%%/nethelp/Header.js
+%%NSUBDIR%%/nethelp/IdxData.js
+%%NSUBDIR%%/nethelp/IdxFill.htm
+%%NSUBDIR%%/nethelp/IdxKey.htm
+%%NSUBDIR%%/nethelp/IdxTool.htm
+%%NSUBDIR%%/nethelp/IdxTopic.htm
+%%NSUBDIR%%/nethelp/Local-1.js
+%%NSUBDIR%%/nethelp/NSHIfrm.htm
+%%NSUBDIR%%/nethelp/NavUI.htm
+%%NSUBDIR%%/nethelp/NoJSerr.htm
+%%NSUBDIR%%/nethelp/Prnt_dep.gif
+%%NSUBDIR%%/nethelp/Prnt_sel.gif
+%%NSUBDIR%%/nethelp/Prnt_up.gif
+%%NSUBDIR%%/nethelp/Stack.js
+%%NSUBDIR%%/nethelp/Status.htm
+%%NSUBDIR%%/nethelp/System.htm
+%%NSUBDIR%%/nethelp/System.js
+%%NSUBDIR%%/nethelp/ToolUI.htm
+%%NSUBDIR%%/nethelp/Tool_dep.gif
+%%NSUBDIR%%/nethelp/Tool_sel.gif
+%%NSUBDIR%%/nethelp/Tool_up.gif
+%%NSUBDIR%%/nethelp/Topic.js
+%%NSUBDIR%%/nethelp/Utility.js
+%%NSUBDIR%%/nethelp/Wait.gif
+%%NSUBDIR%%/nethelp/netscape/home/help.hpf
+%%NSUBDIR%%/nethelp/netscape/home/home.gif
+%%NSUBDIR%%/nethelp/netscape/home/home.htm
+%%NSUBDIR%%/nethelp/netscape/home/homeHdr.htm
+%%NSUBDIR%%/nethelp/netscape/navigatr/help.hpf
+%%NSUBDIR%%/nethelp/netscape/navigatr/nav.htm
+%%NSUBDIR%%/nethelp/netscape/navigatr/navHdr.htm
+%%NSUBDIR%%/nethelp/netscape/navigatr/navigatr.gif
+%%NSUBDIR%%/nethelp/netscape/shared/NetHelpm.css
+%%NSUBDIR%%/nethelp/netscape/shared/NetHelpu.css
+%%NSUBDIR%%/nethelp/netscape/shared/NetHelpw.css
+%%NSUBDIR%%/nethelp/netscape/shared/admnIcon.gif
+%%NSUBDIR%%/nethelp/netscape/shared/calIcon.gif
+%%NSUBDIR%%/nethelp/netscape/shared/collIcon.gif
+%%NSUBDIR%%/nethelp/netscape/shared/commIcon.gif
+%%NSUBDIR%%/nethelp/netscape/shared/compIcon.gif
+%%NSUBDIR%%/nethelp/netscape/shared/confIcon.gif
+%%NSUBDIR%%/nethelp/netscape/shared/ibmIcon.gif
+%%NSUBDIR%%/nethelp/netscape/shared/messIcon.gif
+%%NSUBDIR%%/nethelp/netscape/shared/navIcon.gif
+%%NSUBDIR%%/nethelp/netscape/shared/netIcon.gif
+%%NSUBDIR%%/nethelp/netwatch.gif
+%%NSUBDIR%%/nethelp/picsfail.htm
+%%NSUBDIR%%/nethelp/picsfail.jar
+%%NSUBDIR%%/plugins/cpPack1.jar
+%%NSUBDIR%%/plugins/libnullplugin.so
+%%NSUBDIR%%/registry
+%%NSUBDIR%%/vreg
+@dirrm %%NSUBDIR%%/plugins
+@dirrm %%NSUBDIR%%/nethelp/netscape/shared
+@dirrm %%NSUBDIR%%/nethelp/netscape/navigatr
+@dirrm %%NSUBDIR%%/nethelp/netscape/home
+@dirrm %%NSUBDIR%%/nethelp/netscape
+@dirrm %%NSUBDIR%%/nethelp
+@dirrm %%NSUBDIR%%/java/classes/irix
+@dirrm %%NSUBDIR%%/java/classes/hpux
+@dirrm %%NSUBDIR%%/java/classes/aix
+@dirrm %%NSUBDIR%%/java/classes
+@dirrm %%NSUBDIR%%/java
+@dirrm %%NSUBDIR%%
diff --git a/www/netscape48-communicator/Makefile b/www/netscape48-communicator/Makefile
index cef6ac4031fa..622f360f185c 100644
--- a/www/netscape48-communicator/Makefile
+++ b/www/netscape48-communicator/Makefile
@@ -3,14 +3,13 @@
 # Date created:         24 Feb 1997
 # Whom:                 ache
 #
-# $Id: Makefile,v 1.32 1999/02/12 16:01:22 sada Exp $
+# $Id: Makefile,v 1.33 1999/04/25 13:34:56 markm Exp $
 #
 
-DISTNAME=	netscape-${BROWSER}-${BROWSER_VER}
+DISTNAME?=	netscape-${BROWSER}-${BROWSER_VER}
 CATEGORIES=	www
 MASTER_SITES?=	ftp://ftp.netscape.com/pub/communicator/4.08/english/unix/unsupported/freebsd/professional_edition/
-DISTFILES?=	communicator-v408-export.x86-unknown-freebsd.tar.gz ${AUTOADMIN}
-AUTOADMIN=	autoadmin-v408.x86-unknown-freebsd.tar.gz
+DISTFILES?=	communicator-v408-export.x86-unknown-freebsd.tar.gz
 
 MAINTAINER=     ache@FreeBSD.ORG
 
@@ -18,13 +17,17 @@ Y2K=		http://home.netscape.com/products/year2000/faq/client.html
 
 ONLY_FOR_ARCHS=	i386
 
+NO_BUILD=	yes
 NO_FILTER_SHLIBS=	yes
-WRKSRC?=	${WRKDIR}/${BROWSER}-v408.x86-unknown-freebsd
-NO_BUILD=	Yes
 STRIP=
+WRKSRC?=	${WRKDIR}/${BROWSER}-v408.x86-unknown-freebsd
+FILESDIR=	${.CURDIR}/files
+PKGDIR=		${.CURDIR}/pkg
+PKGREQ=		${MASTERDIR}/pkg/REQ
 
+AUTOADMIN?=	autoadmin-v408.x86-unknown-freebsd.tar.gz
 BROWSER?=	communicator
-BROWSER_VER=	4.08
+BROWSER_VER?=	4.08
 NDIR=		${PREFIX}/${NSUBDIR}
 NSUBDIR=	lib/netscape
 BINDIR=		${PREFIX}/bin
@@ -35,7 +38,11 @@ MAILCAP=	${MASTERDIR}/files/mailcap
 PLIST_SUB=	BROWSER=${BROWSER} BROWSER_VER=${BROWSER_VER} \
 		NSUBDIR=${NSUBDIR}
 
-.if defined(USE_128BIT)
+.if (${BROWSER} == "communicator") && !defined(NO_AUTOADMIN)
+DISTFILES+=	${AUTOADMIN}
+.endif
+
+.if defined(USE_128BIT) && !defined(NO_FORTIFY)
 MASTER_SITES+=	ftp://ftp.fortify.net/pub/Fortify/ \
 		ftp://ftp.za.freebsd.org/pub/Fortify/
 DISTFILES+=	Fortify-1.4.1-unix-x86.tar.gz
@@ -44,12 +51,12 @@ RESTRICTED=     "Contains strong cryptography"
 
 .SILENT:
 
-.if !defined(USE_128BIT)
+.if !defined(USE_128BIT) && !defined(NO_FORTIFY)
 pre-extract:
 	${ECHO} "You can make Netscape use 128-bit encryption by defining USE_128BIT"
 .endif
 
-do-configure:
+post-configure:
 	${SED}	-e "s;@PREFIX@;${PREFIX};g" -e "s;@NSUBDIR@;${NSUBDIR};g" \
 		-e "s;@BROWSER@;${BROWSER};g" \
 		-e "s;@BROWSER_VER@;${BROWSER_VER};g" \
@@ -77,10 +84,11 @@ do-install:
 		${INSTALL_DATA} ${MAILCAP} ${NDIR}; \
 	fi
 	${RM} -rf ${NDIR}/movemail-src
-.if (${BROWSER} == "communicator")
+.if (${BROWSER} == "communicator") && !defined(NO_AUTOADMIN)
 	tar zxf ${DISTDIR}/${AUTOADMIN} -C ${NDIR}
 .endif
-.if defined(USE_128BIT) && defined(USA_RESIDENT) && ${USA_RESIDENT} == NO
+.if defined(USE_128BIT) && defined(USA_RESIDENT) && ${USA_RESIDENT} == NO \
+ && !defined(NO_FORTIFY)
 	cd ${WRKDIR}/Fortify-1.4.1-unix-x86 && \
 		(${ECHO} yes ; ${ECHO} no ; ${ECHO} no) \
 		| ./Fortify.sh ${NDIR}/${BROWSER}-${BROWSER_VER}.bin