diff options
| author | agc <agc@pkgsrc.org> | 1998-08-04 10:28:08 +0000 |
|---|---|---|
| committer | agc <agc@pkgsrc.org> | 1998-08-04 10:28:08 +0000 |
| commit | 0c7c660eaa6d0241f011a67f741c80c130041a49 (patch) | |
| tree | 7ec398b4938cfdadbdbcdd93409e6c239731c2ec | |
| parent | 83a44033ced263b933fc4c8592516d803a85ab18 (diff) | |
| download | pkgsrc-0c7c660eaa6d0241f011a67f741c80c130041a49.tar.gz | |
Make it possible for package Makefiles to specify DEPENDS package
dependencies using fnmatch(3)-style wildcards.
| -rw-r--r-- | mk/bsd.pkg.mk | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 58202cf9710..d1d4e4bae8c 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.131 1998/07/31 14:55:38 tv Exp $ +# $NetBSD: bsd.pkg.mk,v 1.132 1998/08/04 10:28:08 agc Exp $ # # This file is in the public domain. # @@ -1605,11 +1605,12 @@ lib-depends: misc-depends: .if defined(DEPENDS) .if !defined(NO_DEPENDS) - @for dir in ${DEPENDS}; do \ - package="`${ECHO} \"$$dir\" | ${SED} -e 's/:.*//'`"; \ - dir=`${ECHO} $$dir | ${SED} -e 's/.*://'`; \ - if /usr/sbin/pkg_info -qe "$$package"; then \ - ${ECHO_MSG} "===> ${PKGNAME} depends on installed package: $$package"; \ + @(/bin/sh -f -c 'for dir in ${DEPENDS}; do \ + package="`${ECHO} \"$$dir\" | ${SED} -e s/:.\*//`"; \ + dir="`${ECHO} \"$$dir\" | ${SED} -e s/.\*://`"; \ + found=`/usr/sbin/pkg_info -e "$$package"`; \ + if [ "X$$found" != X"" ]; then \ + ${ECHO_MSG} "===> ${PKGNAME} depends on installed package: $$package - $$found found"; \ else \ ${ECHO_MSG} "===> ${PKGNAME} depends on package: $$package"; \ target=${DEPENDS_TARGET}; \ @@ -1620,7 +1621,7 @@ misc-depends: (cd $$dir; ${MAKE} ${.MAKEFLAGS} $$target); \ fi \ fi \ - done + done') .endif .else @${DO_NADA} |