diff options
| author | obache <obache> | 2014-03-02 08:54:41 +0000 |
|---|---|---|
| committer | obache <obache> | 2014-03-02 08:54:41 +0000 |
| commit | 635f3332032054e9a467835caa97a46119d17b1d (patch) | |
| tree | 0b0372c7e8e3e0f69cbb825eda8ac8914759deba /mk | |
| parent | 527fc3ae989be23edbb84e261e8f25914a71af8e (diff) | |
| download | pkgsrc-635f3332032054e9a467835caa97a46119d17b1d.tar.gz | |
loose mandantory DISTNAME.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 10 | ||||
| -rw-r--r-- | mk/fetch/bsd.fetch-vars.mk | 4 |
2 files changed, 10 insertions, 4 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index ae9ddb9fcde..9ace88d234e 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -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+= "PKG_INSTALLATION_TYPE must be \`\`pkgviews'' or \`\`overwrite 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 --git a/mk/fetch/bsd.fetch-vars.mk b/mk/fetch/bsd.fetch-vars.mk index 6b2c65b0f0a..da063360b54 100644 --- a/mk/fetch/bsd.fetch-vars.mk +++ b/mk/fetch/bsd.fetch-vars.mk @@ -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 @@ _SYS_VARS.fetch= DEFAULT_DISTFILES #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. |