diff options
| -rw-r--r-- | sysutils/monitorix/Makefile | 2 | ||||
| -rw-r--r-- | sysutils/monitorix/pkg-plist | 18 |
2 files changed, 6 insertions, 14 deletions
diff --git a/sysutils/monitorix/Makefile b/sysutils/monitorix/Makefile index a43e6c99b662..980bf2f29632 100644 --- a/sysutils/monitorix/Makefile +++ b/sysutils/monitorix/Makefile @@ -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/ \ diff --git a/sysutils/monitorix/pkg-plist b/sysutils/monitorix/pkg-plist index d6b9aad9d928..19d4111c53f0 100644 --- a/sysutils/monitorix/pkg-plist +++ b/sysutils/monitorix/pkg-plist @@ -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 |