Upgrade to 4.7.

PR:	ports/14106
Submitted by:	Palle Girgensohn <girgen@partitur.se>

17 files changed, 65 insertions, 60 deletions

diff --git a/www/Makefile b/www/Makefile
index 965742d79a80..d869b56265ce 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -48,6 +48,7 @@
     SUBDIR += linemode
     SUBDIR += linux-netscape4
     SUBDIR += linux-netscape46-communicator
+    SUBDIR += linux-netscape47-communicator
     SUBDIR += lynx
     SUBDIR += lynx-current
     SUBDIR += lynx-ssl
diff --git a/www/linux-netscape47-communicator/Makefile b/www/linux-netscape47-communicator/Makefile
index 5bff6766d7da..457b20545ba3 100644
--- a/www/linux-netscape47-communicator/Makefile
+++ b/www/linux-netscape47-communicator/Makefile
@@ -1,5 +1,5 @@
-# New ports collection makefile for: netscape-communcator-linux-4.61
-# Version required:		4.61
+# New ports collection makefile for: netscape-communcator-linux-4.x
+# Version required:		4.7
 # Date created:			27 June 1999
 # Whom:				girgen@partitur.se
 # Based on work by:		thepish
@@ -8,16 +8,17 @@
 #
 
 DISTNAME=	linux-netscape-${BROWSER}-${BROWSER_VER}
-MASTER_SITES?=	ftp://ftp.netscape.com/pub/communicator/english/4.61/unix/supported/linux20_libc5/complete_install/
-DISTFILES?=	communicator-v461-export.x86-unknown-linux2.0.tar.gz
+MASTER_SITES=	ftp://ftp.netscape.com/pub/communicator/english/4.7/unix/supported/linux20_glibc2/complete_install/ \
+		ftp://ftp.sunet.se/pub/www/Netscape/communicator/english/4.7/unix/supported/linux20_glibc2/complete_install/
+DISTFILES=	communicator-v47-export.x86-unknown-linuxglibc2.0.tar.gz
 
 MAINTAINER=	girgen@partitur.se
 
-RUN_DEPENDS=	/compat/linux/usr/i486-linux-libc5/lib/libc.so.5:${PORTSDIR}/emulators/linux_base
+RUN_DEPENDS=	/compat/linux/lib/ld.so:${PORTSDIR}/emulators/linux_base
 
-WRKSRC=		${WRKDIR}/${BROWSER}-v461.x86-unknown-linux2.0
+WRKSRC=		${WRKDIR}/${BROWSER}-v47.x86-unknown-linux2.0
 
 MAILCAP=	${.CURDIR}/files/mailcap
-NSUBDIR?=	lib/netscape-linux
+NSUBDIR=	lib/netscape-linux
 
-.include "../netscape46-communicator/Makefile"
+.include "../netscape47-communicator/Makefile"
diff --git a/www/linux-netscape47-communicator/pkg-comment b/www/linux-netscape47-communicator/pkg-comment
index f8bc26746c3b..bcf201f3bef5 100644
--- a/www/linux-netscape47-communicator/pkg-comment
+++ b/www/linux-netscape47-communicator/pkg-comment
@@ -1 +1 @@
-Linux Netscape Communicator suite, version 4.61
+Linux Netscape Communicator suite
diff --git a/www/linux-netscape47-communicator/pkg-descr b/www/linux-netscape47-communicator/pkg-descr
index 4038b020f7a6..3698e4f1382d 100644
--- a/www/linux-netscape47-communicator/pkg-descr
+++ b/www/linux-netscape47-communicator/pkg-descr
@@ -1,6 +1,7 @@
-This is the linux version of the netscape web-surfboard. Linux version
-on FreeBSD is necessary if you want binary downloadable plugins, made
-available for linux, to work.
+This is the linux version of the netscape web-surfboard. Using the
+Linux version on FreeBSD is necessary if you want to use Linux
+versions of plugins. Many plugins are distributed only as Linux
+binaries.
 
 Please read the file "/usr/local/lib/netscape/LICENSE" for the
 licensing terms.
diff --git a/www/linux-netscape47-communicator/pkg-plist b/www/linux-netscape47-communicator/pkg-plist
index c69af8b638aa..4b2d66504ffe 100644
--- a/www/linux-netscape47-communicator/pkg-plist
+++ b/www/linux-netscape47-communicator/pkg-plist
@@ -7,6 +7,7 @@ bin/%%BROWSER%%-%%BROWSER_VER%%
 %%NSUBDIR%%/java/classes/iiop10.jar
 %%NSUBDIR%%/java/classes/jae40.jar
 %%NSUBDIR%%/java/classes/java40.jar
+%%NSUBDIR%%/java/classes/joptio40.jar
 %%NSUBDIR%%/java/classes/jio40.jar
 %%NSUBDIR%%/java/classes/jsd10.jar
 %%NSUBDIR%%/java/classes/ldap30.jar
@@ -174,11 +175,10 @@ bin/%%BROWSER%%-%%BROWSER_VER%%
 %%NSUBDIR%%/libnullplugin-dynMotif.so
 %%NSUBDIR%%/libjsd.so
 %%NSUBDIR%%/bookmark.htm
-%%NSUBDIR%%/dynfonts/libTrueDoc.so
 %%NSUBDIR%%/spell/netscape.dic
 %%NSUBDIR%%/spell/pen4s324.dat
 %%NSUBDIR%%/registry
-%%NSUBDIR%%/communicator-4.61.bin
+%%NSUBDIR%%/communicator-4.7.bin
 %%NSUBDIR%%/mailcap
 @dirrm %%NSUBDIR%%/java/classes/aix
 @dirrm %%NSUBDIR%%/java/classes/hpux
@@ -196,6 +196,5 @@ bin/%%BROWSER%%-%%BROWSER_VER%%
 @dirrm %%NSUBDIR%%/nethelp/netscape
 @dirrm %%NSUBDIR%%/nethelp
 @dirrm %%NSUBDIR%%/plugins
-@dirrm %%NSUBDIR%%/dynfonts
 @dirrm %%NSUBDIR%%/spell
 @dirrm %%NSUBDIR%%
diff --git a/www/linux-netscape47-navigator/Makefile b/www/linux-netscape47-navigator/Makefile
index 5bff6766d7da..457b20545ba3 100644
--- a/www/linux-netscape47-navigator/Makefile
+++ b/www/linux-netscape47-navigator/Makefile
@@ -1,5 +1,5 @@
-# New ports collection makefile for: netscape-communcator-linux-4.61
-# Version required:		4.61
+# New ports collection makefile for: netscape-communcator-linux-4.x
+# Version required:		4.7
 # Date created:			27 June 1999
 # Whom:				girgen@partitur.se
 # Based on work by:		thepish
@@ -8,16 +8,17 @@
 #
 
 DISTNAME=	linux-netscape-${BROWSER}-${BROWSER_VER}
-MASTER_SITES?=	ftp://ftp.netscape.com/pub/communicator/english/4.61/unix/supported/linux20_libc5/complete_install/
-DISTFILES?=	communicator-v461-export.x86-unknown-linux2.0.tar.gz
+MASTER_SITES=	ftp://ftp.netscape.com/pub/communicator/english/4.7/unix/supported/linux20_glibc2/complete_install/ \
+		ftp://ftp.sunet.se/pub/www/Netscape/communicator/english/4.7/unix/supported/linux20_glibc2/complete_install/
+DISTFILES=	communicator-v47-export.x86-unknown-linuxglibc2.0.tar.gz
 
 MAINTAINER=	girgen@partitur.se
 
-RUN_DEPENDS=	/compat/linux/usr/i486-linux-libc5/lib/libc.so.5:${PORTSDIR}/emulators/linux_base
+RUN_DEPENDS=	/compat/linux/lib/ld.so:${PORTSDIR}/emulators/linux_base
 
-WRKSRC=		${WRKDIR}/${BROWSER}-v461.x86-unknown-linux2.0
+WRKSRC=		${WRKDIR}/${BROWSER}-v47.x86-unknown-linux2.0
 
 MAILCAP=	${.CURDIR}/files/mailcap
-NSUBDIR?=	lib/netscape-linux
+NSUBDIR=	lib/netscape-linux
 
-.include "../netscape46-communicator/Makefile"
+.include "../netscape47-communicator/Makefile"
diff --git a/www/linux-netscape47-navigator/pkg-comment b/www/linux-netscape47-navigator/pkg-comment
index f8bc26746c3b..bcf201f3bef5 100644
--- a/www/linux-netscape47-navigator/pkg-comment
+++ b/www/linux-netscape47-navigator/pkg-comment
@@ -1 +1 @@
-Linux Netscape Communicator suite, version 4.61
+Linux Netscape Communicator suite
diff --git a/www/linux-netscape47-navigator/pkg-descr b/www/linux-netscape47-navigator/pkg-descr
index 4038b020f7a6..3698e4f1382d 100644
--- a/www/linux-netscape47-navigator/pkg-descr
+++ b/www/linux-netscape47-navigator/pkg-descr
@@ -1,6 +1,7 @@
-This is the linux version of the netscape web-surfboard. Linux version
-on FreeBSD is necessary if you want binary downloadable plugins, made
-available for linux, to work.
+This is the linux version of the netscape web-surfboard. Using the
+Linux version on FreeBSD is necessary if you want to use Linux
+versions of plugins. Many plugins are distributed only as Linux
+binaries.
 
 Please read the file "/usr/local/lib/netscape/LICENSE" for the
 licensing terms.
diff --git a/www/linux-netscape47-navigator/pkg-plist b/www/linux-netscape47-navigator/pkg-plist
index c69af8b638aa..4b2d66504ffe 100644
--- a/www/linux-netscape47-navigator/pkg-plist
+++ b/www/linux-netscape47-navigator/pkg-plist
@@ -7,6 +7,7 @@ bin/%%BROWSER%%-%%BROWSER_VER%%
 %%NSUBDIR%%/java/classes/iiop10.jar
 %%NSUBDIR%%/java/classes/jae40.jar
 %%NSUBDIR%%/java/classes/java40.jar
+%%NSUBDIR%%/java/classes/joptio40.jar
 %%NSUBDIR%%/java/classes/jio40.jar
 %%NSUBDIR%%/java/classes/jsd10.jar
 %%NSUBDIR%%/java/classes/ldap30.jar
@@ -174,11 +175,10 @@ bin/%%BROWSER%%-%%BROWSER_VER%%
 %%NSUBDIR%%/libnullplugin-dynMotif.so
 %%NSUBDIR%%/libjsd.so
 %%NSUBDIR%%/bookmark.htm
-%%NSUBDIR%%/dynfonts/libTrueDoc.so
 %%NSUBDIR%%/spell/netscape.dic
 %%NSUBDIR%%/spell/pen4s324.dat
 %%NSUBDIR%%/registry
-%%NSUBDIR%%/communicator-4.61.bin
+%%NSUBDIR%%/communicator-4.7.bin
 %%NSUBDIR%%/mailcap
 @dirrm %%NSUBDIR%%/java/classes/aix
 @dirrm %%NSUBDIR%%/java/classes/hpux
@@ -196,6 +196,5 @@ bin/%%BROWSER%%-%%BROWSER_VER%%
 @dirrm %%NSUBDIR%%/nethelp/netscape
 @dirrm %%NSUBDIR%%/nethelp
 @dirrm %%NSUBDIR%%/plugins
-@dirrm %%NSUBDIR%%/dynfonts
 @dirrm %%NSUBDIR%%/spell
 @dirrm %%NSUBDIR%%
diff --git a/www/linux-netscape6/Makefile b/www/linux-netscape6/Makefile
index 5bff6766d7da..457b20545ba3 100644
--- a/www/linux-netscape6/Makefile
+++ b/www/linux-netscape6/Makefile
@@ -1,5 +1,5 @@
-# New ports collection makefile for: netscape-communcator-linux-4.61
-# Version required:		4.61
+# New ports collection makefile for: netscape-communcator-linux-4.x
+# Version required:		4.7
 # Date created:			27 June 1999
 # Whom:				girgen@partitur.se
 # Based on work by:		thepish
@@ -8,16 +8,17 @@
 #
 
 DISTNAME=	linux-netscape-${BROWSER}-${BROWSER_VER}
-MASTER_SITES?=	ftp://ftp.netscape.com/pub/communicator/english/4.61/unix/supported/linux20_libc5/complete_install/
-DISTFILES?=	communicator-v461-export.x86-unknown-linux2.0.tar.gz
+MASTER_SITES=	ftp://ftp.netscape.com/pub/communicator/english/4.7/unix/supported/linux20_glibc2/complete_install/ \
+		ftp://ftp.sunet.se/pub/www/Netscape/communicator/english/4.7/unix/supported/linux20_glibc2/complete_install/
+DISTFILES=	communicator-v47-export.x86-unknown-linuxglibc2.0.tar.gz
 
 MAINTAINER=	girgen@partitur.se
 
-RUN_DEPENDS=	/compat/linux/usr/i486-linux-libc5/lib/libc.so.5:${PORTSDIR}/emulators/linux_base
+RUN_DEPENDS=	/compat/linux/lib/ld.so:${PORTSDIR}/emulators/linux_base
 
-WRKSRC=		${WRKDIR}/${BROWSER}-v461.x86-unknown-linux2.0
+WRKSRC=		${WRKDIR}/${BROWSER}-v47.x86-unknown-linux2.0
 
 MAILCAP=	${.CURDIR}/files/mailcap
-NSUBDIR?=	lib/netscape-linux
+NSUBDIR=	lib/netscape-linux
 
-.include "../netscape46-communicator/Makefile"
+.include "../netscape47-communicator/Makefile"
diff --git a/www/linux-netscape6/pkg-comment b/www/linux-netscape6/pkg-comment
index f8bc26746c3b..bcf201f3bef5 100644
--- a/www/linux-netscape6/pkg-comment
+++ b/www/linux-netscape6/pkg-comment
@@ -1 +1 @@
-Linux Netscape Communicator suite, version 4.61
+Linux Netscape Communicator suite
diff --git a/www/linux-netscape6/pkg-descr b/www/linux-netscape6/pkg-descr
index 4038b020f7a6..3698e4f1382d 100644
--- a/www/linux-netscape6/pkg-descr
+++ b/www/linux-netscape6/pkg-descr
@@ -1,6 +1,7 @@
-This is the linux version of the netscape web-surfboard. Linux version
-on FreeBSD is necessary if you want binary downloadable plugins, made
-available for linux, to work.
+This is the linux version of the netscape web-surfboard. Using the
+Linux version on FreeBSD is necessary if you want to use Linux
+versions of plugins. Many plugins are distributed only as Linux
+binaries.
 
 Please read the file "/usr/local/lib/netscape/LICENSE" for the
 licensing terms.
diff --git a/www/linux-netscape6/pkg-plist b/www/linux-netscape6/pkg-plist
index c69af8b638aa..4b2d66504ffe 100644
--- a/www/linux-netscape6/pkg-plist
+++ b/www/linux-netscape6/pkg-plist
@@ -7,6 +7,7 @@ bin/%%BROWSER%%-%%BROWSER_VER%%
 %%NSUBDIR%%/java/classes/iiop10.jar
 %%NSUBDIR%%/java/classes/jae40.jar
 %%NSUBDIR%%/java/classes/java40.jar
+%%NSUBDIR%%/java/classes/joptio40.jar
 %%NSUBDIR%%/java/classes/jio40.jar
 %%NSUBDIR%%/java/classes/jsd10.jar
 %%NSUBDIR%%/java/classes/ldap30.jar
@@ -174,11 +175,10 @@ bin/%%BROWSER%%-%%BROWSER_VER%%
 %%NSUBDIR%%/libnullplugin-dynMotif.so
 %%NSUBDIR%%/libjsd.so
 %%NSUBDIR%%/bookmark.htm
-%%NSUBDIR%%/dynfonts/libTrueDoc.so
 %%NSUBDIR%%/spell/netscape.dic
 %%NSUBDIR%%/spell/pen4s324.dat
 %%NSUBDIR%%/registry
-%%NSUBDIR%%/communicator-4.61.bin
+%%NSUBDIR%%/communicator-4.7.bin
 %%NSUBDIR%%/mailcap
 @dirrm %%NSUBDIR%%/java/classes/aix
 @dirrm %%NSUBDIR%%/java/classes/hpux
@@ -196,6 +196,5 @@ bin/%%BROWSER%%-%%BROWSER_VER%%
 @dirrm %%NSUBDIR%%/nethelp/netscape
 @dirrm %%NSUBDIR%%/nethelp
 @dirrm %%NSUBDIR%%/plugins
-@dirrm %%NSUBDIR%%/dynfonts
 @dirrm %%NSUBDIR%%/spell
 @dirrm %%NSUBDIR%%
diff --git a/www/netscape7/Makefile b/www/netscape7/Makefile
index 5bff6766d7da..457b20545ba3 100644
--- a/www/netscape7/Makefile
+++ b/www/netscape7/Makefile
@@ -1,5 +1,5 @@
-# New ports collection makefile for: netscape-communcator-linux-4.61
-# Version required:		4.61
+# New ports collection makefile for: netscape-communcator-linux-4.x
+# Version required:		4.7
 # Date created:			27 June 1999
 # Whom:				girgen@partitur.se
 # Based on work by:		thepish
@@ -8,16 +8,17 @@
 #
 
 DISTNAME=	linux-netscape-${BROWSER}-${BROWSER_VER}
-MASTER_SITES?=	ftp://ftp.netscape.com/pub/communicator/english/4.61/unix/supported/linux20_libc5/complete_install/
-DISTFILES?=	communicator-v461-export.x86-unknown-linux2.0.tar.gz
+MASTER_SITES=	ftp://ftp.netscape.com/pub/communicator/english/4.7/unix/supported/linux20_glibc2/complete_install/ \
+		ftp://ftp.sunet.se/pub/www/Netscape/communicator/english/4.7/unix/supported/linux20_glibc2/complete_install/
+DISTFILES=	communicator-v47-export.x86-unknown-linuxglibc2.0.tar.gz
 
 MAINTAINER=	girgen@partitur.se
 
-RUN_DEPENDS=	/compat/linux/usr/i486-linux-libc5/lib/libc.so.5:${PORTSDIR}/emulators/linux_base
+RUN_DEPENDS=	/compat/linux/lib/ld.so:${PORTSDIR}/emulators/linux_base
 
-WRKSRC=		${WRKDIR}/${BROWSER}-v461.x86-unknown-linux2.0
+WRKSRC=		${WRKDIR}/${BROWSER}-v47.x86-unknown-linux2.0
 
 MAILCAP=	${.CURDIR}/files/mailcap
-NSUBDIR?=	lib/netscape-linux
+NSUBDIR=	lib/netscape-linux
 
-.include "../netscape46-communicator/Makefile"
+.include "../netscape47-communicator/Makefile"
diff --git a/www/netscape7/pkg-comment b/www/netscape7/pkg-comment
index f8bc26746c3b..bcf201f3bef5 100644
--- a/www/netscape7/pkg-comment
+++ b/www/netscape7/pkg-comment
@@ -1 +1 @@
-Linux Netscape Communicator suite, version 4.61
+Linux Netscape Communicator suite
diff --git a/www/netscape7/pkg-descr b/www/netscape7/pkg-descr
index 4038b020f7a6..3698e4f1382d 100644
--- a/www/netscape7/pkg-descr
+++ b/www/netscape7/pkg-descr
@@ -1,6 +1,7 @@
-This is the linux version of the netscape web-surfboard. Linux version
-on FreeBSD is necessary if you want binary downloadable plugins, made
-available for linux, to work.
+This is the linux version of the netscape web-surfboard. Using the
+Linux version on FreeBSD is necessary if you want to use Linux
+versions of plugins. Many plugins are distributed only as Linux
+binaries.
 
 Please read the file "/usr/local/lib/netscape/LICENSE" for the
 licensing terms.
diff --git a/www/netscape7/pkg-plist b/www/netscape7/pkg-plist
index c69af8b638aa..4b2d66504ffe 100644
--- a/www/netscape7/pkg-plist
+++ b/www/netscape7/pkg-plist
@@ -7,6 +7,7 @@ bin/%%BROWSER%%-%%BROWSER_VER%%
 %%NSUBDIR%%/java/classes/iiop10.jar
 %%NSUBDIR%%/java/classes/jae40.jar
 %%NSUBDIR%%/java/classes/java40.jar
+%%NSUBDIR%%/java/classes/joptio40.jar
 %%NSUBDIR%%/java/classes/jio40.jar
 %%NSUBDIR%%/java/classes/jsd10.jar
 %%NSUBDIR%%/java/classes/ldap30.jar
@@ -174,11 +175,10 @@ bin/%%BROWSER%%-%%BROWSER_VER%%
 %%NSUBDIR%%/libnullplugin-dynMotif.so
 %%NSUBDIR%%/libjsd.so
 %%NSUBDIR%%/bookmark.htm
-%%NSUBDIR%%/dynfonts/libTrueDoc.so
 %%NSUBDIR%%/spell/netscape.dic
 %%NSUBDIR%%/spell/pen4s324.dat
 %%NSUBDIR%%/registry
-%%NSUBDIR%%/communicator-4.61.bin
+%%NSUBDIR%%/communicator-4.7.bin
 %%NSUBDIR%%/mailcap
 @dirrm %%NSUBDIR%%/java/classes/aix
 @dirrm %%NSUBDIR%%/java/classes/hpux
@@ -196,6 +196,5 @@ bin/%%BROWSER%%-%%BROWSER_VER%%
 @dirrm %%NSUBDIR%%/nethelp/netscape
 @dirrm %%NSUBDIR%%/nethelp
 @dirrm %%NSUBDIR%%/plugins
-@dirrm %%NSUBDIR%%/dynfonts
 @dirrm %%NSUBDIR%%/spell
 @dirrm %%NSUBDIR%%