6 files changed, 12 insertions, 12 deletions

diff --git a/www/bsdi-netscape47-communicator/Makefile b/www/bsdi-netscape47-communicator/Makefile
index fdb79b4e3ee7..d1f1ea9525d6 100644
--- a/www/bsdi-netscape47-communicator/Makefile
+++ b/www/bsdi-netscape47-communicator/Makefile
@@ -3,7 +3,7 @@
 # Date created:		24 Feb 1997
 # Whom:			thepish
 #
-# $Id$
+# $Id: Makefile,v 1.41 1999/05/19 16:06:37 sada Exp $
 #
 
 MASTER_SITES?=	ftp://ftp.netscape.com/pub/communicator/4.6/english/unix/unsupported/freebsd/complete_install/
@@ -18,6 +18,5 @@ WRKSRC=		${WRKDIR}/${BROWSER}-v46.x86-unknown-freebsd
 BROWSER_VER=	4.6
 INFILE_HEAD?=	'Communicator,4.6.0.99124'
 NO_AUTOADMIN=	yes
-NO_FORTIFY=	yes
 
 .include "${MASTERDIR}/Makefile"
diff --git a/www/netscape4-communicator/Makefile b/www/netscape4-communicator/Makefile
index 622f360f185c..b9d58c844daa 100644
--- a/www/netscape4-communicator/Makefile
+++ b/www/netscape4-communicator/Makefile
@@ -3,7 +3,7 @@
 # Date created:         24 Feb 1997
 # Whom:                 ache
 #
-# $Id: Makefile,v 1.33 1999/04/25 13:34:56 markm Exp $
+# $Id: Makefile,v 1.34 1999/05/19 16:06:18 sada Exp $
 #
 
 DISTNAME?=	netscape-${BROWSER}-${BROWSER_VER}
@@ -28,6 +28,7 @@ PKGREQ=		${MASTERDIR}/pkg/REQ
 AUTOADMIN?=	autoadmin-v408.x86-unknown-freebsd.tar.gz
 BROWSER?=	communicator
 BROWSER_VER?=	4.08
+FORTIFY=	Fortify-1.4.2-unix-x86
 NDIR=		${PREFIX}/${NSUBDIR}
 NSUBDIR=	lib/netscape
 BINDIR=		${PREFIX}/bin
@@ -45,7 +46,7 @@ DISTFILES+=	${AUTOADMIN}
 .if defined(USE_128BIT) && !defined(NO_FORTIFY)
 MASTER_SITES+=	ftp://ftp.fortify.net/pub/Fortify/ \
 		ftp://ftp.za.freebsd.org/pub/Fortify/
-DISTFILES+=	Fortify-1.4.1-unix-x86.tar.gz
+DISTFILES+=	${FORTIFY}.tar.gz
 RESTRICTED=     "Contains strong cryptography"
 .endif
 
@@ -89,7 +90,7 @@ do-install:
 .endif
 .if defined(USE_128BIT) && defined(USA_RESIDENT) && ${USA_RESIDENT} == NO \
  && !defined(NO_FORTIFY)
-	cd ${WRKDIR}/Fortify-1.4.1-unix-x86 && \
+	cd ${WRKDIR}/${FORTIFY} && \
 		(${ECHO} yes ; ${ECHO} no ; ${ECHO} no) \
 		| ./Fortify.sh ${NDIR}/${BROWSER}-${BROWSER_VER}.bin
 .endif
diff --git a/www/netscape4-communicator/distinfo b/www/netscape4-communicator/distinfo
index 3d3a18a047ab..21088fa46aa2 100644
--- a/www/netscape4-communicator/distinfo
+++ b/www/netscape4-communicator/distinfo
@@ -1,3 +1,3 @@
 MD5 (communicator-v408-export.x86-unknown-freebsd.tar.gz) = dfe7005dd39ac900fe336d6f052acfdb
 MD5 (autoadmin-v408.x86-unknown-freebsd.tar.gz) = 0435245b83fc5d9be6844ebfa1a242f0
-MD5 (Fortify-1.4.1-unix-x86.tar.gz) = 561c6405619de7c37d34426b4cff80a2
+MD5 (Fortify-1.4.2-unix-x86.tar.gz) = 5a8c932bf88c4b947999995c58af23dd
diff --git a/www/netscape47-communicator/Makefile b/www/netscape47-communicator/Makefile
index fdb79b4e3ee7..d1f1ea9525d6 100644
--- a/www/netscape47-communicator/Makefile
+++ b/www/netscape47-communicator/Makefile
@@ -3,7 +3,7 @@
 # Date created:		24 Feb 1997
 # Whom:			thepish
 #
-# $Id$
+# $Id: Makefile,v 1.41 1999/05/19 16:06:37 sada Exp $
 #
 
 MASTER_SITES?=	ftp://ftp.netscape.com/pub/communicator/4.6/english/unix/unsupported/freebsd/complete_install/
@@ -18,6 +18,5 @@ WRKSRC=		${WRKDIR}/${BROWSER}-v46.x86-unknown-freebsd
 BROWSER_VER=	4.6
 INFILE_HEAD?=	'Communicator,4.6.0.99124'
 NO_AUTOADMIN=	yes
-NO_FORTIFY=	yes
 
 .include "${MASTERDIR}/Makefile"
diff --git a/www/netscape48-communicator/Makefile b/www/netscape48-communicator/Makefile
index 622f360f185c..b9d58c844daa 100644
--- a/www/netscape48-communicator/Makefile
+++ b/www/netscape48-communicator/Makefile
@@ -3,7 +3,7 @@
 # Date created:         24 Feb 1997
 # Whom:                 ache
 #
-# $Id: Makefile,v 1.33 1999/04/25 13:34:56 markm Exp $
+# $Id: Makefile,v 1.34 1999/05/19 16:06:18 sada Exp $
 #
 
 DISTNAME?=	netscape-${BROWSER}-${BROWSER_VER}
@@ -28,6 +28,7 @@ PKGREQ=		${MASTERDIR}/pkg/REQ
 AUTOADMIN?=	autoadmin-v408.x86-unknown-freebsd.tar.gz
 BROWSER?=	communicator
 BROWSER_VER?=	4.08
+FORTIFY=	Fortify-1.4.2-unix-x86
 NDIR=		${PREFIX}/${NSUBDIR}
 NSUBDIR=	lib/netscape
 BINDIR=		${PREFIX}/bin
@@ -45,7 +46,7 @@ DISTFILES+=	${AUTOADMIN}
 .if defined(USE_128BIT) && !defined(NO_FORTIFY)
 MASTER_SITES+=	ftp://ftp.fortify.net/pub/Fortify/ \
 		ftp://ftp.za.freebsd.org/pub/Fortify/
-DISTFILES+=	Fortify-1.4.1-unix-x86.tar.gz
+DISTFILES+=	${FORTIFY}.tar.gz
 RESTRICTED=     "Contains strong cryptography"
 .endif
 
@@ -89,7 +90,7 @@ do-install:
 .endif
 .if defined(USE_128BIT) && defined(USA_RESIDENT) && ${USA_RESIDENT} == NO \
  && !defined(NO_FORTIFY)
-	cd ${WRKDIR}/Fortify-1.4.1-unix-x86 && \
+	cd ${WRKDIR}/${FORTIFY} && \
 		(${ECHO} yes ; ${ECHO} no ; ${ECHO} no) \
 		| ./Fortify.sh ${NDIR}/${BROWSER}-${BROWSER_VER}.bin
 .endif
diff --git a/www/netscape48-communicator/distinfo b/www/netscape48-communicator/distinfo
index 3d3a18a047ab..21088fa46aa2 100644
--- a/www/netscape48-communicator/distinfo
+++ b/www/netscape48-communicator/distinfo
@@ -1,3 +1,3 @@
 MD5 (communicator-v408-export.x86-unknown-freebsd.tar.gz) = dfe7005dd39ac900fe336d6f052acfdb
 MD5 (autoadmin-v408.x86-unknown-freebsd.tar.gz) = 0435245b83fc5d9be6844ebfa1a242f0
-MD5 (Fortify-1.4.1-unix-x86.tar.gz) = 561c6405619de7c37d34426b4cff80a2
+MD5 (Fortify-1.4.2-unix-x86.tar.gz) = 5a8c932bf88c4b947999995c58af23dd