From owner-svn-ports-head@freebsd.org Tue Feb 20 22:58:20 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 13692F0DFEF; Tue, 20 Feb 2018 22:58:20 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id BB2157606B; Tue, 20 Feb 2018 22:58:19 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B5FA3101EC; Tue, 20 Feb 2018 22:58:19 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w1KMwJhw029938; Tue, 20 Feb 2018 22:58:19 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1KMwJXS029935; Tue, 20 Feb 2018 22:58:19 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201802202258.w1KMwJXS029935@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Tue, 20 Feb 2018 22:58:19 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r462464 - in head/Mk: . Scripts X-SVN-Group: ports-head X-SVN-Commit-Author: bdrewery X-SVN-Commit-Paths: in head/Mk: . Scripts X-SVN-Commit-Revision: 462464 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 20 Feb 2018 22:58:20 -0000 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