Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 3 Mar 2015 00:47:43 +0000 (UTC)
From:      Baptiste Daroussin <bapt@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r380321 - head/sysutils/monitorix
Message-ID:  <201503030047.t230lhfY020919@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201503030047.t230lhfY020919>