Update xymon-server and xymon-client to 4.3.16

Approved by:	swills (mentor)

5 files changed, 13 insertions, 25 deletions

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