Date: Sun, 11 Jul 2021 15:46:47 GMT From: Lewis Cook <lcook@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org Subject: git: c01945eed4e5 - 2021Q3 - misc/broot: Unbreak build with CLIENT_SERVER Message-ID: <202107111546.16BFklV5086090@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch 2021Q3 has been updated by lcook: URL: https://cgit.FreeBSD.org/ports/commit/?id=c01945eed4e530b12fc6a8ba0bf9f3f03c525120 commit c01945eed4e530b12fc6a8ba0bf9f3f03c525120 Author: Lewis Cook <lcook@FreeBSD.org> AuthorDate: 2021-07-11 15:37:47 +0000 Commit: Lewis Cook <lcook@FreeBSD.org> CommitDate: 2021-07-11 15:46:21 +0000 misc/broot: Unbreak build with CLIENT_SERVER client-server is no longer feature gated, so we can safely remove the OPTION all together. ===> Building for broot-1.6.1_1 error: Package `broot v1.6.1 does not have the feature `client-server` Reported-by: pkg-fallout (cherry picked from commit 12d04cda7dd3f8d299acf0dce323bc665014f698) --- misc/broot/Makefile | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/misc/broot/Makefile b/misc/broot/Makefile index 43cee69b19b1..bbda7d215359 100644 --- a/misc/broot/Makefile +++ b/misc/broot/Makefile @@ -1,7 +1,7 @@ PORTNAME= broot DISTVERSIONPREFIX= v DISTVERSION= 1.6.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= misc MAINTAINER= lcook@FreeBSD.org @@ -222,16 +222,12 @@ CARGO_FEATURES= --no-default-features SUB_FILES= pkg-message PLIST_FILES= bin/${PORTNAME} \ man/man1/${PORTNAME}.1.gz -PORTDOCS= CHANGELOG.md README.md client-server.md documentation.md \ - features.md +PORTDOCS= CHANGELOG.md README.md documentation.md features.md -OPTIONS_DEFINE= CLIENT_SERVER CLIPBOARD DOCS -OPTIONS_DEFAULT= CLIENT_SERVER CLIPBOARD +OPTIONS_DEFINE= CLIPBOARD DOCS +OPTIONS_DEFAULT= CLIPBOARD -CLIENT_SERVER_DESC= Enable client/server support -CLIPBOARD_DESC= Enable terminal X11 clipboard support - -CLIENT_SERVER_VARS= CARGO_FEATURES+=client-server +CLIPBOARD_DESC= Enable terminal X11 clipboard support CLIPBOARD_USES= python:3.6+,build xorg CLIPBOARD_USE= XORG=xcb @@ -242,16 +238,20 @@ _BUILD_VERSION= ${DISTVERSION} _BUILD_DATE= $$(date +'%Y/%m/%d') pre-build: - @${MV} ${WRKSRC}/man/page ${WRKSRC}/man/${PORTNAME}.1 + @${MV} ${WRKSRC}/man/page \ + ${WRKSRC}/man/${PORTNAME}.1 @${REINPLACE_CMD} -e 's|#version|${_BUILD_VERSION}|g' \ - -e "s|#date|${_BUILD_DATE}|g" ${WRKSRC}/man/${PORTNAME}.1 + -e "s|#date|${_BUILD_DATE}|g" \ + ${WRKSRC}/man/${PORTNAME}.1 post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME} - ${INSTALL_MAN} ${WRKSRC}/man/${PORTNAME}.1 ${STAGEDIR}${MAN1PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/man/${PORTNAME}.1 \ + ${STAGEDIR}${MAN1PREFIX}/man/man1 post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} \ + ${STAGEDIR}${DOCSDIR} .include <bsd.port.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202107111546.16BFklV5086090>