diff options
| author | hubertf <hubertf@pkgsrc.org> | 2001-11-07 00:29:20 +0000 |
|---|---|---|
| committer | hubertf <hubertf@pkgsrc.org> | 2001-11-07 00:29:20 +0000 |
| commit | b3e7e7baec6a5647fd31d96d89c77b833f613825 (patch) | |
| tree | ddf53386966d02e8eb652add59233f829bc2613d /mk | |
| parent | c91b8b7863360966d3916d283c3e5189fc3b243f (diff) | |
| download | pkgsrc-b3e7e7baec6a5647fd31d96d89c77b833f613825.tar.gz | |
The $DEPENDS file has the pkg's directory in the first column, followed by
whitespeace, followed by it's required pkgs. Make sure to look for that
whitespace, to not catch any wrong positives, e.g.
egrep "x11/kdebase.*" $DEPENDSFILE
will catch depends for both KDE1 and KDE2 and do weird things then (among
other things, think that kdelibs-2.2.1 is ok as a dependency when building
in x11/kdebase, which is certainly not!)
Eight broken pkgs less in the bulk builds by adding a single space!
(Now if adding some more would help further... :-)
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bulk/bsd.bulk-pkg.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mk/bulk/bsd.bulk-pkg.mk b/mk/bulk/bsd.bulk-pkg.mk index e2a81c14855..364fb1e5fca 100644 --- a/mk/bulk/bsd.bulk-pkg.mk +++ b/mk/bulk/bsd.bulk-pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.bulk-pkg.mk,v 1.29 2001/10/20 09:07:13 abs Exp $ +# $NetBSD: bsd.bulk-pkg.mk,v 1.30 2001/11/07 00:29:20 hubertf Exp $ # # Copyright (c) 1999, 2000 Hubert Feyrer <hubertf@netbsd.org> @@ -218,7 +218,7 @@ bulk-package: fi; \ if ${PKG_INFO} -qe $$pkgname ; then \ ${SHCOMMENT} "Remove only unneeded pkgs" ; \ - if ! ${EGREP} -q "^${PKGPATH}.* $$pkgdir( |$$)" ${DEPENDSFILE} ; then \ + if ! ${EGREP} -q "^${PKGPATH} .* $$pkgdir( |$$)" ${DEPENDSFILE} ; then \ case "${BULK_PREREQ}" in \ *$$pkgdir* ) \ ${ECHO_MSG} "BULK> Keeping BULK_PREREQ: $$pkgname ($$pkgdir)" ;\ |