From 8b39758d4f6a6d579bec9354faa90dbd15e9b0fd Mon Sep 17 00:00:00 2001
From: cube <cube@pkgsrc.org>
Date: Sat, 6 Dec 2003 18:47:45 +0000
Subject: 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.
---
 mk/bsd.pkg.mk | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'mk')

diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index c4269e9ecd7..0f81869d004 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -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 @@ CKSUMFILES:=	${CKSUMFILES:N${__tmp__}}
 .  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}
-- 
cgit v1.2.3