Date: Wed, 16 Jun 2021 09:00:34 GMT From: Piotr Kubaj <pkubaj@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: bbea3d0e6de2 - main - sysutils/cbsd: fix packaging on non-x86 Message-ID: <202106160900.15G90Y8W015338@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=bbea3d0e6de23cf721a09fb2bc5c666aa29c6509 commit bbea3d0e6de23cf721a09fb2bc5c666aa29c6509 Author: Piotr Kubaj <pkubaj@FreeBSD.org> AuthorDate: 2021-06-16 09:00:18 +0000 Commit: Piotr Kubaj <pkubaj@FreeBSD.org> 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 <bsd.port.options.mk> +.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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202106160900.15G90Y8W015338>