Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 12 Apr 2023 18:21:16 GMT
From:      Adam Weinberger <adamw@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 153e827b5f03 - main - devel/libgusb: Unbreak build
Message-ID:  <202304121821.33CILGMp076574@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by adamw:

URL: https://cgit.FreeBSD.org/ports/commit/?id=153e827b5f030a6349a54e75f2b331185405ba81

commit 153e827b5f030a6349a54e75f2b331185405ba81
Author:     Adam Weinberger <adamw@FreeBSD.org>
AuthorDate: 2023-04-12 18:17:31 +0000
Commit:     Adam Weinberger <adamw@FreeBSD.org>
CommitDate: 2023-04-12 18:17:31 +0000

    devel/libgusb: Unbreak build
    
    Register a dependency on py-setuptools. Somewhere in the dependency
    chain a hard dep on it probably got dropped.
    
    While here, use OPTIONS helpers, and adjust some build dependencies.
    gtk-doc is only needed when DOCS is enabled, and vala is only needed
    when VAPI is enabled.
    
    Based on a patch from Matthew Wener.
    PR:             270788
    Reported by:    Fredrik Eriksson
---
 devel/libgusb/Makefile | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/devel/libgusb/Makefile b/devel/libgusb/Makefile
index 11fae343688a..7f09e7770e28 100644
--- a/devel/libgusb/Makefile
+++ b/devel/libgusb/Makefile
@@ -10,9 +10,9 @@ WWW=		https://github.com/hughsie/libgusb
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	gtk-doc>0:textproc/gtk-doc
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR}
 
-USES=		gnome meson pkgconfig vala:build
+USES=		gnome meson pkgconfig python:build
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	hughsie
@@ -23,13 +23,10 @@ OPTIONS_DEFINE=		DOCS VAPI
 OPTIONS_DEFAULT=	DOCS VAPI
 OPTIONS_SUB=		yes
 
-.include <bsd.port.options.mk>
+DOCS_BUILD_DEPENDS=	gtk-doc>0:textproc/gtk-doc
+DOCS_MESON_TRUE=	docs
 
-.if !${PORT_OPTIONS:MDOCS}
-MESON_ARGS+=	-Ddocs=false
-.endif
-.if !${PORT_OPTIONS:MVAPI}
-MESON_ARGS+=	-Dvapi=false
-.endif
+VAPI_MESON_TRUE=	vapi
+VAPI_USES=		vala:build
 
 .include <bsd.port.mk>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202304121821.33CILGMp076574>