diff options
| author | veego <veego> | 2005-08-08 15:38:19 +0000 |
|---|---|---|
| committer | veego <veego> | 2005-08-08 15:38:19 +0000 |
| commit | f8519ba3e75e558769fefedde510a923bc6ddb81 (patch) | |
| tree | 686c69ada398c091edeb67ead3b2022306829718 /mk | |
| parent | 0b68987d04a408b5ce1ca5677ced69969b1709f1 (diff) | |
| download | pkgsrc-f8519ba3e75e558769fefedde510a923bc6ddb81.tar.gz | |
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 (limited to 'mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index f5361497a6f..5143d6484e5 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -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 @@ fetch-list-one-pkg: ${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 @@ fetch-list-one-pkg: ${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 @@ fetch-list-one-pkg: ${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 @@ fetch-list-one-pkg: ${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) |