diff options
| author | hubertf <hubertf@pkgsrc.org> | 1998-07-12 00:20:04 +0000 |
|---|---|---|
| committer | hubertf <hubertf@pkgsrc.org> | 1998-07-12 00:20:04 +0000 |
| commit | 403e10a469e90f3d91a5462c62f07b4206caddcb (patch) | |
| tree | e63a55213cd2f58ae5a605dc66fe395712a28bb8 | |
| parent | 78487778dec1d531f053f7b7464bae0ebef2499b (diff) | |
| download | pkgsrc-403e10a469e90f3d91a5462c62f07b4206caddcb.tar.gz | |
partially back out variable expansion from rev. 1.109 as inspired by
tron's last commit. Beware that this may break in nasty ways when using
wildcards in CONFLICTS and DEPENDS.
| -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 4ed79ee1f34..025f0954636 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.112 1998/07/11 21:12:59 tron Exp $ +# $NetBSD: bsd.pkg.mk,v 1.113 1998/07/12 00:20:04 hubertf Exp $ # # This file is in the public domain. # @@ -968,7 +968,7 @@ _PORT_USE: .USE .if make(real-install) .if !defined(NO_PKG_REGISTER) && !defined(FORCE_PKG_REGISTER) .if defined(CONFLICTS) - @for i in "${CONFLICTS}"; do \ + @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"; \ |