summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorhubertf <hubertf>1998-07-12 00:20:04 +0000
committerhubertf <hubertf>1998-07-12 00:20:04 +0000
commitbf45ea18f63090d2cb0e703027680a00416eb259 (patch)
treee63a55213cd2f58ae5a605dc66fe395712a28bb8 /mk
parentecea4a88701d1ecda9f6ccb5a50bb1c20cedec11 (diff)
downloadpkgsrc-bf45ea18f63090d2cb0e703027680a00416eb259.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.
Diffstat (limited to 'mk')
-rw-r--r--mk/bsd.pkg.mk4
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"; \