git: 4fbb96961378 - main - sysutils/devcpu-data: Permit neither vendor option to be chosen

From: Joseph Mingrone <jrm_at_FreeBSD.org>
Date: Thu, 18 Nov 2021 03:32:33 UTC
The branch main has been updated by jrm:

URL: https://cgit.FreeBSD.org/ports/commit/?id=4fbb969613782d1b6cb2c65191c9ed2d339bce20

commit 4fbb969613782d1b6cb2c65191c9ed2d339bce20
Author:     Joseph Mingrone <jrm@FreeBSD.org>
AuthorDate: 2021-11-17 16:21:47 +0000
Commit:     Joseph Mingrone <jrm@FreeBSD.org>
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 <d8zNeCFG@aon.at>
    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