diff options
| author | hubertf <hubertf@pkgsrc.org> | 2001-11-29 01:12:24 +0000 |
|---|---|---|
| committer | hubertf <hubertf@pkgsrc.org> | 2001-11-29 01:12:24 +0000 |
| commit | 5542206cbab4ff38cfe05a48a6dcf0205f5c9ff5 (patch) | |
| tree | 57da34d13a725a0c61343ca8eabdee3d27dfbd9a /mk | |
| parent | 718ca46cf7df72abd300f82ed7c9b7d676ff468b (diff) | |
| download | pkgsrc-5542206cbab4ff38cfe05a48a6dcf0205f5c9ff5.tar.gz | |
Get rid of manually adding "nbX" to PKGNAME when a pkg was changed in
pkgsrc. Instead, a new variable PKGREVISION is invented that can get
bumped independent of DISTNAME and PKGNAME.
Example #1:
DISTNAME= foo-X.Y
PKGREVISION= Z
=> PKGNAME= foo-X.YnbZ
Example #2:
DISTNAME= barthing-X.Y
PKGNAME= bar-X.Y
PKGREVISION= Z
=> PKGNAME= bar=X.YnbZ (!)
On subsequent changes, only PKGREVISION needs to be bumped, no more risk
of getting DISTNAME changed accidentally.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 16396f644cf..dcf68c37c49 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.865 2001/11/28 19:55:31 jlam Exp $ +# $NetBSD: bsd.pkg.mk,v 1.866 2001/11/29 01:17:25 hubertf Exp $ # # This file is in the public domain. # @@ -860,7 +860,15 @@ PATCH_SITES:= ${_MASTER_SITE_OVERRIDE} ${PATCH_SITES} # Derived names so that they're easily overridable. DISTFILES?= ${DISTNAME}${EXTRACT_SUFX} +.if defined(PKGREVISION) && ${PKGREVISION} != "" +. if defined(PKGNAME) +PKGNAME:= ${PKGNAME}nb${PKGREVISION} +. else +PKGNAME?= ${DISTNAME}nb${PKGREVISION} +. endif +.else PKGNAME?= ${DISTNAME} +.endif SVR4_PKGNAME?= ${PKGNAME} MAINTAINER?= packages@netbsd.org |