Disable --enable-experimental by default, because it does not work

correctly with sparc64.

Make it an option: clamav-experimental.

Move all options into the options.mk file.

2 files changed, 37 insertions, 31 deletions

diff --git a/mail/clamav/Makefile b/mail/clamav/Makefile
index 84495b37e2f..4588352975a 100644
--- a/mail/clamav/Makefile
+++ b/mail/clamav/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.68 2007/02/17 12:06:10 xtraeme Exp $
+# $NetBSD: Makefile,v 1.69 2007/02/28 20:42:05 xtraeme Exp $
 
 DISTNAME=	clamav-${CLAMAV_VERSION}
 PKGNAME=	clamav-${CLAMAV_VERSION:S/-/./}
-#PKGREVISION=	1
+PKGREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=clamav/}
 
@@ -24,7 +24,6 @@ CONFIGURE_ARGS+=	--with-uid=${CLAMAV_USER:Q}
 CONFIGURE_ARGS+=	--with-group=${CLAMAV_GROUP:Q}
 CONFIGURE_ARGS+=	--with-tcpwrappers
 CONFIGURE_ARGS+=	--with-zlib=${BUILDLINK_PREFIX.zlib}
-CONFIGURE_ARGS+=	--enable-experimental
 CONFIGURE_ARGS+=	--enable-readdir_r
 
 .include "../../mk/bsd.prefs.mk"
@@ -53,34 +52,7 @@ CONF_FILES_PERMS+=	${EGDIR}/${i} ${CLAMAV_DBDIR}/${i}	\
 
 INSTALL_MAKE_FLAGS=	${MAKE_FLAGS} CFGINST=${EGDIR} DBINST=${EGDIR}
 
-PKG_OPTIONS_VAR=	PKG_OPTIONS.clamav
-PKG_SUPPORTED_OPTIONS=	curl milter
-PKG_SUGGESTED_OPTIONS=	curl
-
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Mmilter)
-# force use of pkgsrc version of libmilter -- clamav uses the sendmail binary
-# to check API compatibility(!), so it must build with as new a version of
-# libmilter as pkgsrc is capable of providing
-USE_BUILTIN.libmilter=	no
-.  include "../../mail/libmilter/buildlink3.mk"
-CONFIGURE_ARGS+=	--enable-milter
-PLIST_SUBST+=		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
-PLIST_SUBST+=		MILTER="@comment "
-.endif
-
-.if !empty(PKG_OPTIONS:Mcurl)
-.  include "../../www/curl/buildlink3.mk"
-CONFIGURE_ARGS+=	--with-libcurl
-BUILDLINK_API_DEPENDS.curl+=curl>=7.10.0
-.else
-CONFIGURE_ARGS+=	--without-libcurl
-.endif
+.include "options.mk"
 
 # pkgsrc enforces a "secure" version of zlib, so don't let this check
 # bomb the build.
diff --git a/mail/clamav/options.mk b/mail/clamav/options.mk
new file mode 100644
index 00000000000..e8726d41db7
--- /dev/null
+++ b/mail/clamav/options.mk
@@ -0,0 +1,34 @@
+# $NetBSD: options.mk,v 1.1 2007/02/28 20:42:05 xtraeme Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.clamav
+PKG_SUPPORTED_OPTIONS=	curl milter clamav-experimental
+PKG_SUGGESTED_OPTIONS=	curl
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mmilter)
+# force use of pkgsrc version of libmilter -- clamav uses the sendmail binary
+# to check API compatibility(!), so it must build with as new a version of
+# libmilter as pkgsrc is capable of providing
+USE_BUILTIN.libmilter=  no
+.  include "../../mail/libmilter/buildlink3.mk"
+CONFIGURE_ARGS+=	--enable-milter
+PLIST_SUBST+=		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
+PLIST_SUBST+=		MILTER="@comment "
+.endif
+
+.if !empty(PKG_OPTIONS:Mcurl)
+.  include "../../www/curl/buildlink3.mk"
+CONFIGURE_ARGS+=	--with-libcurl
+BUILDLINK_API_DEPENDS.curl+=curl>=7.10.0
+.else
+CONFIGURE_ARGS+=	--without-libcurl
+.endif
+
+.if !empty(PKG_OPTIONS:Mclamav-experimental)
+CONFIGURE_ARGS+=	--enable-experimental
+.endif