Changeset View
Standalone View
Mk/bsd.port.mk
Show First 20 Lines • Show All 2,645 Lines • ▼ Show 20 Lines | |||||
_PKGDIR= ${PKGREPOSITORY} | _PKGDIR= ${PKGREPOSITORY} | ||||
. else | . else | ||||
_PKGDIR= ${.CURDIR} | _PKGDIR= ${.CURDIR} | ||||
. endif | . endif | ||||
. for sp in ${_PKGS} | . for sp in ${_PKGS} | ||||
PKGNAME${_SP.${sp}}= ${sp}-${PKGVERSION} | PKGNAME${_SP.${sp}}= ${sp}-${PKGVERSION} | ||||
PKGNAMES+= ${PKGNAME${_SP.${sp}}} | PKGNAMES+= ${PKGNAME${_SP.${sp}}} | ||||
PKGFILE${_SP.${sp}}= ${_PKGDIR}/${PKGNAME${_SP.${sp}}}${PKG_SUFX} | PKGFILE${_SP.${sp}}= ${_PKGDIR}/${PKGNAME${_SP.${sp}}}${PKG_SUFX} | ||||
WRKDIR_PKGFILE${_SP.${sp}}= ${WRKDIR}/pkg/${PKGNAME${_SP.${sp}}}${PKG_SUFX} | |||||
. if !empty(_SP.${sp}) | |||||
. for deptype in PKG EXTRACT PATCH FETCH BUILD | |||||
${deptype}_DEPENDS+= ${${deptype}_DEPENDS${_SP.${sp}}} | |||||
. endfor | . endfor | ||||
. for deptype in LIB RUN TEST | |||||
${deptype}_DEPENDS_ALL_SUBPACKAGES+= ${${deptype}_DEPENDS${_SP.${sp}}} | |||||
. endfor | |||||
. endif | |||||
. endfor | |||||
_EXTRA_PACKAGE_TARGET_DEP+= ${_PKGDIR} | _EXTRA_PACKAGE_TARGET_DEP+= ${_PKGDIR} | ||||
. for sp in ${_PKGS} | |||||
WRKDIR_PKGFILE${_SP.${sp}}= ${WRKDIR}/pkg/${PKGNAME${_SP.${sp}}}${PKG_SUFX} | # Poudriere compatibility | ||||
. for deptype in PKG EXTRACT PATCH FETCH BUILD LIB RUN TEST | |||||
${deptype}_DEPENDS_ALL= ${${deptype}_DEPENDS} ${${deptype}_DEPENDS_ALL_SUBPACKAGES} | |||||
pizzamig: the `*_DEPENDS_ALL` you are removing are the one used by poudriere to fetch dependency of the… | |||||
Done Inline ActionsThe ALL variables were introduced just recently with your https://reviews.freebsd.org/D40549 arrowd: The ALL variables were introduced just recently with your https://reviews.freebsd.org/D40549… | |||||
Done Inline ActionsThe ALL variables are used by poudriere to support subpackages. pizzamig: The ALL variables are used by poudriere to support subpackages. | |||||
. endfor | . endfor | ||||
# Integrate with the license auditing framework | # Integrate with the license auditing framework | ||||
. if !defined (DISABLE_LICENSES) | . if !defined (DISABLE_LICENSES) | ||||
.include "${PORTSDIR}/Mk/bsd.licenses.mk" | .include "${PORTSDIR}/Mk/bsd.licenses.mk" | ||||
. endif | . endif | ||||
CONFIGURE_SCRIPT?= configure | CONFIGURE_SCRIPT?= configure | ||||
▲ Show 20 Lines • Show All 1,357 Lines • ▼ Show 20 Lines | |||||
. endif | . endif | ||||
################################################################ | ################################################################ | ||||
# Dependency checking | # Dependency checking | ||||
################################################################ | ################################################################ | ||||
. if !target(depends) | . if !target(depends) | ||||
depends: pkg-depends extract-depends patch-depends lib-depends fetch-depends build-depends run-depends | depends: pkg-depends extract-depends patch-depends lib-depends fetch-depends build-depends run-depends | ||||
. for deptype in PKG EXTRACT PATCH FETCH BUILD LIB RUN TEST | . for deptype in PKG EXTRACT PATCH FETCH BUILD LIB RUN TEST | ||||
. for sp in ${_PKGS} | |||||
${deptype}_DEPENDS_ALL+= ${${deptype}_DEPENDS${_SP.${sp}}} | |||||
. endfor | |||||
${deptype:tl}-depends: | ${deptype:tl}-depends: | ||||
. if !empty(${deptype}_DEPENDS_ALL) && !defined(NO_DEPENDS) | . if !empty(${deptype}_DEPENDS) && !defined(NO_DEPENDS) | ||||
@${SETENV} \ | @${SETENV} \ | ||||
dp_RAWDEPENDS="${${deptype}_DEPENDS_ALL}" \ | dp_RAWDEPENDS="${${deptype}_DEPENDS} ${${deptype}_DEPENDS_ALL_SUBPACKAGES}" \ | ||||
dp_DEPTYPE="${deptype}_DEPENDS" \ | dp_DEPTYPE="${deptype}_DEPENDS" \ | ||||
dp_DEPENDS_TARGET="${DEPENDS_TARGET}" \ | dp_DEPENDS_TARGET="${DEPENDS_TARGET}" \ | ||||
dp_DEPENDS_PRECLEAN="${DEPENDS_PRECLEAN}" \ | dp_DEPENDS_PRECLEAN="${DEPENDS_PRECLEAN}" \ | ||||
dp_DEPENDS_CLEAN="${DEPENDS_CLEAN}" \ | dp_DEPENDS_CLEAN="${DEPENDS_CLEAN}" \ | ||||
dp_DEPENDS_ARGS="${DEPENDS_ARGS}" \ | dp_DEPENDS_ARGS="${DEPENDS_ARGS}" \ | ||||
dp_USE_PACKAGE_DEPENDS="${USE_PACKAGE_DEPENDS}" \ | dp_USE_PACKAGE_DEPENDS="${USE_PACKAGE_DEPENDS}" \ | ||||
dp_USE_PACKAGE_DEPENDS_ONLY="${USE_PACKAGE_DEPENDS_ONLY}" \ | dp_USE_PACKAGE_DEPENDS_ONLY="${USE_PACKAGE_DEPENDS_ONLY}" \ | ||||
dp_PKG_ADD="${PKG_ADD}" \ | dp_PKG_ADD="${PKG_ADD}" \ | ||||
Show All 12 Lines | @${SETENV} \ | ||||
${SH} ${SCRIPTSDIR}/do-depends.sh | ${SH} ${SCRIPTSDIR}/do-depends.sh | ||||
. endif | . endif | ||||
. endfor | . endfor | ||||
. endif | . endif | ||||
# Dependency lists: both build and runtime, recursive. Print out directory names. | # Dependency lists: both build and runtime, recursive. Print out directory names. | ||||
_UNIFIED_DEPENDS=${PKG_DEPENDS_ALL} ${EXTRACT_DEPENDS_ALL} ${PATCH_DEPENDS_ALL} ${FETCH_DEPENDS_ALL} ${BUILD_DEPENDS_ALL} ${LIB_DEPENDS_ALL} ${RUN_DEPENDS_ALL} ${TEST_DEPENDS_ALL} | _UNIFIED_DEPENDS= ${PKG_DEPENDS} ${EXTRACT_DEPENDS} ${PATCH_DEPENDS} \ | ||||
${FETCH_DEPENDS} ${BUILD_DEPENDS} ${LIB_DEPENDS} \ | |||||
${RUN_DEPENDS} ${TEST_DEPENDS} \ | |||||
${LIB_DEPENDS_ALL_SUBPACKAGES} ${RUN_DEPENDS_ALL_SUBPACKAGES} \ | |||||
${TEST_DEPENDS_ALL_SUBPACKAGES} | |||||
_DEPEND_SPECIALS= ${_UNIFIED_DEPENDS:M*\:*\:*:C,^[^:]*:([^:]*):.*$,\1,} | _DEPEND_SPECIALS= ${_UNIFIED_DEPENDS:M*\:*\:*:C,^[^:]*:([^:]*):.*$,\1,} | ||||
. for d in ${_UNIFIED_DEPENDS:M*\:/*} | . for d in ${_UNIFIED_DEPENDS:M*\:/*} | ||||
_PORTSDIR_STR= $${PORTSDIR}/ | _PORTSDIR_STR= $${PORTSDIR}/ | ||||
DEV_WARNING+= "It looks like the ${d} depends line has an absolute port origin, make sure to remove \$${_PORTSDIR_STR} from it." | DEV_WARNING+= "It looks like the ${d} depends line has an absolute port origin, make sure to remove \$${_PORTSDIR_STR} from it." | ||||
. endfor | . endfor | ||||
all-depends-list: | all-depends-list: | ||||
Show All 36 Lines | ${SETENV} \ | ||||
dp_OVERLAYS="${OVERLAYS}" \ | dp_OVERLAYS="${OVERLAYS}" \ | ||||
${SH} ${SCRIPTSDIR}/depends-list.sh \ | ${SH} ${SCRIPTSDIR}/depends-list.sh \ | ||||
${DEPENDS_SHOW_FLAVOR:D-f} | ${DEPENDS_SHOW_FLAVOR:D-f} | ||||
ALL-DEPENDS-LIST= ${DEPENDS-LIST} -r ${_UNIFIED_DEPENDS:Q} | ALL-DEPENDS-LIST= ${DEPENDS-LIST} -r ${_UNIFIED_DEPENDS:Q} | ||||
ALL-DEPENDS-FLAVORS-LIST= ${DEPENDS-LIST} -f -r ${_UNIFIED_DEPENDS:Q} | ALL-DEPENDS-FLAVORS-LIST= ${DEPENDS-LIST} -f -r ${_UNIFIED_DEPENDS:Q} | ||||
DEINSTALL-DEPENDS-FLAVORS-LIST= ${DEPENDS-LIST} -f -r ${_UNIFIED_DEPENDS:N${PKG_DEPENDS}:Q} | DEINSTALL-DEPENDS-FLAVORS-LIST= ${DEPENDS-LIST} -f -r ${_UNIFIED_DEPENDS:N${PKG_DEPENDS}:Q} | ||||
MISSING-DEPENDS-LIST= ${DEPENDS-LIST} -m ${_UNIFIED_DEPENDS:Q} | MISSING-DEPENDS-LIST= ${DEPENDS-LIST} -m ${_UNIFIED_DEPENDS:Q} | ||||
BUILD-DEPENDS-LIST= ${DEPENDS-LIST} "${PKG_DEPENDS_ALL} ${EXTRACT_DEPENDS_ALL} ${PATCH_DEPENDS_ALL} ${FETCH_DEPENDS_ALL} ${BUILD_DEPENDS_ALL} ${LIB_DEPENDS_ALL}" | BUILD-DEPENDS-LIST= ${DEPENDS-LIST} "${PKG_DEPENDS} ${EXTRACT_DEPENDS} ${PATCH_DEPENDS} ${FETCH_DEPENDS} ${BUILD_DEPENDS} ${LIB_DEPENDS} ${LIB_DEPENDS_ALL_SUBPACKAGES}" | ||||
RUN-DEPENDS-LIST= ${DEPENDS-LIST} "${LIB_DEPENDS_ALL} ${RUN_DEPENDS_ALL}" | RUN-DEPENDS-LIST= ${DEPENDS-LIST} "${LIB_DEPENDS} ${RUN_DEPENDS} ${LIB_DEPENDS_ALL_SUBPACKAGES} ${RUN_DEPENDS_ALL_SUBPACKAGES}" | ||||
TEST-DEPENDS-LIST= ${DEPENDS-LIST} ${TEST_DEPENDS_ALL:Q} | TEST-DEPENDS-LIST= ${DEPENDS-LIST} ${TEST_DEPENDS:Q} ${TEST_DEPENDS_ALL_SUBPACKAGES:Q} | ||||
CLEAN-DEPENDS-LIST= ${DEPENDS-LIST} -wr ${_UNIFIED_DEPENDS:Q} | CLEAN-DEPENDS-LIST= ${DEPENDS-LIST} -wr ${_UNIFIED_DEPENDS:Q} | ||||
CLEAN-DEPENDS-LIMITED-LIST= ${DEPENDS-LIST} -w ${_UNIFIED_DEPENDS:Q} | CLEAN-DEPENDS-LIMITED-LIST= ${DEPENDS-LIST} -w ${_UNIFIED_DEPENDS:Q} | ||||
. if !target(clean-depends) | . if !target(clean-depends) | ||||
clean-depends: | clean-depends: | ||||
@for dir in $$(${CLEAN-DEPENDS-LIST}); do \ | @for dir in $$(${CLEAN-DEPENDS-LIST}); do \ | ||||
(cd $$dir; ${MAKE} NOCLEANDEPENDS=yes clean); \ | (cd $$dir; ${MAKE} NOCLEANDEPENDS=yes clean); \ | ||||
done | done | ||||
▲ Show 20 Lines • Show All 72 Lines • ▼ Show 20 Lines | |||||
. if !target(fetch-required) | . if !target(fetch-required) | ||||
fetch-required: fetch | fetch-required: fetch | ||||
. if defined(NO_DEPENDS) | . if defined(NO_DEPENDS) | ||||
@${ECHO_MSG} "===> NO_DEPENDS is set, not fetching any other distfiles for ${PKGNAME}" | @${ECHO_MSG} "===> NO_DEPENDS is set, not fetching any other distfiles for ${PKGNAME}" | ||||
. else | . else | ||||
@${ECHO_MSG} "===> Fetching all required distfiles for ${PKGNAME} and dependencies" | @${ECHO_MSG} "===> Fetching all required distfiles for ${PKGNAME} and dependencies" | ||||
. for deptype in PKG EXTRACT PATCH FETCH BUILD RUN | . for deptype in PKG EXTRACT PATCH FETCH BUILD RUN | ||||
. if defined(${deptype}_DEPENDS) | . if defined(${deptype}_DEPENDS) | ||||
@targ=fetch; deps="${${deptype}_DEPENDS_ALL}"; ${FETCH_LIST} | @targ=fetch; deps="${${deptype}_DEPENDS} ${${deptype}_DEPENDS_ALL_SUBPACKAGES}"; ${FETCH_LIST} | ||||
. endif | . endif | ||||
. endfor | . endfor | ||||
. endif | . endif | ||||
. endif | . endif | ||||
. if !target(fetch-required-list) | . if !target(fetch-required-list) | ||||
fetch-required-list: fetch-list | fetch-required-list: fetch-list | ||||
. if !defined(NO_DEPENDS) | . if !defined(NO_DEPENDS) | ||||
. for deptype in PKG EXTRACT PATCH FETCH BUILD RUN | . for deptype in PKG EXTRACT PATCH FETCH BUILD RUN | ||||
. if defined(${deptype}_DEPENDS) | . if defined(${deptype}_DEPENDS) | ||||
@targ=fetch-list; deps="${${deptype}_DEPENDS_ALL}"; ${FETCH_LIST} | @targ=fetch-list; deps="${${deptype}_DEPENDS} ${${deptype}_DEPENDS_ALL_SUBPACKAGES}"; ${FETCH_LIST} | ||||
Not Done Inline ActionsI would add, as a comment, that _DEPENDS_ALL_SUBPACKAGES is only defined for RUN. pizzamig: I would add, as a comment, that `_DEPENDS_ALL_SUBPACKAGES` is only defined for `RUN`.
Maybe it… | |||||
Done Inline Actions_DEPENDS_ALL_SUBPACKAGES are defined for RUN, TEST and LIB, but only RUN is used here.
That'd mean more lines of code. But I will do that if you insist. arrowd: `_DEPENDS_ALL_SUBPACKAGES` are defined for `RUN`, `TEST` and `LIB`, but only `RUN` is used here. | |||||
Not Done Inline ActionsNo strong opinion, but it seems uneven to me. pizzamig: No strong opinion, but it seems uneven to me.
In any case, I won't block the merge because of… | |||||
Done Inline Actions
I took another look at that and don't quite understand what do you mean by checking separately? You mean plugging in another .if defined(${deptype}_DEPENDS_ALL_SUBPACKAGES) check? arrowd: > Maybe it makes sense to check for RUN_DEPENDS_ALL_SUBPACKAGES separately
I took another… | |||||
. endif | . endif | ||||
. endfor | . endfor | ||||
. endif | . endif | ||||
. endif | . endif | ||||
. if !target(checksum-recursive) | . if !target(checksum-recursive) | ||||
checksum-recursive: | checksum-recursive: | ||||
@${ECHO_MSG} "===> Fetching and checking checksums for ${PKGNAME} and dependencies" | @${ECHO_MSG} "===> Fetching and checking checksums for ${PKGNAME} and dependencies" | ||||
Show All 22 Lines | |||||
# Package (recursive runtime) dependency list. Print out both directory names | # Package (recursive runtime) dependency list. Print out both directory names | ||||
# and package names. | # and package names. | ||||
package-depends-list: | package-depends-list: | ||||
. if defined(CHILD_DEPENDS) || defined(LIB_DEPENDS) || defined(RUN_DEPENDS) | . if defined(CHILD_DEPENDS) || defined(LIB_DEPENDS) || defined(RUN_DEPENDS) | ||||
@${PACKAGE-DEPENDS-LIST} | @${PACKAGE-DEPENDS-LIST} | ||||
. endif | . endif | ||||
_LIB_RUN_DEPENDS= ${LIB_DEPENDS_ALL} ${RUN_DEPENDS_ALL} | _LIB_RUN_DEPENDS= ${LIB_DEPENDS} ${RUN_DEPENDS} ${LIB_DEPENDS_ALL_SUBPACKAGES} ${RUN_DEPENDS_ALL_SUBPACKAGES} | ||||
PACKAGE-DEPENDS-LIST?= \ | PACKAGE-DEPENDS-LIST?= \ | ||||
if [ "${CHILD_DEPENDS}" ]; then \ | if [ "${CHILD_DEPENDS}" ]; then \ | ||||
installed=$$(${PKG_INFO} -qO ${PKGORIGIN} 2>/dev/null || \ | installed=$$(${PKG_INFO} -qO ${PKGORIGIN} 2>/dev/null || \ | ||||
${TRUE}); \ | ${TRUE}); \ | ||||
if [ "$$installed" ]; then \ | if [ "$$installed" ]; then \ | ||||
break; \ | break; \ | ||||
fi; \ | fi; \ | ||||
if [ -z "$$installed" ]; then \ | if [ -z "$$installed" ]; then \ | ||||
▲ Show 20 Lines • Show All 156 Lines • ▼ Show 20 Lines | |||||
################################################################ | ################################################################ | ||||
# This target generates an index entry suitable for aggregation into | # This target generates an index entry suitable for aggregation into | ||||
# a large index. Format is: | # a large index. Format is: | ||||
# | # | ||||
# distribution-name|port-path|installation-prefix|comment| \ | # distribution-name|port-path|installation-prefix|comment| \ | ||||
# description-file|maintainer|categories|extract-depends| \ | # description-file|maintainer|categories|extract-depends| \ | ||||
# patch-depends|fetch-depends|build-depends|run-depends|www site | # patch-depends|fetch-depends|build-depends|run-depends|www site | ||||
# | |||||
# If this ever changes, portmgr should contact the portsnap maintainer | |||||
# first to avoid gratuitous breakage. | |||||
. if !target(describe) | . if !target(describe) | ||||
_EXTRACT_DEPENDS=${EXTRACT_DEPENDS_ALL:C/^[^ :]+:([^ :@]+)(@[^ :]+)?(:[^ :]+)?/\1/:O:u:C,(^[^/]),${PORTSDIR}/\1,} | _EXTRACT_DEPENDS=${EXTRACT_DEPENDS:C/^[^ :]+:([^ :@]+)(@[^ :]+)?(:[^ :]+)?/\1/:O:u:C,(^[^/]),${PORTSDIR}/\1,} | ||||
_PATCH_DEPENDS=${PATCH_DEPENDS_ALL:C/^[^ :]+:([^ :@]+)(@[^ :]+)?(:[^ :]+)?/\1/:O:u:C,(^[^/]),${PORTSDIR}/\1,} | _PATCH_DEPENDS=${PATCH_DEPENDS:C/^[^ :]+:([^ :@]+)(@[^ :]+)?(:[^ :]+)?/\1/:O:u:C,(^[^/]),${PORTSDIR}/\1,} | ||||
_FETCH_DEPENDS=${FETCH_DEPENDS_ALL:C/^[^ :]+:([^ :@]+)(@[^ :]+)?(:[^ :]+)?/\1/:O:u:C,(^[^/]),${PORTSDIR}/\1,} | _FETCH_DEPENDS=${FETCH_DEPENDS:C/^[^ :]+:([^ :@]+)(@[^ :]+)?(:[^ :]+)?/\1/:O:u:C,(^[^/]),${PORTSDIR}/\1,} | ||||
_LIB_DEPENDS=${LIB_DEPENDS_ALL:C/^[^ :]+:([^ :@]+)(@[^ :]+)?(:[^ :]+)?/\1/:O:u:C,(^[^/]),${PORTSDIR}/\1,} | _LIB_DEPENDS=${LIB_DEPENDS:C/^[^ :]+:([^ :@]+)(@[^ :]+)?(:[^ :]+)?/\1/:O:u:C,(^[^/]),${PORTSDIR}/\1,} | ||||
_BUILD_DEPENDS=${BUILD_DEPENDS_ALL:C/^[^ :]+:([^ :@]+)(@[^ :]+)?(:[^ :]+)?/\1/:O:u:C,(^[^/]),${PORTSDIR}/\1,} ${_LIB_DEPENDS} | _BUILD_DEPENDS=${BUILD_DEPENDS:C/^[^ :]+:([^ :@]+)(@[^ :]+)?(:[^ :]+)?/\1/:O:u:C,(^[^/]),${PORTSDIR}/\1,} ${_LIB_DEPENDS} | ||||
_RUN_DEPENDS=${RUN_DEPENDS_ALL:C/^[^ :]+:([^ :@]+)(@[^ :]+)?(:[^ :]+)?/\1/:O:u:C,(^[^/]),${PORTSDIR}/\1,} ${_LIB_DEPENDS} | _RUN_DEPENDS=${RUN_DEPENDS:C/^[^ :]+:([^ :@]+)(@[^ :]+)?(:[^ :]+)?/\1/:O:u:C,(^[^/]),${PORTSDIR}/\1,} ${_LIB_DEPENDS} | ||||
. for sp in ${SUBPACKAGES} | |||||
_BUILD_DEPENDS.${sp}= ${_BUILD_DEPENDS} ${LIB_DEPENDS.${sp}:C/^[^ :]+:([^ :@]+)(@[^ :]+)?(:[^ :]+)?/\1/:O:u:C,(^[^/]),${PORTSDIR}/\1,} | |||||
_RUN_DEPENDS.${sp}= ${RUN_DEPENDS.${sp}:C/^[^ :]+:([^ :@]+)(@[^ :]+)?(:[^ :]+)?/\1/:O:u:C,(^[^/]),${PORTSDIR}/\1,} ${LIB_DEPENDS.${sp}:C/^[^ :]+:([^ :@]+)(@[^ :]+)?(:[^ :]+)?/\1/:O:u:C,(^[^/]),${PORTSDIR}/\1,} | |||||
. endfor | |||||
. if exists(${DESCR}) | . if exists(${DESCR}) | ||||
_DESCR=${DESCR} | _DESCR=${DESCR} | ||||
. else | . else | ||||
_DESCR=/dev/null | _DESCR=/dev/null | ||||
. endif | . endif | ||||
. if defined(BUILDING_INDEX) && defined(INDEX_PORTS) | . if defined(BUILDING_INDEX) && defined(INDEX_PORTS) | ||||
INDEX_OUT=${INDEX_TMPDIR}/${INDEXFILE}.desc.aggr | INDEX_OUT=${INDEX_TMPDIR}/${INDEXFILE}.desc.aggr | ||||
. else | . else | ||||
INDEX_OUT=/dev/stdout | INDEX_OUT=/dev/stdout | ||||
. endif | . endif | ||||
. if empty(FLAVORS) || defined(_DESCRIBE_WITH_FLAVOR) | . if empty(FLAVORS) || defined(_DESCRIBE_WITH_FLAVOR) | ||||
describe: | describe: | ||||
@(${ECHO_CMD} "${PKGNAME}|${.CURDIR}|${PREFIX}|"${COMMENT:Q}"|${_DESCR}|${MAINTAINER}|${CATEGORIES}|${_EXTRACT_DEPENDS}|${_PATCH_DEPENDS}|${_FETCH_DEPENDS}|${_BUILD_DEPENDS:O:u}|${_RUN_DEPENDS:O:u}|${_WWW}" >> ${INDEX_OUT}) | @(${ECHO_CMD} "${PKGNAME}|${.CURDIR}|${PREFIX}|"${COMMENT:Q}"|${_DESCR}|${MAINTAINER}|${CATEGORIES}|${_EXTRACT_DEPENDS}|${_PATCH_DEPENDS}|${_FETCH_DEPENDS}|${_BUILD_DEPENDS:O:u}|${_RUN_DEPENDS:O:u}|${_WWW}" >> ${INDEX_OUT}) | ||||
. for sp in ${SUBPACKAGES} | |||||
@(${ECHO_CMD} "${PKGNAME.${sp}}|${.CURDIR}|${PREFIX}|"${COMMENT:Q}"|${_DESCR.${sp}}|${MAINTAINER}|${CATEGORIES}|${_EXTRACT_DEPENDS}|${_PATCH_DEPENDS}|${_FETCH_DEPENDS}|${_BUILD_DEPENDS.${sp}:O:u}|${_RUN_DEPENDS.${sp}:O:u}|${_WWW}" >> ${INDEX_OUT}) | |||||
. endfor | |||||
. else # empty(FLAVORS) | . else # empty(FLAVORS) | ||||
describe: ${FLAVORS:S/^/describe-/} | describe: ${FLAVORS:S/^/describe-/} | ||||
. for f in ${FLAVORS} | . for f in ${FLAVORS} | ||||
Done Inline ActionsWhile equivalent, I would keep the for loop in the else branch of empty(FLAVORS) pizzamig: While equivalent, I would keep the for loop in the else branch of `empty(FLAVORS)`
| |||||
describe-${f}: | describe-${f}: | ||||
@cd ${.CURDIR} && ${SETENV} FLAVOR=${f} ${MAKE} -B -D_DESCRIBE_WITH_FLAVOR describe | @cd ${.CURDIR} && ${SETENV} FLAVOR=${f} ${MAKE} -B -D_DESCRIBE_WITH_FLAVOR describe | ||||
. endfor | . endfor | ||||
. endif # empty(FLAVORS) | . endif # empty(FLAVORS) | ||||
. endif | . endif | ||||
. if empty(FLAVORS) || defined(_DESCRIBE_WITH_FLAVOR) | . if empty(FLAVORS) || defined(_DESCRIBE_WITH_FLAVOR) | ||||
▲ Show 20 Lines • Show All 1,116 Lines • Show Last 20 Lines |
the *_DEPENDS_ALL you are removing are the one used by poudriere to fetch dependency of the port before building it.
For this reason, they cannot be removed until poudriere is not patched to use something else