From nobody Wed Jun 22 23:12:50 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 1E89685F4A7; Wed, 22 Jun 2022 23:12:51 +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 4LSzgl0KZ4z4kRs; Wed, 22 Jun 2022 23:12:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655939571; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=diWu0djg9zXMcM1ezqmgkaxLa4qe6rEUTHlSiV7524E=; b=oL3pLTX4ovv2BAMlga4Ff08uZY3PoHVvG33aXmsQtcl4uYSvcrn3LteE+HidMpn3OB3jre fEZzAs/vUokijYzzS+VqnhSbi2n03YsHLyQD4yr9OHgK0dnkalQG8O2F/a0QpPedKFKIv1 37g2dvl21yUNnA8xECUxrekCqX4vw6c56VgO8TpWNBb02vJo+UlP5b6ISaHqGOHib81wXO SIiv3SECdDiOgsQlN0umu3ndDrxrEg7d1lReL76Zk8DbIwQpNP20CVo79kaGHFLxreXckZ HuIj4T8xDCEm1wLQ8yejzi0kpqS+JSch+4A/tcEWTLqPi4fEDb7ho7M3eo0fsA== 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 DF3FF77E2; Wed, 22 Jun 2022 23:12:50 +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 25MNConu063909; Wed, 22 Jun 2022 23:12:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25MNCo7Z063908; Wed, 22 Jun 2022 23:12:50 GMT (envelope-from git) Date: Wed, 22 Jun 2022 23:12:50 GMT Message-Id: <202206222312.25MNCo7Z063908@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dmitri Goutnik Subject: git: ba923ff9e3a6 - main - Mk/Uses/go.mk: Do not append to EXTRACT_ONLY List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dmgk X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ba923ff9e3a65d9aa6c711a65d6469d1791c9452 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655939571; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=diWu0djg9zXMcM1ezqmgkaxLa4qe6rEUTHlSiV7524E=; b=HnucP7LYNZLyUNd8y63q3fXYnslRccM45I3N5GlZddOiL8y5SgUwjLTBaWRdwK1m5VwTEJ qP4vyeBwustA93r081fuph43eQUiDntH2zQKYjKQ5Y2ywA9b53XEWS5Tvdrp+wNaIDDRL8 oiMJvGNoBCoNqJUcT+ZsYh80uGzrfHjnUOnJpOJUiNz/lcTsoNCfKEzytV+gihCF2rl7IF Y+qZuBB3brUNbMe868SdbfAm4WfVMj+f5M8CHilN9ouwVIitY51GZuH+VepbtxJeZmI7Kt 1gCvSFAyJHVMuwdLbhYKRW6vMik1hHwJYisxja4UpRf/uRFw+5d7e+YL6P5NJg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1655939571; a=rsa-sha256; cv=none; b=tXVtMse9dm/o33qXgZMd+c9pKMPKHsJCQhBVhsPZ1FkDLQrCX2cz38wKY7xco748B+YLp7 EnBzUJPDzH7KwgatMTht8cMuGzJD5ekkjIesN+h7cFc5BBnWxCZNUO16tkwejVGjVkswUf vvKMlH7DqKKO4yIrRi53Lmnawnr4kwAFK5rWO495XFZ3sx3vcRJkUw+3I3oF3EynbhLcrs 5rnZFhrIOUYX+bQEBrc4nXp3Ag42dxCqS3tibKLkxH81s/4QCjXADZ5/LpPfyoCFceCprq fGMRkEoKueuz1SINuM/N1yqhyBGPZdmu/uGtCBRapvYwu3LuABjrJbC9CSVgBA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dmgk: URL: https://cgit.FreeBSD.org/ports/commit/?id=ba923ff9e3a65d9aa6c711a65d6469d1791c9452 commit ba923ff9e3a65d9aa6c711a65d6469d1791c9452 Author: Dmitri Goutnik AuthorDate: 2022-06-22 22:32:43 +0000 Commit: Dmitri Goutnik CommitDate: 2022-06-22 23:12:02 +0000 Mk/Uses/go.mk: Do not append to EXTRACT_ONLY Appending to EXTRACT_ONLY may re-add files that were already excluded by the port. Instead, set EXTRACT_ONLY only if it was not already defined and let the port handle it otherwise. --- Mk/Uses/go.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Mk/Uses/go.mk b/Mk/Uses/go.mk index b2a5c1841383..b707b8f4c676 100644 --- a/Mk/Uses/go.mk +++ b/Mk/Uses/go.mk @@ -143,7 +143,7 @@ MASTER_SITES+= ${GO_GOPROXY}/${GO_MODNAME:C/([A-Z])/!\1/g:tl}/@v/ DISTFILES+= ${GO_MODFILE} ${GO_DISTFILE} WRKSRC= ${WRKDIR}/${GO_MODNAME}@${GO_MODVERSION} . endif -EXTRACT_ONLY+= ${DISTFILES:N*.mod\:*:N*.mod:C/:.*//} +EXTRACT_ONLY?= ${DISTFILES:N*.mod\:*:N*.mod:C/:.*//} DIST_SUBDIR= go/${PKGORIGIN:S,/,_,g}/${DISTNAME} FETCH_DEPENDS+= ${GO_CMD}:${GO_PORT} \ ca_root_nss>0:security/ca_root_nss