summaryrefslogtreecommitdiff
path: root/mk/bsd.pkg.mk
diff options
context:
space:
mode:
authorhubertf <hubertf@pkgsrc.org>1998-08-07 10:04:53 +0000
committerhubertf <hubertf@pkgsrc.org>1998-08-07 10:04:53 +0000
commit952467d132a98bdfac6c3dd21e74922e1dfd946e (patch)
treefcff470e830b28ddfa91ff39742577720a18be3a /mk/bsd.pkg.mk
parent3bb224005394f4579532680c3b5712c878a29359 (diff)
downloadpkgsrc-952467d132a98bdfac6c3dd21e74922e1dfd946e.tar.gz
Back out last commit to better print an empty list of conflicting pkgs than
not to print any pkg at all.
Diffstat (limited to 'mk/bsd.pkg.mk')
-rw-r--r--mk/bsd.pkg.mk9
1 files changed, 5 insertions, 4 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index 659510295f8..e76fb54f972 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.mk,v 1.139 1998/08/07 07:44:26 hubertf Exp $
+# $NetBSD: bsd.pkg.mk,v 1.140 1998/08/07 10:04:53 hubertf Exp $
#
# This file is in the public domain.
#
@@ -999,12 +999,13 @@ _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 -qe "$$i" ; then \
- ${ECHO_MSG} "===> ${PKGNAME} conflicts with installed package: $$i."; \
+ if /usr/sbin/pkg_info -e "$$i" >${WRKDIR}/.CONFLICT.$$$$; then \
+ ${ECHO_MSG} "===> ${PKGNAME} conflicts with installed package: $$i - "`${CAT} ${WRKDIR}/.CONFLICT.$$$$`" found."; \
${ECHO_MSG} " They install the same files into the same place."; \
- ${ECHO_MSG} " Please remove "$$i" first with pkg_delete(1)."; \
+ ${ECHO_MSG} " Please remove "`${CAT} ${WRKDIR}/.CONFLICT.$$$$`" first with pkg_delete(1)."; \
exit 1; \
fi; \
+ ${RM} ${WRKDIR}/.CONFLICT.$$$$ ; \
done')
.endif
@if [ -d ${PKG_DBDIR}/${PKGNAME} ]; then \