From nobody Thu Aug 7 12:37:21 2025 X-Original-To: dev-commits-src-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 4byRWP4VKpz64Dc5; Thu, 07 Aug 2025 12:37:21 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4byRWP3tMjz3sxW; Thu, 07 Aug 2025 12:37:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1754570241; 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=8yNqtp3xeTV0d+E3s0ID0aT+M0LYUBBlm/8vVo5h9hg=; b=ZY/FxqM3cbiV8WTSElb1pRvardfJX5eXPfKzhrHAFcSQdlmdkySGbY5uVcvFNl4SvKMtbt HxWUJa3StXwDW9+qVvkASKcV5H/AgoMELuHVhjZDAsabU9Yp8zxTMZ5gwr/mH2dRW6QS3P ptdP8GDjM9s5E13DoDIC11aSOL9w3hbl/C7vUF30S1YDwTQlPx5ap4devWtOW+LMq6CDwF V3n+149YVAFnpH5WpR9wpG385qxhb82RKMfitt8L5W4+aPA69gsDubbMyfIef98m9j/Y/r qn34EyJdxI7yPnvqFNQCAxllUBasKmx5LKHv/qKxt3gCRZNAXrgsPHQwODqg4w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1754570241; 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=8yNqtp3xeTV0d+E3s0ID0aT+M0LYUBBlm/8vVo5h9hg=; b=iHdmNjjx6nMsXEq5gZWJF0VgHLDgXHglyBIl0bfhBY7WKKHJ2qfo2hR66HCKRsbeTH2aeT +cfId7u9hDPLsJVnwOywTOCLZOaAWiYm83qv7iWvHKMbxg8awXLsKoJHF6dzM60Fe/soud 3j5ZFD+zSWmayv9Kvu66z+nbmVVtWK3/NdRzhB6fY3TwJQtrc46j1HrNUUXiNvOWWv8grN UMDhlQ8RpBGrH8H5rTSb2Nni/YvOO+1pgLvruKFn5eHXfZDB/9mjBA383H8W5+sNQOItMj 7eA51MUY19hPOp6KNL3KJn9Y5y5ADXr0eSSoXobQ3wLVZpZqIsXIhtHUM0AKNg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1754570241; a=rsa-sha256; cv=none; b=U+HVhm3FS/4+oIX7xLDDW6KF1HZYepuVMQhMrZ7Hh+woYVNrPhPSYtsasz6qv6zK9DVMx6 E/nhnN1UVkP/3+uN2lE3Qymm03VP0IDK11NBtbx1k7vTkK96jhrPJvIHrEcYJK8HRks+oP Ftb+MFsBMgEYuxMluYdltbvRT5HuPcTBVhVLt70w+WbGMjTLFzkfne/tLEWnTrNvnRfATM FeEQAtjWox4x9bMOX1fcTq2a5zasBKUVvKniBq0rbdbgCifaQmAMPtMPm8iL/Uhuw8RFTX H4nVPHtdfm1E1oQkcv1YeHqjlDdWHFl57QKzRrYh/8107ANdpAN9+gt7DviVqQ== 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 4byRWP36GSz16D1; Thu, 07 Aug 2025 12:37:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 577CbLUu023656; Thu, 7 Aug 2025 12:37:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 577CbLGU023653; Thu, 7 Aug 2025 12:37:21 GMT (envelope-from git) Date: Thu, 7 Aug 2025 12:37:21 GMT Message-Id: <202508071237.577CbLGU023653@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Lexi Winter Subject: git: 1e629ebb15db - main - bsd.files.mk: Fix FILESPACKAGE List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ivy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1e629ebb15db9ee0cb11a3654d7bcd3046a0df54 Auto-Submitted: auto-generated The branch main has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=1e629ebb15db9ee0cb11a3654d7bcd3046a0df54 commit 1e629ebb15db9ee0cb11a3654d7bcd3046a0df54 Author: Lexi Winter AuthorDate: 2025-08-07 11:43:25 +0000 Commit: Lexi Winter CommitDate: 2025-08-07 12:36:59 +0000 bsd.files.mk: Fix FILESPACKAGE Because TAGS may already have a package tag, assigning TAGS to FILESTAGS causes the value of FILESPACKAGE to be ignored. Only assign tags other than package, and take the default package from ${PACKAGE}, which matches the behaviour of bsd.confs.mk and bsd.man.mk. This fixes several files that were wrongly installed in utilities, including /usr/share/examples/sendmail/mailer.conf and some files in /usr/share/nls. The fix trips a bug in share/syscons where Makefile.inc was setting FILESPACKAGE to the wrong package, but the problem was hidden because the subdirectories set PACKAGE explicitly. Fix this by setting the correct FILESPACKAGE in Makefile.inc and removing the PACKAGEs. Reviewed by: manu Differential Revision: https://reviews.freebsd.org/D51784 --- share/mk/bsd.files.mk | 6 +++--- share/syscons/Makefile.inc | 2 +- share/syscons/fonts/Makefile | 2 -- share/syscons/keymaps/Makefile | 2 -- share/syscons/scrnmaps/Makefile | 2 -- 5 files changed, 4 insertions(+), 10 deletions(-) diff --git a/share/mk/bsd.files.mk b/share/mk/bsd.files.mk index aedc414d6a28..3ec4da010577 100644 --- a/share/mk/bsd.files.mk +++ b/share/mk/bsd.files.mk @@ -39,14 +39,14 @@ STAGE_SETS+= ${group:C,[/*],_,g} .if ${group} == "FILES" FILESPACKAGE?= ${PACKAGE:Uutilities} -FILESTAGS+= ${TAGS} +FILESTAGS+= ${TAGS:Npackage=*} .endif .if defined(NO_ROOT) .if !defined(${group}TAGS) || ! ${${group}TAGS:Mpackage=*} -${group}TAGS+= package=${${group}PACKAGE:Uutilities} +${group}TAGS+= package=${${group}PACKAGE:U${PACKAGE:Uutilities}} .endif -${group}TAG_ARGS= -T ${${group}TAGS:[*]:S/ /,/g} +${group}TAG_ARGS= -T ${${group}TAGS:ts,:[*]} .endif diff --git a/share/syscons/Makefile.inc b/share/syscons/Makefile.inc index 07cde30e3d52..d4635b273f40 100644 --- a/share/syscons/Makefile.inc +++ b/share/syscons/Makefile.inc @@ -1 +1 @@ -FILESPACKAGE= syscons +FILESPACKAGE= syscons-data diff --git a/share/syscons/fonts/Makefile b/share/syscons/fonts/Makefile index e1b6614b5684..ba3341da87e3 100644 --- a/share/syscons/fonts/Makefile +++ b/share/syscons/fonts/Makefile @@ -1,5 +1,3 @@ -PACKAGE= syscons-data - FILES= armscii8-8x8.fnt armscii8-8x14.fnt armscii8-8x16.fnt \ cp437-8x8.fnt cp437-8x14.fnt cp437-8x16.fnt \ cp437-thin-8x8.fnt cp437-thin-8x16.fnt \ diff --git a/share/syscons/keymaps/Makefile b/share/syscons/keymaps/Makefile index 139834abcd2b..bf0099288a19 100644 --- a/share/syscons/keymaps/Makefile +++ b/share/syscons/keymaps/Makefile @@ -1,5 +1,3 @@ -PACKAGE= syscons-data - FILES= INDEX.keymaps \ be.iso.kbd be.iso.acc.kbd \ bg.bds.ctrlcaps.kbd bg.phonetic.ctrlcaps.kbd \ diff --git a/share/syscons/scrnmaps/Makefile b/share/syscons/scrnmaps/Makefile index 8da31ed32be4..ffbd6be3df4d 100644 --- a/share/syscons/scrnmaps/Makefile +++ b/share/syscons/scrnmaps/Makefile @@ -1,5 +1,3 @@ -PACKAGE= syscons-data - SCRMAPS = armscii8-2haik8.scm \ iso-8859-1_to_cp437.scm iso-8859-4_for_vga9.scm \ iso-8859-7_to_cp437.scm \