tech-pkg archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

Re: clamav update in wip



In message <aKoBqOpCfqN41Yvo%antioche.eu.org@localhost>
	on Sat, 23 Aug 2025 20:00:08 +0200,
	Manuel Bouyer <bouyer%antioche.eu.org@localhost> wrote:
> clamav now uses cmake and rust/cargo, please review my changes for
> common mistakes with these tools. Also, I didn't work on options.mk yet.
> If you're using clamav with libmilter you're welcome to work on it :)
I've tried to milter support and attached patch make it build.  (I'm
not a professional of cmake.)

But I'm not ready to test it on my environment.

-- 
Takahiro Kambe <taca%back-street.net@localhost>

diff --git a/clamav/options.mk b/clamav/options.mk
index 928144dc7e..8b83153723 100644
--- a/clamav/options.mk
+++ b/clamav/options.mk
@@ -16,24 +16,20 @@ PLIST_VARS+=	milter
 # libmilter as pkgsrc is capable of providing
 USE_BUILTIN.libmilter=	no
 .  include "../../mail/libmilter/buildlink3.mk"
-CONFIGURE_ARGS+=	--enable-milter
+CMAKE_CONFIGURE_ARGS+=	-DENABLE_MILTER=on
 PLIST.milter=		yes
 CONF_SAMPLES+=		clamav-milter.conf
 SMF_INSTANCES+=		clamav-milter
 RCD_SCRIPTS+=		clamav-milter
-.else
-CONFIGURE_ARGS+=	--disable-milter
-# XXX --disable-milter doesn't work as expected, so we need this
-CONFIGURE_ENV+=		ac_cv_header_libmilter_mfapi_h=no
 .endif
 
 .if ${PKG_OPTIONS:Mclamav-experimental}
-CONFIGURE_ARGS+=	--enable-experimental
+CMAKE_CONFIGURE_ARGS+=	-DENABLE_EXPERIMENTAL=on
 .endif
 
 # Enable unit test
 .if ${PKG_OPTIONS:Mclamav-unit-test}
-CONFIGURE_ARGS+=		--enable-check
+CMAKE_CONFIGURE_ARGS+=	-DENABLE_TESTS=on
 TEST_TARGET=			check
 # unit test's Makefile depends on gmake.
 USE_TOOLS+=			gmake


Home | Main Index | Thread Index | Old Index