From 682b3abc2e34f60dfc811ae9241496d38153d6c9 Mon Sep 17 00:00:00 2001 From: Renato Botelho Date: Mon, 6 Oct 2014 10:21:01 +0000 Subject: [PATCH] Use new @dir for directories out of PREFIX --- security/clamav/Makefile | 8 ++++---- security/clamav/pkg-plist | 12 +++--------- 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/security/clamav/Makefile b/security/clamav/Makefile index 1c745b6a038b..a89e66656af1 100644 --- a/security/clamav/Makefile +++ b/security/clamav/Makefile @@ -3,7 +3,7 @@ PORTNAME= clamav PORTVERSION= 0.98.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= security MASTER_SITES= SF @@ -59,9 +59,9 @@ PORTDOCS= * DBDIR= /var/db/clamav LOGDIR= /var/log/clamav RUNDIR= /var/run/clamav -PLIST_SUB+= DBDIR=${DBDIR:S/^\///} \ - LOGDIR=${LOGDIR:S/^\///} \ - RUNDIR=${RUNDIR:S/^\///} \ +PLIST_SUB+= DBDIR=${DBDIR} \ + LOGDIR=${LOGDIR} \ + RUNDIR=${RUNDIR} \ CLAMAVUSER=${CLAMAVUSER} \ CLAMAVGROUP=${CLAMAVGROUP} PY_NO_THREAD= ${WRKDIR}/.python-has-no-threads diff --git a/security/clamav/pkg-plist b/security/clamav/pkg-plist index 995e8b17e385..a65f36cf50b3 100644 --- a/security/clamav/pkg-plist +++ b/security/clamav/pkg-plist @@ -37,12 +37,6 @@ man/man8/clamd.8.gz @sample etc/clamd.conf.sample @sample etc/freshclam.conf.sample %%MILTER%%@sample etc/clamav-milter.conf.sample -@cwd / -@owner %%CLAMAVUSER%% -@group %%CLAMAVGROUP%% -@dirrmtry %%DBDIR%% -@dirrmtry %%LOGDIR%% -@dirrmtry %%RUNDIR%% -@group -@owner -@cwd %%RESETPREFIX%% +@dir(%%CLAMAVUSER%%,%%CLAMAVGROUP%%,0755) %%DBDIR%% +@dir(%%CLAMAVUSER%%,%%CLAMAVGROUP%%,0755) %%LOGDIR%% +@dir(%%CLAMAVUSER%%,%%CLAMAVGROUP%%,0755) %%RUNDIR%%