Update xymon-server and xymon-client to 4.3.16

Approved by:	swills (mentor)

14 files changed, 29 insertions, 95 deletions

diff --git a/net-mgmt/xymon-client/Makefile b/net-mgmt/xymon-client/Makefile
index 5ec98807ea43..36a32555f131 100644
--- a/net-mgmt/xymon-client/Makefile
+++ b/net-mgmt/xymon-client/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	xymon
-PORTVERSION=	4.3.12
-PORTREVISION=	1
+PORTVERSION=	4.3.16
 CATEGORIES=	net-mgmt www
 MASTER_SITES=	SF/xymon/Xymon/${PORTVERSION}
 PKGNAMESUFFIX=	-client${PKGNAMESUFFIX2}
@@ -38,8 +37,8 @@ do-configure:
 
 post-install:
 .for i in ${CONFIG_FILES}
-	${CP} -np ${STAGEDIR}${WWWDIR}/client/etc/${i}.DIST \
-		${STAGEDIR}${WWWDIR}/client/etc/${i} || ${TRUE}
+	${CP} -np ${STAGEDIR}${WWWDIR}/etc/${i}.DIST \
+		${STAGEDIR}${WWWDIR}/etc/${i} || ${TRUE}
 .endfor
 
 .include <bsd.port.mk>
diff --git a/net-mgmt/xymon-client/distinfo b/net-mgmt/xymon-client/distinfo
index f40cecbf35bf..00365c0bd258 100644
--- a/net-mgmt/xymon-client/distinfo
+++ b/net-mgmt/xymon-client/distinfo
@@ -1,2 +1,2 @@
-SHA256 (repacked/xymon-4.3.12.tar.gz) = 5f6cad8f4e50b6b37fae187af50b8a926aaa7f1fe83c2018b0b469f272361439
-SIZE (repacked/xymon-4.3.12.tar.gz) = 2762520
+SHA256 (repacked/xymon-4.3.16.tar.gz) = a1f7ef35ea59a0193656aa144c2678d29b7beaf3d91e01280f1ddc8b723e7c63
+SIZE (repacked/xymon-4.3.16.tar.gz) = 2769690
diff --git a/net-mgmt/xymon-client/files/Makefile b/net-mgmt/xymon-client/files/Makefile
index f4162b2ed59a..5237e22d4007 100644
--- a/net-mgmt/xymon-client/files/Makefile
+++ b/net-mgmt/xymon-client/files/Makefile
@@ -7,9 +7,7 @@ LOCALCLIENT = no
 # configure settings for Xymon
 #
 # Toplevel dir
-XYMONTOPDIR = ${PREFIX}/www/xymon
-# Server home dir for etc/, www/
-XYMONHOME = ${PREFIX}/www/xymon/client
+XYMONTOPDIR = ${PREFIX}/www/xymon/client
 
 # hobbit settings follows
 #
diff --git a/net-mgmt/xymon-client/files/patch-Makefile b/net-mgmt/xymon-client/files/patch-Makefile
index 026bff8198db..2d47cee0648e 100644
--- a/net-mgmt/xymon-client/files/patch-Makefile
+++ b/net-mgmt/xymon-client/files/patch-Makefile
@@ -1,11 +1,11 @@
---- client/Makefile.orig	2012-11-14 05:29:54.000000000 -0600
-+++ client/Makefile	2013-04-23 09:14:36.635076021 -0500
+--- client/Makefile.orig	2014-01-07 15:43:56.000000000 -0600
++++ client/Makefile	2014-02-10 10:52:00.000000000 -0600
 @@ -69,15 +69,15 @@
- 	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 ! -d $(INSTALLROOT)$(XYMONHOME)/logs  ; then mkdir -p $(INSTALLROOT)$(XYMONHOME)/logs  ; chmod 755 $(INSTALLROOT)$(XYMONHOME)/logs ; fi
+ 	if test ! -d $(INSTALLROOT)$(XYMONHOME)/ext   ; then mkdir -p $(INSTALLROOT)$(XYMONHOME)/ext   ; chmod 755 $(INSTALLROOT)$(XYMONHOME)/ext  ; fi
+ 	if test ! -d $(INSTALLROOT)$(XYMONHOME)/local ; then mkdir -p $(INSTALLROOT)$(XYMONHOME)/local ; chmod 755 $(INSTALLROOT)$(XYMONHOME)/local; fi
+-	if test ! -f $(INSTALLROOT)$(XYMONHOME)/etc/localclient.cfg ; then cp localclient.cfg $(INSTALLROOT)$(XYMONHOME)/etc/ ; chmod 644 $(INSTALLROOT)$(XYMONHOME)/etc/localclient.cfg; fi
++	if test ! -f $(INSTALLROOT)$(XYMONHOME)/etc/localclient.cfg.DIST ; then cp localclient.cfg $(INSTALLROOT)$(XYMONHOME)/etc/localclient.cfg.DIST ; chmod 644 $(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
  	chmod 755 runclient.sh $(PROGRAMS) xymonclient*.sh $(COMMONTOOLS) $(EXTRATOOLS)
  	cp -fp runclient.sh $(INSTALLROOT)$(XYMONHOME)
diff --git a/net-mgmt/xymon-client/files/patch-build-Makefile.FreeBSD b/net-mgmt/xymon-client/files/patch-build-Makefile.FreeBSD
deleted file mode 100644
index 62921e164092..000000000000
--- a/net-mgmt/xymon-client/files/patch-build-Makefile.FreeBSD
+++ /dev/null
@@ -1,18 +0,0 @@
---- build/Makefile.FreeBSD.orig	2013-09-13 09:58:10.760876623 -0500
-+++ build/Makefile.FreeBSD	2013-09-13 09:58:57.823389711 -0500
-@@ -6,13 +6,8 @@
- NETLIBS =
- 
- # Compile flags for normal build
--CC = gcc
--GCCVER := $(shell gcc -dumpversion|cut -d. -f1)
--ifeq ($(GCCVER),4)
--	CFLAGS = -g -O2 -Wall -Wno-unused -Wno-pointer-sign -D_REENTRANT -I/usr/local/include -L/usr/local/lib $(LFSDEF) $(OSDEF)
--else
--	CFLAGS = -g -O2 -Wall -Wno-unused -D_REENTRANT -I/usr/local/include -L/usr/local/lib $(LFSDEF) $(OSDEF)
--endif
-+CC ?= gcc
-+CFLAGS = -g -O2 -Wall -Wno-unused -Wno-pointer-sign -D_REENTRANT -I/usr/local/include -L/usr/local/lib $(LFSDEF) $(OSDEF)
- 
- 
- RPATH = "-Wl,--rpath,"
diff --git a/net-mgmt/xymon-client/files/patch-freebsd-meminfo.c b/net-mgmt/xymon-client/files/patch-freebsd-meminfo.c
deleted file mode 100644
index 9c556e5b039e..000000000000
--- a/net-mgmt/xymon-client/files/patch-freebsd-meminfo.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- client/freebsd-meminfo.c.orig	2006-08-09 22:09:58.000000000 +0200
-+++ client/freebsd-meminfo.c	2008-03-01 04:31:43.000000000 +0100
-@@ -23,7 +23,7 @@
- 	unsigned long physmem;
- 
- 	int hw_pagesize[] = { CTL_HW, HW_PAGESIZE };
--	unsigned long pagesize;
-+	int pagesize;
- 
- 	int vm_vmtotal[] = { CTL_VM, VM_METER };
- 	struct vmtotal vmdata;
diff --git a/net-mgmt/xymon-client/files/patch-xymonclient-freebsd.sh b/net-mgmt/xymon-client/files/patch-xymonclient-freebsd.sh
deleted file mode 100644
index e121274bc4b3..000000000000
--- a/net-mgmt/xymon-client/files/patch-xymonclient-freebsd.sh
+++ /dev/null
@@ -1,11 +0,0 @@
---- client/xymonclient-freebsd.sh.orig	2010-11-14 18:21:19.000000000 +0100
-+++ client/xymonclient-freebsd.sh	2011-03-31 06:52:18.000000000 +0200
-@@ -43,7 +43,7 @@
- echo "[netstat]"
- netstat -s
- echo "[ports]"
--(netstat -na -f inet; netstat -na -f inet6) | grep "^tcp"
-+(netstat -Wna -f inet; netstat -Wna -f inet6) | grep "^tcp"
- echo "[ps]"
- # Dont use "args". "command" works also in FreeBSD 4.x.
- ps -ax -ww -o pid,ppid,user,start,state,pri,pcpu,cputime,pmem,rss,vsz,command
diff --git a/net-mgmt/xymon-client/files/patch-xymond-client-freebsd.c b/net-mgmt/xymon-client/files/patch-xymond-client-freebsd.c
deleted file mode 100644
index 7c274e9f42cf..000000000000
--- a/net-mgmt/xymon-client/files/patch-xymond-client-freebsd.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- xymond/client/freebsd.c.orig	2013-07-24 08:04:37.846706826 -0500
-+++ xymond/client/freebsd.c	2013-07-24 08:04:47.559598756 -0500
-@@ -47,7 +47,7 @@
- 
- 	timestr = getdata("date");
- 	uptimestr = getdata("uptime");
--	clockstr = getdata("clockstr");
-+	clockstr = getdata("clock");
- 	msgcachestr = getdata("msgcache");
- 	whostr = getdata("who");
- 	psstr = getdata("ps");
diff --git a/net-mgmt/xymon-client/pkg-plist b/net-mgmt/xymon-client/pkg-plist
index 43a2d9277ee8..bbce90c417e9 100644
--- a/net-mgmt/xymon-client/pkg-plist
+++ b/net-mgmt/xymon-client/pkg-plist
@@ -34,9 +34,9 @@
 %%WWWDIR%%/client/local/README
 %%WWWDIR%%/client/runclient.sh
 @exec chown -R %%XYMONUSER%% %D/%%WWWDIR%%/client
-@exec mkdir %D/%%WWWDIR%%/client/ext
-@exec mkdir %D/%%WWWDIR%%/client/logs
-@exec mkdir %D/%%WWWDIR%%/client/tmp
+@exec mkdir -p %D/%%WWWDIR%%/client/ext
+@exec mkdir -p %D/%%WWWDIR%%/client/logs
+@exec mkdir -p %D/%%WWWDIR%%/client/tmp
 @dirrm %%WWWDIR%%/client/tmp
 @dirrm %%WWWDIR%%/client/logs
 @dirrm %%WWWDIR%%/client/local
diff --git a/net-mgmt/xymon-server/Makefile b/net-mgmt/xymon-server/Makefile
index d04e87ce17c2..caf57f7c1d65 100644
--- a/net-mgmt/xymon-server/Makefile
+++ b/net-mgmt/xymon-server/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	xymon
-PORTVERSION=	4.3.12
-PORTREVISION=	1
+PORTVERSION=	4.3.16
 CATEGORIES=	net-mgmt www
 MASTER_SITES=	SF/xymon/Xymon/${PORTVERSION}
 PKGNAMESUFFIX=	-server${PKGNAMESUFFIX2}
@@ -15,7 +14,8 @@ LICENSE=	GPLv2
 
 BUILD_DEPENDS=	rrdtool:${PORTSDIR}/databases/rrdtool
 LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
-		libpcre.so:${PORTSDIR}/devel/pcre
+		libpcre.so:${PORTSDIR}/devel/pcre \
+		libcares.so:${PORTSDIR}/dns/c-ares
 RUN_DEPENDS=	rrdtool:${PORTSDIR}/databases/rrdtool \
 		fping:${PORTSDIR}/net/fping \
 		mtr:${PORTSDIR}/net/mtr-nox11
@@ -71,7 +71,6 @@ post-patch:
 	${REINPLACE_CMD} -e 's|install-docs install-client|install-docs|' ${WRKSRC}/build/Makefile.rules
 	${REINPLACE_CMD} -e 's|$(INSTALLETCDIR)/protocols.cfg|$(INSTALLETCDIR)/protocols.cfg.DIST|' ${WRKSRC}/xymonnet/Makefile
 	${REINPLACE_CMD} -e 's|TRACEROUTE="traceroute"|TRACEROUTE="mtr -c 2 -n --report"|' ${WRKSRC}/xymond/etcfiles/xymonserver.cfg.DIST
-	${REINPLACE_CMD} -e 's|FPING="@FPING@"|FPING="fping"|' ${WRKSRC}/xymond/etcfiles/xymonserver.cfg.DIST
 
 # Configure script is interactive
 do-configure:
diff --git a/net-mgmt/xymon-server/distinfo b/net-mgmt/xymon-server/distinfo
index f40cecbf35bf..00365c0bd258 100644
--- a/net-mgmt/xymon-server/distinfo
+++ b/net-mgmt/xymon-server/distinfo
@@ -1,2 +1,2 @@
-SHA256 (repacked/xymon-4.3.12.tar.gz) = 5f6cad8f4e50b6b37fae187af50b8a926aaa7f1fe83c2018b0b469f272361439
-SIZE (repacked/xymon-4.3.12.tar.gz) = 2762520
+SHA256 (repacked/xymon-4.3.16.tar.gz) = a1f7ef35ea59a0193656aa144c2678d29b7beaf3d91e01280f1ddc8b723e7c63
+SIZE (repacked/xymon-4.3.16.tar.gz) = 2769690
diff --git a/net-mgmt/xymon-server/files/Makefile b/net-mgmt/xymon-server/files/Makefile
index 828a3e736a48..0f84c04ceec5 100644
--- a/net-mgmt/xymon-server/files/Makefile
+++ b/net-mgmt/xymon-server/files/Makefile
@@ -19,7 +19,7 @@ XYMONLOGDIR = /var/log/xymon
 # Where to install manpages
 MANROOT = ${PREFIX}/man
 # How to run fping or xymonping
-FPING = xymonping
+FPING = fping
 
 # Username running xymon
 #XYMONUSER = nobody
@@ -39,6 +39,12 @@ SECUREXYMONCGIURL = /xymon-seccgi
 # Webserver group-ID
 HTTPDGID=80
 
+# C-ARES settings
+SYSTEMCARES = yes
+CARESINCDIR = -I${LOCALBASE}/include
+CARESLIBS = -L${LOCALBASE}/lib -lcares
+RPATHVAL += ${LOCALBASE}/lib
+
 # PCRE settings
 PCREINCDIR = -I${LOCALBASE}/include
 PCRELIBS = -L${LOCALBASE}/lib -lpcre
diff --git a/net-mgmt/xymon-server/files/patch-build-Makefile.FreeBSD b/net-mgmt/xymon-server/files/patch-build-Makefile.FreeBSD
deleted file mode 100644
index 62921e164092..000000000000
--- a/net-mgmt/xymon-server/files/patch-build-Makefile.FreeBSD
+++ /dev/null
@@ -1,18 +0,0 @@
---- build/Makefile.FreeBSD.orig	2013-09-13 09:58:10.760876623 -0500
-+++ build/Makefile.FreeBSD	2013-09-13 09:58:57.823389711 -0500
-@@ -6,13 +6,8 @@
- NETLIBS =
- 
- # Compile flags for normal build
--CC = gcc
--GCCVER := $(shell gcc -dumpversion|cut -d. -f1)
--ifeq ($(GCCVER),4)
--	CFLAGS = -g -O2 -Wall -Wno-unused -Wno-pointer-sign -D_REENTRANT -I/usr/local/include -L/usr/local/lib $(LFSDEF) $(OSDEF)
--else
--	CFLAGS = -g -O2 -Wall -Wno-unused -D_REENTRANT -I/usr/local/include -L/usr/local/lib $(LFSDEF) $(OSDEF)
--endif
-+CC ?= gcc
-+CFLAGS = -g -O2 -Wall -Wno-unused -Wno-pointer-sign -D_REENTRANT -I/usr/local/include -L/usr/local/lib $(LFSDEF) $(OSDEF)
- 
- 
- RPATH = "-Wl,--rpath,"
diff --git a/net-mgmt/xymon-server/pkg-plist b/net-mgmt/xymon-server/pkg-plist
index cb00524df67d..af08e470ece7 100644
--- a/net-mgmt/xymon-server/pkg-plist
+++ b/net-mgmt/xymon-server/pkg-plist
@@ -485,6 +485,7 @@ man/man8/xymonproxy.8
 @dirrm %%WWWDIR%%/server/web
 @dirrm %%WWWDIR%%/server/tmp
 @dirrm %%WWWDIR%%/server/ext
+@dirrm %%WWWDIR%%/server/etc/tasks.d
 @dirrm %%WWWDIR%%/server/etc
 @dirrm %%WWWDIR%%/server/download
 @dirrm %%WWWDIR%%/server/bin