From owner-dev-commits-ports-main@freebsd.org Wed Jun 16 09:00:35 2021 Return-Path: Delivered-To: dev-commits-ports-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 4232165DDC6; Wed, 16 Jun 2021 09:00:35 +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 4G4fKZ4lfrz3Dth; Wed, 16 Jun 2021 09:00:34 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 5AAEB18F24; Wed, 16 Jun 2021 09:00:34 +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 15G90YWe015339; Wed, 16 Jun 2021 09:00:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 15G90Y8W015338; Wed, 16 Jun 2021 09:00:34 GMT (envelope-from git) Date: Wed, 16 Jun 2021 09:00:34 GMT Message-Id: <202106160900.15G90Y8W015338@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Piotr Kubaj Subject: git: bbea3d0e6de2 - main - sysutils/cbsd: fix packaging on non-x86 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pkubaj X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bbea3d0e6de23cf721a09fb2bc5c666aa29c6509 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the main branch of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Jun 2021 09:00:35 -0000 The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=bbea3d0e6de23cf721a09fb2bc5c666aa29c6509 commit bbea3d0e6de23cf721a09fb2bc5c666aa29c6509 Author: Piotr Kubaj AuthorDate: 2021-06-16 09:00:18 +0000 Commit: Piotr Kubaj CommitDate: 2021-06-16 09:00:18 +0000 sysutils/cbsd: fix packaging on non-x86 popcnttest is only installed on amd64 and i386. --- sysutils/cbsd/Makefile | 6 ++++++ sysutils/cbsd/pkg-plist | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/sysutils/cbsd/Makefile b/sysutils/cbsd/Makefile index e5b5b19bb450..95c9f6b0d8c4 100644 --- a/sysutils/cbsd/Makefile +++ b/sysutils/cbsd/Makefile @@ -30,6 +30,12 @@ CBSD_HOME?= ${PREFIX}/cbsd .include +.if ${ARCH} == amd64 || ${ARCH} == i386 +PLIST_SUB= X86="" +.else +PLIST_SUB= X86="@comment " +.endif + do-install: @${ECHO} "Installing in ${CBSD_HOME}" ${MKDIR} ${STAGEDIR}${CBSD_HOME} diff --git a/sysutils/cbsd/pkg-plist b/sysutils/cbsd/pkg-plist index 1d726560c67f..a91ef3b38edf 100644 --- a/sysutils/cbsd/pkg-plist +++ b/sysutils/cbsd/pkg-plist @@ -340,7 +340,7 @@ cbsd/misc/fmagic cbsd/misc/ipv6range cbsd/misc/next-vale-port cbsd/misc/nics-list -cbsd/misc/popcnttest +%%X86%%cbsd/misc/popcnttest cbsd/misc/pwcrypt cbsd/misc/resolv cbsd/misc/sipcalc