svn commit: r370151 - head/security/clamav

[Renato Botelho]

Author: garga
Date: Mon Oct  6 10:21:01 2014
New Revision: 370151
URL: https://svnweb.freebsd.org/changeset/ports/370151
QAT: https://qat.redports.org/buildarchive/r370151/

Log:
  Use new @dir for directories out of PREFIX

Modified:
  head/security/clamav/Makefile
  head/security/clamav/pkg-plist

Modified: head/security/clamav/Makefile
==============================================================================
--- head/security/clamav/Makefile	Mon Oct  6 09:48:38 2014	(r370150)
+++ head/security/clamav/Makefile	Mon Oct  6 10:21:01 2014	(r370151)
@@ -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

Modified: head/security/clamav/pkg-plist
==============================================================================
--- head/security/clamav/pkg-plist	Mon Oct  6 09:48:38 2014	(r370150)
+++ head/security/clamav/pkg-plist	Mon Oct  6 10:21:01 2014	(r370151)
@@ -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
- at cwd /
- at owner %%CLAMAVUSER%%
- at group %%CLAMAVGROUP%%
- at dirrmtry %%DBDIR%%
- at dirrmtry %%LOGDIR%%
- at dirrmtry %%RUNDIR%%
- at group
- at owner
- at cwd %%RESETPREFIX%%
+ at dir(%%CLAMAVUSER%%,%%CLAMAVGROUP%%,0755) %%DBDIR%%
+ at dir(%%CLAMAVUSER%%,%%CLAMAVGROUP%%,0755) %%LOGDIR%%
+ at dir(%%CLAMAVUSER%%,%%CLAMAVGROUP%%,0755) %%RUNDIR%%