From bf597ca3a3cb07b0d6c9e4a0c96aff700aa14c1f Mon Sep 17 00:00:00 2001 From: markm Date: Mon, 16 Mar 1998 14:40:59 +0000 Subject: Fix for the case where a macro is not defined at all. Found by: jkh --- www/bsdi-netscape47-navigator/Makefile | 7 ++++--- www/netscape4-navigator/Makefile | 7 ++++--- www/netscape47-navigator/Makefile | 7 ++++--- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/www/bsdi-netscape47-navigator/Makefile b/www/bsdi-netscape47-navigator/Makefile index 16004cf58fa4..1af5f36c99fa 100644 --- a/www/bsdi-netscape47-navigator/Makefile +++ b/www/bsdi-netscape47-navigator/Makefile @@ -3,7 +3,7 @@ # Date created: 24 Feb 1997 # Whom: ache # -# $Id: Makefile,v 1.15 1998/02/18 11:51:05 markm Exp $ +# $Id: Makefile,v 1.16 1998/03/15 15:15:22 markm Exp $ # DISTNAME= netscape-navigator-4.04 @@ -19,16 +19,17 @@ NO_BUILD= Yes NDIR= ${PREFIX}/lib/netscape BINDIR= ${PREFIX}/bin -.if defined(USE_128BIT) && ${USA_RESIDENT} == NO +.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.1-unix.tar.gz RESTRICTED= "Contains strong cryptography" .endif -.if !defined(USE_128BIT) && ${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: diff --git a/www/netscape4-navigator/Makefile b/www/netscape4-navigator/Makefile index 16004cf58fa4..1af5f36c99fa 100644 --- a/www/netscape4-navigator/Makefile +++ b/www/netscape4-navigator/Makefile @@ -3,7 +3,7 @@ # Date created: 24 Feb 1997 # Whom: ache # -# $Id: Makefile,v 1.15 1998/02/18 11:51:05 markm Exp $ +# $Id: Makefile,v 1.16 1998/03/15 15:15:22 markm Exp $ # DISTNAME= netscape-navigator-4.04 @@ -19,16 +19,17 @@ NO_BUILD= Yes NDIR= ${PREFIX}/lib/netscape BINDIR= ${PREFIX}/bin -.if defined(USE_128BIT) && ${USA_RESIDENT} == NO +.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.1-unix.tar.gz RESTRICTED= "Contains strong cryptography" .endif -.if !defined(USE_128BIT) && ${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: diff --git a/www/netscape47-navigator/Makefile b/www/netscape47-navigator/Makefile index 16004cf58fa4..1af5f36c99fa 100644 --- a/www/netscape47-navigator/Makefile +++ b/www/netscape47-navigator/Makefile @@ -3,7 +3,7 @@ # Date created: 24 Feb 1997 # Whom: ache # -# $Id: Makefile,v 1.15 1998/02/18 11:51:05 markm Exp $ +# $Id: Makefile,v 1.16 1998/03/15 15:15:22 markm Exp $ # DISTNAME= netscape-navigator-4.04 @@ -19,16 +19,17 @@ NO_BUILD= Yes NDIR= ${PREFIX}/lib/netscape BINDIR= ${PREFIX}/bin -.if defined(USE_128BIT) && ${USA_RESIDENT} == NO +.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.1-unix.tar.gz RESTRICTED= "Contains strong cryptography" .endif -.if !defined(USE_128BIT) && ${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: -- cgit