From 79557591bea7c4f062e6aed3c51cc51926221ea1 Mon Sep 17 00:00:00 2001
From: obrien <obrien@FreeBSD.org>
Date: Sun, 31 Jan 1999 22:23:03 +0000
Subject: Don't error out if required manually-fetched distfile doesn't exist
 locally.

---
 www/netscape4-communicator.us/Makefile | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'www')

diff --git a/www/netscape4-communicator.us/Makefile b/www/netscape4-communicator.us/Makefile
index 0272597454a3..2e89d6ac4776 100644
--- a/www/netscape4-communicator.us/Makefile
+++ b/www/netscape4-communicator.us/Makefile
@@ -4,7 +4,7 @@
 # Date created:         14 Feb 1998
 # Whom:                 obrien@cs.ucdavis.edu
 #
-# $Id: Makefile,v 1.7 1999/01/06 04:18:12 simokawa Exp $
+# $Id: Makefile,v 1.8 1999/01/13 04:00:08 scrappy Exp $
 #
 
 DISTNAME=	communicator-v407-us.x86-unknown-linux2.0_libc5
@@ -27,6 +27,8 @@ WRKSRC=		${WRKDIR}/communicator-v407.x86-unknown-linux2.0
 NDIR=		${PREFIX}/lib/netscape.us
 BINDIR=		${PREFIX}/bin
 
+.include <bsd.port.pre.mk>
+
 # Need to define USA_RESIDENT to YES or NO
 .if !defined(USA_RESIDENT) || (${USA_RESIDENT} != YES && ${USA_RESIDENT} != yes && ${USA_RESIDENT} != NO && ${USA_RESIDENT} != no)
 pre-fetch:
@@ -39,13 +41,11 @@ pre-fetch:
 #
 .elif defined(USA_RESIDENT)
 .if ${USA_RESIDENT} == YES || ${USA_RESIDENT} == yes
-#
-pre-fetch:
-	@(if [ ! -f ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} ]; then \
-	${ECHO} You must manually obtain ${DISTNAME}${EXTRACT_SUFX} ; \
-	${ECHO} distribution and place it in ${DISTDIR}. ; \
-	false ; \
-	fi )
+
+.if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX})
+IGNORE='You must manually obtain ${DISTNAME}${EXTRACT_SUFX} distribution and place it in ${DISTDIR}.'
+.endif
+
 .else
 pre-fetch:
 	@${ECHO}
@@ -73,4 +73,4 @@ do-install:
 post-install:
 	@${CAT} ${PKGDIR}/DESCR
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
-- 
cgit