From owner-svn-ports-all@FreeBSD.ORG Tue Mar 3 00:47:44 2015 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E8C346EC; Tue, 3 Mar 2015 00:47:44 +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 BA2C51EE; Tue, 3 Mar 2015 00:47:44 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t230lidv020921; Tue, 3 Mar 2015 00:47:44 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t230lhfY020919; Tue, 3 Mar 2015 00:47:43 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201503030047.t230lhfY020919@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Tue, 3 Mar 2015 00:47:43 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r380321 - head/sysutils/monitorix 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 Mar 2015 00:47:45 -0000 Author: bapt Date: Tue Mar 3 00:47:43 2015 New Revision: 380321 URL: https://svnweb.freebsd.org/changeset/ports/380321 QAT: https://qat.redports.org/buildarchive/r380321/ Log: Modernize plist Modified: head/sysutils/monitorix/Makefile head/sysutils/monitorix/pkg-plist Modified: head/sysutils/monitorix/Makefile ============================================================================== --- head/sysutils/monitorix/Makefile Tue Mar 3 00:43:55 2015 (r380320) +++ head/sysutils/monitorix/Makefile Tue Mar 3 00:47:43 2015 (r380321) @@ -2,7 +2,7 @@ PORTNAME= monitorix PORTVERSION= 3.5.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils MASTER_SITES= http://www.monitorix.org/ \ http://www.monitorix.org/old_versions/ \ Modified: head/sysutils/monitorix/pkg-plist ============================================================================== --- head/sysutils/monitorix/pkg-plist Tue Mar 3 00:43:55 2015 (r380320) +++ head/sysutils/monitorix/pkg-plist Tue Mar 3 00:47:43 2015 (r380321) @@ -1,29 +1,21 @@ -@exec install -d -o %%WWW_OWNER%% -g %%WWW_GROUP%% %D/%%WWWDIR%%/imgs -@unexec if cmp -s %D/etc/monitorix.conf %D/etc/monitorix.conf.sample; then rm -f %D/etc/monitorix.conf; fi -etc/monitorix.conf.sample -@exec if [ ! -f %D/etc/monitorix.conf ]; then cp %D/%F %B/monitorix.conf; fi +@dir(%%WWW_OWNER%%,%%WWW_GROUP%%,,) %%WWWDIR%%/imgs +@sample etc/monitorix.conf.sample bin/monitorix -@exec mkdir -p %D/%%WWWDIR%%/usage -@dirrmtry %%WWWDIR%%/usage +@dir %%WWWDIR%%/usage %%CGIDIR%%/monitorix.cgi man/man5/monitorix.conf.5.gz man/man8/monitorix.8.gz -@unexec rm -f %B/monitorix.conf.path -@dirrmtry %%CGIDIR%% +@rmtry %B/monitorix.conf.path %%WWWDIR%%/reports/ca.html.sample %%WWWDIR%%/reports/de.html.sample %%WWWDIR%%/reports/en.html.sample %%WWWDIR%%/reports/it.html.sample %%WWWDIR%%/reports/pl.html.sample -@dirrm %%WWWDIR%%/reports %%WWWDIR%%/logo_bot.png %%WWWDIR%%/logo_top.png %%WWWDIR%%/monitorixico.png %%WWWDIR%%/cgi -@dirrmtry %%WWWDIR%%/imgs -@dirrmtry %%WWWDIR%% @comment rrd files are now kept in /var/db/monitorix, we'll move @comment previous files over for the user -@exec [ -d %%DBDIR%% ] || install -d -o %%WWW_OWNER%% -g %%WWW_GROUP%% %%DBDIR%% +@dir(%%WWW_OWNER%%,%%WWW_GROUP%%,,) %%DBDIR%% @exec [ -f %%DATADIR%%/fs.rrd ] && mv %%DATADIR%%/*.rrd %%DBDIR%% || true -@unexec rmdir %%DBDIR%% 2>/dev/null || true