Upgrade to 4.7.

NOTE: Now we couldn't use Fortify with Netscape 4.7s.

16 files changed, 55 insertions, 41 deletions

diff --git a/www/Makefile b/www/Makefile
index ea9fa9b97c58..02df860cc30f 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -61,9 +61,11 @@
     SUBDIR += netscape4-communicator
     SUBDIR += netscape4-communicator.us
     SUBDIR += netscape4-navigator
-    SUBDIR += netscape47-communicator.us
     SUBDIR += netscape46-communicator
     SUBDIR += netscape46-navigator
+    SUBDIR += netscape47-communicator
+    SUBDIR += netscape47-communicator.us
+    SUBDIR += netscape47-navigator
     SUBDIR += npc
     SUBDIR += p5-Apache
     SUBDIR += p5-Apache-Radius
diff --git a/www/bsdi-netscape47-communicator/Makefile b/www/bsdi-netscape47-communicator/Makefile
index eb3f558962a1..318efebdc6d4 100644
--- a/www/bsdi-netscape47-communicator/Makefile
+++ b/www/bsdi-netscape47-communicator/Makefile
@@ -1,22 +1,21 @@
 # New ports collection makefile for: netscape (communicator suite)
-# Version required:	4.6*
+# Version required:	4.7
 # Date created:		24 Feb 1997
 # Whom:			thepish
 #
 # $FreeBSD$
 #
 
-MASTER_SITES?=	ftp://ftp.netscape.com/pub/communicator/english/4.61/unix/unsupported/freebsd/complete_install/
-DISTFILES?=	communicator-v461-export.x86-unknown-freebsd.tar.gz
-
-MAINTAINER?=	sada@FreeBSD.org
+MASTER_SITES?=	ftp://ftp.netscape.com./pub/communicator/english/4.7/unix/unsupported/freebsd/complete_install/
+DISTFILES?=	communicator-v47-export.x86-unknown-freebsd.tar.gz
 
 MASTERDIR=	${.CURDIR}/../netscape4-communicator
 NO_LATEST_LINK=	yes
-WRKSRC?=	${WRKDIR}/${BROWSER}-v461.x86-unknown-freebsd
+WRKSRC?=	${WRKDIR}/${BROWSER}-v47.x86-unknown-freebsd
 
-BROWSER_VER?=	4.61
-INFILE_HEAD?=	'Communicator,4.61.0.99147'
+BROWSER_VER=	4.7
+INFILE_HEAD?=	'Communicator,4.7.0.19990915'
 NO_AUTOADMIN=	yes
+NO_FORTIFY=	yes
 
 .include "${MASTERDIR}/Makefile"
diff --git a/www/bsdi-netscape47-communicator/pkg-plist b/www/bsdi-netscape47-communicator/pkg-plist
index 9d22b07cc862..463dc0d5ddfd 100644
--- a/www/bsdi-netscape47-communicator/pkg-plist
+++ b/www/bsdi-netscape47-communicator/pkg-plist
@@ -8,7 +8,7 @@ bin/communicator-%%BROWSER_VER%%
 %%NSUBDIR%%/README
 %%NSUBDIR%%/XKeysymDB
 %%NSUBDIR%%/bookmark.htm
-%%NSUBDIR%%/communicator-4.61.bin
+%%NSUBDIR%%/communicator-%%BROWSER_VER%%.bin
 %%NSUBDIR%%/java/classes/aix/font.properties
 %%NSUBDIR%%/java/classes/aix/font.properties.cs
 %%NSUBDIR%%/java/classes/aix/font.properties.hu
@@ -66,6 +66,7 @@ bin/communicator-%%BROWSER_VER%%
 %%NSUBDIR%%/java/classes/jae40.jar
 %%NSUBDIR%%/java/classes/java40.jar
 %%NSUBDIR%%/java/classes/jio40.jar
+%%NSUBDIR%%/java/classes/joptio40.jar
 %%NSUBDIR%%/java/classes/jsd10.jar
 %%NSUBDIR%%/java/classes/ldap30.jar
 %%NSUBDIR%%/java/classes/resource.jar
diff --git a/www/bsdi-netscape47-navigator/Makefile b/www/bsdi-netscape47-navigator/Makefile
index dda7f112f146..faa4e3ac036b 100644
--- a/www/bsdi-netscape47-navigator/Makefile
+++ b/www/bsdi-netscape47-navigator/Makefile
@@ -1,17 +1,15 @@
 # New ports collection makefile for: netscape (navigator only)
-# Version required:	4.6*
+# Version required:	4.7
 # Date created:		20 Sept 1998
 # Whom:			brett@peloton.physics.montana.edu
 #
 # $FreeBSD$
 #
 
-MASTER_SITES=	ftp://ftp.netscape.com/pub/communicator/english/4.61/unix/unsupported/freebsd/navigator_standalone/
-DISTFILES=	navigator-v461-export.x86-unknown-freebsd.tar.gz
-
-MAINTAINER?=	sada@FreeBSD.org
+MASTER_SITES=	ftp://ftp.netscape.com./pub/communicator/english/4.7/unix/unsupported/freebsd/navigator_standalone/
+DISTFILES=	navigator-v47-export.x86-unknown-freebsd.tar.gz
 
 BROWSER=	navigator
-INFILE_HEAD=	'Navigator,4.61.0.99147'
+INFILE_HEAD=	'Navigator,4.7.0.19990915'
 
-.include "${.CURDIR}/../netscape46-communicator/Makefile"
+.include "${.CURDIR}/../netscape47-communicator/Makefile"
diff --git a/www/bsdi-netscape47-navigator/pkg-comment b/www/bsdi-netscape47-navigator/pkg-comment
index 6bcd84cae310..f5a85a8719ae 100644
--- a/www/bsdi-netscape47-navigator/pkg-comment
+++ b/www/bsdi-netscape47-navigator/pkg-comment
@@ -1 +1 @@
-Netscape ver 4.6 navigator web-surfboard
+Netscape ver 4.7 navigator web-surfboard
diff --git a/www/bsdi-netscape47-navigator/pkg-plist b/www/bsdi-netscape47-navigator/pkg-plist
index 672b74c665d6..5fdbe4185768 100644
--- a/www/bsdi-netscape47-navigator/pkg-plist
+++ b/www/bsdi-netscape47-navigator/pkg-plist
@@ -65,12 +65,13 @@ bin/navigator-%%BROWSER_VER%%
 %%NSUBDIR%%/java/classes/jae40.jar
 %%NSUBDIR%%/java/classes/java40.jar
 %%NSUBDIR%%/java/classes/jio40.jar
+%%NSUBDIR%%/java/classes/joptio40.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.61.bin
+%%NSUBDIR%%/navigator-%%BROWSER_VER%%.bin
 %%NSUBDIR%%/nethelp/Back_dep.gif
 %%NSUBDIR%%/nethelp/Back_dis.gif
 %%NSUBDIR%%/nethelp/Back_sel.gif
diff --git a/www/netscape4-communicator/Makefile b/www/netscape4-communicator/Makefile
index fb3bb1654a69..75aa4b0739ac 100644
--- a/www/netscape4-communicator/Makefile
+++ b/www/netscape4-communicator/Makefile
@@ -22,7 +22,6 @@ NO_BUILD=	yes
 NO_FILTER_SHLIBS=	yes
 STRIP=
 WRKSRC?=	${WRKDIR}/${BROWSER}-v408.x86-unknown-freebsd
-FILESDIR=	${.CURDIR}/files
 PKGDIR=		${.CURDIR}/pkg
 PKGREQ=		${MASTERDIR}/pkg/REQ
 
@@ -53,6 +52,10 @@ RESTRICTED=     "Contains strong cryptography"
 
 .SILENT:
 
+makesum:
+	${ECHO} "You should make ${FILESDIR}/md5 by hand"
+	${FALSE}
+
 .if !defined(USE_128BIT) && !defined(NO_FORTIFY)
 pre-extract:
 	${ECHO} "You can make Netscape use 128-bit encryption by defining USE_128BIT"
diff --git a/www/netscape4-communicator/distinfo b/www/netscape4-communicator/distinfo
index 266236ded4d3..786d4064ba8c 100644
--- a/www/netscape4-communicator/distinfo
+++ b/www/netscape4-communicator/distinfo
@@ -1,3 +1,8 @@
 MD5 (communicator-v408-export.x86-unknown-freebsd.tar.gz) = dfe7005dd39ac900fe336d6f052acfdb
 MD5 (autoadmin-v408.x86-unknown-freebsd.tar.gz) = 0435245b83fc5d9be6844ebfa1a242f0
 MD5 (Fortify-1.4.4-unix-x86.tar.gz) = eb243ab8098f8fc2a63674d1e86ffe09
+MD5 (navigator-v408-export.x86-unknown-freebsd.tar.gz) = 63d607f8e861471f4dcd14d048e1f652
+MD5 (communicator-v461-export.x86-unknown-freebsd.tar.gz) = 308686a3266e5e3aa27692c33313a159
+MD5 (navigator-v461-export.x86-unknown-freebsd.tar.gz) = 49600fb97ba24ca14baf91282f3ad441
+MD5 (communicator-v47-export.x86-unknown-freebsd.tar.gz) = 8cfeb91cce138d9c11bd8ee5f9fa8648
+MD5 (navigator-v47-export.x86-unknown-freebsd.tar.gz) = c84b2779c25cfb10ebace307e56dc569
diff --git a/www/netscape4-navigator/Makefile b/www/netscape4-navigator/Makefile
index 22186eda916b..f88f015b235f 100644
--- a/www/netscape4-navigator/Makefile
+++ b/www/netscape4-navigator/Makefile
@@ -9,8 +9,6 @@
 MASTER_SITES=	ftp://ftp.netscape.com/pub/communicator/${BROWSER_VER}/english/unix/unsupported/freebsd/navigator_standalone/
 DISTFILES=	navigator-v408-export.x86-unknown-freebsd.tar.gz
 
-MAINTAINER?=	sada@FreeBSD.org
-
 MASTERDIR=	${.CURDIR}/../netscape4-communicator
 
 BROWSER=	navigator
diff --git a/www/netscape47-communicator/Makefile b/www/netscape47-communicator/Makefile
index eb3f558962a1..318efebdc6d4 100644
--- a/www/netscape47-communicator/Makefile
+++ b/www/netscape47-communicator/Makefile
@@ -1,22 +1,21 @@
 # New ports collection makefile for: netscape (communicator suite)
-# Version required:	4.6*
+# Version required:	4.7
 # Date created:		24 Feb 1997
 # Whom:			thepish
 #
 # $FreeBSD$
 #
 
-MASTER_SITES?=	ftp://ftp.netscape.com/pub/communicator/english/4.61/unix/unsupported/freebsd/complete_install/
-DISTFILES?=	communicator-v461-export.x86-unknown-freebsd.tar.gz
-
-MAINTAINER?=	sada@FreeBSD.org
+MASTER_SITES?=	ftp://ftp.netscape.com./pub/communicator/english/4.7/unix/unsupported/freebsd/complete_install/
+DISTFILES?=	communicator-v47-export.x86-unknown-freebsd.tar.gz
 
 MASTERDIR=	${.CURDIR}/../netscape4-communicator
 NO_LATEST_LINK=	yes
-WRKSRC?=	${WRKDIR}/${BROWSER}-v461.x86-unknown-freebsd
+WRKSRC?=	${WRKDIR}/${BROWSER}-v47.x86-unknown-freebsd
 
-BROWSER_VER?=	4.61
-INFILE_HEAD?=	'Communicator,4.61.0.99147'
+BROWSER_VER=	4.7
+INFILE_HEAD?=	'Communicator,4.7.0.19990915'
 NO_AUTOADMIN=	yes
+NO_FORTIFY=	yes
 
 .include "${MASTERDIR}/Makefile"
diff --git a/www/netscape47-communicator/pkg-plist b/www/netscape47-communicator/pkg-plist
index 9d22b07cc862..463dc0d5ddfd 100644
--- a/www/netscape47-communicator/pkg-plist
+++ b/www/netscape47-communicator/pkg-plist
@@ -8,7 +8,7 @@ bin/communicator-%%BROWSER_VER%%
 %%NSUBDIR%%/README
 %%NSUBDIR%%/XKeysymDB
 %%NSUBDIR%%/bookmark.htm
-%%NSUBDIR%%/communicator-4.61.bin
+%%NSUBDIR%%/communicator-%%BROWSER_VER%%.bin
 %%NSUBDIR%%/java/classes/aix/font.properties
 %%NSUBDIR%%/java/classes/aix/font.properties.cs
 %%NSUBDIR%%/java/classes/aix/font.properties.hu
@@ -66,6 +66,7 @@ bin/communicator-%%BROWSER_VER%%
 %%NSUBDIR%%/java/classes/jae40.jar
 %%NSUBDIR%%/java/classes/java40.jar
 %%NSUBDIR%%/java/classes/jio40.jar
+%%NSUBDIR%%/java/classes/joptio40.jar
 %%NSUBDIR%%/java/classes/jsd10.jar
 %%NSUBDIR%%/java/classes/ldap30.jar
 %%NSUBDIR%%/java/classes/resource.jar
diff --git a/www/netscape47-navigator/Makefile b/www/netscape47-navigator/Makefile
index dda7f112f146..faa4e3ac036b 100644
--- a/www/netscape47-navigator/Makefile
+++ b/www/netscape47-navigator/Makefile
@@ -1,17 +1,15 @@
 # New ports collection makefile for: netscape (navigator only)
-# Version required:	4.6*
+# Version required:	4.7
 # Date created:		20 Sept 1998
 # Whom:			brett@peloton.physics.montana.edu
 #
 # $FreeBSD$
 #
 
-MASTER_SITES=	ftp://ftp.netscape.com/pub/communicator/english/4.61/unix/unsupported/freebsd/navigator_standalone/
-DISTFILES=	navigator-v461-export.x86-unknown-freebsd.tar.gz
-
-MAINTAINER?=	sada@FreeBSD.org
+MASTER_SITES=	ftp://ftp.netscape.com./pub/communicator/english/4.7/unix/unsupported/freebsd/navigator_standalone/
+DISTFILES=	navigator-v47-export.x86-unknown-freebsd.tar.gz
 
 BROWSER=	navigator
-INFILE_HEAD=	'Navigator,4.61.0.99147'
+INFILE_HEAD=	'Navigator,4.7.0.19990915'
 
-.include "${.CURDIR}/../netscape46-communicator/Makefile"
+.include "${.CURDIR}/../netscape47-communicator/Makefile"
diff --git a/www/netscape47-navigator/pkg-comment b/www/netscape47-navigator/pkg-comment
index 6bcd84cae310..f5a85a8719ae 100644
--- a/www/netscape47-navigator/pkg-comment
+++ b/www/netscape47-navigator/pkg-comment
@@ -1 +1 @@
-Netscape ver 4.6 navigator web-surfboard
+Netscape ver 4.7 navigator web-surfboard
diff --git a/www/netscape47-navigator/pkg-plist b/www/netscape47-navigator/pkg-plist
index 672b74c665d6..5fdbe4185768 100644
--- a/www/netscape47-navigator/pkg-plist
+++ b/www/netscape47-navigator/pkg-plist
@@ -65,12 +65,13 @@ bin/navigator-%%BROWSER_VER%%
 %%NSUBDIR%%/java/classes/jae40.jar
 %%NSUBDIR%%/java/classes/java40.jar
 %%NSUBDIR%%/java/classes/jio40.jar
+%%NSUBDIR%%/java/classes/joptio40.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.61.bin
+%%NSUBDIR%%/navigator-%%BROWSER_VER%%.bin
 %%NSUBDIR%%/nethelp/Back_dep.gif
 %%NSUBDIR%%/nethelp/Back_dis.gif
 %%NSUBDIR%%/nethelp/Back_sel.gif
diff --git a/www/netscape48-communicator/Makefile b/www/netscape48-communicator/Makefile
index fb3bb1654a69..75aa4b0739ac 100644
--- a/www/netscape48-communicator/Makefile
+++ b/www/netscape48-communicator/Makefile
@@ -22,7 +22,6 @@ NO_BUILD=	yes
 NO_FILTER_SHLIBS=	yes
 STRIP=
 WRKSRC?=	${WRKDIR}/${BROWSER}-v408.x86-unknown-freebsd
-FILESDIR=	${.CURDIR}/files
 PKGDIR=		${.CURDIR}/pkg
 PKGREQ=		${MASTERDIR}/pkg/REQ
 
@@ -53,6 +52,10 @@ RESTRICTED=     "Contains strong cryptography"
 
 .SILENT:
 
+makesum:
+	${ECHO} "You should make ${FILESDIR}/md5 by hand"
+	${FALSE}
+
 .if !defined(USE_128BIT) && !defined(NO_FORTIFY)
 pre-extract:
 	${ECHO} "You can make Netscape use 128-bit encryption by defining USE_128BIT"
diff --git a/www/netscape48-communicator/distinfo b/www/netscape48-communicator/distinfo
index 266236ded4d3..786d4064ba8c 100644
--- a/www/netscape48-communicator/distinfo
+++ b/www/netscape48-communicator/distinfo
@@ -1,3 +1,8 @@
 MD5 (communicator-v408-export.x86-unknown-freebsd.tar.gz) = dfe7005dd39ac900fe336d6f052acfdb
 MD5 (autoadmin-v408.x86-unknown-freebsd.tar.gz) = 0435245b83fc5d9be6844ebfa1a242f0
 MD5 (Fortify-1.4.4-unix-x86.tar.gz) = eb243ab8098f8fc2a63674d1e86ffe09
+MD5 (navigator-v408-export.x86-unknown-freebsd.tar.gz) = 63d607f8e861471f4dcd14d048e1f652
+MD5 (communicator-v461-export.x86-unknown-freebsd.tar.gz) = 308686a3266e5e3aa27692c33313a159
+MD5 (navigator-v461-export.x86-unknown-freebsd.tar.gz) = 49600fb97ba24ca14baf91282f3ad441
+MD5 (communicator-v47-export.x86-unknown-freebsd.tar.gz) = 8cfeb91cce138d9c11bd8ee5f9fa8648
+MD5 (navigator-v47-export.x86-unknown-freebsd.tar.gz) = c84b2779c25cfb10ebace307e56dc569