diff --git a/www/bsdi-netscape47-navigator/Makefile b/www/bsdi-netscape47-navigator/Makefile
index f283e59067e5..51362052df6c 100644
--- a/www/bsdi-netscape47-navigator/Makefile
+++ b/www/bsdi-netscape47-navigator/Makefile
@@ -3,35 +3,34 @@
 # Date created:         24 Feb 1997
 # Whom:                 ache
 #
-# $Id: Makefile,v 1.24 1998/09/22 17:54:24 asami Exp $
+# $Id: Makefile,v 1.25 1998/10/09 03:06:50 asami Exp $
 #
 
-DISTNAME=       netscape-navigator-4.06
+DISTNAME=       netscape-navigator-4.07
 CATEGORIES=	www
-MASTER_SITES=   ftp://ftp.netscape.com/pub/communicator/4.06/development/english/unix/freebsd/navigator_standalone/
-DISTFILES=      navigator-v406-export.x86-unknown-freebsd.tar.gz
+MASTER_SITES=   ftp://ftp.netscape.com/pub/communicator/4.07/development/english/unix/freebsd/navigator_standalone/
+DISTFILES=      navigator-v407-export.x86-unknown-freebsd.tar.gz
 
 MAINTAINER=     asami@FreeBSD.ORG
 
-WRKSRC=		${WRKDIR}/navigator-v406.x86-unknown-freebsd
+WRKSRC=		${WRKDIR}/navigator-v407.x86-unknown-freebsd
 NO_BUILD=       Yes
 STRIP=
 
 NDIR=           ${PREFIX}/lib/netscape
 BINDIR=		${PREFIX}/bin
-INFILE_HEAD=	'Navigator,4.06.0.98225,'
+INFILE_HEAD=	'Navigator,4.07.0.98272,'
 
-.if defined(USE_128BIT) && defined(USA_RESIDENT) && ${USA_RESIDENT} == NO
+.if defined(USE_128BIT)
 MASTER_SITES+=	ftp://ftp.fortify.net/pub/Fortify/ \
 		ftp://ftp.za.freebsd.org/pub/Fortify/
-DISTFILES+=	Fortify-1.2.6-unix-x86.tar.gz
+DISTFILES+=	Fortify-1.2.8-unix-x86.tar.gz
 RESTRICTED=     "Contains strong cryptography"
 .endif
 
 .if !defined(USE_128BIT)
 pre-extract:
 		@${ECHO} "You can make Netscape use 128-bit encryption by defining USE_128BIT"
-		@${ECHO} "and defining USA_RESIDENT to NO"
 .endif
 
 do-configure:
@@ -49,17 +48,17 @@ do-install:
 		${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} $${i} -C ${NDIR}; \
 	done
 	${WRKSRC}/vreg ${NDIR}/registry ${WRKSRC}/infile
-	${MV} -f ${NDIR}/netscape ${NDIR}/navigator-4.06.bin
-	${INSTALL_SCRIPT} ${WRKSRC}/netscape ${BINDIR}/navigator-4.06
-	ln -sf navigator-4.06 ${BINDIR}/navigator-4
+	${MV} -f ${NDIR}/netscape ${NDIR}/navigator-4.07.bin
+	${INSTALL_SCRIPT} ${WRKSRC}/netscape ${BINDIR}/navigator-4.07
+	ln -sf navigator-4.07 ${BINDIR}/navigator-4
 	ln -sf navigator-4 ${BINDIR}/netscape
 	if [ ! -f ${NDIR}/mailcap ] ; then \
 	    ${INSTALL_DATA} ${FILESDIR}/mailcap ${NDIR}; \
 	fi
 	${RM} -rf ${NDIR}/movemail-src
 .if defined(USE_128BIT) && defined(USA_RESIDENT) && ${USA_RESIDENT} == NO
-	cd ${WRKDIR}/Fortify-1.2.6-unix-x86 && \
-		(${ECHO} yes ; ${ECHO} no) | ./Fortify.sh ${NDIR}/navigator-4.06.bin
+	cd ${WRKDIR}/Fortify-1.2.8-unix-x86 && \
+		(${ECHO} yes ; ${ECHO} no) | ./Fortify.sh ${NDIR}/navigator-4.07.bin
 .endif
 	chown -R bin.bin ${NDIR}
 
diff --git a/www/bsdi-netscape47-navigator/pkg-plist b/www/bsdi-netscape47-navigator/pkg-plist
index e14d57c8ca20..f058edcec8c4 100644
--- a/www/bsdi-netscape47-navigator/pkg-plist
+++ b/www/bsdi-netscape47-navigator/pkg-plist
@@ -1,4 +1,4 @@
-bin/navigator-4.06
+bin/navigator-4.07
 @exec ln -sf %f %B/navigator-4
 @exec ln -sf navigator-4 %B/netscape
 @unexec rm -f %B/netscape
@@ -69,7 +69,7 @@ lib/netscape/java/classes/jsd10.jar
 lib/netscape/java/classes/ldap10.jar
 lib/netscape/java/classes/scd10.jar
 lib/netscape/mailcap
-lib/netscape/navigator-4.06.bin
+lib/netscape/navigator-4.07.bin
 lib/netscape/nethelp/Back_dep.gif
 lib/netscape/nethelp/Back_dis.gif
 lib/netscape/nethelp/Back_sel.gif
diff --git a/www/netscape4-navigator/Makefile b/www/netscape4-navigator/Makefile
index f283e59067e5..51362052df6c 100644
--- a/www/netscape4-navigator/Makefile
+++ b/www/netscape4-navigator/Makefile
@@ -3,35 +3,34 @@
 # Date created:         24 Feb 1997
 # Whom:                 ache
 #
-# $Id: Makefile,v 1.24 1998/09/22 17:54:24 asami Exp $
+# $Id: Makefile,v 1.25 1998/10/09 03:06:50 asami Exp $
 #
 
-DISTNAME=       netscape-navigator-4.06
+DISTNAME=       netscape-navigator-4.07
 CATEGORIES=	www
-MASTER_SITES=   ftp://ftp.netscape.com/pub/communicator/4.06/development/english/unix/freebsd/navigator_standalone/
-DISTFILES=      navigator-v406-export.x86-unknown-freebsd.tar.gz
+MASTER_SITES=   ftp://ftp.netscape.com/pub/communicator/4.07/development/english/unix/freebsd/navigator_standalone/
+DISTFILES=      navigator-v407-export.x86-unknown-freebsd.tar.gz
 
 MAINTAINER=     asami@FreeBSD.ORG
 
-WRKSRC=		${WRKDIR}/navigator-v406.x86-unknown-freebsd
+WRKSRC=		${WRKDIR}/navigator-v407.x86-unknown-freebsd
 NO_BUILD=       Yes
 STRIP=
 
 NDIR=           ${PREFIX}/lib/netscape
 BINDIR=		${PREFIX}/bin
-INFILE_HEAD=	'Navigator,4.06.0.98225,'
+INFILE_HEAD=	'Navigator,4.07.0.98272,'
 
-.if defined(USE_128BIT) && defined(USA_RESIDENT) && ${USA_RESIDENT} == NO
+.if defined(USE_128BIT)
 MASTER_SITES+=	ftp://ftp.fortify.net/pub/Fortify/ \
 		ftp://ftp.za.freebsd.org/pub/Fortify/
-DISTFILES+=	Fortify-1.2.6-unix-x86.tar.gz
+DISTFILES+=	Fortify-1.2.8-unix-x86.tar.gz
 RESTRICTED=     "Contains strong cryptography"
 .endif
 
 .if !defined(USE_128BIT)
 pre-extract:
 		@${ECHO} "You can make Netscape use 128-bit encryption by defining USE_128BIT"
-		@${ECHO} "and defining USA_RESIDENT to NO"
 .endif
 
 do-configure:
@@ -49,17 +48,17 @@ do-install:
 		${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} $${i} -C ${NDIR}; \
 	done
 	${WRKSRC}/vreg ${NDIR}/registry ${WRKSRC}/infile
-	${MV} -f ${NDIR}/netscape ${NDIR}/navigator-4.06.bin
-	${INSTALL_SCRIPT} ${WRKSRC}/netscape ${BINDIR}/navigator-4.06
-	ln -sf navigator-4.06 ${BINDIR}/navigator-4
+	${MV} -f ${NDIR}/netscape ${NDIR}/navigator-4.07.bin
+	${INSTALL_SCRIPT} ${WRKSRC}/netscape ${BINDIR}/navigator-4.07
+	ln -sf navigator-4.07 ${BINDIR}/navigator-4
 	ln -sf navigator-4 ${BINDIR}/netscape
 	if [ ! -f ${NDIR}/mailcap ] ; then \
 	    ${INSTALL_DATA} ${FILESDIR}/mailcap ${NDIR}; \
 	fi
 	${RM} -rf ${NDIR}/movemail-src
 .if defined(USE_128BIT) && defined(USA_RESIDENT) && ${USA_RESIDENT} == NO
-	cd ${WRKDIR}/Fortify-1.2.6-unix-x86 && \
-		(${ECHO} yes ; ${ECHO} no) | ./Fortify.sh ${NDIR}/navigator-4.06.bin
+	cd ${WRKDIR}/Fortify-1.2.8-unix-x86 && \
+		(${ECHO} yes ; ${ECHO} no) | ./Fortify.sh ${NDIR}/navigator-4.07.bin
 .endif
 	chown -R bin.bin ${NDIR}
 
diff --git a/www/netscape4-navigator/pkg-plist b/www/netscape4-navigator/pkg-plist
index e14d57c8ca20..f058edcec8c4 100644
--- a/www/netscape4-navigator/pkg-plist
+++ b/www/netscape4-navigator/pkg-plist
@@ -1,4 +1,4 @@
-bin/navigator-4.06
+bin/navigator-4.07
 @exec ln -sf %f %B/navigator-4
 @exec ln -sf navigator-4 %B/netscape
 @unexec rm -f %B/netscape
@@ -69,7 +69,7 @@ lib/netscape/java/classes/jsd10.jar
 lib/netscape/java/classes/ldap10.jar
 lib/netscape/java/classes/scd10.jar
 lib/netscape/mailcap
-lib/netscape/navigator-4.06.bin
+lib/netscape/navigator-4.07.bin
 lib/netscape/nethelp/Back_dep.gif
 lib/netscape/nethelp/Back_dis.gif
 lib/netscape/nethelp/Back_sel.gif
diff --git a/www/netscape47-navigator/Makefile b/www/netscape47-navigator/Makefile
index f283e59067e5..51362052df6c 100644
--- a/www/netscape47-navigator/Makefile
+++ b/www/netscape47-navigator/Makefile
@@ -3,35 +3,34 @@
 # Date created:         24 Feb 1997
 # Whom:                 ache
 #
-# $Id: Makefile,v 1.24 1998/09/22 17:54:24 asami Exp $
+# $Id: Makefile,v 1.25 1998/10/09 03:06:50 asami Exp $
 #
 
-DISTNAME=       netscape-navigator-4.06
+DISTNAME=       netscape-navigator-4.07
 CATEGORIES=	www
-MASTER_SITES=   ftp://ftp.netscape.com/pub/communicator/4.06/development/english/unix/freebsd/navigator_standalone/
-DISTFILES=      navigator-v406-export.x86-unknown-freebsd.tar.gz
+MASTER_SITES=   ftp://ftp.netscape.com/pub/communicator/4.07/development/english/unix/freebsd/navigator_standalone/
+DISTFILES=      navigator-v407-export.x86-unknown-freebsd.tar.gz
 
 MAINTAINER=     asami@FreeBSD.ORG
 
-WRKSRC=		${WRKDIR}/navigator-v406.x86-unknown-freebsd
+WRKSRC=		${WRKDIR}/navigator-v407.x86-unknown-freebsd
 NO_BUILD=       Yes
 STRIP=
 
 NDIR=           ${PREFIX}/lib/netscape
 BINDIR=		${PREFIX}/bin
-INFILE_HEAD=	'Navigator,4.06.0.98225,'
+INFILE_HEAD=	'Navigator,4.07.0.98272,'
 
-.if defined(USE_128BIT) && defined(USA_RESIDENT) && ${USA_RESIDENT} == NO
+.if defined(USE_128BIT)
 MASTER_SITES+=	ftp://ftp.fortify.net/pub/Fortify/ \
 		ftp://ftp.za.freebsd.org/pub/Fortify/
-DISTFILES+=	Fortify-1.2.6-unix-x86.tar.gz
+DISTFILES+=	Fortify-1.2.8-unix-x86.tar.gz
 RESTRICTED=     "Contains strong cryptography"
 .endif
 
 .if !defined(USE_128BIT)
 pre-extract:
 		@${ECHO} "You can make Netscape use 128-bit encryption by defining USE_128BIT"
-		@${ECHO} "and defining USA_RESIDENT to NO"
 .endif
 
 do-configure:
@@ -49,17 +48,17 @@ do-install:
 		${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} $${i} -C ${NDIR}; \
 	done
 	${WRKSRC}/vreg ${NDIR}/registry ${WRKSRC}/infile
-	${MV} -f ${NDIR}/netscape ${NDIR}/navigator-4.06.bin
-	${INSTALL_SCRIPT} ${WRKSRC}/netscape ${BINDIR}/navigator-4.06
-	ln -sf navigator-4.06 ${BINDIR}/navigator-4
+	${MV} -f ${NDIR}/netscape ${NDIR}/navigator-4.07.bin
+	${INSTALL_SCRIPT} ${WRKSRC}/netscape ${BINDIR}/navigator-4.07
+	ln -sf navigator-4.07 ${BINDIR}/navigator-4
 	ln -sf navigator-4 ${BINDIR}/netscape
 	if [ ! -f ${NDIR}/mailcap ] ; then \
 	    ${INSTALL_DATA} ${FILESDIR}/mailcap ${NDIR}; \
 	fi
 	${RM} -rf ${NDIR}/movemail-src
 .if defined(USE_128BIT) && defined(USA_RESIDENT) && ${USA_RESIDENT} == NO
-	cd ${WRKDIR}/Fortify-1.2.6-unix-x86 && \
-		(${ECHO} yes ; ${ECHO} no) | ./Fortify.sh ${NDIR}/navigator-4.06.bin
+	cd ${WRKDIR}/Fortify-1.2.8-unix-x86 && \
+		(${ECHO} yes ; ${ECHO} no) | ./Fortify.sh ${NDIR}/navigator-4.07.bin
 .endif
 	chown -R bin.bin ${NDIR}
 
diff --git a/www/netscape47-navigator/pkg-plist b/www/netscape47-navigator/pkg-plist
index e14d57c8ca20..f058edcec8c4 100644
--- a/www/netscape47-navigator/pkg-plist
+++ b/www/netscape47-navigator/pkg-plist
@@ -1,4 +1,4 @@
-bin/navigator-4.06
+bin/navigator-4.07
 @exec ln -sf %f %B/navigator-4
 @exec ln -sf navigator-4 %B/netscape
 @unexec rm -f %B/netscape
@@ -69,7 +69,7 @@ lib/netscape/java/classes/jsd10.jar
 lib/netscape/java/classes/ldap10.jar
 lib/netscape/java/classes/scd10.jar
 lib/netscape/mailcap
-lib/netscape/navigator-4.06.bin
+lib/netscape/navigator-4.07.bin
 lib/netscape/nethelp/Back_dep.gif
 lib/netscape/nethelp/Back_dis.gif
 lib/netscape/nethelp/Back_sel.gif