[pkgsrc/trunk]: pkgsrc/mk/fetch Documented DIST_PATH and fixed two typos (${T...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/cf6155745baa
branches:  trunk
changeset: 516752:cf6155745baa
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Thu Jul 27 07:41:40 2006 +0000

description:
Documented DIST_PATH and fixed two typos (${TARGET} is not ${.TARGET}).

diffstat:

 mk/fetch/bsd.fetch-vars.mk |   6 +++++-
 mk/fetch/fetch.mk          |  26 ++++++++++++--------------
 2 files changed, 17 insertions(+), 15 deletions(-)

diffs (60 lines):

diff -r 2466cc0e58f2 -r cf6155745baa mk/fetch/bsd.fetch-vars.mk
--- a/mk/fetch/bsd.fetch-vars.mk        Thu Jul 27 07:06:13 2006 +0000
+++ b/mk/fetch/bsd.fetch-vars.mk        Thu Jul 27 07:41:40 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.fetch-vars.mk,v 1.5 2006/07/19 16:01:40 jlam Exp $
+# $NetBSD: bsd.fetch-vars.mk,v 1.6 2006/07/27 07:41:40 rillig Exp $
 #
 # This Makefile fragment is included separately by bsd.pkg.mk and
 # defines some variables which must be defined earlier than where
@@ -9,6 +9,10 @@
 #    DISTDIR is the top-level directory into which all original
 #      distribution files are fetched.
 #
+#    DIST_PATH is a list of directories, separated by colons, in which
+#      the distribution files are looked up, additionally to DISTDIR.
+#      No files will ever be created in these directories.
+#
 # The following variables may be set in a package Makefile:
 #
 #    DIST_SUBDIR is the subdirectory of ${DISTDIR} in which the original
diff -r 2466cc0e58f2 -r cf6155745baa mk/fetch/fetch.mk
--- a/mk/fetch/fetch.mk Thu Jul 27 07:06:13 2006 +0000
+++ b/mk/fetch/fetch.mk Thu Jul 27 07:41:40 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: fetch.mk,v 1.16 2006/07/19 14:25:59 jlam Exp $
+# $NetBSD: fetch.mk,v 1.17 2006/07/27 07:41:40 rillig Exp $
 
 _MASTER_SITE_BACKUP=   ${MASTER_SITE_BACKUP:=${DIST_SUBDIR}${DIST_SUBDIR:D/}}
 _MASTER_SITE_OVERRIDE= ${MASTER_SITE_OVERRIDE:=${DIST_SUBDIR}${DIST_SUBDIR:D/}}
@@ -234,19 +234,17 @@
        @${STEP_MSG} "Fetching ${.TARGET:T}"
        ${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${.TARGET:H}
        ${_PKG_SILENT}${_PKG_DEBUG}                                     \
-       if ${TEST} -n {DIST_PATH:Q}""; then                             \
-               for d in "" ${DIST_PATH:S/:/ /g}; do                    \
-                       case $$d in                                     \
-                       ""|${DISTDIR})  continue ;;                     \
-                       esac;                                           \
-                       file="$$d/${DIST_SUBDIR}/${TARGET:T}";          \
-                       if ${TEST} -f $$file; then                      \
-                               ${ECHO} "Using $$file";                 \
-                               ${RM} -f ${TARGET};                     \
-                               ${LN} -s $$file ${.TARGET};             \
-                       fi;                                             \
-               done;                                                   \
-       fi
+       for d in "" ${DIST_PATH:S/:/ /g}; do                            \
+               case $$d in                                             \
+               ""|${DISTDIR})  continue ;;                             \
+               esac;                                                   \
+               file="$$d/${DIST_SUBDIR}/${.TARGET:T}";                 \
+               if ${TEST} -f $$file; then                              \
+                       ${ECHO} "Using $$file";                         \
+                       ${RM} -f ${.TARGET};                            \
+                       ${LN} -s $$file ${.TARGET};                     \
+               fi;                                                     \
+       done
        ${_PKG_SILENT}${_PKG_DEBUG}set -e;                              \
        unsorted_sites="${SITES.${.TARGET:T:S/=/--/}} ${_MASTER_SITE_BACKUP}"; \
        sites="${_ORDERED_SITES}";                                      \