mail/clamav: rename VIRUSDBDIR to CLAMAV_DBDIR and make it user-settable.

Default value is kept but now set in mk/defaults/mk.conf.

3 files changed, 15 insertions, 13 deletions

diff --git a/mail/clamav/DEINSTALL b/mail/clamav/DEINSTALL
index b52cb398855..77d64386323 100644
--- a/mail/clamav/DEINSTALL
+++ b/mail/clamav/DEINSTALL
@@ -1,11 +1,9 @@
-# $NetBSD: DEINSTALL,v 1.1 2004/08/01 04:35:33 jlam Exp $
-
-VIRUSDBDIR="@VIRUSDBDIR@"
+# $NetBSD: DEINSTALL,v 1.2 2006/11/08 17:33:26 ghen Exp $
 
 case ${STAGE} in
 DEINSTALL)
 	# Unconditionally remove the virus databases when deinstalling.
-	${RM} -f ${VIRUSDBDIR}/daily.cvd
-	${RM} -f ${VIRUSDBDIR}/main.cvd
+	${RM} -f @CLAMAV_DBDIR@/daily.cvd
+	${RM} -f @CLAMAV_DBDIR@/main.cvd
 	;;
 esac
diff --git a/mail/clamav/Makefile b/mail/clamav/Makefile
index 5cc90c48e7f..b84e7ad7f00 100644
--- a/mail/clamav/Makefile
+++ b/mail/clamav/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.63 2006/11/07 07:09:06 martti Exp $
+# $NetBSD: Makefile,v 1.64 2006/11/08 17:33:26 ghen Exp $
 
 DISTNAME=	clamav-${CLAMAV_VERSION}
 PKGNAME=	clamav-${CLAMAV_VERSION:S/-/./}
@@ -19,7 +19,7 @@ USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--disable-clamav
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
-CONFIGURE_ARGS+=	--with-dbdir=${VIRUSDBDIR:Q}
+CONFIGURE_ARGS+=	--with-dbdir=${CLAMAV_DBDIR:Q}
 CONFIGURE_ARGS+=	--with-uid=${CLAMAV_USER:Q}
 CONFIGURE_ARGS+=	--with-group=${CLAMAV_GROUP:Q}
 CONFIGURE_ARGS+=	--with-tcpwrappers
@@ -27,7 +27,7 @@ CONFIGURE_ARGS+=	--with-zlib=${BUILDLINK_PREFIX.zlib}
 
 .include "../../mk/bsd.prefs.mk"
 
-BUILD_DEFS+=	CLAMAV_USER CLAMAV_GROUP
+BUILD_DEFS+=	CLAMAV_USER CLAMAV_GROUP CLAMAV_DBDIR
 FILES_SUBST+=	CLAMAV_USER=${CLAMAV_USER:Q}
 MESSAGE_SUBST+=	CLAMAV_USER=${CLAMAV_USER}
 
@@ -35,18 +35,17 @@ RCD_SCRIPTS=	clamd freshclamd
 PKG_GROUPS+=	${CLAMAV_GROUP}
 PKG_USERS+=	${CLAMAV_USER}:${CLAMAV_GROUP}
 
-VIRUSDBDIR=	${VARBASE}/clamav
 EGDIR=		${PREFIX}/share/examples/clamav
-FILES_SUBST+=	VIRUSDBDIR=${VIRUSDBDIR:Q}
+FILES_SUBST+=	CLAMAV_DBDIR=${CLAMAV_DBDIR:Q}
 
-OWN_DIRS_PERMS=		${VIRUSDBDIR} ${CLAMAV_USER} ${CLAMAV_GROUP} 0775
+OWN_DIRS_PERMS=		${CLAMAV_DBDIR} ${CLAMAV_USER} ${CLAMAV_GROUP} 0775
 CONF_FILES=		# empty
 CONF_FILES_PERMS=	# empty
 .for i in clamd.conf freshclam.conf
 CONF_FILES+=		${EGDIR}/${i} ${PKG_SYSCONFDIR}/${i}
 .endfor
 .for i in daily.cvd main.cvd
-CONF_FILES_PERMS+=	${EGDIR}/${i} ${VIRUSDBDIR}/${i}	\
+CONF_FILES_PERMS+=	${EGDIR}/${i} ${CLAMAV_DBDIR}/${i}	\
 			${CLAMAV_USER} ${CLAMAV_GROUP} 0664
 .endfor
 
diff --git a/mk/defaults/mk.conf b/mk/defaults/mk.conf
index 0f104491ddc..475fbf75d8f 100644
--- a/mk/defaults/mk.conf
+++ b/mk/defaults/mk.conf
@@ -1,4 +1,4 @@
-# $NetBSD: mk.conf,v 1.134 2006/10/11 14:38:04 reed Exp $
+# $NetBSD: mk.conf,v 1.135 2006/11/08 17:33:26 ghen Exp $
 #
 
 # This file provides default values for variables that may be overridden
@@ -641,6 +641,11 @@ CLAMAV_USER?=	clamav
 # Possible: any user name
 # Default: clamav
 
+CLAMAV_DBDIR?=	${VARBASE}/clamav
+# Used in clamav to specify the virus database directory
+# Possible: any directory writable by ${CLAMAV_USER}
+# Default: ${VARBASE}/clamav
+
 CONSERVER_DEFAULTHOST?=	localhost
 # Used by conserver package to specify the master server hostname.
 # Possible: any hostname