diff options
| author | bdrewery <bdrewery@FreeBSD.org> | 2015-10-20 03:23:53 +0800 |
|---|---|---|
| committer | bdrewery <bdrewery@FreeBSD.org> | 2015-10-20 03:23:53 +0800 |
| commit | 05ce8cd4756cc1eca6993fa86032f7d7bc78b1e0 (patch) | |
| tree | acaaf3358083342435e9bbdbfea8d7568eb4c2bd /Mk/bsd.port.mk | |
| parent | d6b6acc680ad2a391ede3cf873f543ce8521fadd (diff) | |
| download | freebsd-ports-gnome-05ce8cd4756cc1eca6993fa86032f7d7bc78b1e0.tar.gz freebsd-ports-gnome-05ce8cd4756cc1eca6993fa86032f7d7bc78b1e0.tar.zst freebsd-ports-gnome-05ce8cd4756cc1eca6993fa86032f7d7bc78b1e0.zip | |
- Combine clean-depends-list.sh into depends-list.sh
- Refactor how depends-list.sh is called from bsd.port.mk for each variant.
With hat: portmgr
Diffstat (limited to 'Mk/bsd.port.mk')
| -rw-r--r-- | Mk/bsd.port.mk | 31 |
1 files changed, 11 insertions, 20 deletions
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index 89c7a64d79e8..41d8c8958628 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -4377,32 +4377,31 @@ _DEPEND_SPECIALS= ${_UNIFIED_DEPENDS:M*\:*\:*:C,^[^:]*:([^:]*):.*$,\1,} all-depends-list: @${ALL-DEPENDS-LIST} -ALL-DEPENDS-LIST= \ - ${SETENV} dp_ALLDEPENDS="${_UNIFIED_DEPENDS}" \ +# This script is shared among several dependency list variables. See file for +# usage. +DEPENDS-LIST= \ + ${SETENV} \ dp_PORTSDIR="${PORTSDIR}" \ dp_MAKE="${MAKE}" \ dp_PKGNAME="${PKGNAME}" \ dp_SCRIPTSDIR="${SCRIPTSDIR}" \ - ${SH} ${SCRIPTSDIR}/depends-list.sh -r + ${SH} ${SCRIPTSDIR}/depends-list.sh -CLEAN-DEPENDS-LIST= \ - ${SETENV} dp_ALLDEPENDS="${_UNIFIED_DEPENDS}" \ - dp_PORTSDIR="${PORTSDIR}" \ - dp_MAKE="${MAKE}" \ - dp_PKGNAME="${PKGNAME}" \ - dp_SCRIPTSDIR="${SCRIPTSDIR}" \ - ${SH} ${SCRIPTSDIR}/clean-depends-list.sh +ALL-DEPENDS-LIST= ${DEPENDS-LIST} -r ${_UNIFIED_DEPENDS:Q} +TEST-DEPENDS-LIST= ${DEPENDS-LIST} ${TEST_DEPENDS:Q} +CLEAN-DEPENDS-LIST= ${DEPENDS-LIST} -wr ${_UNIFIED_DEPENDS:Q} +CLEAN-DEPENDS-LIMITED-LIST= ${DEPENDS-LIST} -w ${_UNIFIED_DEPENDS:Q} .if !target(clean-depends) clean-depends: - @for dir in $$(${CLEAN-DEPENDS-LIST} full); do \ + @for dir in $$(${CLEAN-DEPENDS-LIST}); do \ (cd $$dir; ${MAKE} NOCLEANDEPENDS=yes clean); \ done .endif .if !target(limited-clean-depends) limited-clean-depends: - @for dir in $$(${CLEAN-DEPENDS-LIST} limited); do \ + @for dir in $$(${CLEAN-DEPENDS-LIMITED-LIST}); do \ (cd $$dir; ${MAKE} NOCLEANDEPENDS=yes clean); \ done .endif @@ -4547,14 +4546,6 @@ test-depends-list: @${TEST-DEPENDS-LIST} .endif -TEST-DEPENDS-LIST= \ - ${SETENV} dp_ALLDEPENDS="${TEST_DEPENDS}" \ - dp_PORTSDIR="${PORTSDIR}" \ - dp_MAKE="${MAKE}" \ - dp_PKGNAME="${PKGNAME}" \ - dp_SCRIPTSDIR="${SCRIPTSDIR}" \ - ${SH} ${SCRIPTSDIR}/depends-list.sh - # Package (recursive runtime) dependency list. Print out both directory names # and package names. |