From nobody Thu Nov 18 03:32:33 2021 X-Original-To: dev-commits-ports-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 A6A1C188A9D0; Thu, 18 Nov 2021 03:32:33 +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 4HvljY4Fntz3lrS; Thu, 18 Nov 2021 03:32:33 +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 7206558D5; Thu, 18 Nov 2021 03:32:33 +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 1AI3WXtB035367; Thu, 18 Nov 2021 03:32:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1AI3WXa4035366; Thu, 18 Nov 2021 03:32:33 GMT (envelope-from git) Date: Thu, 18 Nov 2021 03:32:33 GMT Message-Id: <202111180332.1AI3WXa4035366@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Joseph Mingrone Subject: git: 4fbb96961378 - main - sysutils/devcpu-data: Permit neither vendor option to be chosen List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrm X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4fbb969613782d1b6cb2c65191c9ed2d339bce20 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jrm: URL: https://cgit.FreeBSD.org/ports/commit/?id=4fbb969613782d1b6cb2c65191c9ed2d339bce20 commit 4fbb969613782d1b6cb2c65191c9ed2d339bce20 Author: Joseph Mingrone AuthorDate: 2021-11-17 16:21:47 +0000 Commit: Joseph Mingrone CommitDate: 2021-11-18 03:31:43 +0000 sysutils/devcpu-data: Permit neither vendor option to be chosen This allows users with both AMD- and Intel-based systems to build and install devcpu-data-amd and devcpu-data-intel, but not force either to be installed with `pkg install devcpu-data`. PR: 259883 Reported by: Martin Birgmeier Approved by: sbruno (maintainer) Differential Revision: https://reviews.freebsd.org/D33036 --- sysutils/devcpu-data/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sysutils/devcpu-data/Makefile b/sysutils/devcpu-data/Makefile index 0e63dde8f574..47d9d4ffd3f1 100644 --- a/sysutils/devcpu-data/Makefile +++ b/sysutils/devcpu-data/Makefile @@ -26,8 +26,8 @@ SUB_FILES= pkg-message NO_WRKSUBDIR= yes OPTIONS_DEFAULT= AMD INTEL -OPTIONS_MULTI= VENDOR -OPTIONS_MULTI_VENDOR= AMD INTEL +OPTIONS_GROUP= VENDOR +OPTIONS_GROUP_VENDOR= AMD INTEL AMD_DESC= Depend on sysutils/devcpu-data-amd INTEL_DESC= Depend on sysutils/devcpu-data-intel