From owner-svn-ports-head@freebsd.org Mon Sep 10 13:41:23 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 77BC1109031A; Mon, 10 Sep 2018 13:41:23 +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 0CAAC81F3A; Mon, 10 Sep 2018 13:41:22 +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 9355F11FB; Mon, 10 Sep 2018 13:41:22 +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 w8ADfMKX085517; Mon, 10 Sep 2018 13:41:22 GMT (envelope-from mat@FreeBSD.org) Received: (from mat@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w8ADfMGJ085515; Mon, 10 Sep 2018 13:41:22 GMT (envelope-from mat@FreeBSD.org) Message-Id: <201809101341.w8ADfMGJ085515@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mat set sender to mat@FreeBSD.org using -f From: Mathieu Arnold Date: Mon, 10 Sep 2018 13:41:22 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r479421 - head/Mk X-SVN-Group: ports-head X-SVN-Commit-Author: mat X-SVN-Commit-Paths: head/Mk X-SVN-Commit-Revision: 479421 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: Mon, 10 Sep 2018 13:41:23 -0000 Author: mat Date: Mon Sep 10 13:41:21 2018 New Revision: 479421 URL: https://svnweb.freebsd.org/changeset/ports/479421 Log: Move sanity checks later. Some USES set some variables that a porter may need to be aware and set some variables too late for sanity checks to do a good job. Modified: head/Mk/bsd.port.mk (contents, props changed) head/Mk/bsd.sanity.mk (contents, props changed) Modified: head/Mk/bsd.port.mk ============================================================================== --- head/Mk/bsd.port.mk Mon Sep 10 13:41:19 2018 (r479420) +++ head/Mk/bsd.port.mk Mon Sep 10 13:41:21 2018 (r479421) @@ -1318,8 +1318,8 @@ WITH_DEBUG= yes # Start of pre-makefile section. .if !defined(AFTERPORTMK) && !defined(INOPTIONSMK) -.if defined(PORTNAME) -.include "${PORTSDIR}/Mk/bsd.sanity.mk" +.if defined(_PREMKINCLUDED) +DEV_ERROR+= "you cannot include bsd.port[.pre].mk twice" .endif _PREMKINCLUDED= yes @@ -2007,6 +2007,10 @@ ${_f}_ARGS:= ${f:C/^[^\:]*(\:|\$)//:S/,/ /g} .for f in ${_USES_POST} .include "${USESDIR}/${f:C/\:.*//}.mk" .endfor + +.if defined(PORTNAME) +.include "${PORTSDIR}/Mk/bsd.sanity.mk" +.endif .if defined(USE_LOCALE) CONFIGURE_ENV+= LANG=${USE_LOCALE} LC_ALL=${USE_LOCALE} Modified: head/Mk/bsd.sanity.mk ============================================================================== --- head/Mk/bsd.sanity.mk Mon Sep 10 13:41:19 2018 (r479420) +++ head/Mk/bsd.sanity.mk Mon Sep 10 13:41:21 2018 (r479421) @@ -102,10 +102,6 @@ DEV_WARNING+= "USE_GNOME=desktopfileutils is deprecate DEV_ERROR+= "All LIB_DEPENDS should use the new format and start out with lib. \(libfoo.so vs foo.so\)" .endif -.if defined(_PREMKINCLUDED) -DEV_ERROR+= "you cannot include bsd.port[.pre].mk twice" -.endif - .if defined(LICENSE) .if ${LICENSE:MBSD} DEV_WARNING+= "LICENSE must not contain BSD, instead use BSD[234]CLAUSE"