diff --git a/www/netscape/Makefile b/www/netscape/Makefile
index cb6212eadf6..df65bf2649b 100644
--- a/www/netscape/Makefile
+++ b/www/netscape/Makefile
@@ -1,7 +1,5 @@
-# $OpenBSD: Makefile,v 1.2 2000/04/16 18:46:19 brad Exp $
+# $OpenBSD: Makefile,v 1.3 2000/08/31 10:04:36 brad Exp $
 
-SUBDIR+= navigator-old
-SUBDIR+= communicator-old
 SUBDIR+= navigator
 SUBDIR+= communicator
 
diff --git a/www/netscape/Makefile.inc b/www/netscape/Makefile.inc
index c2bd6c3dd9e..427d89ff7d6 100644
--- a/www/netscape/Makefile.inc
+++ b/www/netscape/Makefile.inc
@@ -1,49 +1,35 @@
-# $OpenBSD: Makefile.inc,v 1.6 2000/07/10 01:07:33 brad Exp $
+# $OpenBSD: Makefile.inc,v 1.7 2000/08/31 10:04:36 brad Exp $
 #
 # Relevant URLs:	http://www.bsdi.com/netscape/
-#			http://www.fortify.net/
+
+# Subdirectory MUST define DIRNAME, LOCATION and PROGRAM_V.
 
 CATEGORIES=     www
-NEED_VERSION=	1.310
+NEED_VERSION=	1.322
+MASTER_SITES= \
+	ftp://ftp.netscape.com/pub/%SUBDIR%/ \
+	ftp://uiarchive.uiuc.edu/pub/www/netscape/%SUBDIR%/ \
+	ftp://netscape.Mirror.McGill.CA/pub/mirrors/ftp.netscape.com/pub/%SUBDIR%/ \
+	ftp://ftp.the.net/pub/mirrors/ftp.netscape.com/pub/%SUBDIR%/ \
+	ftp://sunsite.doc.ic.ac.uk/packages/netscape/pub/%SUBDIR%/ \
+	ftp://ftp-de.netscape.com/pub/%SUBDIR%/ \
+	ftp://nic.funet.fi/pub/mirrors/ftp.netscape.com/pub/%SUBDIR%/
+MASTER_SITE_SUBDIR= communicator/english/${PROGRAM_V}/unix/unsupported/${LOCATION}
 DIST_SUBDIR=	netscape
 
 HOMEPAGE=	http://www.netscape.com/
 
+MAINTAINER=	brad@openbsd.org
+
 PERMIT_PACKAGE_CDROM=	No
 PERMIT_PACKAGE_FTP=	No
 PERMIT_DISTFILES_CDROM=	No
 PERMIT_DISTFILES_FTP=	No
 
-# Subdirectory MUST define PROGRAM_V and LOCATION
+WRKDIST=	${WRKDIR}/${DIRNAME}
 
-MASTER_SITES= \
-	ftp://netscape.Mirror.McGill.CA/pub/mirrors/ftp.netscape.com/pub/%SUBDIR%/ \
-	ftp://ftp.netscape.com/pub/%SUBDIR%/ \
-	ftp://uiarchive.uiuc.edu/pub/www/netscape/%SUBDIR%/ \
-	ftp://ftp.the.net/pub/mirrors/ftp.netscape.com/pub/%SUBDIR%/ \
-	ftp://sunsite.doc.ic.ac.uk/packages/netscape/pub/%SUBDIR%/ \
-	ftp://ftp-de.netscape.com/pub/%SUBDIR%/ \
-	ftp://nic.funet.fi/pub/mirrors/ftp.netscape.com/pub/%SUBDIR%/
-
-MASTER_SITES0=	ftp://ftp.fortify.net/pub/Fortify/ \
-		ftp://ftp.sunet.se/pub/security/tools/net/Fortify/ \
-		ftp://ftp.funet.fi/pub/crypt/mirrors/fortify/ \
-		ftp://ftp.it.net.au/mirrors/Fortify/
-
-FORTIFY=	Fortify-1.4.6-unix-src
-DISTFILES=	${DISTNAME}.tar.gz \
-		${FORTIFY}.tar.gz:0
-
-MASTER_SITE_SUBDIR=	communicator/english/${PROGRAM_V}/unix/unsupported/${LOCATION}
-
-OBJMACHINE=	Yes
-NO_CONFIGURE=	Yes
-WRKDIST=	${WRKDIR}
-
-MAINTAINER=	brad@openbsd.org
-
-pre-fetch:
 .if !defined(NO_WARNINGS)
+pre-fetch:
 .if ${MACHINE_ARCH} == "i386"
 	@echo ""
 	@echo "  WARNING: This application requires a kernel compiled with"
@@ -51,47 +37,12 @@ pre-fetch:
 	@echo "           GENERIC kernel contains this option."
 	@echo ""
 .endif
-.if ${MACHINE_ARCH} == "sparc"
-	@echo ""
-	@echo "  WARNING: This application requires a kernel compiled with"
-	@echo "           'option COMPAT_SUNOS' and SunOS shared libraries"
-	@echo "           for proper operation, see compat_sunos(8) for"
-	@echo "           further details. The GENERIC kernel contains"
-	@echo "           this option."
-	@echo ""
 .endif
-.endif
-
-MAKE_FLAGS=	CC="${CC}" CFLAGS="${CFLAGS} -I. -I../common" \
-		LDFLAGS="" YACC="yacc"
-
-do-build:
-	@cd ${WRKDIR}/${FORTIFY}/src/common && \
-	env ${MAKE_ENV} make ${MAKE_FLAGS} ${MAKEFILE} all && \
-	cd ${WRKDIR}/${FORTIFY}/src/cmdline && \
-	env ${MAKE_ENV} make ${MAKE_FLAGS} ${MAKEFILE} fortify
 
 do-install:
 	@cd ${WRKDIR}/${DIRNAME} && ${MAKE_ENV} ./ns-install
 
 post-install:
-.if ${MACHINE_ARCH} == "sparc"
-	@cp ${PREFIX}/netscape/netscape ${PREFIX}/netscape/netscape_nis
-	@cp ${PREFIX}/netscape/netscape_dns ${PREFIX}/netscape/netscape
-	@rm -f ${PREFIX}/netscape/netscape_dns
-.endif
-	@cd ${WRKDIR}/${FORTIFY} && \
-	ln -sf languages/English Messages && \
-	{ echo yes ; echo no ; echo no; } \
-	| src/cmdline/fortify >/dev/null ${PREFIX}/netscape/netscape
-.if ${MACHINE_ARCH} == "sparc"
-	@cd ${WRKDIR}/${FORTIFY} && \
-	{ echo yes ; echo no ; echo no; } \
-	| src/cmdline/fortify >/dev/null ${PREFIX}/netscape/netscape_nis
-.endif
 	@sed -e 's#@netscape_home@#${TRUEPREFIX}/netscape#' \
 	 ${FILESDIR}/netscape.${MACHINE_ARCH} > ${WRKDIR}/netscape
-	@if [ -f ${PREFIX}/bin/netscape ]; then \
-	 mv ${PREFIX}/bin/netscape ${PREFIX}/bin/netscape.old; \
-	fi
 	${INSTALL_SCRIPT} ${WRKDIR}/netscape ${PREFIX}/bin
diff --git a/www/netscape/communicator-old/Makefile b/www/netscape/communicator-old/Makefile
deleted file mode 100644
index edcafb2238c..00000000000
--- a/www/netscape/communicator-old/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-# $OpenBSD: Makefile,v 1.2 2000/07/06 22:40:19 brad Exp $
-
-ONLY_FOR_ARCHS=	sparc 
-NEED_VERSION=	1.310
-
-PROGRAM_V=	4.61
-V2:=${PROGRAM_V:S/.//}
-
-DISTNAME=	communicator-v${V2}-export.sparc-sun-sunos4.1.3_U1
-LOCATION=	sunos413/complete_install
-DIRNAME=	communicator-v${V2}.sparc-sun-sunos4.1.3_U1
-
-PKGNAME=	communicator-${PROGRAM_V}
-
-.include <bsd.port.mk>
diff --git a/www/netscape/communicator-old/files/md5 b/www/netscape/communicator-old/files/md5
deleted file mode 100644
index 7b1d703715c..00000000000
--- a/www/netscape/communicator-old/files/md5
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 (netscape/Fortify-1.4.6-unix-src.tar.gz) = 129ab43043a62e7494b991ab5182c1f8
-MD5 (netscape/communicator-v461-export.sparc-sun-sunos4.1.3_U1.tar.gz) = 26d2944a58d6fa8c73ff5a4a2f3d7258
-RMD160 (netscape/Fortify-1.4.6-unix-src.tar.gz) = ac85a7993c100c7584c35e61be4e8ae0a72d1949
-RMD160 (netscape/communicator-v461-export.sparc-sun-sunos4.1.3_U1.tar.gz) = 09c948f655c62ee04c1dce885917cfc93e856f53
-SHA1 (netscape/Fortify-1.4.6-unix-src.tar.gz) = a1debcb3c7d2d5dbb9f638b7713bc2544dcea3cd
-SHA1 (netscape/communicator-v461-export.sparc-sun-sunos4.1.3_U1.tar.gz) = a0d44122101972df47b4f6605c3c7fbca5e71270
diff --git a/www/netscape/communicator-old/files/netscape.sparc b/www/netscape/communicator-old/files/netscape.sparc
deleted file mode 100644
index cd89df6ec9f..00000000000
--- a/www/netscape/communicator-old/files/netscape.sparc
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-# $OpenBSD: netscape.sparc,v 1.1.1.1 2000/04/09 15:50:16 espie Exp $
-#
-# Wrapper for the fortified Netscape navigator program.
-
-XKEYSYMDB=@netscape_home@
-XNLSPATH=@netscape_home@/nls
-MOZILLA_HOME=@netscape_home@
-export XKEYSYMDB XNLSPATH MOZILLA_HOME
-exec $MOZILLA_HOME/netscape "$@"
diff --git a/www/netscape/communicator-old/patches.sparc/patch-ns-install b/www/netscape/communicator-old/patches.sparc/patch-ns-install
deleted file mode 100644
index f5b4dd97984..00000000000
--- a/www/netscape/communicator-old/patches.sparc/patch-ns-install
+++ /dev/null
@@ -1,253 +0,0 @@
---- communicator-v461.sparc-sun-sunos4.1.3_U1/ns-install.orig	Wed May  5 14:18:29 1999
-+++ communicator-v461.sparc-sun-sunos4.1.3_U1/ns-install	Thu May 20 16:27:26 1999
-@@ -84,22 +84,10 @@
- 	exit 1
- fi
- #
-+# We use OpenBSD's ports environment instead.
- #
--# If MOZILLA_HOME is set, assume that is the place to install.
--# Otherwise, make an educated guess at the "right" default
--# directory.
--#
--if test ! -z "${MOZILLA_HOME}"
--then
--	INSTALL_DIR="${MOZILLA_HOME}"
--else
--	if test -d /opt
--	then
--		INSTALL_DIR="/opt/netscape"
--	else
--		INSTALL_DIR="/usr/local/netscape"
--	fi
--fi
-+INSTALL_DIR="${PREFIX}/netscape"
-+
- #
- #
- # See if we have to use the lame SYS-V echo command flags.
-@@ -137,63 +125,22 @@
- 	fi
- done
- #
--echo ""
--echo "Please specify the directory path under which the software will be"
--echo "installed.  The default directory is ${INSTALL_DIR}, but you may"
--echo "install anywhere you wish (if you have permission to do so)."
--echo ""
- flag=1
- while test ${flag} -eq 1
- do
--	${ECHO} "Location for ${PRODUCT} software [${INSTALL_DIR}]: ${ENDER}"
--	read TARGET
--	if test -z "${TARGET}"
--	then
--		TARGET="${INSTALL_DIR}"
--	fi
--	if test ! -z "`echo ${TARGET} | grep '~'`"
--	then
--		TARGET=`echo ${TARGET} | sed "s:~:${HOME}:"`
--	fi
--#
-+	TARGET="${INSTALL_DIR}"
-+
- 	flag=0
- 	if test ! -d ${TARGET}
- 	then
--		echo ""
--		${ECHO} "${TARGET}: No such directory.  Do you wish to create it? (y/n)[y] ${ENDER}"
--		read check
--		if test "${check}" = "n" -o "${check}" = "N"
--		then
--			flag=1
--		else
--			#
--			# The -p flag may cause an error on some HP-UX systems.
--			# Removing the -p will work for 'basename TARGET' as long
--			# as 'dirname TARGET' exists.
--			#
--			mkdir -p ${TARGET}
--			if test $? -ne 0
--			then
--				echo "ERROR: Problem creating ${TARGET}"
--				exit 2
--			fi
--		fi
--	else
--		echo ""
--		echo "Existing '${TARGET}' directory found."
--		echo ""
--		echo "The existing contents may be modified or replaced if you install in"
--		echo "this directory.  If you choose not to install in '${TARGET}',"
--		echo "you will be prompted for a different directory."
--		echo ""
--		${ECHO} "Do you wish to install in '${TARGET}'? (y/n)[y] ${ENDER}"
--		read check
--		if test "${check}" = "n" -o "${check}" = "N"
-+		mkdir -p ${TARGET}
-+		if test $? -ne 0
- 		then
--			flag=1
-+		    echo "ERROR: Problem creating ${TARGET}"
-+		    exit 2
- 		fi
- 	fi
--#
-+
- 	if test ${flag} -eq 0
- 	then
- 		(echo "Write test." 2>/dev/null > ${TARGET}/${TESTFILE}) 2>/dev/null
-@@ -217,13 +164,6 @@
- echo ""
- echo "Installing ${PRODUCT} files..."
- #
--#
--# Make a list of the files in this package, so we can check for
--# existing files with the same names and save them.
--#
--FILELIST="`${GZIP} -dc ${PACKAGE} | tar -tvf - | awk '{print $NF}'`"
--#
--#
- # Keep a log of this installation for reference.
- #
- LOGFILE="ns-install.log-$$"
-@@ -231,30 +171,6 @@
- echo "Files installed:" >> ${LOGFILE}
- echo "================" >> ${LOGFILE}
- #
--#
--# Check for existing files and move them out of the way.
--#
--if test -d ${TARGET}/java/classes
--then
--	echo " ==> moving existing '${TARGET}/java/classes' to '${TARGET}/java/classes.old'"; \
--	/bin/rm -rf ${TARGET}/java/classes.old
--	mv ${TARGET}/java/classes ${TARGET}/java/classes.old
--fi
--for i in ${FILELIST}
--do
--	echo "${i}" >> ${LOGFILE}
--	if test ! -d ${TARGET}/${i}
--	then
--		(cd ${TARGET}; \
--		 /bin/rm -f ${i}.old; \
--		 if test -f ${i}; then \
--			echo " ==> moving existing '${TARGET}/${i}' to '${TARGET}/${i}.old'"; \
--			mv ${i} ${i}.old; \
--		 fi)
--	fi
--done
--#
--#
- # Actually install the package in TARGET.
- #
- ${GZIP} -dc ${PACKAGE} | (cd ${TARGET}; tar -x${TAR_OPTIONS}f -)
-@@ -269,33 +185,28 @@
- then
- 	echo ""
- 	echo "Installing ${PRODUCT} Java files..."
-+	/bin/rm -rf ${TARGET}/java
- 	if test ! -d ${TARGET}/java/classes
- 	then
- 		(cd ${TARGET}; mkdir -p java/classes)
- 	fi
- 	for i in *.jar
- 	do
--		if test -f ${TARGET}/java/classes/${i}
--		then
--			echo " ==> moving existing '${TARGET}/java/classes/${i}' to '${TARGET}/java/classes/${i}.old'"
--			/bin/rm -f ${TARGET}/java/classes/${i}.old
--			mv ${TARGET}/java/classes/${i} ${TARGET}/java/classes/${i}.old
--		fi
- 		tar -cf - ${i} | (cd ${TARGET}/java/classes; tar -xf -)
- 		echo "${i}" >> ${LOGFILE}
--		/bin/rm -f ${TARGET}/${i} ./${i}
-+		/bin/rm -f ${TARGET}/${i}
- 		echo "${i},${BLDVERS},${TARGET}/java/classes" >> ${REG_INFILE}
- 	done
--#
-+
- 	#
- 	# Try to properly deal with the font.properties files, to hopefully
- 	# avoid users having to set MOZILLA_JAVA_FONT_PROPERTY_PATH, or
- 	# just assuming Java font-handling is broken.
- 	#
--	if test ! -z "`ls /bin/uname`"
-+	if test ! -z "`ls /usr/bin/uname`"
- 	then
- 		MOVE_FONTS="TRUE"
--		case `/bin/uname` in
-+		case `/usr/bin/uname` in
- 			AIX)
- 				PLATFORM="aix"
- 				;;
-@@ -317,19 +228,6 @@
- 			mv ${TARGET}/java/classes/${PLATFORM}/* ${TARGET}/java/classes/.
- 		fi
- 	fi
--#
--	#
--	# Is this a virgin install?  If so, create the .netscape dir
--	# and put the default bookmark file in it.
--	#
--	if test ! -d ${HOME}/.netscape
--	then
--		# New install, or upgrade from 0.x or 1.x.
--		mkdir ${HOME}/.netscape
--		cp ${TARGET}/bookmark.htm ${HOME}/.netscape/bookmarks.html
--		chmod 644 ${HOME}/.netscape/bookmarks.html
--		echo "${HOME}/.netscape/bookmarks.html" >> ${LOGFILE}
--	fi
- fi
- #
- echo ""
-@@ -356,7 +254,6 @@
- 	esac
- 	${GZIP} -dc ${pkg} | (cd ${TARGET}; tar -x${TAR_OPTIONS}f -)
- 	echo "${pkg},${BLDVERS},${TARGET}" >> ${REG_INFILE}
--	/bin/rm -f ${pkg}
- done
- #
- #
-@@ -374,20 +271,7 @@
- #
- # Install the vreg binary in the TARGET directory.
- #
--if test -f ${TARGET}/vreg
--then
--	/bin/rm -f ${TARGET}/vreg.old
--	mv ${TARGET}/vreg ${TARGET}/vreg.old
--	# Handle the case where TARGET == . (meaning we just moved the file we just installed).
--	if test ! -f ./vreg
--	then
--		mv ${TARGET}/vreg.old ${TARGET}/vreg
--	else
--		mv ./vreg ${TARGET}/vreg
--	fi
--else
--	mv ./vreg ${TARGET}/vreg
--fi
-+cp ./vreg ${TARGET}/vreg
- #
- #
- # Register the product so Automatic Software Download can work.
-@@ -413,7 +297,6 @@
- 	awk '{printf("\techo \"%s\" >>/tmp/infile\n", $0)}' ${REG_INFILE}
- 	echo "	${TARGET}/vreg ${TARGET}/${VREGISTRY} /tmp/infile"
- 	echo ""
--	/bin/rm -f ns-install ${PACKAGE} ${REG_INFILE} core
- 	exit 3
- fi
- #
-@@ -422,11 +305,6 @@
- echo "The Netscape ${PRODUCT} software installation is complete."
- echo ""
- echo ""
--#
--#
--# Get rid of the trash.
--#
--/bin/rm -f ns-install ${PACKAGE} ${REG_INFILE}
- #
- echo ""
- exit 0
diff --git a/www/netscape/communicator-old/pkg/COMMENT b/www/netscape/communicator-old/pkg/COMMENT
deleted file mode 100644
index 3fb1f1e06fd..00000000000
--- a/www/netscape/communicator-old/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-Netscape Communicator WWW browser with 128-bit encryption
diff --git a/www/netscape/communicator-old/pkg/DESCR b/www/netscape/communicator-old/pkg/DESCR
deleted file mode 100644
index d2075304161..00000000000
--- a/www/netscape/communicator-old/pkg/DESCR
+++ /dev/null
@@ -1,20 +0,0 @@
-Netscape Communicator 4.61, fortified
-----------------------------------------------
-
-Release notes for this version of Netscape are available on-line.  After
-starting the program, select "Release Notes" from the "Help" menu.  This
-will take you to the URL
-
-    http://home.netscape.com/eng/mozilla/4.61/relnotes/unix-4.61.html
-
-which lists new features and known problems of this release.
-
-This version of Netscape has been modified for OpenBSD using Fortify,
-a program that provides world-wide, unconditional, full strength
-128-bit cryptography to export-crippled Netscape browsers.
-
-SPARC NOTICE
-------------
-Use of this port requires a kernel compiled with 'option COMPAT_SUNOS'
-
-WWW: ${HOMEPAGE}
diff --git a/www/netscape/communicator-old/pkg/PLIST.sparc b/www/netscape/communicator-old/pkg/PLIST.sparc
deleted file mode 100644
index c39f375a567..00000000000
--- a/www/netscape/communicator-old/pkg/PLIST.sparc
+++ /dev/null
@@ -1,149 +0,0 @@
-@comment $OpenBSD: PLIST.sparc,v 1.2 2000/08/04 20:54:19 brad Exp $
-@pkgcfl navigator-*
-netscape/README
-netscape/LICENSE
-netscape/netscape
-netscape/netscape_nis
-netscape/Netscape.ad
-netscape/XKeysymDB
-netscape/bookmark.htm
-netscape/libjsd.so.1.0
-netscape/movemail
-netscape/dynfonts/libTrueDoc.so
-netscape/nls/C
-netscape/nls/nls.dir
-netscape/java/classes/resource.jar
-netscape/java/classes/ifc11.jar
-netscape/java/classes/iiop10.jar
-netscape/java/classes/jae40.jar
-netscape/java/classes/java40.jar
-netscape/java/classes/jio40.jar
-netscape/java/classes/jsd10.jar
-netscape/java/classes/ldap30.jar
-netscape/java/classes/scd10.jar
-netscape/movemail-src/COPYING
-netscape/movemail-src/README
-netscape/movemail-src/movemail.c
-netscape/nethelp/Back_dep.gif
-netscape/nethelp/Topic.js
-netscape/nethelp/System.js
-netscape/nethelp/Stack.js
-netscape/nethelp/Local-1.js
-netscape/nethelp/IdxData.js
-netscape/nethelp/Header.js
-netscape/nethelp/CntTool.js
-netscape/nethelp/CntData.js
-netscape/nethelp/Button.js
-netscape/nethelp/ToolUI.htm
-netscape/nethelp/System.htm
-netscape/nethelp/Status.htm
-netscape/nethelp/NoJSerr.htm
-netscape/nethelp/NavUI.htm
-netscape/nethelp/NSHIfrm.htm
-netscape/nethelp/IdxTopic.htm
-netscape/nethelp/IdxTool.htm
-netscape/nethelp/IdxKey.htm
-netscape/nethelp/IdxFill.htm
-netscape/nethelp/CntTool.htm
-netscape/nethelp/Blank.htm
-netscape/nethelp/Wait.gif
-netscape/nethelp/Tool_up.gif
-netscape/nethelp/Tool_sel.gif
-netscape/nethelp/Tool_dep.gif
-netscape/nethelp/Prnt_up.gif
-netscape/nethelp/Prnt_sel.gif
-netscape/nethelp/Prnt_dep.gif
-netscape/nethelp/Forw_up.gif
-netscape/nethelp/Forw_sel.gif
-netscape/nethelp/Forw_dis.gif
-netscape/nethelp/Forw_dep.gif
-netscape/nethelp/Exit_up.gif
-netscape/nethelp/Exit_sel.gif
-netscape/nethelp/Exit_dep.gif
-netscape/nethelp/Back_up.gif
-netscape/nethelp/Back_sel.gif
-netscape/nethelp/Back_dis.gif
-netscape/nethelp/Utility.js
-netscape/nethelp/netwatch.gif
-netscape/nethelp/picsfail.htm
-netscape/nethelp/picsfail.jar
-netscape/nethelp/netscape/collabra/collabra.gif
-netscape/nethelp/netscape/collabra/discgrps.gif
-netscape/nethelp/netscape/collabra/mailbox2.gif
-netscape/nethelp/netscape/collabra/coll.htm
-netscape/nethelp/netscape/collabra/collHdr.htm
-netscape/nethelp/netscape/collabra/help.hpf
-netscape/nethelp/netscape/composer/composer.gif
-netscape/nethelp/netscape/composer/comtlbr2.gif
-netscape/nethelp/netscape/composer/fmtlbr3.gif
-netscape/nethelp/netscape/composer/tagicon2.gif
-netscape/nethelp/netscape/composer/comp.htm
-netscape/nethelp/netscape/composer/compHdr.htm
-netscape/nethelp/netscape/composer/help.hpf
-netscape/nethelp/netscape/home/home.gif
-netscape/nethelp/netscape/home/home.htm
-netscape/nethelp/netscape/home/homeHdr.htm
-netscape/nethelp/netscape/home/help.hpf
-netscape/nethelp/netscape/messengr/abook.gif
-netscape/nethelp/netscape/messengr/compbar.gif
-netscape/nethelp/netscape/messengr/mailbox.gif
-netscape/nethelp/netscape/messengr/mailbox2.gif
-netscape/nethelp/netscape/messengr/messengr.gif
-netscape/nethelp/netscape/messengr/mpctrl.gif
-netscape/nethelp/netscape/messengr/newsgrp.gif
-netscape/nethelp/netscape/messengr/tabs.gif
-netscape/nethelp/netscape/messengr/mess.htm
-netscape/nethelp/netscape/messengr/messHdr.htm
-netscape/nethelp/netscape/messengr/help.hpf
-netscape/nethelp/netscape/navigatr/navigatr.gif
-netscape/nethelp/netscape/navigatr/nav.htm
-netscape/nethelp/netscape/navigatr/navHdr.htm
-netscape/nethelp/netscape/navigatr/help.hpf
-netscape/nethelp/netscape/news/abook.gif
-netscape/nethelp/netscape/news/collabra.gif
-netscape/nethelp/netscape/news/compbar.gif
-netscape/nethelp/netscape/news/discgrps.gif
-netscape/nethelp/netscape/news/mailbox2.gif
-netscape/nethelp/netscape/news/newsgrp.gif
-netscape/nethelp/netscape/news/news.htm
-netscape/nethelp/netscape/news/help.hpf
-netscape/nethelp/netscape/shared/collIcon.gif
-netscape/nethelp/netscape/shared/commIcon.gif
-netscape/nethelp/netscape/shared/navIcon.gif
-netscape/nethelp/netscape/shared/netIcon.gif
-netscape/nethelp/netscape/shared/NetHelpm.css
-netscape/nethelp/netscape/shared/NetHelpu.css
-netscape/nethelp/netscape/shared/NetHelpw.css
-netscape/nethelp/netscape/shared/calIcon.gif
-netscape/nethelp/netscape/shared/admnIcon.gif
-netscape/nethelp/netscape/shared/compIcon.gif
-netscape/nethelp/netscape/shared/confIcon.gif
-netscape/nethelp/netscape/shared/ibmIcon.gif
-netscape/nethelp/netscape/shared/messIcon.gif
-netscape/nethelp/netscape/trouble/trouble.htm
-netscape/nethelp/netscape/trouble/help.hpf
-netscape/plugins/cpPack1.jar
-netscape/plugins/libnullplugin.so
-netscape/spell/netscape.dic
-netscape/spell/pen4s324.dat
-netscape/vreg
-netscape/registry
-bin/netscape
-@dirrm netscape/dynfonts
-@dirrm netscape/spell
-@dirrm netscape/plugins
-@dirrm netscape/movemail-src
-@dirrm netscape/nethelp/netscape/composer
-@dirrm netscape/nethelp/netscape/messengr
-@dirrm netscape/nethelp/netscape/collabra
-@dirrm netscape/nethelp/netscape/news
-@dirrm netscape/nethelp/netscape/trouble
-@dirrm netscape/nethelp/netscape/shared
-@dirrm netscape/nethelp/netscape/navigatr
-@dirrm netscape/nethelp/netscape/home
-@dirrm netscape/nethelp/netscape
-@dirrm netscape/nethelp
-@dirrm netscape/java/classes
-@dirrm netscape/java
-@dirrm netscape/nls
-@dirrm netscape
diff --git a/www/netscape/communicator/Makefile b/www/netscape/communicator/Makefile
index a45df72212f..a58438cc3be 100644
--- a/www/netscape/communicator/Makefile
+++ b/www/netscape/communicator/Makefile
@@ -1,20 +1,14 @@
-# $OpenBSD: Makefile,v 1.4 2000/07/09 21:57:37 brad Exp $
+# $OpenBSD: Makefile,v 1.5 2000/08/31 10:04:37 brad Exp $
 
 ONLY_FOR_ARCHS=	i386 
-NEED_VERSION=	1.310
+NEED_VERSION=	1.322
 
-PROGRAM_V=	4.73
-V2:=${PROGRAM_V:S/.//}
+PROGRAM_V=	4.75
+V2:=		${PROGRAM_V:S/.//}
 
-DISTNAME=	communicator-v${V2}-export.x86-bsdi-bsd2
+DISTNAME=	communicator-v${V2}-us.x86-bsdi-bsd2
+PKGNAME=	communicator-${PROGRAM_V}
 LOCATION=	bsdi21/complete_install
 DIRNAME=	communicator-v${V2}.x86-bsdi-bsd2
 
-PKGNAME=	communicator-${PROGRAM_V}
-
-pre-patch:
-	@cd ${WRKDIR}/Fortify-1.4.6-unix-src/x86-bsdi-bsd2 && \
-	   mkdir comm-4.73 && \
-	   cp comm-4.72/morphs-1.2 comm-4.73
-
 .include <bsd.port.mk>
diff --git a/www/netscape/communicator/files/md5 b/www/netscape/communicator/files/md5
index 0f711ce731b..102726aef60 100644
--- a/www/netscape/communicator/files/md5
+++ b/www/netscape/communicator/files/md5
@@ -1,6 +1,3 @@
-MD5 (netscape/Fortify-1.4.6-unix-src.tar.gz) = 129ab43043a62e7494b991ab5182c1f8
-MD5 (netscape/communicator-v473-export.x86-bsdi-bsd2.tar.gz) = fd7975f7aeb2c6ebac9ca96724b0afb6
-RMD160 (netscape/Fortify-1.4.6-unix-src.tar.gz) = ac85a7993c100c7584c35e61be4e8ae0a72d1949
-RMD160 (netscape/communicator-v473-export.x86-bsdi-bsd2.tar.gz) = a9e015c86efb5633e76d6d0619a6916662c75f5a
-SHA1 (netscape/Fortify-1.4.6-unix-src.tar.gz) = a1debcb3c7d2d5dbb9f638b7713bc2544dcea3cd
-SHA1 (netscape/communicator-v473-export.x86-bsdi-bsd2.tar.gz) = a579ea6ab7207bfb0dd8b80641845711f18ae919
+MD5 (netscape/communicator-v475-us.x86-bsdi-bsd2.tar.gz) = 30280590f4e75bea070ec6e4f902cff0
+RMD160 (netscape/communicator-v475-us.x86-bsdi-bsd2.tar.gz) = d9e1b6227df1c2e15261a4bcae238b1fa0b32f1a
+SHA1 (netscape/communicator-v475-us.x86-bsdi-bsd2.tar.gz) = dfb381f315896dd91c8f6ef1db7502d84b5b048c
diff --git a/www/netscape/communicator/files/netscape.i386 b/www/netscape/communicator/files/netscape.i386
index e127d7d9dda..ce617bd5397 100644
--- a/www/netscape/communicator/files/netscape.i386
+++ b/www/netscape/communicator/files/netscape.i386
@@ -1,7 +1,7 @@
 #!/bin/sh
-# $OpenBSD: netscape.i386,v 1.1.1.1 2000/04/09 15:50:15 espie Exp $
+# $OpenBSD: netscape.i386,v 1.2 2000/08/31 10:04:38 brad Exp $
 #
-# Wrapper for the fortified Netscape navigator program.
+# Wrapper for Netscape Communicator.
 
 MOZILLA_HOME=@netscape_home@
 export MOZILLA_HOME
diff --git a/www/netscape/communicator/patches.i386/patch-Index b/www/netscape/communicator/patches.i386/patch-Index
deleted file mode 100644
index a048aeaa60e..00000000000
--- a/www/netscape/communicator/patches.i386/patch-Index
+++ /dev/null
@@ -1,10 +0,0 @@
---- Fortify-1.4.6-unix-src/Index.orig	Sun Jul  9 15:21:12 2000
-+++ Fortify-1.4.6-unix-src/Index	Sun Jul  9 15:22:05 2000
-@@ -1333,6 +1333,7 @@
- 14494100 - 45580e185035dd63c8dddb6b5023363e comm 4.72 0 2 morphs-1.2 sparc-sun-solaris2.4 -
- 15585412 - 6d0c1904fc890d14f727a98c087346e4 comm 4.72 0 2 morphs-1.2 sparc-sun-solaris2.5.1 -
- 10784768 - 92842d102ecb515b1d334d1059086e45 comm 4.72 0 2 morphs-1.2 x86-bsdi-bsd2 -
-+10784768 - b92858d61ec336c56547addb1d9b6b58 comm 4.73 0 2 morphs-1.2 x86-bsdi-bsd2 -
- 11203448 - 3b2b7d9f05dccdd2c6150b668a706aca comm 4.72 0 2 morphs-1.2 x86-sun-solaris2.4 -
- 11227508 - 98a00ea33eacee73bff1ff1ac299b396 comm 4.72 0 2 morphs-1.2 x86-sun-solaris2.5.1 -
- 13303808 - 1e88d8a6d133a828c1a5d533b26fdf0c comm 4.72 0 2 morphs-1.2 x86-unknown-freebsd -
diff --git a/www/netscape/communicator/patches.i386/patch-morphs-1.2 b/www/netscape/communicator/patches.i386/patch-morphs-1.2
deleted file mode 100644
index 419e11778d9..00000000000
--- a/www/netscape/communicator/patches.i386/patch-morphs-1.2
+++ /dev/null
@@ -1,11 +0,0 @@
---- Fortify-1.4.6-unix-src/x86-bsdi-bsd2/comm-4.73/morphs-1.2.orig	Sun Jul  9 15:22:46 2000
-+++ Fortify-1.4.6-unix-src/x86-bsdi-bsd2/comm-4.73/morphs-1.2	Sun Jul  9 15:23:04 2000
-@@ -33,7 +33,7 @@
- 
- init {
- 	grammar		1.2
--	target		"comm-v472-export.x86-bsdi-bsd2"
-+	target		"comm-v473-export.x86-bsdi-bsd2"
- 	text_offset	0x1000
- 	data_offset	0x1000
- 	rodata_offset	0x1000
diff --git a/www/netscape/communicator/patches.i386/patch-ns-install b/www/netscape/communicator/patches.i386/patch-ns-install
index 8fa2db46bb5..02e1660d3d7 100644
--- a/www/netscape/communicator/patches.i386/patch-ns-install
+++ b/www/netscape/communicator/patches.i386/patch-ns-install
@@ -1,5 +1,5 @@
---- communicator-v473.x86-bsdi-bsd2/ns-install.orig	Fri May  5 12:34:27 2000
-+++ communicator-v473.x86-bsdi-bsd2/ns-install	Sun Jul  9 17:33:39 2000
+--- ns-install.orig	Tue Aug 15 20:37:22 2000
++++ ns-install	Thu Aug 31 05:49:43 2000
 @@ -84,22 +84,10 @@
  	exit 1
  fi
diff --git a/www/netscape/communicator/pkg/DESCR b/www/netscape/communicator/pkg/DESCR
index 6cd1a488e90..c9ee10ed33a 100644
--- a/www/netscape/communicator/pkg/DESCR
+++ b/www/netscape/communicator/pkg/DESCR
@@ -1,18 +1,14 @@
-Netscape Communicator 4.73, fortified
-----------------------------------------------
+Netscape Communicator 4.75
+--------------------------
 
 Release notes for this version of Netscape are available on-line.  After
 starting the program, select "Release Notes" from the "Help" menu.  This
 will take you to the URL
 
-    http://home.netscape.com/eng/mozilla/4.7/relnotes/unix-4.73.html
+    http://home.netscape.com/eng/mozilla/4.7/relnotes/unix-4.75.html
 
 which lists new features and known problems of this release.
 
-This version of Netscape has been modified for OpenBSD using Fortify,
-a program that provides world-wide, unconditional, full strength
-128-bit cryptography to export-crippled Netscape browsers.
-
 i386 NOTICE
 -----------
 Use of this port requires a kernel compiled with 'option COMPAT_BSDOS'
diff --git a/www/netscape/navigator-old/Makefile b/www/netscape/navigator-old/Makefile
deleted file mode 100644
index 92ab95f8949..00000000000
--- a/www/netscape/navigator-old/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-# $OpenBSD: Makefile,v 1.2 2000/07/06 22:40:20 brad Exp $
-
-ONLY_FOR_ARCHS=	sparc
-NEED_VERSION=	1.310
-
-PROGRAM_V=	4.61
-V2:=${PROGRAM_V:S/.//}
-
-DISTNAME=	navigator-v${V2}-export.sparc-sun-sunos4.1.3_U1
-LOCATION=	sunos413/navigator_standalone
-DIRNAME=	navigator-v${V2}.sparc-sun-sunos4.1.3_U1
-
-PKGNAME=	navigator-${PROGRAM_V}
-
-.include <bsd.port.mk>
diff --git a/www/netscape/navigator-old/files/md5 b/www/netscape/navigator-old/files/md5
deleted file mode 100644
index 0dbdaad71c1..00000000000
--- a/www/netscape/navigator-old/files/md5
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 (netscape/Fortify-1.4.6-unix-src.tar.gz) = 129ab43043a62e7494b991ab5182c1f8
-MD5 (netscape/navigator-v461-export.sparc-sun-sunos4.1.3_U1.tar.gz) = a1bc10d5dfce9f36ddae55930d683b6d
-RMD160 (netscape/Fortify-1.4.6-unix-src.tar.gz) = ac85a7993c100c7584c35e61be4e8ae0a72d1949
-RMD160 (netscape/navigator-v461-export.sparc-sun-sunos4.1.3_U1.tar.gz) = e1c7d65f8b173db6332e18c01954b1873c2f478f
-SHA1 (netscape/Fortify-1.4.6-unix-src.tar.gz) = a1debcb3c7d2d5dbb9f638b7713bc2544dcea3cd
-SHA1 (netscape/navigator-v461-export.sparc-sun-sunos4.1.3_U1.tar.gz) = e3264c6611c43395a0b8aa32df586116d0b2edcc
diff --git a/www/netscape/navigator-old/files/netscape.sparc b/www/netscape/navigator-old/files/netscape.sparc
deleted file mode 100644
index cd89df6ec9f..00000000000
--- a/www/netscape/navigator-old/files/netscape.sparc
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-# $OpenBSD: netscape.sparc,v 1.1.1.1 2000/04/09 15:50:16 espie Exp $
-#
-# Wrapper for the fortified Netscape navigator program.
-
-XKEYSYMDB=@netscape_home@
-XNLSPATH=@netscape_home@/nls
-MOZILLA_HOME=@netscape_home@
-export XKEYSYMDB XNLSPATH MOZILLA_HOME
-exec $MOZILLA_HOME/netscape "$@"
diff --git a/www/netscape/navigator-old/patches.sparc/patch-ns-install b/www/netscape/navigator-old/patches.sparc/patch-ns-install
deleted file mode 100644
index 145fe43b80e..00000000000
--- a/www/netscape/navigator-old/patches.sparc/patch-ns-install
+++ /dev/null
@@ -1,253 +0,0 @@
---- navigator-v461.sparc-sun-sunos4.1.3_U1/ns-install.orig	Wed May  5 14:31:44 1999
-+++ navigator-v461.sparc-sun-sunos4.1.3_U1/ns-install	Thu May 20 12:03:01 1999
-@@ -84,22 +84,10 @@
- 	exit 1
- fi
- #
-+# We use OpenBSD's ports environment instead.
- #
--# If MOZILLA_HOME is set, assume that is the place to install.
--# Otherwise, make an educated guess at the "right" default
--# directory.
--#
--if test ! -z "${MOZILLA_HOME}"
--then
--	INSTALL_DIR="${MOZILLA_HOME}"
--else
--	if test -d /opt
--	then
--		INSTALL_DIR="/opt/netscape"
--	else
--		INSTALL_DIR="/usr/local/netscape"
--	fi
--fi
-+INSTALL_DIR="${PREFIX}/netscape"
-+
- #
- #
- # See if we have to use the lame SYS-V echo command flags.
-@@ -137,63 +125,22 @@
- 	fi
- done
- #
--echo ""
--echo "Please specify the directory path under which the software will be"
--echo "installed.  The default directory is ${INSTALL_DIR}, but you may"
--echo "install anywhere you wish (if you have permission to do so)."
--echo ""
- flag=1
- while test ${flag} -eq 1
- do
--	${ECHO} "Location for ${PRODUCT} software [${INSTALL_DIR}]: ${ENDER}"
--	read TARGET
--	if test -z "${TARGET}"
--	then
--		TARGET="${INSTALL_DIR}"
--	fi
--	if test ! -z "`echo ${TARGET} | grep '~'`"
--	then
--		TARGET=`echo ${TARGET} | sed "s:~:${HOME}:"`
--	fi
--#
-+	TARGET="${INSTALL_DIR}"
-+
- 	flag=0
- 	if test ! -d ${TARGET}
- 	then
--		echo ""
--		${ECHO} "${TARGET}: No such directory.  Do you wish to create it? (y/n)[y] ${ENDER}"
--		read check
--		if test "${check}" = "n" -o "${check}" = "N"
--		then
--			flag=1
--		else
--			#
--			# The -p flag may cause an error on some HP-UX systems.
--			# Removing the -p will work for 'basename TARGET' as long
--			# as 'dirname TARGET' exists.
--			#
--			mkdir -p ${TARGET}
--			if test $? -ne 0
--			then
--				echo "ERROR: Problem creating ${TARGET}"
--				exit 2
--			fi
--		fi
--	else
--		echo ""
--		echo "Existing '${TARGET}' directory found."
--		echo ""
--		echo "The existing contents may be modified or replaced if you install in"
--		echo "this directory.  If you choose not to install in '${TARGET}',"
--		echo "you will be prompted for a different directory."
--		echo ""
--		${ECHO} "Do you wish to install in '${TARGET}'? (y/n)[y] ${ENDER}"
--		read check
--		if test "${check}" = "n" -o "${check}" = "N"
-+		mkdir -p ${TARGET}
-+		if test $? -ne 0
- 		then
--			flag=1
-+		    echo "ERROR: Problem creating ${TARGET}"
-+		    exit 2
- 		fi
- 	fi
--#
-+
- 	if test ${flag} -eq 0
- 	then
- 		(echo "Write test." 2>/dev/null > ${TARGET}/${TESTFILE}) 2>/dev/null
-@@ -217,13 +164,6 @@
- echo ""
- echo "Installing ${PRODUCT} files..."
- #
--#
--# Make a list of the files in this package, so we can check for
--# existing files with the same names and save them.
--#
--FILELIST="`${GZIP} -dc ${PACKAGE} | tar -tvf - | awk '{print $NF}'`"
--#
--#
- # Keep a log of this installation for reference.
- #
- LOGFILE="ns-install.log-$$"
-@@ -231,30 +171,6 @@
- echo "Files installed:" >> ${LOGFILE}
- echo "================" >> ${LOGFILE}
- #
--#
--# Check for existing files and move them out of the way.
--#
--if test -d ${TARGET}/java/classes
--then
--	echo " ==> moving existing '${TARGET}/java/classes' to '${TARGET}/java/classes.old'"; \
--	/bin/rm -rf ${TARGET}/java/classes.old
--	mv ${TARGET}/java/classes ${TARGET}/java/classes.old
--fi
--for i in ${FILELIST}
--do
--	echo "${i}" >> ${LOGFILE}
--	if test ! -d ${TARGET}/${i}
--	then
--		(cd ${TARGET}; \
--		 /bin/rm -f ${i}.old; \
--		 if test -f ${i}; then \
--			echo " ==> moving existing '${TARGET}/${i}' to '${TARGET}/${i}.old'"; \
--			mv ${i} ${i}.old; \
--		 fi)
--	fi
--done
--#
--#
- # Actually install the package in TARGET.
- #
- ${GZIP} -dc ${PACKAGE} | (cd ${TARGET}; tar -x${TAR_OPTIONS}f -)
-@@ -269,33 +185,28 @@
- then
- 	echo ""
- 	echo "Installing ${PRODUCT} Java files..."
-+	/bin/rm -rf ${TARGET}/java
- 	if test ! -d ${TARGET}/java/classes
- 	then
- 		(cd ${TARGET}; mkdir -p java/classes)
- 	fi
- 	for i in *.jar
- 	do
--		if test -f ${TARGET}/java/classes/${i}
--		then
--			echo " ==> moving existing '${TARGET}/java/classes/${i}' to '${TARGET}/java/classes/${i}.old'"
--			/bin/rm -f ${TARGET}/java/classes/${i}.old
--			mv ${TARGET}/java/classes/${i} ${TARGET}/java/classes/${i}.old
--		fi
- 		tar -cf - ${i} | (cd ${TARGET}/java/classes; tar -xf -)
- 		echo "${i}" >> ${LOGFILE}
--		/bin/rm -f ${TARGET}/${i} ./${i}
-+		/bin/rm -f ${TARGET}/${i}
- 		echo "${i},${BLDVERS},${TARGET}/java/classes" >> ${REG_INFILE}
- 	done
--#
-+
- 	#
- 	# Try to properly deal with the font.properties files, to hopefully
- 	# avoid users having to set MOZILLA_JAVA_FONT_PROPERTY_PATH, or
- 	# just assuming Java font-handling is broken.
- 	#
--	if test ! -z "`ls /bin/uname`"
-+	if test ! -z "`ls /usr/bin/uname`"
- 	then
- 		MOVE_FONTS="TRUE"
--		case `/bin/uname` in
-+		case `/usr/bin/uname` in
- 			AIX)
- 				PLATFORM="aix"
- 				;;
-@@ -317,19 +228,6 @@
- 			mv ${TARGET}/java/classes/${PLATFORM}/* ${TARGET}/java/classes/.
- 		fi
- 	fi
--#
--	#
--	# Is this a virgin install?  If so, create the .netscape dir
--	# and put the default bookmark file in it.
--	#
--	if test ! -d ${HOME}/.netscape
--	then
--		# New install, or upgrade from 0.x or 1.x.
--		mkdir ${HOME}/.netscape
--		cp ${TARGET}/bookmark.htm ${HOME}/.netscape/bookmarks.html
--		chmod 644 ${HOME}/.netscape/bookmarks.html
--		echo "${HOME}/.netscape/bookmarks.html" >> ${LOGFILE}
--	fi
- fi
- #
- echo ""
-@@ -356,7 +254,6 @@
- 	esac
- 	${GZIP} -dc ${pkg} | (cd ${TARGET}; tar -x${TAR_OPTIONS}f -)
- 	echo "${pkg},${BLDVERS},${TARGET}" >> ${REG_INFILE}
--	/bin/rm -f ${pkg}
- done
- #
- #
-@@ -374,20 +271,7 @@
- #
- # Install the vreg binary in the TARGET directory.
- #
--if test -f ${TARGET}/vreg
--then
--	/bin/rm -f ${TARGET}/vreg.old
--	mv ${TARGET}/vreg ${TARGET}/vreg.old
--	# Handle the case where TARGET == . (meaning we just moved the file we just installed).
--	if test ! -f ./vreg
--	then
--		mv ${TARGET}/vreg.old ${TARGET}/vreg
--	else
--		mv ./vreg ${TARGET}/vreg
--	fi
--else
--	mv ./vreg ${TARGET}/vreg
--fi
-+cp ./vreg ${TARGET}/vreg
- #
- #
- # Register the product so Automatic Software Download can work.
-@@ -413,7 +297,6 @@
- 	awk '{printf("\techo \"%s\" >>/tmp/infile\n", $0)}' ${REG_INFILE}
- 	echo "	${TARGET}/vreg ${TARGET}/${VREGISTRY} /tmp/infile"
- 	echo ""
--	/bin/rm -f ns-install ${PACKAGE} ${REG_INFILE} core
- 	exit 3
- fi
- #
-@@ -422,11 +305,6 @@
- echo "The Netscape ${PRODUCT} software installation is complete."
- echo ""
- echo ""
--#
--#
--# Get rid of the trash.
--#
--/bin/rm -f ns-install ${PACKAGE} ${REG_INFILE}
- #
- echo ""
- exit 0
diff --git a/www/netscape/navigator-old/pkg/COMMENT b/www/netscape/navigator-old/pkg/COMMENT
deleted file mode 100644
index 9792e60811e..00000000000
--- a/www/netscape/navigator-old/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-Netscape Navigator WWW browser with 128-bit encryption
diff --git a/www/netscape/navigator-old/pkg/DESCR b/www/netscape/navigator-old/pkg/DESCR
deleted file mode 100644
index b186ecb66df..00000000000
--- a/www/netscape/navigator-old/pkg/DESCR
+++ /dev/null
@@ -1,20 +0,0 @@
-Netscape stand-alone Navigator 4.61, fortified
-----------------------------------------------
-
-Release notes for this version of Netscape are available on-line.  After
-starting the program, select "Release Notes" from the "Help" menu.  This
-will take you to the URL
-
-    http://home.netscape.com/eng/mozilla/4.61/relnotes/unix-4.61.html
-
-which lists new features and known problems of this release.
-
-This version of Netscape has been modified for OpenBSD using Fortify,
-a program that provides world-wide, unconditional, full strength
-128-bit cryptography to export-crippled Netscape browsers.
-
-SPARC NOTICE
-------------
-Use of this port requires a kernel compiled with 'option COMPAT_SUNOS'
-
-WWW: ${HOMEPAGE}
diff --git a/www/netscape/navigator-old/pkg/PLIST.sparc b/www/netscape/navigator-old/pkg/PLIST.sparc
deleted file mode 100644
index 2dbb0eaecd2..00000000000
--- a/www/netscape/navigator-old/pkg/PLIST.sparc
+++ /dev/null
@@ -1,101 +0,0 @@
-@comment $OpenBSD: PLIST.sparc,v 1.2 2000/08/04 20:54:20 brad Exp $
-@pkgcfl communicator-*
-netscape/README
-netscape/LICENSE
-netscape/netscape
-netscape/netscape_nis
-netscape/Netscape.ad
-netscape/XKeysymDB
-netscape/bookmark.htm
-netscape/dynfonts/libTrueDoc.so
-netscape/nls/C
-netscape/nls/nls.dir
-netscape/java/classes/resource.jar
-netscape/java/classes/ifc11.jar
-netscape/java/classes/iiop10.jar
-netscape/java/classes/jae40.jar
-netscape/java/classes/java40.jar
-netscape/java/classes/jio40.jar
-netscape/java/classes/jsd10.jar
-netscape/java/classes/ldap30.jar
-netscape/java/classes/scd10.jar
-netscape/nethelp/Back_dep.gif
-netscape/nethelp/Topic.js
-netscape/nethelp/System.js
-netscape/nethelp/Stack.js
-netscape/nethelp/Local-1.js
-netscape/nethelp/IdxData.js
-netscape/nethelp/Header.js
-netscape/nethelp/CntTool.js
-netscape/nethelp/CntData.js
-netscape/nethelp/Button.js
-netscape/nethelp/ToolUI.htm
-netscape/nethelp/System.htm
-netscape/nethelp/Status.htm
-netscape/nethelp/NoJSerr.htm
-netscape/nethelp/NavUI.htm
-netscape/nethelp/NSHIfrm.htm
-netscape/nethelp/IdxTopic.htm
-netscape/nethelp/IdxTool.htm
-netscape/nethelp/IdxKey.htm
-netscape/nethelp/IdxFill.htm
-netscape/nethelp/CntTool.htm
-netscape/nethelp/Blank.htm
-netscape/nethelp/Wait.gif
-netscape/nethelp/Tool_up.gif
-netscape/nethelp/Tool_sel.gif
-netscape/nethelp/Tool_dep.gif
-netscape/nethelp/Prnt_up.gif
-netscape/nethelp/Prnt_sel.gif
-netscape/nethelp/Prnt_dep.gif
-netscape/nethelp/Forw_up.gif
-netscape/nethelp/Forw_sel.gif
-netscape/nethelp/Forw_dis.gif
-netscape/nethelp/Forw_dep.gif
-netscape/nethelp/Exit_up.gif
-netscape/nethelp/Exit_sel.gif
-netscape/nethelp/Exit_dep.gif
-netscape/nethelp/Back_up.gif
-netscape/nethelp/Back_sel.gif
-netscape/nethelp/Back_dis.gif
-netscape/nethelp/Utility.js
-netscape/nethelp/netwatch.gif
-netscape/nethelp/picsfail.htm
-netscape/nethelp/picsfail.jar
-netscape/nethelp/netscape/home/home.gif
-netscape/nethelp/netscape/home/home.htm
-netscape/nethelp/netscape/home/homeHdr.htm
-netscape/nethelp/netscape/home/help.hpf
-netscape/nethelp/netscape/navigatr/navigatr.gif
-netscape/nethelp/netscape/navigatr/nav.htm
-netscape/nethelp/netscape/navigatr/navHdr.htm
-netscape/nethelp/netscape/navigatr/help.hpf
-netscape/nethelp/netscape/shared/collIcon.gif
-netscape/nethelp/netscape/shared/commIcon.gif
-netscape/nethelp/netscape/shared/navIcon.gif
-netscape/nethelp/netscape/shared/netIcon.gif
-netscape/nethelp/netscape/shared/NetHelpm.css
-netscape/nethelp/netscape/shared/NetHelpu.css
-netscape/nethelp/netscape/shared/NetHelpw.css
-netscape/nethelp/netscape/shared/calIcon.gif
-netscape/nethelp/netscape/shared/admnIcon.gif
-netscape/nethelp/netscape/shared/compIcon.gif
-netscape/nethelp/netscape/shared/confIcon.gif
-netscape/nethelp/netscape/shared/ibmIcon.gif
-netscape/nethelp/netscape/shared/messIcon.gif
-netscape/plugins/cpPack1.jar
-netscape/plugins/libnullplugin.so
-netscape/vreg
-netscape/registry
-bin/netscape
-@dirrm netscape/dynfonts
-@dirrm netscape/plugins
-@dirrm netscape/nethelp/netscape/shared
-@dirrm netscape/nethelp/netscape/navigatr
-@dirrm netscape/nethelp/netscape/home
-@dirrm netscape/nethelp/netscape
-@dirrm netscape/nethelp
-@dirrm netscape/java/classes
-@dirrm netscape/java
-@dirrm netscape/nls
-@dirrm netscape
diff --git a/www/netscape/navigator/Makefile b/www/netscape/navigator/Makefile
index 3cfbe9abd38..bb929fbf617 100644
--- a/www/netscape/navigator/Makefile
+++ b/www/netscape/navigator/Makefile
@@ -1,20 +1,14 @@
-# $OpenBSD: Makefile,v 1.4 2000/07/09 21:57:38 brad Exp $
+# $OpenBSD: Makefile,v 1.5 2000/08/31 10:04:45 brad Exp $
 
-ONLY_FOR_ARCHS=	i386
-NEED_VERSION=	1.310
+#ONLY_FOR_ARCHS=	i386
+NEED_VERSION=	1.322
 
-PROGRAM_V=	4.73
-V2:=${PROGRAM_V:S/.//}
+PROGRAM_V=	4.75
+V2:=		${PROGRAM_V:S/.//}
 
-DISTNAME=	navigator-v${V2}-export.x86-bsdi-bsd2
+DISTNAME=	navigator-v${V2}-us.x86-bsdi-bsd2
+PKGNAME=	navigator-${PROGRAM_V}
 LOCATION=	bsdi21/navigator_standalone
 DIRNAME=	navigator-v${V2}.x86-bsdi-bsd2
 
-PKGNAME=	navigator-${PROGRAM_V}
-
-pre-patch:
-	@cd ${WRKDIR}/Fortify-1.4.6-unix-src/x86-bsdi-bsd2 && \
-	   mkdir nav-4.73 && \
-	   cp nav-4.72/morphs-1.2 nav-4.73
-
 .include <bsd.port.mk>
diff --git a/www/netscape/navigator/files/md5 b/www/netscape/navigator/files/md5
index f2c290b0657..210b52d43a8 100644
--- a/www/netscape/navigator/files/md5
+++ b/www/netscape/navigator/files/md5
@@ -1,6 +1,3 @@
-MD5 (netscape/Fortify-1.4.6-unix-src.tar.gz) = 129ab43043a62e7494b991ab5182c1f8
-MD5 (netscape/navigator-v473-export.x86-bsdi-bsd2.tar.gz) = af6995971ae513e25ac760c9c8d3565b
-RMD160 (netscape/Fortify-1.4.6-unix-src.tar.gz) = ac85a7993c100c7584c35e61be4e8ae0a72d1949
-RMD160 (netscape/navigator-v473-export.x86-bsdi-bsd2.tar.gz) = 38a515267192215ee7235d9a9262bff5b6de3e2f
-SHA1 (netscape/Fortify-1.4.6-unix-src.tar.gz) = a1debcb3c7d2d5dbb9f638b7713bc2544dcea3cd
-SHA1 (netscape/navigator-v473-export.x86-bsdi-bsd2.tar.gz) = 05ccaf758526a391a3c70c305dc7d5ef8fbf73c1
+MD5 (netscape/navigator-v475-us.x86-bsdi-bsd2.tar.gz) = 35db9c1fc5db01131d99167b6746df9f
+RMD160 (netscape/navigator-v475-us.x86-bsdi-bsd2.tar.gz) = 9bc448cad0c219d46bf0fd7a63637fc3790c9242
+SHA1 (netscape/navigator-v475-us.x86-bsdi-bsd2.tar.gz) = 692313695679be2770e964508d4e52519629c76c
diff --git a/www/netscape/navigator/files/netscape.i386 b/www/netscape/navigator/files/netscape.i386
index c40075f911e..ab6d7bd6d98 100644
--- a/www/netscape/navigator/files/netscape.i386
+++ b/www/netscape/navigator/files/netscape.i386
@@ -1,7 +1,7 @@
 #!/bin/sh
-# $OpenBSD: netscape.i386,v 1.1.1.1 2000/04/09 15:50:16 espie Exp $
+# $OpenBSD: netscape.i386,v 1.2 2000/08/31 10:04:46 brad Exp $
 #
-# Wrapper for the fortified Netscape navigator program.
+# Wrapper for Netscape Navigator.
 
 MOZILLA_HOME=@netscape_home@
 export MOZILLA_HOME
diff --git a/www/netscape/navigator/patches.i386/patch-Index b/www/netscape/navigator/patches.i386/patch-Index
deleted file mode 100644
index 527285d1ca9..00000000000
--- a/www/netscape/navigator/patches.i386/patch-Index
+++ /dev/null
@@ -1,10 +0,0 @@
---- Fortify-1.4.6-unix-src/Index.orig	Sun Jul  9 12:54:42 2000
-+++ Fortify-1.4.6-unix-src/Index	Sun Jul  9 13:01:56 2000
-@@ -1378,6 +1378,7 @@
- 7136964  - 4182af939a243b0551d5d98dfe9f4323 nav 4.72 0 2 morphs-1.2 sparc-sun-solaris2.4 -
- 7609364  - d0a141a021590b650648eda176e0e031 nav 4.72 0 2 morphs-1.2 sparc-sun-solaris2.5.1 -
- 6955008  - 95de11f985a25b077a989adb22f8882f nav 4.72 0 2 morphs-1.2 x86-bsdi-bsd2 -
-+6955008  - dbaaefbcfc521a93bb6a5e7b41bfe63e nav 4.73 0 2 morphs-1.2 x86-bsdi-bsd2 -
- 6234712  - 34d468fc0c267a7d014822a1ce254bc5 nav 4.72 0 2 morphs-1.2 x86-sun-solaris2.4 -
- 6258900  - a68b79739f92c675691e81b41f2f5bfc nav 4.72 0 2 morphs-1.2 x86-sun-solaris2.5.1 -
- 7741440  - 604f30e0b2da238ecfd9444bf250f103 nav 4.72 0 2 morphs-1.2 x86-unknown-freebsd -
diff --git a/www/netscape/navigator/patches.i386/patch-morphs-1.2 b/www/netscape/navigator/patches.i386/patch-morphs-1.2
deleted file mode 100644
index fb7e7dcc26e..00000000000
--- a/www/netscape/navigator/patches.i386/patch-morphs-1.2
+++ /dev/null
@@ -1,11 +0,0 @@
---- Fortify-1.4.6-unix-src/x86-bsdi-bsd2/nav-4.73/morphs-1.2.orig	Sun Jul  9 13:32:14 2000
-+++ Fortify-1.4.6-unix-src/x86-bsdi-bsd2/nav-4.73/morphs-1.2	Sun Jul  9 13:03:42 2000
-@@ -33,7 +33,7 @@
- 
- init {
- 	grammar		1.2
--	target		"nav-v472-export.x86-bsdi-bsd2"
-+	target		"nav-v473-export.x86-bsdi-bsd2"
- 	text_offset	0x1000
- 	data_offset	0x1000
- 	rodata_offset	0x1000
diff --git a/www/netscape/navigator/patches.i386/patch-ns-install b/www/netscape/navigator/patches.i386/patch-ns-install
index f0bf01585d8..be77a30f3de 100644
--- a/www/netscape/navigator/patches.i386/patch-ns-install
+++ b/www/netscape/navigator/patches.i386/patch-ns-install
@@ -1,5 +1,5 @@
---- navigator-v473.x86-bsdi-bsd2/ns-install.orig	Fri May  5 12:40:55 2000
-+++ navigator-v473.x86-bsdi-bsd2/ns-install	Sun Jul  9 17:37:40 2000
+--- ns-install.orig	Tue Aug 15 20:40:40 2000
++++ ns-install	Thu Aug 31 05:53:42 2000
 @@ -84,22 +84,10 @@
  	exit 1
  fi
diff --git a/www/netscape/navigator/pkg/DESCR b/www/netscape/navigator/pkg/DESCR
index 405e85f4cdd..bcbbd231aa0 100644
--- a/www/netscape/navigator/pkg/DESCR
+++ b/www/netscape/navigator/pkg/DESCR
@@ -1,18 +1,14 @@
-Netscape stand-alone Navigator 4.73, fortified
-----------------------------------------------
+Netscape stand-alone Navigator 4.75
+-----------------------------------
 
 Release notes for this version of Netscape are available on-line.  After
 starting the program, select "Release Notes" from the "Help" menu.  This
 will take you to the URL
 
-    http://home.netscape.com/eng/mozilla/4.7/relnotes/unix-4.73.html
+    http://home.netscape.com/eng/mozilla/4.7/relnotes/unix-4.75.html
 
 which lists new features and known problems of this release.
 
-This version of Netscape has been modified for OpenBSD using Fortify,
-a program that provides world-wide, unconditional, full strength
-128-bit cryptography to export-crippled Netscape browsers.
-
 i386 NOTICE
 -----------
 Use of this port requires a kernel compiled with 'option COMPAT_BSDOS'