Upgrade to v4.6.

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

4 files changed, 163 insertions, 205 deletions

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%%