diff options
| author | jlam <jlam@pkgsrc.org> | 2006-07-18 23:27:14 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2006-07-18 23:27:14 +0000 |
| commit | 4c09a7046a37710b750605348bba8c60f74347a3 (patch) | |
| tree | 6a1e94be400ffc55f4402c5344549e393d61835e /mk/fetch | |
| parent | a7c790b05225a4fa11d8d993d17e11d7a4f7a79b (diff) | |
| download | pkgsrc-4c09a7046a37710b750605348bba8c60f74347a3.tar.gz | |
Convert _FETCH_MESSAGE to plain old FETCH_MESSAGE. Remove _FETCH_MESSAGE
processing from mk/fetch/*.mk.
Diffstat (limited to 'mk/fetch')
| -rw-r--r-- | mk/fetch/fetch-list.mk | 16 | ||||
| -rw-r--r-- | mk/fetch/fetch.mk | 5 |
2 files changed, 4 insertions, 17 deletions
diff --git a/mk/fetch/fetch-list.mk b/mk/fetch/fetch-list.mk index e1fdce62520..1fba10682cf 100644 --- a/mk/fetch/fetch-list.mk +++ b/mk/fetch/fetch-list.mk @@ -1,4 +1,4 @@ -# $NetBSD: fetch-list.mk,v 1.1 2006/07/18 22:41:06 jlam Exp $ +# $NetBSD: fetch-list.mk,v 1.2 2006/07/18 23:27:14 jlam Exp $ # Prints out a script to fetch all needed files (no checksumming). .PHONY: fetch-list @@ -44,17 +44,7 @@ fetch-list-one-pkg: @location=`${PWD_CMD} | ${AWK} -F / '{ print $$(NF-1) "/" $$NF }'`; \ ${ECHO} '# Need additional files for ${PKGNAME} ('$$location')...' . for fetchfile in ${_ALLFILES} -. if defined(_FETCH_MESSAGE) - @(if [ ! -f ${_DISTDIR}/${fetchfile:T} ]; then \ - ${ECHO}; \ - filesize=`${AWK} ' \ - /^Size/ && $$2 == "(${fetchfile})" { print $$4 } \ - ' ${DISTINFO_FILE}` || true; \ - ${ECHO} '# Prompt user to get ${fetchfile} ('$${filesize-???}' bytes) manually:'; \ - ${ECHO} '#'; \ - ${ECHO} ${_FETCH_MESSAGE:Q}; \ - fi) -. elif defined(DYNAMIC_MASTER_SITES) +. if defined(DYNAMIC_MASTER_SITES) @(if [ ! -f ${_DISTDIR}/${fetchfile:T} ]; then \ ${ECHO}; \ filesize=`${AWK} ' \ @@ -93,7 +83,7 @@ fetch-list-one-pkg: ${ECHO} ' ${ECHO} ${fetchfile:T} not fetched'; \ ${ECHO} done; \ fi) -. endif # defined(_FETCH_MESSAGE) || defined(DYNAMIC_MASTER_SITES) +. endif # defined(DYNAMIC_MASTER_SITES) . endfor . endif # !empty(_ALLFILES) .endif # !target(fetch-list-one-pkg) diff --git a/mk/fetch/fetch.mk b/mk/fetch/fetch.mk index f831a6ccc24..dbb1d8599ce 100644 --- a/mk/fetch/fetch.mk +++ b/mk/fetch/fetch.mk @@ -1,4 +1,4 @@ -# $NetBSD: fetch.mk,v 1.10 2006/07/18 22:41:06 jlam Exp $ +# $NetBSD: fetch.mk,v 1.11 2006/07/18 23:27:14 jlam Exp $ # If this host is behind a filtering firewall, use passive ftp(1) FETCH_BEFORE_ARGS+= ${PASSIVE_FETCH:D-p} @@ -160,9 +160,6 @@ fetch-check-interactive: .USEBEFORE ${ERROR_MSG} ""; \ ${ERROR_MSG} "======================================================================"; \ exit 1 -.elif defined(_FETCH_MESSAGE) - @${TEST} ! -f ${.TARGET} || exit 0; \ - ${_FETCH_MESSAGE} .else @${DO_NADA} .endif |