[pkgsrc/trunk]: pkgsrc/mk When DIST_SUBDIR is set, make sure various download...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/56ce5507e55f
branches:  trunk
changeset: 464324:56ce5507e55f
user:      cube <cube%pkgsrc.org@localhost>
date:      Sat Dec 06 18:47:45 2003 +0000

description:
When DIST_SUBDIR is set, make sure various download variables don't get
changed when they're defined but empty.  Although it might sound weird
to have DISTFILES empty and DIST_SUBDIR set, it makes sense for wrapper
packages such as graphics/Mesa.

Fixes PR 23658 from Aaron J. Grier.

diffstat:

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

diffs (29 lines):

diff -r bac7ffe9bfcb -r 56ce5507e55f mk/bsd.pkg.mk
--- a/mk/bsd.pkg.mk     Sat Dec 06 18:30:02 2003 +0000
+++ b/mk/bsd.pkg.mk     Sat Dec 06 18:47:45 2003 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.pkg.mk,v 1.1314 2003/12/05 08:38:15 jdolecek Exp $
+#      $NetBSD: bsd.pkg.mk,v 1.1315 2003/12/06 18:47:45 cube Exp $
 #
 # This file is in the public domain.
 #
@@ -1202,9 +1202,19 @@
 .  if ${CKSUMFILES} != ""
 _CKSUMFILES?=  ${CKSUMFILES:S/^/${DIST_SUBDIR}\//}
 .  endif
+.  if !empty(DISTFILES)
 _DISTFILES?=   ${DISTFILES:S/^/${DIST_SUBDIR}\//}
+.  else
+_DISTFILES?=   # empty
+.  endif
+.  if defined(IGNOREFILES) && !empty(IGNOREFILES)
 _IGNOREFILES?= ${IGNOREFILES:S/^/${DIST_SUBDIR}\//}
+.  endif
+.  if defined(PATCHFILES) && !empty(PATCHFILES)
 _PATCHFILES?=  ${PATCHFILES:S/^/${DIST_SUBDIR}\//}
+.  else
+_PATCHFILES?=  # empty
+.  endif
 .else
 _CKSUMFILES?=  ${CKSUMFILES}
 _DISTFILES?=   ${DISTFILES}