From owner-svn-ports-head@freebsd.org Thu Jul 26 10:37:37 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 5AFEB104ADCE; Thu, 26 Jul 2018 10:37:37 +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 0A5308960D; Thu, 26 Jul 2018 10:37:37 +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 DD64727D79; Thu, 26 Jul 2018 10:37:36 +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 w6QAbaeP033572; Thu, 26 Jul 2018 10:37:36 GMT (envelope-from mat@FreeBSD.org) Received: (from mat@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w6QAbaPu033570; Thu, 26 Jul 2018 10:37:36 GMT (envelope-from mat@FreeBSD.org) Message-Id: <201807261037.w6QAbaPu033570@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mat set sender to mat@FreeBSD.org using -f From: Mathieu Arnold Date: Thu, 26 Jul 2018 10:37:36 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r475360 - in head/Mk: . Scripts X-SVN-Group: ports-head X-SVN-Commit-Author: mat X-SVN-Commit-Paths: in head/Mk: . Scripts X-SVN-Commit-Revision: 475360 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.27 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: Thu, 26 Jul 2018 10:37:37 -0000 Author: mat Date: Thu Jul 26 10:37:36 2018 New Revision: 475360 URL: https://svnweb.freebsd.org/changeset/ports/475360 Log: Tell people who disabled LICENSE processing that it then cannot be checked. Reported by: mfechner Approved by: bapt Sponsored by: Absolight Differential Revision: https://reviews.freebsd.org/D16450 Modified: head/Mk/Scripts/qa.sh (contents, props changed) head/Mk/bsd.port.mk (contents, props changed) Modified: head/Mk/Scripts/qa.sh ============================================================================== --- head/Mk/Scripts/qa.sh Thu Jul 26 09:44:41 2018 (r475359) +++ head/Mk/Scripts/qa.sh Thu Jul 26 10:37:36 2018 (r475360) @@ -918,7 +918,9 @@ license() { local lic autoaccept pkgmirror #distsell distmirror pkgsell - if [ -n "$LICENSE" ]; then + if [ -n "$DISABLE_LICENSES" ]; then + warn "You have disabled the licenses framework with DISABLE_LICENSES, unable to run checks" + elif [ -n "$LICENSE" ]; then for lic in $LICENSE_PERMS; do case "$lic" in auto-accept) autoaccept=1 ;; Modified: head/Mk/bsd.port.mk ============================================================================== --- head/Mk/bsd.port.mk Thu Jul 26 09:44:41 2018 (r475359) +++ head/Mk/bsd.port.mk Thu Jul 26 10:37:36 2018 (r475360) @@ -1633,6 +1633,7 @@ QA_ENV+= STAGEDIR=${STAGEDIR} \ PKGBASE=${PKGBASE} \ LICENSE="${LICENSE}" \ LICENSE_PERMS="${_LICENSE_PERMS}" \ + DISABLE_LICENSES="${DISABLE_LICENSES:Dyes}" \ PORTNAME=${PORTNAME} \ NO_ARCH=${NO_ARCH} \ "NO_ARCH_IGNORE=${NO_ARCH_IGNORE}" \