From nobody Tue Dec 6 16:03:21 2022 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 4NRQF624DQz4k1kl; Tue, 6 Dec 2022 16:03:22 +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 4NRQF61Njmz43Bf; Tue, 6 Dec 2022 16:03:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670342602; 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=UPdJPbWSqVcGskixTdn9WnQbIs6jSlTw6dcgr0Y/abE=; b=VjLzxxSjyIzxzvIm2unwzXo72q5y8Uh+vflrI58lWonmq+L7HcUsz299mH+LCcm9iLWg0B 69i+51r+YqUW4BF93KJXNGrzUhEdcdbJOkos6tq2eZ9jUV7KzUi4mUwbJRos/3NlUn0V7c y24Ivd5TYnfucexRN9V/H5GyPYj3wV6Ln97MTb6BxJw6+ahpbHbYND7QeKeogqzeGixSCi +WLFko0Q30QG6rrtKoaXa00rqrQ+FW2xad91Dyx/9NVW+jgGilmU414cIPolhrrGYPs+c/ coPyA4FOAdVKDk3stm+8C5ILeg02uH46tc+0GJBk/eE377oF6k+oLlT6EE63/A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670342602; 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=UPdJPbWSqVcGskixTdn9WnQbIs6jSlTw6dcgr0Y/abE=; b=ho/BxoRFDbtXZGPyuYg8iRXJtiUDrcndtmY+WWFKPBQ/ltUzJwoJ1SdIIqWsoBMxHTr6lE Ct+j5U/kTF25DTPdqUtz0TtLdJPAmAGCM8EXyjLaDEeg67WeQM1sTvOaqLTeJZko6HAokw iHeW9wmJ3GCjpozgSlUotgIwAl4qopUl2pH5yWDgfk5x/mpwRTVc3QTfVu/7ObuyiyjAos MVeaeH4Bpr0lIXSp+nouO7qkwsOtUgXnrQcCf2Hd+URJCuKA6vDhcaVG9kcEb1se08u3Ra K0kC2lws7IkKIWUskonl0tqgilyRJqszfvlNGItUT/fygQTShhvqlSEsWqZ5zw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1670342602; a=rsa-sha256; cv=none; b=SMtbndPCo9fxB99DaeYqKPiBX1YbzZl6DGtv/8kpfL1p0WM6R2HEKuDcyl4Liw/pHsA69t xEuZ6VOa3FGUK8JE+syo+ohvHOlsAmtIFs9eMl/qDWiovE6AvNfkGi3Xiro5eQpUEanVGo IkMalFCfpCG9cxUD75NbJyNCavLcKWNTOtNgkuqpzpvWTuxCOfBPiJrcxPe2/+YvZqFUcK 17k9MvRI5ppRlgfQKCY57g1kY7K18zfB+g9ypxddsiqF9d85hkbBqSvOCAEbGsmMbizujN oZUPD0jb/Cf2LION9Hq1HOLf1vxagQm3dIVI1R2L9xtLzoHb4HJIWH8YwOqmNA== 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 4NRQF60QzLzjwh; Tue, 6 Dec 2022 16:03:22 +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 2B6G3LgF048704; Tue, 6 Dec 2022 16:03:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2B6G3LTb048703; Tue, 6 Dec 2022 16:03:21 GMT (envelope-from git) Date: Tue, 6 Dec 2022 16:03:21 GMT Message-Id: <202212061603.2B6G3LTb048703@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dmitry Marakasov Subject: git: f7ed2f7db48d - main - sysutils/cbsd: simplify by switching to OPTIONS_SUB 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: amdmi3 X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f7ed2f7db48d0836b87e67d68d79126cc7d2ad3a Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by amdmi3: URL: https://cgit.FreeBSD.org/ports/commit/?id=f7ed2f7db48d0836b87e67d68d79126cc7d2ad3a commit f7ed2f7db48d0836b87e67d68d79126cc7d2ad3a Author: Dmitry Marakasov AuthorDate: 2022-12-06 16:02:16 +0000 Commit: Dmitry Marakasov CommitDate: 2022-12-06 16:03:17 +0000 sysutils/cbsd: simplify by switching to OPTIONS_SUB Approved by: maintainer (semi-implicit) --- sysutils/cbsd/Makefile | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/sysutils/cbsd/Makefile b/sysutils/cbsd/Makefile index 82e6aea5cbbe..9023134de9b7 100644 --- a/sysutils/cbsd/Makefile +++ b/sysutils/cbsd/Makefile @@ -28,7 +28,7 @@ USERS= ${PORTNAME} GROUPS= ${PORTNAME} OPTIONS_DEFINE= BHYVE_GOP -OPTIONS_DEFAULT= +OPTIONS_SUB= yes BHYVE_GOP_DESC= Include bhyve UEFI firmware with GPU PPT+GOP support CBSD_HOME?= ${PREFIX}/cbsd @@ -36,9 +36,9 @@ CBSD_HOME?= ${PREFIX}/cbsd .include .if ${ARCH} == amd64 || ${ARCH} == i386 || ${ARCH} == x86_64 -PLIST_SUB= X86="" +PLIST_SUB+= X86="" .else -PLIST_SUB= X86="@comment " +PLIST_SUB+= X86="@comment " .endif .if ${OPSYS} != FreeBSD @@ -49,12 +49,6 @@ RUN_DEPENDS+= sysrc:sysutils/sysrc PLIST_SUB+= FBSD="" .endif -.if !${PORT_OPTIONS:MBHYVE_GOP} -PLIST_SUB+= BHYVE_GOP="@comment " -.else -PLIST_SUB+= BHYVE_GOP="" -.endif - do-install: @${ECHO} "Installing in ${CBSD_HOME}" ${MKDIR} ${STAGEDIR}${CBSD_HOME} @@ -69,9 +63,6 @@ do-install: ${STAGEDIR}${PREFIX}/cbsd/sbin/src \ ${STAGEDIR}${PREFIX}/cbsd/tools/src ${INSTALL_MAN} ${WRKSRC}/man/cbsd.8 ${STAGEDIR}${PREFIX}/man/man8/cbsd.8 -.if !${PORT_OPTIONS:MBHYVE_GOP} - ${RM} -f ${STAGEDIR}${PREFIX}/cbsd/upgrade/patch/efigop.fd -.endif post-install: @${MKDIR} ${STAGEDIR}${PREFIX}/libexec/bsdconfig