diff options
| author | hubertf <hubertf@pkgsrc.org> | 1999-06-14 01:56:52 +0000 |
|---|---|---|
| committer | hubertf <hubertf@pkgsrc.org> | 1999-06-14 01:56:52 +0000 |
| commit | 9e1f32869900346948b68b5a5f955e7b8a4931a8 (patch) | |
| tree | 9de8b438b9cf8a50de7267c18d81fb6b4037ecd4 /mk | |
| parent | b5cb03014f285244b26256ce88a4621bc15e67b2 (diff) | |
| download | pkgsrc-9e1f32869900346948b68b5a5f955e7b8a4931a8.tar.gz | |
Don't recognize foo-bar-x.y as an old version already installed when
installing foo-u.v.
(Necessary workaround for deficiency of shell globs; works as long as
version numbers start with a digit)
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 67d2f902ecf..ac69a294e03 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.281 1999/06/04 17:05:26 tv Exp $ +# $NetBSD: bsd.pkg.mk,v 1.282 1999/06/14 01:56:52 hubertf Exp $ # # This file is in the public domain. # @@ -1081,7 +1081,7 @@ root-install: exit 1; \ fi .endif # CONFLICTS - ${_PKG_SILENT}${_PKG_DEBUG}found="`${PKG_INFO} -e \"${PKGNAME:C/-[^-]*$/-*/}\" || ${TRUE}`"; \ + ${_PKG_SILENT}${_PKG_DEBUG}found="`${PKG_INFO} -e \"${PKGNAME:C/-[^-]*$/-[0-9]*/}\" || ${TRUE}`"; \ if [ "$$found" != "" ]; then \ ${ECHO_MSG} "===> $$found is already installed - perhaps an older version?"; \ ${ECHO_MSG} " If so, you may wish to \`\`pkg_delete $$found'' and install"; \ |