diff options
| author | jlam <jlam@pkgsrc.org> | 2006-01-18 18:03:08 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2006-01-18 18:03:08 +0000 |
| commit | ca35caf06f9ab54d4770282e372f3c764f51c294 (patch) | |
| tree | 648e4413d4afde2d361fd7155732a13a95bf1bac /mk/bsd.utils.mk | |
| parent | eb3653b4a8eba364e24a5d210a2f8e748a6073ed (diff) | |
| download | pkgsrc-ca35caf06f9ab54d4770282e372f3c764f51c294.tar.gz | |
Modify the show-depends-pkgpaths implementation so that we don't assume
package directories specified in DEPENDS lines begin with "../..". The
new standalone script pkgsrc/mk/scripts/pkg_path will canonicalize them
into package paths relative to ${PKGSRCDIR}.
Diffstat (limited to 'mk/bsd.utils.mk')
| -rw-r--r-- | mk/bsd.utils.mk | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/mk/bsd.utils.mk b/mk/bsd.utils.mk index de843e3d326..45430b9a2b5 100644 --- a/mk/bsd.utils.mk +++ b/mk/bsd.utils.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.utils.mk,v 1.2 2006/01/18 03:58:19 jlam Exp $ +# $NetBSD: bsd.utils.mk,v 1.3 2006/01/18 18:03:08 jlam Exp $ # # This Makefile fragment is included by bsd.pkg.mk and defines utility # and otherwise miscellaneous variables and targets. @@ -10,20 +10,24 @@ # DEPENDS_TYPE?= all .if !empty(DEPENDS_TYPE:Mbuild) || !empty(DEPENDS_TYPE:Mall) -_ALL_DEPENDS_PKGPATHS+= \ - ${BUILD_DEPENDS:C/^[^:]*://:S/^..\/..\///:S/${PKGSRCDIR}\///} +_ALL_DEPENDS_PKGSRCDIRS+= ${BUILD_DEPENDS:C/^[^:]*://} .endif .if !empty(DEPENDS_TYPE:Minstall) || !empty(DEPENDS_TYPE:Mpackage) || \ !empty(DEPENDS_TYPE:Mall) -_ALL_DEPENDS_PKGPATHS+= \ - ${DEPENDS:C/^[^:]*://:S/^..\/..\///:S/${PKGSRCDIR}\///} +_ALL_DEPENDS_PKGSRCDIRS+= ${DEPENDS:C/^[^:]*://} .endif +# _PKG_PATHS_CMD canonicalizes package paths so that they're relative to +# ${PKGSRCDIR} and also verifies that they exist within pkgsrc. +# +_PKG_PATHS_CMD= \ + ${SETENV} ECHO=${TOOLS_ECHO:Q} PKGSRCDIR=${PKGSRCDIR:Q} \ + PWD_CMD=${TOOLS_PWD_CMD:Q} TEST=${TOOLS_TEST:Q} \ + ${SH} ${.CURDIR}/../../mk/scripts/pkg_path + .PHONY: show-depends-pkgpaths show-depends-pkgpaths: -.for _deppath_ in ${_ALL_DEPENDS_PKGPATHS:O:u} - @${ECHO} ${_deppath_} -.endfor + @${_PKG_PATHS_CMD} ${_ALL_DEPENDS_PKGSRCDIRS:O:u} # _DEPENDS_WALK_CMD holds the command (sans arguments) to walk the # dependency graph for a package. |