diff options
| -rw-r--r-- | security/clamav-devel/Makefile | 8 | ||||
| -rw-r--r-- | security/clamav-devel/pkg-install | 14 | ||||
| -rw-r--r-- | security/clamav-devel/pkg-plist | 2 |
3 files changed, 13 insertions, 11 deletions
diff --git a/security/clamav-devel/Makefile b/security/clamav-devel/Makefile index f879fa165bb0..dcd51153b64b 100644 --- a/security/clamav-devel/Makefile +++ b/security/clamav-devel/Makefile @@ -42,8 +42,9 @@ PKGDEINSTALL= ${WRKDIR}/pkg-deinstall PORTDOCS= NEWS ChangeLog html DBDIR= /var/db/clamav +LOGDIR= /var/log/clamav RUNDIR= /var/run/clamav -PLIST_SUB+= DBDIR=${DBDIR} RUNDIR=${RUNDIR} +PLIST_SUB+= DBDIR=${DBDIR} LOGDIR=${LOGDIR} RUNDIR=${RUNDIR} CONFIGURE_ARGS= --with-dbdir=${DBDIR} \ --with-zlib=/usr \ @@ -72,6 +73,7 @@ CLAMAV_MILTER_SOCKET?= ${RUNDIR}/clmilter.sock SED_SCRIPT= -e 's|%%PREFIX%%|${PREFIX}|g' \ -e 's|%%DBDIR%%|${DBDIR}|g' \ + -e 's|%%LOGDIR%%|${LOGDIR}|g' \ -e 's|%%RUNDIR%%|${RUNDIR}|g' \ -e 's|%%CLAMAVUSER%%|${CLAMAVUSER}|g' \ -e 's|%%CLAMAVGROUP%%|${CLAMAVGROUP}|g' \ @@ -79,7 +81,7 @@ SED_SCRIPT= -e 's|%%PREFIX%%|${PREFIX}|g' \ -e 's|%%CLAMAV_MILTER_SOCKET%%|${CLAMAV_MILTER_SOCKET}|g' SED_CONF= -E -e 's|^\#?(Example)$$|\#\1|' \ - -e 's|^\#?((Update)?LogFile) .*/([a-z]+\.log)$$|\1 /var/log/clamav/\3|' \ + -e 's|^\#?((Update)?LogFile) .*/([a-z]+\.log)$$|\1 ${LOGDIR}/\3|' \ -e 's|^\#?(PidFile) .*/([a-z]+\.pid)$$|\1 ${RUNDIR}/\2|' \ -e 's|^\#?(LocalSocket) .*$$|\1 ${CLAMAV_CLAMD_SOCKET}|' \ -e 's|^\#?(User) .*$$|\1 ${CLAMAVUSER}|' \ @@ -89,7 +91,7 @@ SED_CONF= -E -e 's|^\#?(Example)$$|\#\1|' \ -e 's|^\#?(Checks)$$|\#\1|' \ -e 's|^\#?(DatabaseDirectory) .*$$|\1 ${DBDIR}|' \ -e 's|^\#?(DatabaseOwner) .*$$|\1 ${CLAMAVUSER}|' \ - -e 's|^\#?(UpdateLogFile) .*$$|\1 /var/log/clamav/freshclam.log|' \ + -e 's|^\#?(UpdateLogFile) .*$$|\1 ${LOGDIR}/freshclam.log|' \ -e 's|^\#?(FixStaleSocket)$$|\1|' PLIST_SUB+= CLAMAVUSER=${CLAMAVUSER} \ diff --git a/security/clamav-devel/pkg-install b/security/clamav-devel/pkg-install index efa21d86a171..ee4cea1d98ef 100644 --- a/security/clamav-devel/pkg-install +++ b/security/clamav-devel/pkg-install @@ -1,5 +1,5 @@ #!/bin/sh -# $FreeBSD: /tmp/pcvs/ports/security/clamav-devel/Attic/pkg-install,v 1.19 2005-01-12 18:22:56 yar Exp $ +# $FreeBSD: /tmp/pcvs/ports/security/clamav-devel/Attic/pkg-install,v 1.20 2005-01-27 12:15:27 yar Exp $ PREFIX=${PKG_PREFIX:-%%PREFIX%%} DESTDIR=${PKG_DESTDIR:-} @@ -9,8 +9,8 @@ CLAMAVGROUP=%%CLAMAVGROUP%% UID=106 GID=$UID -CLAMLOG=$DESTDIR/var/log/clamav DBDIR=$DESTDIR%%DBDIR%% +LOGDIR=$DESTDIR%%LOGDIR%% RUNDIR=$DESTDIR%%RUNDIR%% if [ "$2" = "PRE-INSTALL" ]; then @@ -39,16 +39,16 @@ if [ "$2" = "PRE-INSTALL" ]; then elif [ "$2" = "POST-INSTALL" ]; then - if [ ! -d "$CLAMLOG" ]; then - mkdir -p "$CLAMLOG" || exit 1 - chown "$CLAMAVUSER:$CLAMAVGROUP" "$CLAMLOG" || exit 1 - fi - if [ ! -d "$DBDIR" ]; then mkdir -p "$DBDIR" || exit 1 chown "$CLAMAVUSER:$CLAMAVGROUP" "$DBDIR" || exit 1 fi + if [ ! -d "$LOGDIR" ]; then + mkdir -p "$LOGDIR" || exit 1 + chown "$CLAMAVUSER:$CLAMAVGROUP" "$LOGDIR" || exit 1 + fi + if [ ! -d "$RUNDIR" ]; then mkdir -p "$RUNDIR" || exit 1 chown "$CLAMAVUSER:$CLAMAVGROUP" "$RUNDIR" || exit 1 diff --git a/security/clamav-devel/pkg-plist b/security/clamav-devel/pkg-plist index 40083b15d9a8..c3ad2a52fa80 100644 --- a/security/clamav-devel/pkg-plist +++ b/security/clamav-devel/pkg-plist @@ -27,5 +27,5 @@ etc/freshclam.conf.default @unexec [ ! -f %%DBDIR%%/daily.cvd ] || rm -f %%DBDIR%%/daily.cvd || true @unexec [ ! -f %%DBDIR%%/main.cvd ] || rm -f %%DBDIR%%/main.cvd || true @unexec rmdir %%DBDIR%% +@unexec rmdir %%LOGDIR%% 2>/dev/null || true @unexec rmdir %%RUNDIR%% 2>/dev/null || true -@unexec rmdir /var/log/clamav 2>/dev/null || true |