Upgrade to v4.74.

No response from: maintainer

5 files changed, 41 insertions, 45 deletions

diff --git a/www/bsdi-netscape47-communicator/Makefile b/www/bsdi-netscape47-communicator/Makefile
index 645ec39a06a8..cfd03cfbee95 100644
--- a/www/bsdi-netscape47-communicator/Makefile
+++ b/www/bsdi-netscape47-communicator/Makefile
@@ -7,40 +7,37 @@
 #
 
 PORTNAME=	bsdi-netscape-${BROWSER}
-PORTVERSION=	${BROWSER_VER}
-CATEGORIES=	www
-
-.if !defined(MASTER_SITES)
-MASTER_SITES=	ftp://ftp.netscape.com/pub/communicator/english/4.73/unix/unsupported/bsdi21/complete_install/ \
-		ftp://ftp.sunet.se/pub/www/Netscape/communicator/english/4.73/unix/unsupported/bsdi21/complete_install/
-.endif
-
-DISTFILES=	${BROWSER}-v473-export.x86-bsdi-bsd2.tar.gz
 
 MAINTAINER=	trevor@jpj.net
 
-NO_FORTIFY=	"frozen until further notice--http://www.fortify.net/latest_main.html"
-
-RUN_DEPENDS=	netscape:${PORTSDIR}/www/netscape-wrapper
-
 ONLY_FOR_ARCHS=	i386
 
+NETSCAPE_DIST_ARCH=	unsupported/bsdi21
+NETSCAPE_DIST_TAG=	x86-bsdi-bsd2
+
 # don't overwrite the FreeBSD port's shell script wrapper in ${PREFIX}/bin
 BROWSER_ARC=	${BROWSER}-bsdi
 
-MASTERDIR=	${.CURDIR}/../netscape4-communicator
-WRKSRC=		${WRKDIR}/${BROWSER}-v473.x86-bsdi-bsd2
-
-BROWSER_VER=	4.73
-#	taken from ,${BLDVERS} in ns-install
-INFILE_HEAD?=	'Communicator,4.73.0.20000502'
-NO_AUTOADMIN=	yes
-
 MAILCAP=	${.CURDIR}/../bsdi-netscape47-communicator/files/mailcap
 NSUBDIR=	lib/netscape-bsdi
 
-PRE_MK_INCLUDED=	yes
 # don't require a.out libraries
 WITHOUT_AOUT=		yes
 
-.include "${MASTERDIR}/Makefile"
+pre-fetch:
+	@${ECHO} "************************************************************"
+	@${ECHO} "None of the Software or underlying information or technology"
+	@${ECHO} "may be downloaded or otherwise exported or re-exported (i)"
+	@${ECHO} "into (or to a national or resident of) Cuba, Iraq, Libya,"
+	@${ECHO} "Sudan, North Korea, Iran, Syria or any other country to"
+	@${ECHO} "which the U.S.  has embargoed goods; or (ii) to anyone on"
+	@${ECHO} "the U.S.  Treasury Department's list of Specially Designated"
+	@${ECHO} "Nationals or the U.S.  Commerce Department's Table of Denial"
+	@${ECHO} "Orders.  By downloading or using the Software, you are"
+	@${ECHO} "agreeing to the foregoing and you are representing and"
+	@${ECHO} "warranting that you are not located in, under the control"
+	@${ECHO} "of, or a national or resident of any such country or on"
+	@${ECHO} "any such list."
+	@${ECHO} "************************************************************"
+
+.include "../netscape47-communicator/Makefile"
diff --git a/www/bsdi-netscape47-communicator/pkg-descr b/www/bsdi-netscape47-communicator/pkg-descr
index a93297852712..39f744b76207 100644
--- a/www/bsdi-netscape47-communicator/pkg-descr
+++ b/www/bsdi-netscape47-communicator/pkg-descr
@@ -1,15 +1,15 @@
 This is the BSDI BSD/OS version of the Netscape Communicator suite
-(Navigator Web browser, Messenger e-mail and news reader, and
-Composer HTML editor).
-
-Unlike the FreeBSD version, this does not require a.out X libraries.
-
-If Java applets fail to display, do this:
-
-	# cd /usr/X11R6/lib/X11/fonts/misc
-	# /usr/X11R6/bin/mkfontdir
-	# chmod 444 fonts.dir
-
+(Navigator Web browser, Messenger MUA and news reader, and Composer
+HTML editor) with strong encryption.  Unlike the FreeBSD version,
+this does not require a.out X libraries (because it is statically
+linked).  This browser is under U.S. export restrictions.  Do "make
+pre-fetch" to determine whether you may download it.
+
+If Java applets fail to display, do this as root:
+	cd /usr/X11R6/lib/X11/fonts/misc
+	/usr/X11R6/bin/mkfontdir
+	chmod 444 fonts.dir
 then exit and restart your X server.
 
-Please read /usr/local/lib/netscape/LICENSE.
+Please read http://www.cert.org/advisories/CA-2000-08.html before
+sending sensitive information with this program.
diff --git a/www/bsdi-netscape47-navigator/Makefile b/www/bsdi-netscape47-navigator/Makefile
index f4146faca370..a63e8da30516 100644
--- a/www/bsdi-netscape47-navigator/Makefile
+++ b/www/bsdi-netscape47-navigator/Makefile
@@ -8,7 +8,4 @@
 
 BROWSER=	navigator
 
-MASTER_SITES=	ftp://ftp.netscape.com/pub/communicator/english/4.73/unix/unsupported/bsdi21/navigator_standalone/ \
-		ftp://ftp.sunet.se/pub/www/Netscape/communicator/english/4.73/unix/unsupported/bsdi21/navigator_standalone/
-
 .include "../bsdi-netscape47-communicator/Makefile"
diff --git a/www/bsdi-netscape47-navigator/pkg-comment b/www/bsdi-netscape47-navigator/pkg-comment
index cb28e172d5b7..8a0673da52c1 100644
--- a/www/bsdi-netscape47-navigator/pkg-comment
+++ b/www/bsdi-netscape47-navigator/pkg-comment
@@ -1 +1 @@
-Navigator browser 4.73 for BSD/OS
+Netscape Navigator with 128-bit encryption for BSDI BSD/OS
diff --git a/www/bsdi-netscape47-navigator/pkg-descr b/www/bsdi-netscape47-navigator/pkg-descr
index 16a8a75ac945..19d893dc9c63 100644
--- a/www/bsdi-netscape47-navigator/pkg-descr
+++ b/www/bsdi-netscape47-navigator/pkg-descr
@@ -1,12 +1,14 @@
-This is the BSDI BSD/OS version of the Netscape Navigator Web browser.
-Unlike the FreeBSD version, this does not require a.out X libraries.
-
-If Java applets fail to display, do this:
+This is the BSDI BSD/OS version of the Netscape Navigator Web
+browser with strong encryption.  Unlike the FreeBSD version, this
+does not require a.out X libraries (because it is statically linked).
+This browser is under U.S. export restrictions.  Do "make pre-fetch"
+to determine whether you may download it.
 
+If Java applets fail to display, do:
 	# cd /usr/X11R6/lib/X11/fonts/misc
 	# /usr/X11R6/bin/mkfontdir
 	# chmod 444 fonts.dir
-
 then exit and restart your X server.
 
-Please read /usr/local/lib/netscape/LICENSE.
+Please read http://www.cert.org/advisories/CA-2000-08.html before
+sending sensitive information with this program.