From nobody Fri Aug 23 03:38:40 2024 X-Original-To: dev-commits-ports-all@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 4Wqm4w4CG4z5VB3Q; Fri, 23 Aug 2024 03:38:40 +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 4Wqm4w3d0kz58qJ; Fri, 23 Aug 2024 03:38:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1724384320; 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=OzqZW8E30cU+3DjxTwdxZtxDgOXH3xFTUmFf7bAt2T4=; b=QICkpmgIL7KpynXnBU7+7OCsKyeXxAjUy753SGLAkkYJdtJkx8i9NnmL5K9H2IpTzIGT4b h//iu0yRE85jlW3Dusq/QRBF/iKJ8m71quSqdJaP9lIX9J3dPV3S4NUgP4iOWGhWrB+gaU uMkTKtpZDXMDUBJDluOr5mhaov4Cq+4LrJpZ9aNR2Cw+GvfCy6HE/IKNflFJ8Sckz0dwje H2suEh6zzFAZXXuPmc3ZDQpvKd3n5DrKV3/8VV/R4iNcDYNbnUJv+g9grFveDlErTo0S/O T6Cfq+1v48Y5YB6+ADCFBycY1JmFpVVKMvaQURHEzIRF2P4oobW14iGHOheqEw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1724384320; a=rsa-sha256; cv=none; b=XOlFvupEMU9VvAZvOz4HTYRJVr9cRtGg5uA5EIhoLgfDqt4ZSXjusd9AnOcWb70UAuTKEt vFZ/mJBkJS8b1TQMlA/Va/btei7eSRjJzy0UZyuzOrG94dW4jogW8I1lI6GpBXt2cXJy3t xM45wyFtpCtIHWRkhMxD09EduTSu6/NxDWW7kHovkYAWX/+8j2JXGWL3/nWRGdd9qLJXRn +pt/7vcq9N7rs1YrHvV3HAJGclUMibSMosG48n/MnS2VNhASscpnOFnSGOvyqq1PhMLe5r HbtBg8BPltoRUzztd8+S3BXFPHsIRBMBYCZ4Ao0NTLXsWqjiDx7nPbYlN6InFg== 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=1724384320; 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=OzqZW8E30cU+3DjxTwdxZtxDgOXH3xFTUmFf7bAt2T4=; b=sCosSVpEONHeRDivKUBSdoar8o84yYNGs0h4M6E6E/5qqxLPPakdQu6vM5CtK8QCURFAJo /ookD2214SV0DFBYB1BtEykIpvFIOqi6aVFiLCE0/wdlwkjDYanPNclhxBlmjyE1udE/L8 pCy5ru3YQ3lYijvFaWJleU2Rz9TjqDX4cSUlkEwlCEcsgXRfzcaCcJRKdCCbxlkdkLb7RF 8DnT/iqv00DdztU8Dsk7xnH8HAXfCw/j3HhXYf81Vy51P7sfsTPkaHWx526pEdAPGBdMtH XdCJcbCYrscHjIVzACQzZ2u0OlIV29mXZ+xHg0PY43Ue5XSJeqRY7m4J3cOcoA== 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 4Wqm4w3CmRzvpl; Fri, 23 Aug 2024 03:38:40 +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 47N3ceOF047912; Fri, 23 Aug 2024 03:38:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47N3ceqR047909; Fri, 23 Aug 2024 03:38:40 GMT (envelope-from git) Date: Fri, 23 Aug 2024 03:38:40 GMT Message-Id: <202408230338.47N3ceqR047909@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Cy Schubert Subject: git: 0f349ce7fa5b - main - sysutils/freebsd-bsdlabel: Fix package on non-Intel architectures List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@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/main X-Git-Reftype: branch X-Git-Commit: 0f349ce7fa5bdf9af2b908487ddba8fcbfec33f8 Auto-Submitted: auto-generated The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/ports/commit/?id=0f349ce7fa5bdf9af2b908487ddba8fcbfec33f8 commit 0f349ce7fa5bdf9af2b908487ddba8fcbfec33f8 Author: Cy Schubert AuthorDate: 2024-08-23 03:35:23 +0000 Commit: Cy Schubert CommitDate: 2024-08-23 03:37:43 +0000 sysutils/freebsd-bsdlabel: Fix package on non-Intel architectures FreeBSD never installed disklabel(8) on non-Intel architectures. MFH: 2024Q3 --- 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