diff options
| author | tron <tron> | 2002-03-15 10:05:56 +0000 |
|---|---|---|
| committer | tron <tron> | 2002-03-15 10:05:56 +0000 |
| commit | 9164ce46a78e4420266575c2231994de3ac68167 (patch) | |
| tree | 1a12df516aaf308317ad43c7f0f3a0331154d405 /mk | |
| parent | 9f5af81cbdbc92a8f08ad915cd1ffb369374a16f (diff) | |
| download | pkgsrc-9164ce46a78e4420266575c2231994de3ac68167.tar.gz | |
Invent a new variable "PKGNAME_NOREV" which holds the package name without
the package revision added. Replace "PKGNAME" in package list with this
value because the installed software doesn't know anything about package
system revision. This fixes package list problems in e.g. the "xemacs"
package.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 306f5fbafb0..622c871befb 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.948 2002/03/15 07:16:23 tron Exp $ +# $NetBSD: bsd.pkg.mk,v 1.949 2002/03/15 10:05:56 tron Exp $ # # This file is in the public domain. # @@ -492,7 +492,7 @@ PLIST_SUBST+= OPSYS=${OPSYS} \ LOWER_OPSYS=${LOWER_OPSYS} \ LOWER_OS_VERSION=${LOWER_OS_VERSION} \ PKGBASE=${PKGBASE} \ - PKGNAME=${PKGNAME} \ + PKGNAME=${PKGNAME_NOREV} \ PKGLOCALEDIR=${PKGLOCALEDIR} \ PKGVERSION=${PKGVERSION:C/nb[0-9]*$//} \ LOCALBASE=${LOCALBASE} \ @@ -823,12 +823,15 @@ MASTER_SITE_LOCAL?= \ 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} |