pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/mk Restore the @(..)s which were removed in rev 1.1706.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/f3022039bafb
branches:  trunk
changeset: 497958:f3022039bafb
user:      veego <veego%pkgsrc.org@localhost>
date:      Mon Aug 08 15:38:19 2005 +0000

description:
Restore the @(..)s which were removed in rev 1.1706.
They are needed in the fetch-list case to prevent outputting anything if
the distfile is allready in $DISTDIR.

diffstat:

 mk/bsd.pkg.mk |  14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diffs (51 lines):

diff -r 354f9ab446f5 -r f3022039bafb mk/bsd.pkg.mk
--- a/mk/bsd.pkg.mk     Mon Aug 08 14:45:27 2005 +0000
+++ b/mk/bsd.pkg.mk     Mon Aug 08 15:38:19 2005 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.pkg.mk,v 1.1710 2005/07/22 18:59:55 rillig Exp $
+#      $NetBSD: bsd.pkg.mk,v 1.1711 2005/08/08 15:38:19 veego Exp $
 #
 # This file is in the public domain.
 #
@@ -3258,7 +3258,7 @@
                ${ECHO} '# Need additional files for ${PKGNAME} ('$$location')...'
 .    for fetchfile in ${_ALLFILES}
 .      if defined(_FETCH_MESSAGE)
-       if [ ! -f ${_DISTDIR}/${fetchfile:T} ]; then                    \
+       @(if [ ! -f ${_DISTDIR}/${fetchfile:T} ]; then                  \
                ${ECHO};                                                \
                filesize=`${AWK} '                                      \
                        /^Size/ && $$2 == "(${fetchfile})" { print $$4 } \
@@ -3266,9 +3266,9 @@
                ${ECHO} '# Prompt user to get ${fetchfile} ('$${filesize-???}' bytes) manually:'; \
                ${ECHO} '#';                                            \
                ${ECHO} ${_FETCH_MESSAGE:Q};                            \
-       fi
+       fi)
 .      elif defined(DYNAMIC_MASTER_SITES)
-       if [ ! -f ${_DISTDIR}/${fetchfile:T} ]; then                    \
+       @(if [ ! -f ${_DISTDIR}/${fetchfile:T} ]; then                  \
                ${ECHO};                                                \
                filesize=`${AWK} '                                      \
                        /^Size/ && $$2 == "(${fetchfile})" { print $$4 } \
@@ -3288,9 +3288,9 @@
                ${ECHO} '       ${ECHO} ${fetchfile:T} not fetched';    \
                ${ECHO} done;                                           \
                ${ECHO} ')';                                            \
-       fi
+       fi)
 .      else
-       if [ ! -f ${_DISTDIR}/${fetchfile:T} ]; then                    \
+       @(if [ ! -f ${_DISTDIR}/${fetchfile:T} ]; then                  \
                ${ECHO};                                                \
                filesize=`${AWK} '                                      \
                        /^Size/ && $$2 == "(${fetchfile})" { print $$4 } \
@@ -3305,7 +3305,7 @@
                ${ECHO} '       ${FETCH_CMD} ${FETCH_BEFORE_ARGS} "$${site}${fetchfile:T}" ${FETCH_AFTER_ARGS} && break ||'; \
                ${ECHO} '       ${ECHO} ${fetchfile:T} not fetched';    \
                ${ECHO} done;                                           \
-       fi
+       fi)
 .      endif # defined(_FETCH_MESSAGE) || defined(DYNAMIC_MASTER_SITES)
 .    endfor
 .  endif # !empty(_ALLFILES)



Home | Main Index | Thread Index | Old Index