From: Sebastien Marie <semarie@kapouay.eu.org>
Subject: security/clamav and lang/rust
To: Stuart Henderson <stu.ports@spacehopper.org>
Cc: ports@openbsd.org
Date: Mon, 01 Jan 2024 17:52:24 +0100

Hi,

I would like to commit the following diff to security/clamav.

It switches clamav 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: security/clamav/Makefile
===================================================================
RCS file: /cvs/ports/security/clamav/Makefile,v
diff -u -p -r1.166 Makefile
--- security/clamav/Makefile	26 Oct 2023 06:40:00 -0000	1.166
+++ security/clamav/Makefile	1 Jan 2024 16:14:29 -0000
@@ -15,13 +15,12 @@ MAINTAINER=	Stuart Henderson <stu.ports@
 # GPLv2/LGPL, with OpenSSL exemption
 PERMIT_PACKAGE=	Yes
 
-WANTLIB += ${COMPILER_LIBCXX}
-WANTLIB += bz2 c crypto curl curses execinfo iconv json-c m milter
+WANTLIB += ${COMPILER_LIBCXX} ${MODRUST_WANTLIB}
+WANTLIB += bz2 crypto curl curses execinfo iconv json-c m milter
 WANTLIB += mspack pcre2-8 ssl util xml2 z
 
 COMPILER=	base-clang ports-gcc
 
-BUILD_DEPENDS=	lang/rust
 LIB_DEPENDS=	archivers/bzip2 \
 		archivers/libmspack \
 		devel/json-c \
@@ -33,7 +32,8 @@ TEST_DEPENDS=	security/clamav
 
 SITES=		https://www.clamav.net/downloads/production/
 
-MODULES=	devel/cmake
+MODULES=	devel/cmake \
+		lang/rust
 CONFIGURE_ARGS=	-DCLAMAV_USER=_clamav \
 		-DCLAMAV_GROUP=_clamav \
 		-DENABLE_EXTERNAL_MSPACK=ON \