diff options
| author | jlam <jlam@pkgsrc.org> | 2004-09-15 15:26:10 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2004-09-15 15:26:10 +0000 |
| commit | 9ba4de5e140d875de0d6be2c87766c54a4c3f1f3 (patch) | |
| tree | 6878cc64d605e11b935f113bc666a5abaee83fc8 /mk | |
| parent | 4fdb6e1802705f0612454637a5179634faf730bf (diff) | |
| download | pkgsrc-9ba4de5e140d875de0d6be2c87766c54a4c3f1f3.tar.gz | |
Move definition of PKGNAME and PKGNAME_NOREV higher in the file since their
expanded values are used somewhere in the middle.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 69be02896d8..dca58d4925b 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.1497 2004/09/11 07:26:03 agc Exp $ +# $NetBSD: bsd.pkg.mk,v 1.1498 2004/09/15 15:26:10 jlam Exp $ # # This file is in the public domain. # @@ -109,6 +109,19 @@ NOCLEAN?= NO # don't clean up after update PKGBASE?= ${PKGNAME:C/-[^-]*$//} PKGVERSION?= ${PKGNAME:C/^.*-//} PKGWILDCARD?= ${PKGBASE}-[0-9]* +.if defined(PKGREVISION) && !empty(PKGREVISION) && (${PKGREVISION} != "0") +. if defined(PKGNAME) +PKGNAME_NOREV:= ${PKGNAME} +PKGNAME:= ${PKGNAME}nb${PKGREVISION} +. else +PKGNAME?= ${DISTNAME}nb${PKGREVISION} +PKGNAME_NOREV= ${DISTNAME} +. endif +.else +PKGNAME?= ${DISTNAME} +PKGNAME_NOREV= ${PKGNAME} +.endif +SVR4_PKGNAME?= ${PKGNAME} _DISTDIR?= ${DISTDIR}/${DIST_SUBDIR} @@ -1023,19 +1036,6 @@ MASTER_SITE_LOCAL?= \ # Derived names so that they're easily overridable. DISTFILES?= ${DISTNAME}${EXTRACT_SUFX} -.if defined(PKGREVISION) && ${PKGREVISION} != "" && ${PKGREVISION} != "0" -. if defined(PKGNAME) -PKGNAME_NOREV:= ${PKGNAME} -PKGNAME:= ${PKGNAME}nb${PKGREVISION} -. else -PKGNAME?= ${DISTNAME}nb${PKGREVISION} -PKGNAME_NOREV= ${DISTNAME} -. endif -.else -PKGNAME?= ${DISTNAME} -PKGNAME_NOREV= ${PKGNAME} -.endif -SVR4_PKGNAME?= ${PKGNAME} MAINTAINER?= tech-pkg@NetBSD.org |