[pkgsrc/trunk]: pkgsrc mail/clamav: rename VIRUSDBDIR to CLAMAV_DBDIR and mak...

[ghen <ghen%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/b775cac06e50
branches:  trunk
changeset: 521292:b775cac06e50
user:      ghen <ghen%pkgsrc.org@localhost>
date:      Wed Nov 08 17:33:26 2006 +0000

description:
mail/clamav: rename VIRUSDBDIR to CLAMAV_DBDIR and make it user-settable.
Default value is kept but now set in mk/defaults/mk.conf.

diffstat:

 mail/clamav/DEINSTALL |   8 +++-----
 mail/clamav/Makefile  |  13 ++++++-------
 mk/defaults/mk.conf   |   7 ++++++-
 3 files changed, 15 insertions(+), 13 deletions(-)

diffs (88 lines):

diff -r eeceec188a7f -r b775cac06e50 mail/clamav/DEINSTALL
--- a/mail/clamav/DEINSTALL     Wed Nov 08 14:41:00 2006 +0000
+++ b/mail/clamav/DEINSTALL     Wed Nov 08 17:33:26 2006 +0000
@@ -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 -r eeceec188a7f -r b775cac06e50 mail/clamav/Makefile
--- a/mail/clamav/Makefile      Wed Nov 08 14:41:00 2006 +0000
+++ b/mail/clamav/Makefile      Wed Nov 08 17:33:26 2006 +0000
@@ -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 @@
 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 @@
 
 .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 @@
 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 -r eeceec188a7f -r b775cac06e50 mk/defaults/mk.conf
--- a/mk/defaults/mk.conf       Wed Nov 08 14:41:00 2006 +0000
+++ b/mk/defaults/mk.conf       Wed Nov 08 17:33:26 2006 +0000
@@ -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 @@
 # 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