diff options
| author | agc <agc> | 2009-07-17 23:24:57 +0000 |
|---|---|---|
| committer | agc <agc> | 2009-07-17 23:24:57 +0000 |
| commit | e5bc9db00b9dc66a9771e0617fbeb1100ff8f08b (patch) | |
| tree | 30ae4702f22a048a09516aea7e1acf7e223b6c0e /mk | |
| parent | aff36724536b4cd35bbf393e7633eaca3e364976 (diff) | |
| download | pkgsrc-e5bc9db00b9dc66a9771e0617fbeb1100ff8f08b.tar.gz | |
Apply the fixes from Jukka Salmi in pkg PR/41621 to fix smart message
display.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/flavor/pkg/depends.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mk/flavor/pkg/depends.mk b/mk/flavor/pkg/depends.mk index a0bf998f33a..7ce7690627a 100644 --- a/mk/flavor/pkg/depends.mk +++ b/mk/flavor/pkg/depends.mk @@ -1,4 +1,4 @@ -# $NetBSD: depends.mk,v 1.44 2009/02/06 15:27:00 joerg Exp $ +# $NetBSD: depends.mk,v 1.45 2009/07/17 23:24:57 agc Exp $ # This command prints out the dependency patterns for all full (run-time) # dependencies of the package. @@ -79,7 +79,7 @@ _DEPENDS_INSTALL_CMD= \ ${STEP_MSG} "Verifying $$target for $$dir"; \ [ -d "$$dir" ] || ${FAIL_MSG} "[depends.mk] The directory \`\`$$dir'' does not exist."; \ cd $$dir; \ - ${SETENV} ${PKGSRC_MAKE_ENV} _PKGSRC_DEPS="${PKGNAME} ${_PKGSRC_DEPS}" PKGNAME_REQD="$$pattern" ${MAKE} ${MAKEFLAGS} _AUTOMATIC=yes $$target; \ + ${SETENV} ${PKGSRC_MAKE_ENV} _PKGSRC_DEPS=" ${PKGNAME}${_PKGSRC_DEPS}" PKGNAME_REQD="$$pattern" ${MAKE} ${MAKEFLAGS} _AUTOMATIC=yes $$target; \ pkg=`${_PKG_BEST_EXISTS} "$$pattern" || ${TRUE}`; \ case "$$pkg" in \ "") ${ERROR_MSG} "[depends.mk] A package matching \`\`$$pattern'' should"; \ @@ -142,10 +142,10 @@ pkg_install-depends: ${RUN}if [ `${PKG_INFO_CMD} -V 2>/dev/null || echo 20010302` -lt ${PKGTOOLS_REQD} ]; then \ ${PHASE_MSG} "Trying to handle out-dated pkg_install..."; \ cd ../../pkgtools/pkg_install && ${SETENV} ${PKGSRC_MAKE_ENV} \ - _PKGSRC_DEPS="${PKGNAME} ${_PKGSRC_DEPS}" \ + _PKGSRC_DEPS=" ${PKGNAME}${_PKGSRC_DEPS}" \ ${MAKE} ${MAKEFLAGS} _AUTOMATIC=yes clean && \ cd ../../pkgtools/pkg_install && ${SETENV} ${PKGSRC_MAKE_ENV} \ - _PKGSRC_DEPS="${PKGNAME} ${_PKGSRC_DEPS}" \ + _PKGSRC_DEPS=" ${PKGNAME}${_PKGSRC_DEPS}" \ ${MAKE} ${MAKEFLAGS} _AUTOMATIC=yes ${DEPENDS_TARGET:Q}; \ fi |