diff options
| author | hubertf <hubertf@pkgsrc.org> | 1999-03-03 17:48:23 +0000 |
|---|---|---|
| committer | hubertf <hubertf@pkgsrc.org> | 1999-03-03 17:48:23 +0000 |
| commit | 7742bbe8acbdaffebed42dd568118287c66314e5 (patch) | |
| tree | 42a5af8949cb36b64a05adc7427d1110438d7225 /mk | |
| parent | 6a40fdf6191a27a3c930428d75f63c526950aa2f (diff) | |
| download | pkgsrc-7742bbe8acbdaffebed42dd568118287c66314e5.tar.gz | |
Call "pkg_delete -O' on "make reinstall", to remove things not only
from /var/db/pkg, but also from the pkgdb (in case someone does a
"make reinstall" with FORCE_PKG_REGISTER set). Pointed out by Greg Woods.
XXX This change is only effective if one has a pkg_* tools as of 19990302
or later, but I will not bump the PKGTOOLS_REQD version up, as I do
not expect many people to run into this (and if, it's not a problem).
One should just remove the check with ${_PKGTOOLS_VER} >= 19990302
if the version's bumped beyond 19990302.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 13f63a3ab1c..9a008f78a1e 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.218 1999/02/25 23:02:38 hubertf Exp $ +# $NetBSD: bsd.pkg.mk,v 1.219 1999/03/03 17:48:23 hubertf Exp $ # # This file is in the public domain. # @@ -541,6 +541,9 @@ DISTFILES?= ${DISTNAME}${EXTRACT_SUFX} PKGNAME?= ${DISTNAME} # Latest version of pkgtools required for this file. +# XXX There's a conditinal hack for "pkg_delete -O" for +# _PKGTOOLS_VER>=19990302 below which should be backed out if this +# is bumped beyond 19990302. - HF PKGTOOLS_REQD= 19990119 # Check that we're using up-to-date pkg_* tools with this file. @@ -1964,6 +1967,9 @@ fake-pkg: ${PLIST} ${DESCR} ${MKDIR} ${PKG_DBDIR}; \ fi .if defined(FORCE_PKG_REGISTER) +.if ${_PKGTOOLS_VER} >= 19990302 + @${PKG_DELETE} -O ${PKGNAME} +.endif @${RM} -rf ${PKG_DBDIR}/${PKGNAME} .endif @${RM} -f ${BUILD_VERSION_FILE} ${BUILD_INFO_FILE} |