From nobody Mon Jan 15 16:17:39 2024 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 4TDHNg5Qpmz57GSp; Mon, 15 Jan 2024 16:17:39 +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 4TDHNg4DNPz53ys; Mon, 15 Jan 2024 16:17:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705335459; 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=C17g4N54xcwOGeGqnAZ0oj07yKWHy9nlcvBOpQv8Zg4=; b=qytwuWuyp0Cq/HI6Qn1SIwSTjPNy8PQ90a7Vughrbg/6sDB3rUxmHa3KUKDexXrUSEk0CQ v3NGhKGV8f9XVSXQRl2YbL8KZo17TKIbZF1IAgdRi62fLd7FtGkcxLlrtt9BzEIUHY+GOC DHParyU8E0L94YQsT/J0V9Ge9B5O/tzlbgpkl5Fnft95do5Bi//gjbwfxLWN7PXIEMKWpR zkWWXmXOru5eUKqYHbhr+ywVrAZfQaQ1n+3mv/dZ1qTe6xh8i4rZ2Vh5Ei7+ctqO39st5B DFAUeyHqLfKgn04GJ34iEKg9eBiz0pWdqbI8WXBwU5BU4ES4DymibLY7rcLDqA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705335459; 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=C17g4N54xcwOGeGqnAZ0oj07yKWHy9nlcvBOpQv8Zg4=; b=ba5ukaXSpkeeDCRzKAymPd8ophhvsgIglhSst654zb978JPhYdIHaq5hKWgkonFPBas9HB FWHYbSKVR2fryK4dFiITXIayCRKc1WwX87dCJoJ1wLIBjrDTt0vnj5UrzxYXAVOtDeLY+k qTBznRoRsC5BnqWun7j/Agoal8+spmULhRk3J5RIMi+zqlC2ZLzd10MUvSPH5KVRBXQz66 kql2fsVG6PVete8MMsC7JVg1C4OgDwPWErgLNQUsWaRqOagj+gEYCTGvik5zNtgscHSMgi uW8ilGaeQgdY6Z/B4FxrUu1rFZM2ujX3UEpKlQlT78fxfNiaYwJJX25gBdwDTw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705335459; a=rsa-sha256; cv=none; b=fLicg0bSd2EgzfWI7PmsHJNozRu2tJTf1PhFOzKvpqDPMYBGgwjjvYcnjgkNb5wdW765IO 6wx4lcEmtG+LfAFjrBh1XaxnU6xRgVqhLEbteDIsQ5hSm0WHSFMNrlHdk0yBmggwjVOUSG 790tK3fqdut2UsP0OpEaRh+hPkNhl1EdDHLJo1/QwAGPQPim+GpgqNRCAANtNdMmLnUTqB bfSYNwghjjAZaIMMAD3ITgaQ7EzRAq5wkW58vlSk3EN765+UEW6VqayJCkyHa2x7CGps7g UkVgw5izuIE0lLw1LokGteffTUWnd3nHhNh4XkobHZ29NvlT2x5DanTDB6lvmA== 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 4TDHNg3727z13C9; Mon, 15 Jan 2024 16:17:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 40FGHdAV095124; Mon, 15 Jan 2024 16:17:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40FGHd7A095121; Mon, 15 Jan 2024 16:17:39 GMT (envelope-from git) Date: Mon, 15 Jan 2024 16:17:39 GMT Message-Id: <202401151617.40FGHd7A095121@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Christian Weisgerber Subject: git: fe3392ed8d42 - main - Mk/*: unconditionally use .MAKE.UID and .MAKE.GID 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: naddy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fe3392ed8d428ccb922ea60097e4cac7c95ad07a Auto-Submitted: auto-generated The branch main has been updated by naddy: URL: https://cgit.FreeBSD.org/ports/commit/?id=fe3392ed8d428ccb922ea60097e4cac7c95ad07a commit fe3392ed8d428ccb922ea60097e4cac7c95ad07a Author: Christian Weisgerber AuthorDate: 2024-01-11 14:53:35 +0000 Commit: Christian Weisgerber CommitDate: 2024-01-15 16:17:05 +0000 Mk/*: unconditionally use .MAKE.UID and .MAKE.GID Since FreeBSD 12 has been EOLed, the built-in make(1) variables .MAKE.UID and .MAKE.GID are always available. PR: 276259 Approved by: arrowd --- Mk/Uses/uidfix.mk | 4 +--- Mk/bsd.port.mk | 8 +------- Mk/bsd.port.subdir.mk | 4 +--- 3 files changed, 3 insertions(+), 13 deletions(-) diff --git a/Mk/Uses/uidfix.mk b/Mk/Uses/uidfix.mk index b8828d4a8a29..4fcce22846ef 100644 --- a/Mk/Uses/uidfix.mk +++ b/Mk/Uses/uidfix.mk @@ -8,9 +8,7 @@ .if !defined(_INCLUDE_USES_UIDFIX_MK) _INCLUDE_USES_UIDFIX_MK= yes -. if !defined(GID) -GID!= id -g -. endif +GID?= ${.MAKE.GID} . if ${UID} != 0 MAKE_ENV+= BINOWN=${UID} SHAREOWN=${UID} CONFOWN=${UID} LIBOWN=${UID} MAKE_ENV+= BINGRP=${GID} SHAREGRP=${GID} CONFGRP=${GID} LIBGRP=${GID} diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index 54390720912e..203b78749fd7 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -1448,13 +1448,7 @@ USES+=mysql:${USE_MYSQL} .include "${PORTSDIR}/Mk/bsd.wx.mk" . endif -. if !defined(UID) -. if defined(.MAKE.UID) -UID= ${.MAKE.UID} -. else -UID!= ${ID} -u -. endif -. endif +UID?= ${.MAKE.UID} DESTDIRNAME?= DESTDIR diff --git a/Mk/bsd.port.subdir.mk b/Mk/bsd.port.subdir.mk index cc2cc81da01b..d83379a52feb 100644 --- a/Mk/bsd.port.subdir.mk +++ b/Mk/bsd.port.subdir.mk @@ -137,9 +137,7 @@ _JAVA_PORTS_INSTALLED!= ${MAKE} -V _JAVA_PORTS_INSTALLED USE_JAVA=1 -f ${PORTSD . endif _EXPORTED_VARS+= _JAVA_PORTS_INSTALLED -. if !defined(UID) -UID!= ${ID} -u -. endif +UID?= ${.MAKE.UID} _EXPORTED_VARS+= UID .endif