[pkgsrc/trunk]: pkgsrc/mk/fetch If a package defines FETCH_MESSAGE, show that...

[rillig <rillig%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/e979c0a1769f
branches:  trunk
changeset: 536006:e979c0a1769f
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Sat Dec 01 10:56:31 2007 +0000

description:
If a package defines FETCH_MESSAGE, show that instead of the generic
instructions.

diffstat:

 mk/fetch/fetch.mk |  4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diffs (18 lines):

diff -r 4c0904913445 -r e979c0a1769f mk/fetch/fetch.mk
--- a/mk/fetch/fetch.mk Sat Dec 01 06:37:11 2007 +0000
+++ b/mk/fetch/fetch.mk Sat Dec 01 10:56:31 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: fetch.mk,v 1.30 2007/09/06 20:54:53 joerg Exp $
+# $NetBSD: fetch.mk,v 1.31 2007/12/01 10:56:31 rillig Exp $
 
 _MASTER_SITE_BACKUP=   ${MASTER_SITE_BACKUP:=${DIST_SUBDIR}${DIST_SUBDIR:D/}}
 _MASTER_SITE_OVERRIDE= ${MASTER_SITE_OVERRIDE:=${DIST_SUBDIR}${DIST_SUBDIR:D/}}
@@ -151,7 +151,7 @@
 ###
 .PHONY: fetch-check-interactive
 fetch-check-interactive: .USEBEFORE
-.if !empty(INTERACTIVE_STAGE:Mfetch) && defined(BATCH)
+.if !empty(INTERACTIVE_STAGE:Mfetch) && defined(BATCH) && !defined(FETCH_MESSAGE)
        @${TEST} ! -f ${.TARGET} || exit 0;                             \
        ${ERROR_MSG} "The fetch stage of this package requires user interaction to download"; \
        ${ERROR_MSG} "the distfiles.  Please fetch the distfiles manually and place them in:"; \