svn commit: r343677 - in head/net-mgmt: xymon-client xymon-client/files xymon-server xymon-server/files
Mark Felder
feld at FreeBSD.org
Mon Feb 10 20:10:31 UTC 2014
Author: feld
Date: Mon Feb 10 20:10:29 2014
New Revision: 343677
URL: http://svnweb.freebsd.org/changeset/ports/343677
QAT: https://qat.redports.org/buildarchive/r343677/
Log:
Update xymon-server and xymon-client to 4.3.16
Approved by: swills (mentor)
Deleted:
head/net-mgmt/xymon-client/files/patch-build-Makefile.FreeBSD
head/net-mgmt/xymon-client/files/patch-freebsd-meminfo.c
head/net-mgmt/xymon-client/files/patch-xymonclient-freebsd.sh
head/net-mgmt/xymon-client/files/patch-xymond-client-freebsd.c
head/net-mgmt/xymon-server/files/patch-build-Makefile.FreeBSD
Modified:
head/net-mgmt/xymon-client/Makefile
head/net-mgmt/xymon-client/distinfo
head/net-mgmt/xymon-client/files/Makefile
head/net-mgmt/xymon-client/files/patch-Makefile
head/net-mgmt/xymon-client/pkg-plist
head/net-mgmt/xymon-server/Makefile
head/net-mgmt/xymon-server/distinfo
head/net-mgmt/xymon-server/files/Makefile
head/net-mgmt/xymon-server/pkg-plist
Modified: head/net-mgmt/xymon-client/Makefile
==============================================================================
--- head/net-mgmt/xymon-client/Makefile Mon Feb 10 20:03:23 2014 (r343676)
+++ head/net-mgmt/xymon-client/Makefile Mon Feb 10 20:10:29 2014 (r343677)
@@ -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>
Modified: head/net-mgmt/xymon-client/distinfo
==============================================================================
--- head/net-mgmt/xymon-client/distinfo Mon Feb 10 20:03:23 2014 (r343676)
+++ head/net-mgmt/xymon-client/distinfo Mon Feb 10 20:10:29 2014 (r343677)
@@ -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
Modified: head/net-mgmt/xymon-client/files/Makefile
==============================================================================
--- head/net-mgmt/xymon-client/files/Makefile Mon Feb 10 20:03:23 2014 (r343676)
+++ head/net-mgmt/xymon-client/files/Makefile Mon Feb 10 20:10:29 2014 (r343677)
@@ -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
#
Modified: head/net-mgmt/xymon-client/files/patch-Makefile
==============================================================================
--- head/net-mgmt/xymon-client/files/patch-Makefile Mon Feb 10 20:03:23 2014 (r343676)
+++ head/net-mgmt/xymon-client/files/patch-Makefile Mon Feb 10 20:10:29 2014 (r343677)
@@ -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)
Modified: head/net-mgmt/xymon-client/pkg-plist
==============================================================================
--- head/net-mgmt/xymon-client/pkg-plist Mon Feb 10 20:03:23 2014 (r343676)
+++ head/net-mgmt/xymon-client/pkg-plist Mon Feb 10 20:10:29 2014 (r343677)
@@ -34,9 +34,9 @@
%%WWWDIR%%/client/local/README
%%WWWDIR%%/client/runclient.sh
@exec chown -R %%XYMONUSER%% %D/%%WWWDIR%%/client
- at exec mkdir %D/%%WWWDIR%%/client/ext
- at exec mkdir %D/%%WWWDIR%%/client/logs
- at exec mkdir %D/%%WWWDIR%%/client/tmp
+ at exec mkdir -p %D/%%WWWDIR%%/client/ext
+ at exec mkdir -p %D/%%WWWDIR%%/client/logs
+ at exec mkdir -p %D/%%WWWDIR%%/client/tmp
@dirrm %%WWWDIR%%/client/tmp
@dirrm %%WWWDIR%%/client/logs
@dirrm %%WWWDIR%%/client/local
Modified: head/net-mgmt/xymon-server/Makefile
==============================================================================
--- head/net-mgmt/xymon-server/Makefile Mon Feb 10 20:03:23 2014 (r343676)
+++ head/net-mgmt/xymon-server/Makefile Mon Feb 10 20:10:29 2014 (r343677)
@@ -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:
Modified: head/net-mgmt/xymon-server/distinfo
==============================================================================
--- head/net-mgmt/xymon-server/distinfo Mon Feb 10 20:03:23 2014 (r343676)
+++ head/net-mgmt/xymon-server/distinfo Mon Feb 10 20:10:29 2014 (r343677)
@@ -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
Modified: head/net-mgmt/xymon-server/files/Makefile
==============================================================================
--- head/net-mgmt/xymon-server/files/Makefile Mon Feb 10 20:03:23 2014 (r343676)
+++ head/net-mgmt/xymon-server/files/Makefile Mon Feb 10 20:10:29 2014 (r343677)
@@ -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
Modified: head/net-mgmt/xymon-server/pkg-plist
==============================================================================
--- head/net-mgmt/xymon-server/pkg-plist Mon Feb 10 20:03:23 2014 (r343676)
+++ head/net-mgmt/xymon-server/pkg-plist Mon Feb 10 20:10:29 2014 (r343677)
@@ -485,6 +485,7 @@ man/man8/xymonproxy.8
@dirrm %%WWWDIR%%/server/web
@dirrm %%WWWDIR%%/server/tmp
@dirrm %%WWWDIR%%/server/ext
+ at dirrm %%WWWDIR%%/server/etc/tasks.d
@dirrm %%WWWDIR%%/server/etc
@dirrm %%WWWDIR%%/server/download
@dirrm %%WWWDIR%%/server/bin
More information about the svn-ports-head
mailing list