Date: Tue, 20 Feb 2018 22:58:19 +0000 (UTC) From: Bryan Drewery <bdrewery@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r462464 - in head/Mk: . Scripts Message-ID: <201802202258.w1KMwJXS029935@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bdrewery Date: Tue Feb 20 22:58:19 2018 New Revision: 462464 URL: https://svnweb.freebsd.org/changeset/ports/462464 Log: Fix RANDOMIZE_MASTER_SITES. - /usr/games/random moved to /usr/bin/random in 11.0+ - Need to explicitly add in the pipe '|' Approved by: portmgr (implicit) Modified: head/Mk/Scripts/do-fetch.sh head/Mk/bsd.port.mk Modified: head/Mk/Scripts/do-fetch.sh ============================================================================== --- head/Mk/Scripts/do-fetch.sh Tue Feb 20 22:53:48 2018 (r462463) +++ head/Mk/Scripts/do-fetch.sh Tue Feb 20 22:58:19 2018 (r462464) @@ -112,7 +112,12 @@ for _file in "${@}"; do ;; esac sites_remaining=0 - sites="$(${SORTED_MASTER_SITES_CMD_TMP} ${dp_RANDOMIZE_SITES})" + if [ -n "${dp_RANDOMIZE_SITES}" ]; then + sites="$(${SORTED_MASTER_SITES_CMD_TMP} | ${dp_RANDOMIZE_SITES})" + else + sites="$(${SORTED_MASTER_SITES_CMD_TMP})" + fi + echo $sites >&2 for site in ${sites}; do sites_remaining=$((sites_remaining + 1)) done Modified: head/Mk/bsd.port.mk ============================================================================== --- head/Mk/bsd.port.mk Tue Feb 20 22:53:48 2018 (r462463) +++ head/Mk/bsd.port.mk Tue Feb 20 22:58:19 2018 (r462464) @@ -2110,8 +2110,12 @@ FETCH_CMD?= ${FETCH_BINARY} ${FETCH_ARGS} .if defined(RANDOMIZE_MASTER_SITES) .if exists(/usr/games/random) RANDOM_CMD?= /usr/games/random +.elif exists(/usr/bin/random) +RANDOM_CMD?= /usr/bin/random +.endif +.if defined(RANDOM_CMD) && !empty(RANDOM_CMD) RANDOM_ARGS?= -w -f - -_RANDOMIZE_SITES= |${RANDOM_CMD} ${RANDOM_ARGS} +_RANDOMIZE_SITES= ${RANDOM_CMD} ${RANDOM_ARGS} .endif .endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201802202258.w1KMwJXS029935>