From owner-svn-ports-all@freebsd.org Wed Jul 18 11:33:25 2018 Return-Path: Delivered-To: svn-ports-all@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 84E751045B3D; Wed, 18 Jul 2018 11:33:25 +0000 (UTC) (envelope-from mat@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 3A5B075EE4; Wed, 18 Jul 2018 11:33:25 +0000 (UTC) (envelope-from mat@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 1B73B19A86; Wed, 18 Jul 2018 11:33:25 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w6IBXOR8028163; Wed, 18 Jul 2018 11:33:24 GMT (envelope-from mat@FreeBSD.org) Received: (from mat@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w6IBXO5l028162; Wed, 18 Jul 2018 11:33:24 GMT (envelope-from mat@FreeBSD.org) Message-Id: <201807181133.w6IBXO5l028162@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mat set sender to mat@FreeBSD.org using -f From: Mathieu Arnold Date: Wed, 18 Jul 2018 11:33:24 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r474853 - head/Mk/Scripts X-SVN-Group: ports-head X-SVN-Commit-Author: mat X-SVN-Commit-Paths: head/Mk/Scripts X-SVN-Commit-Revision: 474853 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 18 Jul 2018 11:33:25 -0000 Author: mat Date: Wed Jul 18 11:33:24 2018 New Revision: 474853 URL: https://svnweb.freebsd.org/changeset/ports/474853 Log: Have the license qa check actually work. Pointy hat: mat Sponsored by: Absolight Modified: head/Mk/Scripts/qa.sh (contents, props changed) Modified: head/Mk/Scripts/qa.sh ============================================================================== --- head/Mk/Scripts/qa.sh Wed Jul 18 11:27:24 2018 (r474852) +++ head/Mk/Scripts/qa.sh Wed Jul 18 11:33:24 2018 (r474853) @@ -916,16 +916,18 @@ flavors() license() { - local autoaccept pkgmirror #distsell distmirror pkgsell + local lic autoaccept pkgmirror #distsell distmirror pkgsell if [ -n "$LICENSE" ]; then - case "$LICENSE_PERMS" in - auto-accept) autoaccept=1 ;; - #dist-mirror) distmirror=1 ;; - #dist-sell) distsell=1 ;; - pkg-mirror) pkgmirror=1 ;; - #pkg-sell) pkgsell=1 ;; - esac + for lic in $LICENSE_PERMS; do + case "$lic" in + auto-accept) autoaccept=1 ;; + #dist-mirror) distmirror=1 ;; + #dist-sell) distsell=1 ;; + pkg-mirror) pkgmirror=1 ;; + #pkg-sell) pkgsell=1 ;; + esac + done if [ -z "$autoaccept" ]; then warn "License is not auto-accepted, packages will not be built, ports depending on this one will be ignored."