From nobody Fri Aug 23 03:39:37 2024 X-Original-To: dev-commits-ports-branches@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 4Wqm613ZsVz5VBDw; Fri, 23 Aug 2024 03:39:37 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Wqm612sPbz58nH; Fri, 23 Aug 2024 03:39:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1724384377; 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=FdKQS8ne5aatAuf0ZHAvsfDR9cn/Lb40n9TBO9ZN0Rc=; b=wTzOsy7tgD7GAyNow3zfLigRnMTTT3qxAnht5sQk0g2/HwCxuUEbo0FiP1t3bGfNcLCsYL GwID+L4I0GqZYrbqbxzvsbVOl/LubNZUlI3rLQ/TX/AtT2KnHIXAF8qHPPqYzFb0M91HSl pOgcPa+F3OFY/QW3DNxs61U2BWr/ii2HJqKMjPJzSl/+Mw3qgZRAwNlf+Cn7g1jPbOdMVZ VU0gNUrDqCgLRu/ACuvq2lol56Fo7hduATv+74fOd5dUCFuL8WWpgfj+AZD40eHIvtPgae V2RyQ0UwHByTv7a6zIs1ehecg41dWCiZ+GSwwKeEcrMi1zdn8Lu7cog1ruUYPg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1724384377; a=rsa-sha256; cv=none; b=P8NQPF4aHA08k5DG8cdFZ6r0k5//z8zMtsZ7xxPAl7XV/2K1fR7c8zIuYCZjMcMVXKtppI H8CUYxuQNg0ONDVXtlWtbWi1fMocc7L7cMAf3DTWoKVlNvt6n7Hw15nWGmq/LNICIudDCo L75oL5C09B1nMqIBQ4ioqfIVnw6HFP0DtW6rKAGEaVDrONtdAnqfGIMjxWYPCKlFEK7kkF 7hAvrvJdNOxLh9nom7toBKZDYL+8/A3ruSPfuP2MwsMO6JA7OunesbIbCiQVA4sGzyR+Du OcO+gwZs+tB2Nj8MT0AZqu0BRaeRHSJ3rJ01XnbMeUp8h8vkxvd4iQaKeQNx0Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1724384377; 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=FdKQS8ne5aatAuf0ZHAvsfDR9cn/Lb40n9TBO9ZN0Rc=; b=uxAJ3tbUnNjCL9aZezxCTWO+1ikT2H6Ng5iacFFq+n8LPzgAepsgWm68XGlPCO2r1oCNlZ nyNP3XQ7HiaKsSst7yc1LE3WF8w9vnTbEjjQOVkfuF6qr7oqg1TH6+hWpWwH0Nv3gyx1e0 LOsYQ2+B8SWnjPs44ZQerbD+VF21LL5Bosa58bPz8z14DIG29fudpyOJJYnp8mF54Vx850 h0OoYU2Z/ttoRTnYiuQsryWrn7gE2fCvb6nOs4f4+KshvG1P4xdh2+5XGqXyWwVznUksWE tRv+JOlG2biWAyQwlDGGrBcSE/WQbcJ97J81ISkTNpdw4j6PKMl2l0vquWWpEg== 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 4Wqm612TMTzvbJ; Fri, 23 Aug 2024 03:39:37 +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 47N3dbgE048167; Fri, 23 Aug 2024 03:39:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47N3dbxJ048164; Fri, 23 Aug 2024 03:39:37 GMT (envelope-from git) Date: Fri, 23 Aug 2024 03:39:37 GMT Message-Id: <202408230339.47N3dbxJ048164@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Cy Schubert Subject: git: 0f174d4daabc - 2024Q3 - sysutils/freebsd-bsdlabel: Fix package on non-Intel architectures List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-branches@freebsd.org Sender: owner-dev-commits-ports-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: ports X-Git-Refname: refs/heads/2024Q3 X-Git-Reftype: branch X-Git-Commit: 0f174d4daabccb931cbd09b400376bfd4498e437 Auto-Submitted: auto-generated The branch 2024Q3 has been updated by cy: URL: https://cgit.FreeBSD.org/ports/commit/?id=0f174d4daabccb931cbd09b400376bfd4498e437 commit 0f174d4daabccb931cbd09b400376bfd4498e437 Author: Cy Schubert AuthorDate: 2024-08-23 03:35:23 +0000 Commit: Cy Schubert CommitDate: 2024-08-23 03:39:30 +0000 sysutils/freebsd-bsdlabel: Fix package on non-Intel architectures FreeBSD never installed disklabel(8) on non-Intel architectures. (cherry picked from commit 0f349ce7fa5bdf9af2b908487ddba8fcbfec33f8) --- sysutils/freebsd-bsdlabel/Makefile | 8 ++++++++ sysutils/freebsd-bsdlabel/pkg-plist | 4 ++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/sysutils/freebsd-bsdlabel/Makefile b/sysutils/freebsd-bsdlabel/Makefile index 14b4eab20485..0626b13dee90 100644 --- a/sysutils/freebsd-bsdlabel/Makefile +++ b/sysutils/freebsd-bsdlabel/Makefile @@ -24,4 +24,12 @@ MAKE_ENV+= MAKESYSPATH=/usr/src/share/mk \ WRKSRC_SUBDIR= bsdlabel +.include + +.if ${ARCH} == "amd64" || ${ARCH} == "i386" +PLIST_SUB= DISKLABEL="" +.else +PLIST_SUB= DISKLABEL="@comment " +.endif + .include diff --git a/sysutils/freebsd-bsdlabel/pkg-plist b/sysutils/freebsd-bsdlabel/pkg-plist index e45737f5dcb8..23491d438a4b 100644 --- a/sysutils/freebsd-bsdlabel/pkg-plist +++ b/sysutils/freebsd-bsdlabel/pkg-plist @@ -1,4 +1,4 @@ sbin/bsdlabel -sbin/disklabel +%%DISKLABEL%%sbin/disklabel share/man/man8/bsdlabel.8.gz -share/man/man8/disklabel.8.gz +%%DISKLABEL%%share/man/man8/disklabel.8.gz