[pkgsrc/trunk]: pkgsrc/mk loose mandantory DISTNAME.

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/6ffcb46e495b
branches:  trunk
changeset: 631335:6ffcb46e495b
user:      obache <obache%pkgsrc.org@localhost>
date:      Sun Mar 02 08:54:41 2014 +0000

description:
loose mandantory DISTNAME.

diffstat:

 mk/bsd.pkg.mk              |  10 +++++++---
 mk/fetch/bsd.fetch-vars.mk |   4 +++-
 2 files changed, 10 insertions(+), 4 deletions(-)

diffs (43 lines):

diff -r 46e848f62cac -r 6ffcb46e495b mk/bsd.pkg.mk
--- a/mk/bsd.pkg.mk     Sun Mar 02 08:39:01 2014 +0000
+++ b/mk/bsd.pkg.mk     Sun Mar 02 08:54:41 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.pkg.mk,v 1.1993 2013/07/15 20:22:15 christos Exp $
+#      $NetBSD: bsd.pkg.mk,v 1.1994 2014/03/02 08:54:41 obache Exp $
 #
 # This file is in the public domain.
 #
@@ -133,8 +133,12 @@
 PKG_FAIL_REASON+=      "This package doesn't support PKG_INSTALLATION_TYPE=${PKG_INSTALLATION_TYPE}."
 .endif
 
-.if !defined(CATEGORIES) || !defined(DISTNAME)
-PKG_FAIL_REASON+='CATEGORIES and DISTNAME are mandatory.'
+.if !defined(CATEGORIES)
+PKG_FAIL_REASON+='CATEGORIES are mandatory.'
+.endif
+
+.if !defined(PKGNAME) && !defined(DISTNAME)
+PKG_FAIL_REASON+='PKGNAME and/or DISTNAME are mandatory.'
 .endif
 
 .if defined(PKG_PATH)
diff -r 46e848f62cac -r 6ffcb46e495b mk/fetch/bsd.fetch-vars.mk
--- a/mk/fetch/bsd.fetch-vars.mk        Sun Mar 02 08:39:01 2014 +0000
+++ b/mk/fetch/bsd.fetch-vars.mk        Sun Mar 02 08:54:41 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.fetch-vars.mk,v 1.15 2014/02/14 07:43:46 obache Exp $
+# $NetBSD: bsd.fetch-vars.mk,v 1.16 2014/03/02 08:54:41 obache Exp $
 #
 # This Makefile fragment is included separately by bsd.pkg.mk and
 # defines some variables which must be defined earlier than where
@@ -36,7 +36,9 @@
 #DISTDIR?=               ${PKGSRCDIR}/distfiles
 
 _DISTDIR=              ${DISTDIR}/${DIST_SUBDIR}
+.if defined(DISTNAME) && !empty(DISTNAME)
 DEFAULT_DISTFILES=     ${DISTNAME}${EXTRACT_SUFX}
+.endif
 DISTFILES?=            ${DEFAULT_DISTFILES}
 
 # File lists, defined early to allow tool dependencies.