Remove faulty 128 bit support. Correct name of distfile, correct directory

where distfile is located on netscape site. Provide backwards compatability
as install script was pointing (by default) to wrong binary. Fix md5 entry.
Note PR2 was buggy and unsupported and anyone who attempted to install the
PR2 version of this port should upgrade now.

2 files changed, 46 insertions, 56 deletions

diff --git a/www/bsdi-netscape47-communicator/Makefile b/www/bsdi-netscape47-communicator/Makefile
index bc07abe44b81..86d093391230 100644
--- a/www/bsdi-netscape47-communicator/Makefile
+++ b/www/bsdi-netscape47-communicator/Makefile
@@ -3,54 +3,49 @@
 # Date created:         24 Feb 1997
 # Whom:                 thepish
 #
-# $Id: Makefile,v 1.24 1998/09/03 08:21:40 asami Exp $
+# $Id: Makefile,v 1.25 1998/10/07 13:44:16 obrien Exp $
 #
 
-DISTNAME=       communicator-v45b2-export.x86-unknown-freebsd
-PKGNAME=       netscape-communicator-4.5b2
+DISTNAME=	communicator-v45-export.x86-unknown-freebsd
+PKGNAME=	netscape-communicator-4.5
 CATEGORIES=	www
-MASTER_SITES=   ftp://ftp.netscape.com/pub/communicator/4.5/4.5_PR2/english/unix/unsupported/freebsd/professional_edition/
+MASTER_SITES=   ftp://ftp.netscape.com/pub/communicator/4.5/english/unix/unsupported/freebsd/complete_install/
 
 MAINTAINER=     thepish@FreeBSD.ORG
 
 NO_LATEST_LINK=	yes
-WRKSRC=         ${WRKDIR}/communicator-v45b2.x86-unknown-freebsd
+WRKSRC=         ${WRKDIR}/communicator-v45.x86-unknown-freebsd
 NO_BUILD=       Yes
 
 NDIR=           ${PREFIX}/lib/netscape.45
 BINDIR=		${PREFIX}/bin
 
-.if defined(USE_128BIT) && defined(USA_RESIDENT) && ${USA_RESIDENT} == NO
-MASTER_SITES+=	ftp://ftp.fortify.net/pub/Fortify/ \
-		ftp://ftp.za.freebsd.org/pub/Fortify/
-DISTFILES+=	Fortify-1.2.2-unix.tar.gz
-RESTRICTED=     "Contains strong cryptography"
+pre-extract:
+.if defined(USE_128BIT)
+	@${ECHO} "Sorry Fortify do not provide support for pre-release netscape versions"
 .endif
 
-.if !defined(USE_128BIT) && defined(USA_RESIDENT) && ${USA_RESIDENT} == NO
-pre-extract:
-		@${ECHO} "You can make Netscape use 128-bit encryption by defining USE_128BIT"
-		@${ECHO} "and defining USA_RESIDENT to NO"
+.if !defined(MULTIVERSION)
+		@${ECHO} "you can define MULTIVERSION to install the script which runs communicator-v45"
+		@${ECHO} "as ${BINDIR}/communicator-4.5 rather than ${BINDIR}/netscape."
+		@${ECHO} "You may find this useful if you want to run the stable and pre release versions"
+		@${ECHO} "concurrently."
 .endif
 
+
 do-install:
-	cd ${WRKSRC} && yes "" | \
-	    LC_TIME=C MOZILLA_HOME="${NDIR}" ./ns-install
-	mv -f ${NDIR}/netscape ${NDIR}/communicator-4.5.bin
+	cd ${WRKSRC} && \
+	  yes "" | LC_TIME=C MOZILLA_HOME="${NDIR}" ./ns-install
+	${MV} -f ${NDIR}/netscape ${NDIR}/communicator-4.5.bin
+.if defined(MULTIVERSION)
 	${INSTALL_SCRIPT} ${WRKSRC}/netscape ${BINDIR}/communicator-4.5
-	#ln -sf communicator-4.5 ${BINDIR}/communicator-4
-	#ln -sf communicator-4 ${BINDIR}/netscape
+.else
+	${INSTALL_SCRIPT} ${WRKSRC}/netscape ${BINDIR}
+.endif
 	if [ ! -f ${NDIR}/mailcap ] ; then \
-	    ${INSTALL_DATA} ${FILESDIR}/mailcap ${NDIR}; \
+	  ${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.2-unix && \
-		(${ECHO} yes ; ${ECHO} no) | ./Fortify.sh ${NDIR}/communicator-4.5.bin
-.endif
+	${RM} -rf ${NDIR}/movemail-src
 	chown -R root.wheel ${NDIR}
 
-post-install:
-	@${CAT} ${PKGDIR}/DESCR
-
 .include <bsd.port.mk>
diff --git a/www/netscape47-communicator/Makefile b/www/netscape47-communicator/Makefile
index bc07abe44b81..86d093391230 100644
--- a/www/netscape47-communicator/Makefile
+++ b/www/netscape47-communicator/Makefile
@@ -3,54 +3,49 @@
 # Date created:         24 Feb 1997
 # Whom:                 thepish
 #
-# $Id: Makefile,v 1.24 1998/09/03 08:21:40 asami Exp $
+# $Id: Makefile,v 1.25 1998/10/07 13:44:16 obrien Exp $
 #
 
-DISTNAME=       communicator-v45b2-export.x86-unknown-freebsd
-PKGNAME=       netscape-communicator-4.5b2
+DISTNAME=	communicator-v45-export.x86-unknown-freebsd
+PKGNAME=	netscape-communicator-4.5
 CATEGORIES=	www
-MASTER_SITES=   ftp://ftp.netscape.com/pub/communicator/4.5/4.5_PR2/english/unix/unsupported/freebsd/professional_edition/
+MASTER_SITES=   ftp://ftp.netscape.com/pub/communicator/4.5/english/unix/unsupported/freebsd/complete_install/
 
 MAINTAINER=     thepish@FreeBSD.ORG
 
 NO_LATEST_LINK=	yes
-WRKSRC=         ${WRKDIR}/communicator-v45b2.x86-unknown-freebsd
+WRKSRC=         ${WRKDIR}/communicator-v45.x86-unknown-freebsd
 NO_BUILD=       Yes
 
 NDIR=           ${PREFIX}/lib/netscape.45
 BINDIR=		${PREFIX}/bin
 
-.if defined(USE_128BIT) && defined(USA_RESIDENT) && ${USA_RESIDENT} == NO
-MASTER_SITES+=	ftp://ftp.fortify.net/pub/Fortify/ \
-		ftp://ftp.za.freebsd.org/pub/Fortify/
-DISTFILES+=	Fortify-1.2.2-unix.tar.gz
-RESTRICTED=     "Contains strong cryptography"
+pre-extract:
+.if defined(USE_128BIT)
+	@${ECHO} "Sorry Fortify do not provide support for pre-release netscape versions"
 .endif
 
-.if !defined(USE_128BIT) && defined(USA_RESIDENT) && ${USA_RESIDENT} == NO
-pre-extract:
-		@${ECHO} "You can make Netscape use 128-bit encryption by defining USE_128BIT"
-		@${ECHO} "and defining USA_RESIDENT to NO"
+.if !defined(MULTIVERSION)
+		@${ECHO} "you can define MULTIVERSION to install the script which runs communicator-v45"
+		@${ECHO} "as ${BINDIR}/communicator-4.5 rather than ${BINDIR}/netscape."
+		@${ECHO} "You may find this useful if you want to run the stable and pre release versions"
+		@${ECHO} "concurrently."
 .endif
 
+
 do-install:
-	cd ${WRKSRC} && yes "" | \
-	    LC_TIME=C MOZILLA_HOME="${NDIR}" ./ns-install
-	mv -f ${NDIR}/netscape ${NDIR}/communicator-4.5.bin
+	cd ${WRKSRC} && \
+	  yes "" | LC_TIME=C MOZILLA_HOME="${NDIR}" ./ns-install
+	${MV} -f ${NDIR}/netscape ${NDIR}/communicator-4.5.bin
+.if defined(MULTIVERSION)
 	${INSTALL_SCRIPT} ${WRKSRC}/netscape ${BINDIR}/communicator-4.5
-	#ln -sf communicator-4.5 ${BINDIR}/communicator-4
-	#ln -sf communicator-4 ${BINDIR}/netscape
+.else
+	${INSTALL_SCRIPT} ${WRKSRC}/netscape ${BINDIR}
+.endif
 	if [ ! -f ${NDIR}/mailcap ] ; then \
-	    ${INSTALL_DATA} ${FILESDIR}/mailcap ${NDIR}; \
+	  ${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.2-unix && \
-		(${ECHO} yes ; ${ECHO} no) | ./Fortify.sh ${NDIR}/communicator-4.5.bin
-.endif
+	${RM} -rf ${NDIR}/movemail-src
 	chown -R root.wheel ${NDIR}
 
-post-install:
-	@${CAT} ${PKGDIR}/DESCR
-
 .include <bsd.port.mk>