Fix my fubar'd import of this port, update fortify.

NOTE: If an old version of netscape* exists on the system, this program
will rename them, and that will break PLIST on deinstall. Any ideas on how
to dynamically adapt to this would be neat.

Submitted by:	David O'Brien <obrien@FreeBSD.org>

4 files changed, 22 insertions, 50 deletions

diff --git a/www/bsdi-netscape47-navigator/Makefile b/www/bsdi-netscape47-navigator/Makefile
index 154edfe751b8..ca0c293d330e 100644
--- a/www/bsdi-netscape47-navigator/Makefile
+++ b/www/bsdi-netscape47-navigator/Makefile
@@ -3,32 +3,31 @@
 # Date created:         20 Sept 1998
 # Whom:                 brett@peloton.physics.montana.edu
 #
-# $Id: Makefile,v 1.27 1998/11/18 23:14:01 billf Exp $
+# $Id: Makefile,v 1.28 1998/11/19 21:57:42 billf Exp $
 #
 
-DISTNAME=       netscape-navigator-4.5b2
+DISTNAME=       netscape-navigator-4.5
 CATEGORIES=	www
-MASTER_SITES=   ftp://ftp.netscape.com/pub/communicator/4.5/4.5_PR2/english/unix/unsupported/freebsd/navigator_standalone/
-DISTFILES=      navigator-v45b2-export.x86-unknown-freebsd.tar.gz
+MASTER_SITES=   ftp://ftp.netscape.com/pub/communicator/4.5/english/unix/unsupported/freebsd/navigator_standalone/
+DISTFILES=      navigator-v45-export.x86-unknown-freebsd.tar.gz
 
 MAINTAINER=     ports@FreeBSD.ORG
 
-BROKEN=		needs upgrade.
 NO_LATEST_LINK=	yes
-WRKSRC=         ${WRKDIR}/navigator-v45b2.x86-unknown-freebsd
+WRKSRC=         ${WRKDIR}/navigator-v45.x86-unknown-freebsd
 NO_BUILD=       Yes
 
 NDIR=           ${PREFIX}/lib/netscape
 BINDIR=		${PREFIX}/bin
 
-.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.2-unix.tar.gz
+DISTFILES+=	Fortify-1.3.0-unix-x86.tar.gz
 RESTRICTED=     "Contains strong cryptography"
 .endif
 
-.if !defined(USE_128BIT) && defined(USA_RESIDENT) && ${USA_RESIDENT} == NO
+.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"
@@ -37,15 +36,15 @@ pre-extract:
 do-install:
 	cd ${WRKSRC} && yes "" | \
 	    LC_TIME=C MOZILLA_HOME="${NDIR}" ./ns-install
-	mv -f ${NDIR}/netscape ${NDIR}/navigator-4.5.bin
+	${MV} -f ${NDIR}/netscape ${NDIR}/navigator-4.5.bin
 	${INSTALL_SCRIPT} ${WRKSRC}/netscape ${BINDIR}/navigator-4.5
 	ln -sf navigator-4.5 ${BINDIR}/navigator-4
 	ln -sf navigator-4 ${BINDIR}/netscape
 	if [ ! -f ${NDIR}/mailcap ] ; then \
 	    ${INSTALL_DATA} ${FILESDIR}/mailcap ${NDIR}; \
 	fi
-.if defined(USE_128BIT) && defined(USA_RESIDENT) && ${USA_RESIDENT} == NO
-	cd ${WRKDIR}/Fortify-1.2.2-unix && \
+.if defined(USE_128BIT)
+	cd ${WRKDIR}/Fortify-1.3.0-unix-x86 && \
 		(${ECHO} yes ; ${ECHO} no) | ./Fortify.sh ${NDIR}/navigator-4.5.bin
 .endif
 	chown -R bin.bin ${NDIR}
diff --git a/www/bsdi-netscape47-navigator/pkg-plist b/www/bsdi-netscape47-navigator/pkg-plist
index c741048af9f0..94184ea1c47b 100644
--- a/www/bsdi-netscape47-navigator/pkg-plist
+++ b/www/bsdi-netscape47-navigator/pkg-plist
@@ -8,7 +8,6 @@ lib/netscape/LICENSE
 lib/netscape/Netscape.ad
 lib/netscape/XKeysymDB
 lib/netscape/plugins/libnullplugin.so
-lib/netscape/libAutoAdmin.so
 lib/netscape/bookmark.htm
 lib/netscape/vreg
 lib/netscape/navigator-4.5.bin
@@ -115,10 +114,6 @@ lib/netscape/nethelp/Back_up.gif
 lib/netscape/nethelp/Back_sel.gif
 lib/netscape/nethelp/Back_dis.gif
 lib/netscape/nethelp/Utility.js
-lib/netscape/nethelp/netscape/collabra/security.gif
-lib/netscape/nethelp/netscape/collabra/coll.htm
-lib/netscape/nethelp/netscape/collabra/collHdr.htm
-lib/netscape/nethelp/netscape/collabra/help.hpf
 lib/netscape/nethelp/netscape/home/home.gif
 lib/netscape/nethelp/netscape/home/home.htm
 lib/netscape/nethelp/netscape/home/homeHdr.htm
@@ -127,22 +122,14 @@ lib/netscape/nethelp/netscape/navigatr/navigatr.gif
 lib/netscape/nethelp/netscape/navigatr/nav.htm
 lib/netscape/nethelp/netscape/navigatr/navHdr.htm
 lib/netscape/nethelp/netscape/navigatr/help.hpf
-lib/netscape/nethelp/netscape/netcastr/netcastr.gif
-lib/netscape/nethelp/netscape/netcastr/net.htm
-lib/netscape/nethelp/netscape/netcastr/netHdr.htm
-lib/netscape/nethelp/netscape/netcastr/help.hpf
 lib/netscape/nethelp/netscape/shared/collIcon.gif
 lib/netscape/nethelp/netscape/shared/commIcon.gif
 lib/netscape/nethelp/netscape/shared/navIcon.gif
 lib/netscape/nethelp/netscape/shared/netIcon.gif
-lib/netscape/nethelp/netscape/shared/Contents.htm
-lib/netscape/nethelp/netscape/shared/NetHelp1.css
 @dirrm lib/netscape/plugins
 @dirrm lib/netscape/nethelp/netscape/shared
-@dirrm lib/netscape/nethelp/netscape/netcastr
 @dirrm lib/netscape/nethelp/netscape/navigatr
 @dirrm lib/netscape/nethelp/netscape/home
-@dirrm lib/netscape/nethelp/netscape/collabra
 @dirrm lib/netscape/nethelp/netscape
 @dirrm lib/netscape/nethelp
 @dirrm lib/netscape/java/classes/irix
diff --git a/www/netscape47-navigator/Makefile b/www/netscape47-navigator/Makefile
index 154edfe751b8..ca0c293d330e 100644
--- a/www/netscape47-navigator/Makefile
+++ b/www/netscape47-navigator/Makefile
@@ -3,32 +3,31 @@
 # Date created:         20 Sept 1998
 # Whom:                 brett@peloton.physics.montana.edu
 #
-# $Id: Makefile,v 1.27 1998/11/18 23:14:01 billf Exp $
+# $Id: Makefile,v 1.28 1998/11/19 21:57:42 billf Exp $
 #
 
-DISTNAME=       netscape-navigator-4.5b2
+DISTNAME=       netscape-navigator-4.5
 CATEGORIES=	www
-MASTER_SITES=   ftp://ftp.netscape.com/pub/communicator/4.5/4.5_PR2/english/unix/unsupported/freebsd/navigator_standalone/
-DISTFILES=      navigator-v45b2-export.x86-unknown-freebsd.tar.gz
+MASTER_SITES=   ftp://ftp.netscape.com/pub/communicator/4.5/english/unix/unsupported/freebsd/navigator_standalone/
+DISTFILES=      navigator-v45-export.x86-unknown-freebsd.tar.gz
 
 MAINTAINER=     ports@FreeBSD.ORG
 
-BROKEN=		needs upgrade.
 NO_LATEST_LINK=	yes
-WRKSRC=         ${WRKDIR}/navigator-v45b2.x86-unknown-freebsd
+WRKSRC=         ${WRKDIR}/navigator-v45.x86-unknown-freebsd
 NO_BUILD=       Yes
 
 NDIR=           ${PREFIX}/lib/netscape
 BINDIR=		${PREFIX}/bin
 
-.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.2-unix.tar.gz
+DISTFILES+=	Fortify-1.3.0-unix-x86.tar.gz
 RESTRICTED=     "Contains strong cryptography"
 .endif
 
-.if !defined(USE_128BIT) && defined(USA_RESIDENT) && ${USA_RESIDENT} == NO
+.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"
@@ -37,15 +36,15 @@ pre-extract:
 do-install:
 	cd ${WRKSRC} && yes "" | \
 	    LC_TIME=C MOZILLA_HOME="${NDIR}" ./ns-install
-	mv -f ${NDIR}/netscape ${NDIR}/navigator-4.5.bin
+	${MV} -f ${NDIR}/netscape ${NDIR}/navigator-4.5.bin
 	${INSTALL_SCRIPT} ${WRKSRC}/netscape ${BINDIR}/navigator-4.5
 	ln -sf navigator-4.5 ${BINDIR}/navigator-4
 	ln -sf navigator-4 ${BINDIR}/netscape
 	if [ ! -f ${NDIR}/mailcap ] ; then \
 	    ${INSTALL_DATA} ${FILESDIR}/mailcap ${NDIR}; \
 	fi
-.if defined(USE_128BIT) && defined(USA_RESIDENT) && ${USA_RESIDENT} == NO
-	cd ${WRKDIR}/Fortify-1.2.2-unix && \
+.if defined(USE_128BIT)
+	cd ${WRKDIR}/Fortify-1.3.0-unix-x86 && \
 		(${ECHO} yes ; ${ECHO} no) | ./Fortify.sh ${NDIR}/navigator-4.5.bin
 .endif
 	chown -R bin.bin ${NDIR}
diff --git a/www/netscape47-navigator/pkg-plist b/www/netscape47-navigator/pkg-plist
index c741048af9f0..94184ea1c47b 100644
--- a/www/netscape47-navigator/pkg-plist
+++ b/www/netscape47-navigator/pkg-plist
@@ -8,7 +8,6 @@ lib/netscape/LICENSE
 lib/netscape/Netscape.ad
 lib/netscape/XKeysymDB
 lib/netscape/plugins/libnullplugin.so
-lib/netscape/libAutoAdmin.so
 lib/netscape/bookmark.htm
 lib/netscape/vreg
 lib/netscape/navigator-4.5.bin
@@ -115,10 +114,6 @@ lib/netscape/nethelp/Back_up.gif
 lib/netscape/nethelp/Back_sel.gif
 lib/netscape/nethelp/Back_dis.gif
 lib/netscape/nethelp/Utility.js
-lib/netscape/nethelp/netscape/collabra/security.gif
-lib/netscape/nethelp/netscape/collabra/coll.htm
-lib/netscape/nethelp/netscape/collabra/collHdr.htm
-lib/netscape/nethelp/netscape/collabra/help.hpf
 lib/netscape/nethelp/netscape/home/home.gif
 lib/netscape/nethelp/netscape/home/home.htm
 lib/netscape/nethelp/netscape/home/homeHdr.htm
@@ -127,22 +122,14 @@ lib/netscape/nethelp/netscape/navigatr/navigatr.gif
 lib/netscape/nethelp/netscape/navigatr/nav.htm
 lib/netscape/nethelp/netscape/navigatr/navHdr.htm
 lib/netscape/nethelp/netscape/navigatr/help.hpf
-lib/netscape/nethelp/netscape/netcastr/netcastr.gif
-lib/netscape/nethelp/netscape/netcastr/net.htm
-lib/netscape/nethelp/netscape/netcastr/netHdr.htm
-lib/netscape/nethelp/netscape/netcastr/help.hpf
 lib/netscape/nethelp/netscape/shared/collIcon.gif
 lib/netscape/nethelp/netscape/shared/commIcon.gif
 lib/netscape/nethelp/netscape/shared/navIcon.gif
 lib/netscape/nethelp/netscape/shared/netIcon.gif
-lib/netscape/nethelp/netscape/shared/Contents.htm
-lib/netscape/nethelp/netscape/shared/NetHelp1.css
 @dirrm lib/netscape/plugins
 @dirrm lib/netscape/nethelp/netscape/shared
-@dirrm lib/netscape/nethelp/netscape/netcastr
 @dirrm lib/netscape/nethelp/netscape/navigatr
 @dirrm lib/netscape/nethelp/netscape/home
-@dirrm lib/netscape/nethelp/netscape/collabra
 @dirrm lib/netscape/nethelp/netscape
 @dirrm lib/netscape/nethelp
 @dirrm lib/netscape/java/classes/irix