Date: Tue, 6 Dec 2022 16:03:21 GMT From: Dmitry Marakasov <amdmi3@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: f7ed2f7db48d - main - sysutils/cbsd: simplify by switching to OPTIONS_SUB Message-ID: <202212061603.2B6G3LTb048703@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by amdmi3: URL: https://cgit.FreeBSD.org/ports/commit/?id=f7ed2f7db48d0836b87e67d68d79126cc7d2ad3a commit f7ed2f7db48d0836b87e67d68d79126cc7d2ad3a Author: Dmitry Marakasov <amdmi3@FreeBSD.org> AuthorDate: 2022-12-06 16:02:16 +0000 Commit: Dmitry Marakasov <amdmi3@FreeBSD.org> 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 <bsd.port.options.mk> .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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202212061603.2B6G3LTb048703>