[pkgsrc/trunk]: pkgsrc/mk/fetch Meta-packages that had DIST_SUBDIR set (for w...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/f5e594488359
branches:  trunk
changeset: 519674:f5e594488359
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Sat Oct 07 12:22:06 2006 +0000

description:
Meta-packages that had DIST_SUBDIR set (for whatever reason) tried to
fetch files with an empty name, for example "geda/".

The problem was that the expression ${LIST:S,^,${DIST_SUBDIR}/,} results
in ${DIST_SUBDIR}/ when ${LIST} is empty. This is surprising but matches
the documentation in the manual page, so this cannot be called a bug.

The proper fix is to use ${LIST:@f@${DIST_SUBDIR}/${f}@} instead.

Noticed by Don Woodstock on #netbsd-code.

diffstat:

 mk/fetch/fetch.mk |  10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diffs (24 lines):

diff -r 7b3cb35889fd -r f5e594488359 mk/fetch/fetch.mk
--- a/mk/fetch/fetch.mk Sat Oct 07 12:16:56 2006 +0000
+++ b/mk/fetch/fetch.mk Sat Oct 07 12:22:06 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: fetch.mk,v 1.20 2006/07/27 18:48:03 jlam Exp $
+# $NetBSD: fetch.mk,v 1.21 2006/10/07 12:22:06 rillig Exp $
 
 _MASTER_SITE_BACKUP=   ${MASTER_SITE_BACKUP:=${DIST_SUBDIR}${DIST_SUBDIR:D/}}
 _MASTER_SITE_OVERRIDE= ${MASTER_SITE_OVERRIDE:=${DIST_SUBDIR}${DIST_SUBDIR:D/}}
@@ -15,10 +15,10 @@
 
 # List of all files, with ${DIST_SUBDIR} in front.  Used for fetch and checksum.
 .if defined(DIST_SUBDIR)
-_CKSUMFILES?=  ${CKSUMFILES:S/^/${DIST_SUBDIR}\//}
-_DISTFILES?=   ${DISTFILES:S/^/${DIST_SUBDIR}\//}
-_IGNOREFILES?= ${IGNOREFILES:S/^/${DIST_SUBDIR}\//}
-_PATCHFILES?=  ${PATCHFILES:S/^/${DIST_SUBDIR}\//}
+_CKSUMFILES?=  ${CKSUMFILES:@.f.@${DIST_SUBDIR}/${.f.}@}
+_DISTFILES?=   ${DISTFILES:@.f.@${DIST_SUBDIR}/${.f.}@}
+_IGNOREFILES?= ${IGNOREFILES:@.f.@${DIST_SUBDIR}/${.f.}@}
+_PATCHFILES?=  ${PATCHFILES:@.f.@${DIST_SUBDIR}/${.f.}@}
 .else
 _CKSUMFILES?=  ${CKSUMFILES}
 _DISTFILES?=   ${DISTFILES}