From owner-svn-ports-head@FreeBSD.ORG  Mon Oct  6 10:21:02 2014
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 8578D72B;
 Mon,  6 Oct 2014 10:21:02 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 7333A1DA;
 Mon,  6 Oct 2014 10:21:02 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s96AL2nW092100;
 Mon, 6 Oct 2014 10:21:02 GMT (envelope-from garga@FreeBSD.org)
Received: (from garga@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s96AL2Ik092095;
 Mon, 6 Oct 2014 10:21:02 GMT (envelope-from garga@FreeBSD.org)
Message-Id: <201410061021.s96AL2Ik092095@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: garga set sender to
 garga@FreeBSD.org using -f
From: Renato Botelho <garga@FreeBSD.org>
Date: Mon, 6 Oct 2014 10:21:02 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r370151 - head/security/clamav
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 06 Oct 2014 10:21:02 -0000

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
-@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%%