diff options
| author | hubertf <hubertf@pkgsrc.org> | 1998-08-07 07:44:26 +0000 |
|---|---|---|
| committer | hubertf <hubertf@pkgsrc.org> | 1998-08-07 07:44:26 +0000 |
| commit | 8efa598b6997a4bbd88a99d153eea87b9a46cb43 (patch) | |
| tree | 8875e376d042ae79bab608a9bbb10828dcd6038a /mk | |
| parent | 3558f40d39a9b02ff541cd048b75394ffca3a7d0 (diff) | |
| download | pkgsrc-8efa598b6997a4bbd88a99d153eea87b9a46cb43.tar.gz | |
Back out changes for fnmach'ing pkg_info -e due to the changed semantics
(print name(s) of found pkgs) not available in 1.3; This can be backed
out together with revisions 1.136-1.138 if NetBSD 1.4 gets out.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 265a55d38f6..659510295f8 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.138 1998/08/06 14:49:41 agc Exp $ +# $NetBSD: bsd.pkg.mk,v 1.139 1998/08/07 07:44:26 hubertf Exp $ # # This file is in the public domain. # @@ -999,13 +999,12 @@ _PORT_USE: .USE .if !defined(NO_PKG_REGISTER) && !defined(FORCE_PKG_REGISTER) .if defined(CONFLICTS) @(/bin/sh -f -c 'for i in ${CONFLICTS}; do \ - if /usr/sbin/pkg_info -e "$$i" >${WRKDIR}/.CONFLICT.$$$$; then \ - ${ECHO_MSG} "===> ${PKGNAME} conflicts with installed package: $$i - "`${CAT} ${WRKDIR}/.CONFLICT.$$$$`" found."; \ + if /usr/sbin/pkg_info -qe "$$i" ; then \ + ${ECHO_MSG} "===> ${PKGNAME} conflicts with installed package: $$i."; \ ${ECHO_MSG} " They install the same files into the same place."; \ - ${ECHO_MSG} " Please remove "`${CAT} ${WRKDIR}/.CONFLICT.$$$$`" first with pkg_delete(1)."; \ + ${ECHO_MSG} " Please remove "$$i" first with pkg_delete(1)."; \ exit 1; \ fi; \ - ${RM} ${WRKDIR}/.CONFLICT.$$$$ ; \ done') .endif @if [ -d ${PKG_DBDIR}/${PKGNAME} ]; then \ |