8 files changed, 38 insertions, 27 deletions

diff --git a/net-mgmt/xymon-client/Makefile b/net-mgmt/xymon-client/Makefile
index 78ad1a0a18b0..d566c8deca70 100644
--- a/net-mgmt/xymon-client/Makefile
+++ b/net-mgmt/xymon-client/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xymon
-PORTVERSION=	4.3.4
+PORTVERSION=	4.3.7
 CATEGORIES=	net-mgmt www
 MASTER_SITES=	SF/xymon/Xymon/${PORTVERSION}
 PKGNAMESUFFIX=	-client${PKGNAMESUFFIX2}
diff --git a/net-mgmt/xymon-client/distinfo b/net-mgmt/xymon-client/distinfo
index 41d4197231d2..39e99183fe2c 100644
--- a/net-mgmt/xymon-client/distinfo
+++ b/net-mgmt/xymon-client/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xymon-4.3.4.tar.gz) = bbd42ce1f975cb9a15ac45423df1ba54f6748ac3fec5dbf64299c6259a91071e
-SIZE (xymon-4.3.4.tar.gz) = 2919010
+SHA256 (xymon-4.3.7.tar.gz) = 9652a141cea57a67dd57f67c7aba73eeb932fa7300df56b18fe1d2a3ad21a519
+SIZE (xymon-4.3.7.tar.gz) = 2740378
diff --git a/net-mgmt/xymon-client/files/patch-Makefile b/net-mgmt/xymon-client/files/patch-Makefile
index 7c8adbdcbcc9..47341ec4a998 100644
--- a/net-mgmt/xymon-client/files/patch-Makefile
+++ b/net-mgmt/xymon-client/files/patch-Makefile
@@ -1,11 +1,12 @@
---- client/Makefile.orig	2011-03-04 11:01:25.000000000 +0100
-+++ client/Makefile	2011-03-31 08:03:39.000000000 +0200
-@@ -63,13 +63,13 @@
- 	if test ! -d $(INSTALLROOT)$(XYMONHOME)/tmp ; then mkdir -p $(INSTALLROOT)$(XYMONHOME)/tmp ; fi
- 	if test ! -d $(INSTALLROOT)$(XYMONHOME)/logs; then mkdir -p $(INSTALLROOT)$(XYMONHOME)/logs; fi
- 	if test ! -d $(INSTALLROOT)$(XYMONHOME)/ext ; then mkdir -p $(INSTALLROOT)$(XYMONHOME)/ext ; fi
+--- client/Makefile.orig	2011-12-12 23:15:39.000000000 +0100
++++ client/Makefile	2012-01-12 06:47:33.000000000 +0100
+@@ -64,14 +64,14 @@
+ 	if test ! -d $(INSTALLROOT)$(XYMONHOME)/logs  ; then mkdir -p $(INSTALLROOT)$(XYMONHOME)/logs  ; fi
+ 	if test ! -d $(INSTALLROOT)$(XYMONHOME)/ext   ; then mkdir -p $(INSTALLROOT)$(XYMONHOME)/ext   ; fi
+ 	if test ! -d $(INSTALLROOT)$(XYMONHOME)/local ; then mkdir -p $(INSTALLROOT)$(XYMONHOME)/local ; fi
 -	if test ! -f $(INSTALLROOT)$(XYMONHOME)/etc/localclient.cfg ; then cp localclient.cfg $(INSTALLROOT)$(XYMONHOME)/etc/ ; fi
 +	if test ! -f $(INSTALLROOT)$(XYMONHOME)/etc/localclient.cfg ; then cp localclient.cfg $(INSTALLROOT)$(XYMONHOME)/etc/localclient.cfg.DIST ; fi
+ 	if test ! -f $(INSTALLROOT)$(XYMONHOME)/local/README; then cp README-local $(INSTALLROOT)$(XYMONHOME)/local/README ; chmod 644 $(INSTALLROOT)$(XYMONHOME)/local/README; fi
  	cp -fp runclient.sh $(INSTALLROOT)$(XYMONHOME)
  	cp -fp $(PROGRAMS) xymonclient*.sh $(COMMONTOOLS) $(EXTRATOOLS) $(INSTALLROOT)$(XYMONHOME)/bin/
  	chmod ugo+x $(INSTALLROOT)$(XYMONHOME)/bin/*
diff --git a/net-mgmt/xymon-client/pkg-plist b/net-mgmt/xymon-client/pkg-plist
index a9c0d0a79de9..24c8a0476c40 100644
--- a/net-mgmt/xymon-client/pkg-plist
+++ b/net-mgmt/xymon-client/pkg-plist
@@ -34,6 +34,7 @@
 @exec [ ! -f %B/xymonclient.cfg ] && cp %B/%f %B/xymonclient.cfg
 %%WWWDIR%%/client/etc/localclient.cfg.DIST
 @exec [ ! -f %B/localclient.cfg ] && cp %B/%f %B/localclient.cfg
+%%WWWDIR%%/client/local/README
 %%WWWDIR%%/client/runclient.sh
 @exec mkdir %D/%%WWWDIR%%/client/ext
 @exec mkdir %D/%%WWWDIR%%/client/logs
@@ -43,6 +44,7 @@
 @exec chown %%XYMONUSER%% %D/%%WWWDIR%%/client/tmp
 @dirrm %%WWWDIR%%/client/tmp
 @dirrm %%WWWDIR%%/client/logs
+@dirrm %%WWWDIR%%/client/local
 @dirrm %%WWWDIR%%/client/ext
 @dirrm %%WWWDIR%%/client/etc
 @dirrm %%WWWDIR%%/client/bin
diff --git a/net-mgmt/xymon-server/Makefile b/net-mgmt/xymon-server/Makefile
index 9648d5bbe477..60dd7da573ce 100644
--- a/net-mgmt/xymon-server/Makefile
+++ b/net-mgmt/xymon-server/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xymon
-PORTVERSION=	4.3.4
+PORTVERSION=	4.3.7
 CATEGORIES=	net-mgmt www
 MASTER_SITES=	SF/xymon/Xymon/${PORTVERSION}
 PKGNAMESUFFIX=	-server${PKGNAMESUFFIX2}
@@ -44,24 +44,24 @@ FIXME1=		alerts.cfg hosts.cfg xymon-apache-open xymon-apache-secure
 FIXME2=		analysis.cfg combo.cfg holidays.cfg rrddefinitions.cfg \
 		snmpmibs.cfg xymonmenu.cfg xymonserver-migration.cfg
 
-MAN1 =	ackinfo.cgi.1 acknowledge.cgi.1 clientupdate.1 combostatus.1 \
-	confreport.cgi.1 criticaleditor.cgi.1 criticalview.cgi.1 \
-	csvinfo.cgi.1 datepage.cgi.1 eventlog.cgi.1 findhost.cgi.1 \
-	ghostlist.cgi.1 history.cgi.1 hostgraphs.cgi.1 logfetch.1 \
-	orcaxymon.1 report.cgi.1 reportlog.cgi.1 showgraph.cgi.1 \
+MAN1 =	ackinfo.cgi.1 acknowledge.cgi.1 appfeed.cgi.1 clientupdate.1 \
+	combostatus.1 confreport.cgi.1 criticaleditor.cgi.1 \
+	criticalview.cgi.1 csvinfo.cgi.1 datepage.cgi.1 eventlog.cgi.1 \
+	findhost.cgi.1 ghostlist.cgi.1 history.cgi.1 hostgraphs.cgi.1 \
+	logfetch.1 orcaxymon.1 report.cgi.1 reportlog.cgi.1 showgraph.cgi.1 \
 	snapshot.cgi.1 statusreport.cgi.1 svcstatus.cgi.1 xymon.1 xymoncfg.1 \
 	xymoncmd.1 xymondigest.1 xymongen.1 xymongrep.1 xymonnet-again.sh.1 \
 	xymonnet.1 xymonpage.cgi.1 xymonping.1
 MAN5=	alerts.cfg.5 analysis.cfg.5 cgioptions.cfg.5 client-local.cfg.5 \
 	clientlaunch.cfg.5 combo.cfg.5 critical.cfg.5 graphs.cfg.5 \
 	hosts.cfg.5 protocols.cfg.5 tasks.cfg.5 xymon-xmh.5 \
-	xymonclient.cfg.5 xymonserver.cfg.5 xymonweb.5
+	xymonclient.cfg.5 xymonserver.cfg.5 xymonweb.5 xymonwebaccess.5
 MAN7=	xymon.7
 MAN8=	enadis.cgi.8 xymon-mailack.8 xymoncgimsg.cgi.8 xymond.8 \
 	xymond_alert.8 xymond_capture.8 xymond_channel.8 xymond_client.8 \
-	xymond_filestore.8 xymond_history.8 xymond_hostdata.8 xymond_rrd.8 \
-	xymond_sample.8 xymonfetch.8 xymonlaunch.8 xymonproxy.8 msgcache.8 \
-	trimhistory.8
+	xymond_distribute.8 xymond_filestore.8 xymond_history.8 \
+	xymond_hostdata.8 xymond_rrd.8 xymond_sample.8 xymonfetch.8 \
+	xymonlaunch.8 xymonproxy.8 msgcache.8 trimhistory.8
 
 .include <bsd.port.pre.mk>
 
diff --git a/net-mgmt/xymon-server/distinfo b/net-mgmt/xymon-server/distinfo
index 41d4197231d2..39e99183fe2c 100644
--- a/net-mgmt/xymon-server/distinfo
+++ b/net-mgmt/xymon-server/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xymon-4.3.4.tar.gz) = bbd42ce1f975cb9a15ac45423df1ba54f6748ac3fec5dbf64299c6259a91071e
-SIZE (xymon-4.3.4.tar.gz) = 2919010
+SHA256 (xymon-4.3.7.tar.gz) = 9652a141cea57a67dd57f67c7aba73eeb932fa7300df56b18fe1d2a3ad21a519
+SIZE (xymon-4.3.7.tar.gz) = 2740378
diff --git a/net-mgmt/xymon-server/files/patch-xymond-Makefile b/net-mgmt/xymon-server/files/patch-xymond-Makefile
index 11ed0c631897..65b1eef1df76 100644
--- a/net-mgmt/xymon-server/files/patch-xymond-Makefile
+++ b/net-mgmt/xymon-server/files/patch-xymond-Makefile
@@ -1,6 +1,6 @@
---- xymond/Makefile.orig	2010-11-14 18:21:19.000000000 +0100
-+++ xymond/Makefile	2011-03-31 07:23:21.000000000 +0200
-@@ -149,14 +149,14 @@
+--- xymond/Makefile.orig	2011-12-12 23:18:17.000000000 +0100
++++ xymond/Makefile	2012-01-12 06:55:06.000000000 +0100
+@@ -153,13 +153,13 @@
  	cp -fp *.8 $(INSTALLROOT)$(MANROOT)/man8/
  
  install-cfg:
@@ -10,15 +10,13 @@
 -	cd etcfiles; ../../build/merge-sects client-local.cfg $(INSTALLROOT)$(INSTALLETCDIR)/client-local.cfg
 -	cd etcfiles; ../../build/merge-sects graphs.cfg $(INSTALLROOT)$(INSTALLETCDIR)/graphs.cfg
 -	cd etcfiles; ../../build/merge-lines columndoc.csv $(INSTALLROOT)$(INSTALLETCDIR)/columndoc.csv
--	cd etcfiles; (echo "hosts.cfg"; echo "alerts.cfg"; echo "analysis.cfg"; echo "combo.cfg"; echo "client-local.cfg"; echo "holidays.cfg"; echo "rrddefinitions.cfg"; echo snmpmibs.cfg; echo xymonmenu.cfg) | ../../build/setup-newfiles $(INSTALLROOT)$(INSTALLETCDIR)/
--	cd etcfiles; cp -fp xymon-apache.conf $(INSTALLROOT)$(INSTALLETCDIR)/xymon-apache.conf
+-	cd etcfiles; (echo "hosts.cfg"; echo "alerts.cfg"; echo "analysis.cfg"; echo "combo.cfg"; echo "client-local.cfg"; echo "holidays.cfg"; echo "rrddefinitions.cfg"; echo snmpmibs.cfg; echo xymonmenu.cfg; echo xymon-apache.conf) | ../../build/setup-newfiles $(INSTALLROOT)$(INSTALLETCDIR)/
 +	cd etcfiles; ../../build/merge-lines xymonserver.cfg $(INSTALLROOT)$(INSTALLETCDIR)/xymonserver.cfg.DIST LARRDCOLUMN=TRENDSCOLUMN LARRDS=TEST2RRD
 +	cd etcfiles; ../../build/merge-lines cgioptions.cfg $(INSTALLROOT)$(INSTALLETCDIR)/cgioptions.cfg.DIST
 +	cd etcfiles; ../../build/merge-sects tasks.cfg $(INSTALLROOT)$(INSTALLETCDIR)/tasks.cfg.DIST larrdstatus=rrdstatus larrddata=rrddata
 +	cd etcfiles; ../../build/merge-sects client-local.cfg $(INSTALLROOT)$(INSTALLETCDIR)/client-local.cfg.DIST
 +	cd etcfiles; ../../build/merge-sects graphs.cfg $(INSTALLROOT)$(INSTALLETCDIR)/graphs.cfg.DIST
 +	cd etcfiles; ../../build/merge-lines columndoc.csv $(INSTALLROOT)$(INSTALLETCDIR)/columndoc.csv.DIST
-+#	cd etcfiles; (echo "hosts.cfg"; echo "alerts.cfg"; echo "analysis.cfg"; echo "combo.cfg"; echo "client-local.cfg"; echo "holidays.cfg"; echo "rrddefinitions.cfg"; echo snmpmibs.cfg; echo xymonmenu.cfg) | ../../build/setup-newfiles $(INSTALLROOT)$(INSTALLETCDIR)/
 +	cd etcfiles; cp -fp xymon-apache.conf $(INSTALLROOT)$(INSTALLETCDIR)/xymon-apache.conf.DIST
  	cd $(INSTALLROOT)$(XYMONHOME); rm -f xymon.sh; ln -sf bin/xymon.sh .
  	cd wwwfiles; find . | grep -v RCS | grep -v ".svn" | grep -v DIST | ../../build/setup-newfiles $(INSTALLROOT)$(INSTALLWWWDIR)/ ../../build/md5.dat
diff --git a/net-mgmt/xymon-server/pkg-plist b/net-mgmt/xymon-server/pkg-plist
index e3e44468d31e..da71b6271888 100644
--- a/net-mgmt/xymon-server/pkg-plist
+++ b/net-mgmt/xymon-server/pkg-plist
@@ -1,6 +1,8 @@
 @exec if ! pw groupshow %%XYMONUSER%% 2>/dev/null; then pw groupadd %%XYMONUSER%% -g 280; fi
 @exec if ! pw usershow %%XYMONUSER%% 2>/dev/null; then pw useradd %%XYMONUSER%% -g %%XYMONUSER%% -u 280 -h - -d %%WWWDIR%% -s /usr/sbin/nologin -c "Xymon Monitor"; fi
 @unexec if pw usershow %%XYMONUSER%%; then pw userdel %%XYMONUSER%%; fi
+%%WWWDIR%%/cgi-bin/appfeed-critical.sh
+%%WWWDIR%%/cgi-bin/appfeed.sh
 %%WWWDIR%%/cgi-bin/certreport.sh
 %%WWWDIR%%/cgi-bin/columndoc.sh
 %%WWWDIR%%/cgi-bin/confreport-critical.sh
@@ -31,6 +33,7 @@
 %%WWWDIR%%/cgi-secure/useradm.sh
 %%WWWDIR%%/server/bin/ackinfo.cgi
 %%WWWDIR%%/server/bin/acknowledge.cgi
+%%WWWDIR%%/server/bin/appfeed.cgi
 %%WWWDIR%%/server/bin/bb
 %%WWWDIR%%/server/bin/bbcmd
 %%WWWDIR%%/server/bin/bbdigest
@@ -77,6 +80,7 @@
 %%WWWDIR%%/server/bin/xymond_capture
 %%WWWDIR%%/server/bin/xymond_channel
 %%WWWDIR%%/server/bin/xymond_client
+%%WWWDIR%%/server/bin/xymond_distribute
 %%WWWDIR%%/server/bin/xymond_filestore
 %%WWWDIR%%/server/bin/xymond_history
 %%WWWDIR%%/server/bin/xymond_hostdata
@@ -164,6 +168,9 @@
 %%WWWDIR%%/server/web/critedit_header
 %%WWWDIR%%/server/web/critical_footer
 %%WWWDIR%%/server/web/critical_header
+%%WWWDIR%%/server/web/critmulti_header
+%%WWWDIR%%/server/web/divider_footer
+%%WWWDIR%%/server/web/divider_header
 %%WWWDIR%%/server/web/event_footer
 %%WWWDIR%%/server/web/event_form
 %%WWWDIR%%/server/web/event_header
@@ -293,6 +300,7 @@
 %%WWWDIR%%/server/www/help/manpages/index.html
 %%WWWDIR%%/server/www/help/manpages/man1/ackinfo.cgi.1.html
 %%WWWDIR%%/server/www/help/manpages/man1/acknowledge.cgi.1.html
+%%WWWDIR%%/server/www/help/manpages/man1/appfeed.cgi.1.html
 %%WWWDIR%%/server/www/help/manpages/man1/clientupdate.1.html
 %%WWWDIR%%/server/www/help/manpages/man1/combostatus.1.html
 %%WWWDIR%%/server/www/help/manpages/man1/confreport.cgi.1.html
@@ -338,6 +346,7 @@
 %%WWWDIR%%/server/www/help/manpages/man5/xymonclient.cfg.5.html
 %%WWWDIR%%/server/www/help/manpages/man5/xymonserver.cfg.5.html
 %%WWWDIR%%/server/www/help/manpages/man5/xymonweb.5.html
+%%WWWDIR%%/server/www/help/manpages/man5/xymonwebaccess.5.html
 %%WWWDIR%%/server/www/help/manpages/man7/xymon.7.html
 %%WWWDIR%%/server/www/help/manpages/man8/enadis.cgi.8.html
 %%WWWDIR%%/server/www/help/manpages/man8/msgcache.8.html
@@ -349,6 +358,7 @@
 %%WWWDIR%%/server/www/help/manpages/man8/xymond_capture.8.html
 %%WWWDIR%%/server/www/help/manpages/man8/xymond_channel.8.html
 %%WWWDIR%%/server/www/help/manpages/man8/xymond_client.8.html
+%%WWWDIR%%/server/www/help/manpages/man8/xymond_distribute.8.html
 %%WWWDIR%%/server/www/help/manpages/man8/xymond_filestore.8.html
 %%WWWDIR%%/server/www/help/manpages/man8/xymond_history.8.html
 %%WWWDIR%%/server/www/help/manpages/man8/xymond_hostdata.8.html