pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/mk Packages may set the variable FETCH_MESSAGE to a li...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/c16ce7aaa586
branches:  trunk
changeset: 513255:c16ce7aaa586
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Tue May 23 07:39:22 2006 +0000

description:
Packages may set the variable FETCH_MESSAGE to a list of lines that are
printed when some distfile must be fetched manually. After printing
them, the build is aborted.

This deprecates the old _FETCH_MESSAGE, as packages should never need to
define variables with leading underscores.

diffstat:

 mk/bsd.pkg.mk |  13 +++++++++++--
 1 files changed, 11 insertions(+), 2 deletions(-)

diffs (27 lines):

diff -r 1b3600f29ab5 -r c16ce7aaa586 mk/bsd.pkg.mk
--- a/mk/bsd.pkg.mk     Mon May 22 23:51:13 2006 +0000
+++ b/mk/bsd.pkg.mk     Tue May 23 07:39:22 2006 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.pkg.mk,v 1.1825 2006/05/22 22:22:02 jlam Exp $
+#      $NetBSD: bsd.pkg.mk,v 1.1826 2006/05/23 07:39:22 rillig Exp $
 #
 # This file is in the public domain.
 #
@@ -1292,7 +1292,16 @@
        ${MAKE} ${MAKEFLAGS} batch-check-distfiles
 .    else
 .      for fetchfile in ${_ALLFILES}
-.        if defined(_FETCH_MESSAGE)
+.        if defined(FETCH_MESSAGE) && !empty(FETCH_MESSAGE)
+       ${_PKG_SILENT}${_PKG_DEBUG} set -e;                             \
+       ${TEST} -f ${DISTDIR:Q}/${fetchfile:Q} || {                     \
+               h="==============="; h="$$h$$h$$h$$h$$h";               \
+               ${ECHO} "$$h"; ${ECHO} "";                              \
+               for l in ${FETCH_MESSAGE}; do ${ECHO} "$$l"; done;      \
+               ${ECHO} ""; ${ECHO} "$$h";                              \
+               exit 1;                                                 \
+       }
+.        elif defined(_FETCH_MESSAGE)
        ${_PKG_SILENT}${_PKG_DEBUG}                                     \
        file="${fetchfile}";                                            \
        if [ ! -f ${DISTDIR}/$$file ]; then                             \



Home | Main Index | Thread Index | Old Index