From b8d7dda78bcc486b5b25e2df74141010f30107d9 Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@FreeBSD.org>
Date: Tue, 24 May 2016 14:30:58 +0000
Subject: net-mgmt/xymon-server: Modernize port

Clean up pkg-plist
Move @exec to post-install

Reported by:	bapt
---
 net-mgmt/xymon-server/Makefile  | 17 +++++++++-
 net-mgmt/xymon-server/pkg-plist | 70 ++++++++++++-----------------------------
 2 files changed, 36 insertions(+), 51 deletions(-)

(limited to 'net-mgmt')

diff --git a/net-mgmt/xymon-server/Makefile b/net-mgmt/xymon-server/Makefile
index 70f4bc5ccbde..a1d74df40208 100644
--- a/net-mgmt/xymon-server/Makefile
+++ b/net-mgmt/xymon-server/Makefile
@@ -79,7 +79,22 @@ do-configure:
 	${CP} ${FILESDIR}/Makefile ${WRKSRC}/
 
 post-install:
-	${MKDIR} ${STAGEDIR}${WWWDIR}/server/etc
+	${MKDIR} ${STAGEDIR}${WWWDIR}/data
+	${MKDIR} ${STAGEDIR}${WWWDIR}/data/acks
+	${MKDIR} ${STAGEDIR}${WWWDIR}/data/data
+	${MKDIR} ${STAGEDIR}${WWWDIR}/data/disabled
+	${MKDIR} ${STAGEDIR}${WWWDIR}/data/hist
+	${MKDIR} ${STAGEDIR}${WWWDIR}/data/histlogs
+	${MKDIR} ${STAGEDIR}${WWWDIR}/data/hostdata
+	${MKDIR} ${STAGEDIR}${WWWDIR}/data/logs
+	${MKDIR} ${STAGEDIR}${WWWDIR}/data/rrd
+	${MKDIR} ${STAGEDIR}${WWWDIR}/server/download
+	${MKDIR} ${STAGEDIR}${WWWDIR}/server/tmp
+	${MKDIR} ${STAGEDIR}${WWWDIR}/server/www/html
+	${MKDIR} ${STAGEDIR}${WWWDIR}/server/www/notes
+	${MKDIR} ${STAGEDIR}${WWWDIR}/server/www/rep
+	${MKDIR} ${STAGEDIR}${WWWDIR}/server/www/snap
+	${MKDIR} ${STAGEDIR}${WWWDIR}/server/www/wml
 	${LN} -s ${LOCALBASE}/sbin/fping ${STAGEDIR}${WWWDIR}/server/bin/xymonping
 	${INSTALL_SCRIPT} ${WRKSRC}/build/upgrade430.sh ${STAGEDIR}${WWWDIR}/server/bin/
 	${INSTALL_PROGRAM} ${WRKSRC}/build/renamevars ${STAGEDIR}${WWWDIR}/server/bin/
diff --git a/net-mgmt/xymon-server/pkg-plist b/net-mgmt/xymon-server/pkg-plist
index 042cfa0025b5..694b96ad52ed 100644
--- a/net-mgmt/xymon-server/pkg-plist
+++ b/net-mgmt/xymon-server/pkg-plist
@@ -427,54 +427,24 @@ man/man8/xymonproxy.8
 %%WWWDIR%%/server/www/menu/xymonmenu-blue.css
 %%WWWDIR%%/server/www/menu/xymonmenu-grey.css
 %%WWWDIR%%/server/xymon.sh
-@exec install -d -o %%XYMONUSER%% %D/%%WWWDIR%%/data
-@exec install -d -o %%XYMONUSER%% %D/%%WWWDIR%%/data/acks
-@exec install -d -o %%XYMONUSER%% %D/%%WWWDIR%%/data/data
-@exec install -d -o %%XYMONUSER%% %D/%%WWWDIR%%/data/disabled
-@exec install -d -o %%XYMONUSER%% %D/%%WWWDIR%%/data/hist
-@exec install -d -o %%XYMONUSER%% %D/%%WWWDIR%%/data/histlogs
-@exec install -d -o %%XYMONUSER%% %D/%%WWWDIR%%/data/hostdata
-@exec install -d -o %%XYMONUSER%% %D/%%WWWDIR%%/data/logs
-@exec install -d -o %%XYMONUSER%% %D/%%WWWDIR%%/data/rrd
-@exec install -d -o %%XYMONUSER%% %D/%%WWWDIR%%/server/download
-@exec install -d -o %%XYMONUSER%% %D/%%WWWDIR%%/server/tmp
-@exec install -d -o %%XYMONUSER%% %D/%%WWWDIR%%/server/www/html
-@exec install -d -o %%XYMONUSER%% %D/%%WWWDIR%%/server/www/notes
-@exec install -d -o %%XYMONUSER%% %D/%%WWWDIR%%/server/www/rep
-@exec install -d -o %%XYMONUSER%% %D/%%WWWDIR%%/server/www/snap
-@exec install -d -o %%XYMONUSER%% %D/%%WWWDIR%%/server/www/wml
-@exec chown %%XYMONUSER%% %D/%%WWWDIR%%/server/www
-@dir %%WWWDIR%%/server/www/wml
-@dir %%WWWDIR%%/server/www/snap
-@dir %%WWWDIR%%/server/www/rep
-@dir %%WWWDIR%%/server/www/notes
-@dir %%WWWDIR%%/server/www/menu
-@dir %%WWWDIR%%/server/www/html
-@dir %%WWWDIR%%/server/www/help/manpages/man8
-@dir %%WWWDIR%%/server/www/help/manpages/man7
-@dir %%WWWDIR%%/server/www/help/manpages/man5
-@dir %%WWWDIR%%/server/www/help/manpages/man1
-@dir %%WWWDIR%%/server/www/help/manpages
-@dir %%WWWDIR%%/server/www/help
-@dir %%WWWDIR%%/server/www/gifs
-@dir %%WWWDIR%%/server/www
-@dir %%WWWDIR%%/server/web
-@dir %%WWWDIR%%/server/tmp
-@dir %%WWWDIR%%/server/ext
-@dir %%WWWDIR%%/server/etc/tasks.d
-@dir %%WWWDIR%%/server/etc
-@dir %%WWWDIR%%/server/download
-@dir %%WWWDIR%%/server/bin
-@dir %%WWWDIR%%/server
-@dir %%WWWDIR%%/data/rrd
-@dir %%WWWDIR%%/data/logs
-@dir %%WWWDIR%%/data/hostdata
-@dir %%WWWDIR%%/data/histlogs
-@dir %%WWWDIR%%/data/hist
-@dir %%WWWDIR%%/data/disabled
-@dir %%WWWDIR%%/data/data
+@owner %%XYMONUSER%%
 @dir %%WWWDIR%%/data/acks
-@dir %%WWWDIR%%/data
-@dir %%WWWDIR%%/cgi-secure
-@dir %%WWWDIR%%/cgi-bin
-@dir %%WWWDIR%%
+@dir %%WWWDIR%%/data/data
+@dir %%WWWDIR%%/data/disabled
+@dir %%WWWDIR%%/data/hist
+@dir %%WWWDIR%%/data/histlogs
+@dir %%WWWDIR%%/data/hostdata
+@dir %%WWWDIR%%/data/logs
+@dir %%WWWDIR%%/data/rrd
+@dir %%WWWDIR%%/server/download
+@owner
+@dir %%WWWDIR%%/server/etc/tasks.d
+@owner %%XYMONUSER%%
+@dir %%WWWDIR%%/server/tmp
+@dir %%WWWDIR%%/server/www
+@dir %%WWWDIR%%/server/www/html
+@dir %%WWWDIR%%/server/www/notes
+@dir %%WWWDIR%%/server/www/rep
+@dir %%WWWDIR%%/server/www/snap
+@dir %%WWWDIR%%/server/www/wml
+@owner
-- 
cgit v1.2.3