Upgrade to 4.07 / Fortify 1.2.28

6 files changed, 40 insertions, 40 deletions

diff --git a/www/netscape4-communicator/Makefile b/www/netscape4-communicator/Makefile
index 3f09649f3bd1..7e45dff80f4c 100644
--- a/www/netscape4-communicator/Makefile
+++ b/www/netscape4-communicator/Makefile
@@ -3,51 +3,50 @@
 # Date created:         24 Feb 1997
 # Whom:                 ache
 #
-# $Id: Makefile,v 1.20 1998/08/18 01:42:41 ache Exp $
+# $Id: Makefile,v 1.21 1998/08/24 10:04:55 markm Exp $
 #
 
-DISTNAME=       netscape-communicator-4.06
+DISTNAME=       netscape-communicator-4.07
 CATEGORIES=	www
-MASTER_SITES=   ftp://ftp.netscape.com/pub/communicator/4.06/development/english/unix/freebsd/professional_edition/
-DISTFILES=      communicator-pro-v406-export.x86-unknown-freebsd.tar.gz
-AUTOADMIN=      autoadmin-v406.x86-unknown-freebsd.tar.gz
+MASTER_SITES=   ftp://ftp.netscape.com/pub/communicator/4.07/development/english/unix/freebsd/professional_edition/
+DISTFILES=      communicator-v407-export.x86-unknown-freebsd.tar.gz ${AUTOADMIN}
+AUTOADMIN=      autoadmin-v407.x86-unknown-freebsd.tar.gz
 
 MAINTAINER=     ache@FreeBSD.ORG
 
-WRKSRC=         ${WRKDIR}/communicator-v406.x86-unknown-freebsd
+WRKSRC=         ${WRKDIR}/communicator-v407.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.6-unix-x86.tar.gz
+DISTFILES+=	Fortify-1.2.8-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"
 .endif
 
 do-install:
 	cd ${WRKSRC} && yes "" | \
 	    LC_TIME=C MOZILLA_HOME="${NDIR}" ./ns-install
-	mv -f ${NDIR}/netscape ${NDIR}/communicator-4.06.bin
-	${INSTALL_SCRIPT} ${WRKSRC}/netscape ${BINDIR}/communicator-4.06
-	ln -sf communicator-4.06 ${BINDIR}/communicator-4
+	mv -f ${NDIR}/netscape ${NDIR}/communicator-4.07.bin
+	${INSTALL_SCRIPT} ${WRKSRC}/netscape ${BINDIR}/communicator-4.07
+	ln -sf communicator-4.07 ${BINDIR}/communicator-4
 	ln -sf communicator-4 ${BINDIR}/netscape
 	if [ ! -f ${NDIR}/mailcap ] ; then \
 	    ${INSTALL_DATA} ${FILESDIR}/mailcap ${NDIR}; \
 	fi
 	rm -rf ${NDIR}/movemail-src
-	tar zxvf ${WRKDIR}/${AUTOADMIN} -C ${NDIR}
+	tar zxvf ${DISTDIR}/${AUTOADMIN} -C ${NDIR}
 .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}/communicator-4.06.bin
+	cd ${WRKDIR}/Fortify-1.2.8-unix-x86 && \
+		(${ECHO} yes ; ${ECHO} no) | ./Fortify.sh ${NDIR}/communicator-4.07.bin
 .endif
 	chown -R bin.bin ${NDIR}
 
diff --git a/www/netscape4-communicator/distinfo b/www/netscape4-communicator/distinfo
index d6f0702bd41e..b2e0c66810a4 100644
--- a/www/netscape4-communicator/distinfo
+++ b/www/netscape4-communicator/distinfo
@@ -1,2 +1,3 @@
-MD5 (communicator-pro-v406-export.x86-unknown-freebsd.tar.gz) = 1e53b8932a94506df158900c85cb6862
-MD5 (Fortify-1.2.6-unix-x86.tar.gz) = 070062e10e6ab2813a9607cc64bed646
+MD5 (communicator-v407-export.x86-unknown-freebsd.tar.gz) = d038293bc6f4aa5829532d9898dbd0fb
+MD5 (autoadmin-v407.x86-unknown-freebsd.tar.gz) = 70b216bfde0797a7e755f0de41640d80
+MD5 (Fortify-1.2.8-unix-x86.tar.gz) = 1edd29d027d8f1ca84d5e6fb61f66e07
diff --git a/www/netscape4-communicator/pkg-plist b/www/netscape4-communicator/pkg-plist
index 7274829c3633..36cec82f18c8 100644
--- a/www/netscape4-communicator/pkg-plist
+++ b/www/netscape4-communicator/pkg-plist
@@ -1,4 +1,4 @@
-bin/communicator-4.06
+bin/communicator-4.07
 @exec ln -sf %f %B/communicator-4
 @exec ln -sf communicator-4 %B/netscape
 @unexec rm -f %B/netscape
@@ -178,7 +178,7 @@ lib/netscape/spell/pen4s324.dat
 lib/netscape/spell/netscape.dic
 lib/netscape/vreg
 lib/netscape/registry
-lib/netscape/communicator-4.06.bin
+lib/netscape/communicator-4.07.bin
 lib/netscape/mailcap
 @dirrm lib/netscape/spell
 @dirrm lib/netscape/plugins
diff --git a/www/netscape48-communicator/Makefile b/www/netscape48-communicator/Makefile
index 3f09649f3bd1..7e45dff80f4c 100644
--- a/www/netscape48-communicator/Makefile
+++ b/www/netscape48-communicator/Makefile
@@ -3,51 +3,50 @@
 # Date created:         24 Feb 1997
 # Whom:                 ache
 #
-# $Id: Makefile,v 1.20 1998/08/18 01:42:41 ache Exp $
+# $Id: Makefile,v 1.21 1998/08/24 10:04:55 markm Exp $
 #
 
-DISTNAME=       netscape-communicator-4.06
+DISTNAME=       netscape-communicator-4.07
 CATEGORIES=	www
-MASTER_SITES=   ftp://ftp.netscape.com/pub/communicator/4.06/development/english/unix/freebsd/professional_edition/
-DISTFILES=      communicator-pro-v406-export.x86-unknown-freebsd.tar.gz
-AUTOADMIN=      autoadmin-v406.x86-unknown-freebsd.tar.gz
+MASTER_SITES=   ftp://ftp.netscape.com/pub/communicator/4.07/development/english/unix/freebsd/professional_edition/
+DISTFILES=      communicator-v407-export.x86-unknown-freebsd.tar.gz ${AUTOADMIN}
+AUTOADMIN=      autoadmin-v407.x86-unknown-freebsd.tar.gz
 
 MAINTAINER=     ache@FreeBSD.ORG
 
-WRKSRC=         ${WRKDIR}/communicator-v406.x86-unknown-freebsd
+WRKSRC=         ${WRKDIR}/communicator-v407.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.6-unix-x86.tar.gz
+DISTFILES+=	Fortify-1.2.8-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"
 .endif
 
 do-install:
 	cd ${WRKSRC} && yes "" | \
 	    LC_TIME=C MOZILLA_HOME="${NDIR}" ./ns-install
-	mv -f ${NDIR}/netscape ${NDIR}/communicator-4.06.bin
-	${INSTALL_SCRIPT} ${WRKSRC}/netscape ${BINDIR}/communicator-4.06
-	ln -sf communicator-4.06 ${BINDIR}/communicator-4
+	mv -f ${NDIR}/netscape ${NDIR}/communicator-4.07.bin
+	${INSTALL_SCRIPT} ${WRKSRC}/netscape ${BINDIR}/communicator-4.07
+	ln -sf communicator-4.07 ${BINDIR}/communicator-4
 	ln -sf communicator-4 ${BINDIR}/netscape
 	if [ ! -f ${NDIR}/mailcap ] ; then \
 	    ${INSTALL_DATA} ${FILESDIR}/mailcap ${NDIR}; \
 	fi
 	rm -rf ${NDIR}/movemail-src
-	tar zxvf ${WRKDIR}/${AUTOADMIN} -C ${NDIR}
+	tar zxvf ${DISTDIR}/${AUTOADMIN} -C ${NDIR}
 .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}/communicator-4.06.bin
+	cd ${WRKDIR}/Fortify-1.2.8-unix-x86 && \
+		(${ECHO} yes ; ${ECHO} no) | ./Fortify.sh ${NDIR}/communicator-4.07.bin
 .endif
 	chown -R bin.bin ${NDIR}
 
diff --git a/www/netscape48-communicator/distinfo b/www/netscape48-communicator/distinfo
index d6f0702bd41e..b2e0c66810a4 100644
--- a/www/netscape48-communicator/distinfo
+++ b/www/netscape48-communicator/distinfo
@@ -1,2 +1,3 @@
-MD5 (communicator-pro-v406-export.x86-unknown-freebsd.tar.gz) = 1e53b8932a94506df158900c85cb6862
-MD5 (Fortify-1.2.6-unix-x86.tar.gz) = 070062e10e6ab2813a9607cc64bed646
+MD5 (communicator-v407-export.x86-unknown-freebsd.tar.gz) = d038293bc6f4aa5829532d9898dbd0fb
+MD5 (autoadmin-v407.x86-unknown-freebsd.tar.gz) = 70b216bfde0797a7e755f0de41640d80
+MD5 (Fortify-1.2.8-unix-x86.tar.gz) = 1edd29d027d8f1ca84d5e6fb61f66e07
diff --git a/www/netscape48-communicator/pkg-plist b/www/netscape48-communicator/pkg-plist
index 7274829c3633..36cec82f18c8 100644
--- a/www/netscape48-communicator/pkg-plist
+++ b/www/netscape48-communicator/pkg-plist
@@ -1,4 +1,4 @@
-bin/communicator-4.06
+bin/communicator-4.07
 @exec ln -sf %f %B/communicator-4
 @exec ln -sf communicator-4 %B/netscape
 @unexec rm -f %B/netscape
@@ -178,7 +178,7 @@ lib/netscape/spell/pen4s324.dat
 lib/netscape/spell/netscape.dic
 lib/netscape/vreg
 lib/netscape/registry
-lib/netscape/communicator-4.06.bin
+lib/netscape/communicator-4.07.bin
 lib/netscape/mailcap
 @dirrm lib/netscape/spell
 @dirrm lib/netscape/plugins