diff options
| author | ghen <ghen@pkgsrc.org> | 2006-11-08 17:33:26 +0000 |
|---|---|---|
| committer | ghen <ghen@pkgsrc.org> | 2006-11-08 17:33:26 +0000 |
| commit | ee81f46750e46fc5dbc81086d9bb1f8b369fc989 (patch) | |
| tree | 6d4f2fe479be718878bcd7e97289694b59969855 /mail | |
| parent | cc4f8b96f1f57edbaa06bf3b05e46f4e425743bd (diff) | |
| download | pkgsrc-ee81f46750e46fc5dbc81086d9bb1f8b369fc989.tar.gz | |
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 (limited to 'mail')
| -rw-r--r-- | mail/clamav/DEINSTALL | 8 | ||||
| -rw-r--r-- | mail/clamav/Makefile | 13 |
2 files changed, 9 insertions, 12 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 |