diff options
| author | agc <agc> | 1998-08-04 15:05:38 +0000 |
|---|---|---|
| committer | agc <agc> | 1998-08-04 15:05:38 +0000 |
| commit | e9b733fa7edfa3eab2799e4e0b3e6ff3223d1559 (patch) | |
| tree | ceb8a6f741d1c284de813c2a4a2ace81f6666394 /mk | |
| parent | 05169081d569c1b53488c8c1e5c6cab9306552fd (diff) | |
| download | pkgsrc-e9b733fa7edfa3eab2799e4e0b3e6ff3223d1559.tar.gz | |
Enable specification of CONFLICTS entries using fnmatch(3) patterns.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index d1d4e4bae8c..85273558e56 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.132 1998/08/04 10:28:08 agc Exp $ +# $NetBSD: bsd.pkg.mk,v 1.133 1998/08/04 15:05:38 agc Exp $ # # This file is in the public domain. # @@ -997,16 +997,15 @@ _PORT_USE: .USE .if make(real-install) .if !defined(NO_PKG_REGISTER) && !defined(FORCE_PKG_REGISTER) .if defined(CONFLICTS) - @for i in ${CONFLICTS}; do \ + @(/bin/sh -f -c 'for i in ${CONFLICTS}; do \ if /usr/sbin/pkg_info -e "$$i" >${WRKDIR}/.CONFLICT.$$$$; then \ - ${ECHO_MSG} "===> ${PKGNAME} conflicts with already installed pkg(s) "`${CAT} ${WRKDIR}/.CONFLICT.$$$$`.; \ - ${ECHO_MSG} " They install the same files into the same place, its therefor not"; \ - ${ECHO_MSG} " usefull to install ${PKGNAME}. Please remove "`${CAT} ${WRKDIR}/.CONFLICT.$$$$`" first with"; \ - ${ECHO_MSG} " pkg_delete(1)."; \ + ${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 "`${CAT} ${WRKDIR}/.CONFLICT.$$$$`" first with pkg_delete(1)."; \ exit 1; \ fi; \ ${RM} ${WRKDIR}/.CONFLICT.$$$$ ; \ - done + done') .endif @if [ -d ${PKG_DBDIR}/${PKGNAME} ]; then \ ${ECHO_MSG} "===> ${PKGNAME} is already installed - perhaps an older version?"; \ |