From owner-dev-commits-ports-all@freebsd.org Mon May 10 17:32:00 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id A757263EABF; Mon, 10 May 2021 17:32:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Ff7Qm4Qt5z3sHZ; Mon, 10 May 2021 17:32:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8ADFCA9B; Mon, 10 May 2021 17:32:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 14AHW033034123; Mon, 10 May 2021 17:32:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 14AHW01F034122; Mon, 10 May 2021 17:32:00 GMT (envelope-from git) Date: Mon, 10 May 2021 17:32:00 GMT Message-Id: <202105101732.14AHW01F034122@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Baptiste Daroussin Subject: git: 61daf777c5d6 - main - Revert "overlay: allow to load -overlay.mk files for each USES" MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 61daf777c5d6ccfd8bfd1287627f7f286759ffa4 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 May 2021 17:32:00 -0000 The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/ports/commit/?id=61daf777c5d6ccfd8bfd1287627f7f286759ffa4 commit 61daf777c5d6ccfd8bfd1287627f7f286759ffa4 Author: Baptiste Daroussin AuthorDate: 2021-05-10 17:31:36 +0000 Commit: Baptiste Daroussin CommitDate: 2021-05-10 17:31:36 +0000 Revert "overlay: allow to load -overlay.mk files for each USES" This changes was not supposed to be pushed yet This reverts commit 073b0aa8a4304190cd1727cee1393d39fd520a8b. --- Mk/bsd.port.mk | 3 --- 1 file changed, 3 deletions(-) diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index 49dcd31afbba..13785ff0f234 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -1464,9 +1464,6 @@ ${_f}_ARGS:= ${f:C/^[^\:]*(\:|\$)//:S/,/ /g} .for f in ${USES} .undef _usefound .for udir in ${OVERLAYS:C,$,/Mk/Uses,} ${USESDIR} -# always include all overlay files found in each overlay -_overlayfile= ${udir}/${f:C/\:.*//}-overlay.mk -.sinclude "${_overlayfile} _usefile= ${udir}/${f:C/\:.*//}.mk .if exists(${_usefile}) && !defined(_usefound) _usefound=