pkgsrc-WIP-changes archive

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

clamav: update options.mk, from Takahiro Kambe with minor tweaks by me. build-tested with all options enabled; 'make test' shows some test failing, I suspect because pkgsrc sets a fake http_proxy environnement.



Module Name:	pkgsrc-wip
Committed By:	Manuel Bouyer <bouyer%antioche.eu.org@localhost>
Pushed By:	bouyer
Date:		Sun Aug 24 17:24:36 2025 +0200
Changeset:	28fe136a754353d978c886ac1a3d5ef079c466c7

Modified Files:
	clamav/options.mk

Log Message:
clamav: update options.mk, from Takahiro Kambe with minor tweaks by me.
build-tested with all options enabled; 'make test' shows some test failing,
I suspect because pkgsrc sets a fake http_proxy environnement.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=28fe136a754353d978c886ac1a3d5ef079c466c7

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 clamav/options.mk | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diffs:
diff --git a/clamav/options.mk b/clamav/options.mk
index 928144dc7e..8271a326db 100644
--- a/clamav/options.mk
+++ b/clamav/options.mk
@@ -16,27 +16,22 @@ 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
 BUILDLINK_DEPMETHOD.check=	build
 .  include "../../devel/check/buildlink3.mk"
 .endif


Home | Main Index | Thread Index | Old Index