From: Antoine Jacoutot <ajacoutot@bsdfrog.org>
Subject: Re: devel/spidermonkey115, x11/gnome/tour and lang/rust
To: Sebastien Marie <semarie@kapouay.eu.org>
Cc: ports@openbsd.org
Date: Mon, 1 Jan 2024 20:03:56 +0100

OK

On Mon, Jan 01, 2024 at 06:01:05PM +0100, Sebastien Marie wrote:
> Hi,
> 
> I would like to commit the following diffs to devel/spidermonkey115 and
> x11/gnome/tour.
> 
> It switches the ports to use MODULES+=lang/rust instead of
> BUILD_DEPENDS+=lang/rust, and adds MODRUST_WANTLIB to WANTLIB.
> 
> It makes the ports to use _SYSTEM_VERSION-rust and be bumped
> automatically when rust (compiler or stdlib) changes, and so get the
> package updated.
> 
> Comments or OK ?
> -- 
> Sebastien Marie
> 
> Index: devel/spidermonkey115/Makefile
> ===================================================================
> RCS file: /cvs/ports/devel/spidermonkey115/Makefile,v
> diff -u -p -r1.3 Makefile
> --- devel/spidermonkey115/Makefile	20 Dec 2023 13:58:42 -0000	1.3
> +++ devel/spidermonkey115/Makefile	1 Jan 2024 16:14:29 -0000
> @@ -30,9 +30,10 @@ EXTRACT_SUFX =		.tar.xz
>  PERMIT_PACKAGE=	Yes
>  
>  WANTLIB += curses ffi icudata icui18n icuuc m nspr4 plc4 plds4 z
> -WANTLIB += ${COMPILER_LIBCXX}
> +WANTLIB += ${COMPILER_LIBCXX} ${MODRUST_WANTLIB}
>  
> -MODULES =		lang/python
> +MODULES =		lang/python \
> +			lang/rust
>  
>  MODPY_RUNDEP =		No
>  
> @@ -47,8 +48,7 @@ LIB_DEPENDS =		devel/libffi \
>  
>  DEBUG_PACKAGES =	${BUILD_PACKAGES}
>  
> -BUILD_DEPENDS =		devel/cbindgen \
> -			lang/rust
> +BUILD_DEPENDS =		devel/cbindgen
>  
>  SEPARATE_BUILD =	Yes
>  WRKDIST =		${WRKDIR}/firefox-${V}
> 
> Index: x11/gnome/tour/Makefile
> ===================================================================
> RCS file: /cvs/ports/x11/gnome/tour/Makefile,v
> diff -u -p -r1.14 Makefile
> --- x11/gnome/tour/Makefile	8 Nov 2023 18:49:09 -0000	1.14
> +++ x11/gnome/tour/Makefile	1 Jan 2024 16:14:29 -0000
> @@ -13,15 +13,14 @@ DISTFILES=		${GNOME_PROJECT}-${GNOME_VER
>  # gnome-tour source code results in effective GPLv3+ for the resulting binary
>  PERMIT_PACKAGE=		Yes
>  
> -WANTLIB += adwaita-1 c c++abi gio-2.0 glib-2.0 gobject-2.0 gtk-4
> -WANTLIB += intl m pthread
> +WANTLIB += ${MODRUST_WANTLIB}
> +WANTLIB += adwaita-1 gio-2.0 glib-2.0 gobject-2.0 gtk-4 intl m
>  
>  MODULES=		devel/meson \
> +			lang/rust \
>  			x11/gnome
>  
>  MODGNOME_TOOLS=		desktop-file-utils gtk-update-icon-cache
> -
> -BUILD_DEPENDS=		lang/rust
>  
>  LIB_DEPENDS=		x11/gnome/libadwaita
>  

-- 
Antoine