From owner-svn-ports-all@FreeBSD.ORG  Fri Oct 31 23:41:32 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@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 C73E5E60;
 Fri, 31 Oct 2014 23:41:32 +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 A63EF634;
 Fri, 31 Oct 2014 23:41:32 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s9VNfWs3038393;
 Fri, 31 Oct 2014 23:41:32 GMT (envelope-from bapt@FreeBSD.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s9VNfWes038372;
 Fri, 31 Oct 2014 23:41:32 GMT (envelope-from bapt@FreeBSD.org)
Message-Id: <201410312341.s9VNfWes038372@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: bapt set sender to bapt@FreeBSD.org
 using -f
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Fri, 31 Oct 2014 23:41:32 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r371967 - head/net-mgmt/collectd5
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 31 Oct 2014 23:41:32 -0000

Author: bapt
Date: Fri Oct 31 23:41:31 2014
New Revision: 371967
URL: https://svnweb.freebsd.org/changeset/ports/371967
QAT: https://qat.redports.org/buildarchive/r371967/

Log:
  Simplify plist

Modified:
  head/net-mgmt/collectd5/pkg-plist

Modified: head/net-mgmt/collectd5/pkg-plist
==============================================================================
--- head/net-mgmt/collectd5/pkg-plist	Fri Oct 31 23:39:33 2014	(r371966)
+++ head/net-mgmt/collectd5/pkg-plist	Fri Oct 31 23:41:31 2014	(r371967)
@@ -1,14 +1,8 @@
-@stopdaemon collectd
 sbin/collectd
 sbin/collectdmon
-@unexec if cmp -s %D/etc/collectd.conf.sample %D/etc/collectd.conf; then rm -f %D/etc/collectd.conf; fi
-etc/collectd.conf.sample
-@exec if [ ! -f %B/collectd.conf ] ; then cp -p %B/%f %B/collectd.conf; fi
+@sample etc/collectd.conf.sample
 %%CGI%%%%WWWDIR%%/collection.cgi
-%%CGI%%@unexec if cmp -s %B/collection.conf.sample %B/collection.conf; then rm -f %B/collection.conf; fi
-%%CGI%%%%WWWDIR%%/collection.conf.sample
-%%CGI%%@exec if [ ! -f %B/collection.conf ] ; then cp -p %B/%f %B/collection.conf; fi
-%%CGI%%@dirrmtry %%WWWDIR%%
+@sample %%CGI%%%%WWWDIR%%/collection.conf.sample
 bin/collectd-nagios
 bin/collectd-tg
 bin/collectdctl
@@ -119,15 +113,6 @@ man/man5/collectd-threshold.5.gz
 man/man5/collectd-unixsock.5.gz
 man/man5/collectd.conf.5.gz
 man/man5/types.db.5.gz
-@dirrm lib/collectd
-@dirrm include/collectd
-@dirrm %%DATADIR%%
-%%PERL%%@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Collectd
-%%PERL%%@dirrmtry %%SITE_PERL%%/Collectd/Plugins
-%%PERL%%@dirrmtry %%SITE_PERL%%/Collectd
-@exec mkdir -p /var/db/collectd
-@cwd /
-@dirrmtry var/db/collectd
-@dirrmtry var/lib/collectd
-@dirrmtry var/lib
-@cwd %%RESETPREFIX%%
+@dir /var/db/collectd
+@dir /var/lib/collectd
+@dir /var/lib