diff options
| author | hubertf <hubertf@pkgsrc.org> | 1999-02-16 03:23:04 +0000 |
|---|---|---|
| committer | hubertf <hubertf@pkgsrc.org> | 1999-02-16 03:23:04 +0000 |
| commit | b7e101fd1bbc58a59bb82d6909dc0bab0bc4aec0 (patch) | |
| tree | ec06a2c272864606b900154fb17fb78843da8307 /mk | |
| parent | 9ddc4f3fb0db14c15acb7285300c303542b73c09 (diff) | |
| download | pkgsrc-b7e101fd1bbc58a59bb82d6909dc0bab0bc4aec0.tar.gz | |
Do not overwrite (files of) other pkg versions, warn instead.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index c0f5c382d28..be6738811e5 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.215 1999/02/14 21:15:12 tron Exp $ +# $NetBSD: bsd.pkg.mk,v 1.216 1999/02/16 03:23:04 hubertf Exp $ # # This file is in the public domain. # @@ -1109,11 +1109,12 @@ _PORT_USE: .USE exit 1; \ fi .endif # CONFLICTS - @if [ -d ${PKG_DBDIR}/${PKGNAME} ]; then \ - ${ECHO_MSG} "===> ${PKGNAME} is already installed - perhaps an older version?"; \ - ${ECHO_MSG} " If so, you may wish to \`\`${MAKE} deinstall'' and install"; \ + @found="`${PKG_INFO} -e \"${PKGNAME:C/-[^-]*$/-*/}\" || ${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"; \ ${ECHO_MSG} " this port again by \`\`${MAKE} reinstall'' to upgrade it properly."; \ - ${ECHO_MSG} " If you really wish to overwrite the old port of ${PKGNAME}"; \ + ${ECHO_MSG} " If you really wish to overwrite the old package of $$found"; \ ${ECHO_MSG} " without deleting it first, set the variable \"FORCE_PKG_REGISTER\""; \ ${ECHO_MSG} " in your environment or the \"${MAKE} install\" command line."; \ exit 1; \ |