- Update to 4.3.11

- Proper usage of USERS and GROUPS

PR:		ports/178322
Submitted by:	Mark Felder <feld@feld.me> (maintainer)

6 files changed, 33 insertions, 100 deletions

diff --git a/net-mgmt/xymon-server/Makefile b/net-mgmt/xymon-server/Makefile
index 9072959437f3..3baa461bfc2f 100644
--- a/net-mgmt/xymon-server/Makefile
+++ b/net-mgmt/xymon-server/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	xymon
-PORTVERSION=	4.3.10
-PORTREVISION=	3
+PORTVERSION=	4.3.11
 CATEGORIES=	net-mgmt www
 MASTER_SITES=	SF/xymon/Xymon/${PORTVERSION}
 PKGNAMESUFFIX=	-server${PKGNAMESUFFIX2}
@@ -16,9 +15,12 @@ LICENSE=	GPLv2
 BUILD_DEPENDS=	rrdtool:${PORTSDIR}/databases/rrdtool
 LIB_DEPENDS=	png15:${PORTSDIR}/graphics/png \
 		pcre:${PORTSDIR}/devel/pcre
-RUN_DEPENDS=	rrdtool:${PORTSDIR}/databases/rrdtool
+RUN_DEPENDS=	rrdtool:${PORTSDIR}/databases/rrdtool \
+		fping:${PORTSDIR}/net/fping \
+		mtr:${PORTSDIR}/net/mtr-nox11
 
-MAKE_JOBS_UNSAFE=	yes
+USERS=	xymon
+GROUPS=	xymon
 
 # Options
 XYMONUSER?=	xymon
@@ -27,6 +29,7 @@ XYMONHOSTIP?=	127.0.0.1
 
 USE_GMAKE=	yes
 USE_OPENSSL=	yes
+MAKE_JOBS_UNSAFE=	yes
 CONFIGURE_ENV=	MAKE=gmake
 MAKE_ENV+=	XYMONUSER="${XYMONUSER}"
 MAKE_ENV+=	XYMONHOSTNAME="${XYMONHOSTNAME}"
@@ -79,18 +82,18 @@ LIB_DEPENDS+=	netsnmp.30:${PORTSDIR}/net-mgmt/net-snmp
 post-patch:
 	${REINPLACE_CMD} -e 's|!/bin/bash|!/usr/local/bin/bash|' \
 		${WRKSRC}/xymond/xymonreports.sh.DIST
+	${REINPLACE_CMD} -e 's|web-build client|web-build|' ${WRKSRC}/build/Makefile.rules
+	${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:
 	${CP} ${FILESDIR}/Makefile ${WRKSRC}/
 
-pre-install:
-	if ! pw groupshow ${XYMONUSER}; then pw groupadd ${XYMONUSER} -g 280; fi
-	if ! pw usershow ${XYMONUSER}; then pw useradd ${XYMONUSER} -g ${XYMONUSER} -u 280 \
-		-h - -d ${WWWDIR} -s /usr/sbin/nologin -c "Xymon Monitor"; fi
-
 post-install:
-	-${MKDIR} ${WWWDIR}/server/etc
+	${MKDIR} ${WWWDIR}/server/etc
 	${INSTALL_SCRIPT} ${WRKSRC}/build/upgrade430.sh ${WWWDIR}/server/bin/
 	${INSTALL_PROGRAM} ${WRKSRC}/build/renamevars ${WWWDIR}/server/bin/
 .for i in ${FIXME1}
diff --git a/net-mgmt/xymon-server/distinfo b/net-mgmt/xymon-server/distinfo
index 8b69ff600254..f89f9a9c135a 100644
--- a/net-mgmt/xymon-server/distinfo
+++ b/net-mgmt/xymon-server/distinfo
@@ -1,2 +1,2 @@
-SHA256 (repacked/xymon-4.3.10.tar.gz) = 06b519cbe94b93a4b1ea5601d55e58f3ad8304acf555cf3d11ba04cee47455c1
-SIZE (repacked/xymon-4.3.10.tar.gz) = 2754807
+SHA256 (repacked/xymon-4.3.11.tar.gz) = d36f4ea320816375377d97784b7f0e04b8df3dfd19f75a2f1ff4b9f86e6829ee
+SIZE (repacked/xymon-4.3.11.tar.gz) = 2760418
diff --git a/net-mgmt/xymon-server/files/patch-build-Makefile.rules b/net-mgmt/xymon-server/files/patch-build-Makefile.rules
deleted file mode 100644
index e8114694713b..000000000000
--- a/net-mgmt/xymon-server/files/patch-build-Makefile.rules
+++ /dev/null
@@ -1,15 +0,0 @@
---- build/Makefile.rules.orig	2011-02-14 12:00:30.000000000 +0100
-+++ build/Makefile.rules	2011-03-31 07:16:54.000000000 +0200
-@@ -22,9 +22,9 @@
- 	INSTALLTARGETS = install-client install-clientmsg
- endif
- else
--	BUILDTARGETS = lib-build common-build xymongen-build xymonnet-build xymonproxy-build docs-build build-build xymond-build web-build client
--	CLIENTTARGETS = lib-client common-client build-build
--	INSTALLTARGETS = install-xymongen install-xymonnet install-xymonproxy install-man install-xymond install-web install-docs install-client install-servermsg
-+	BUILDTARGETS = lib-build common-build xymongen-build xymonnet-build xymonproxy-build docs-build build-build xymond-build web-build
-+	CLIENTTARGETS = 
-+	INSTALLTARGETS = install-xymongen install-xymonnet install-xymonproxy install-man install-xymond install-web install-docs install-servermsg
- 	CFLAGS += $(PCREINCDIR)
- endif
- 
diff --git a/net-mgmt/xymon-server/files/patch-xymond-client-freebsd.c b/net-mgmt/xymon-server/files/patch-xymond-client-freebsd.c
deleted file mode 100644
index 5af6cfb2f787..000000000000
--- a/net-mgmt/xymon-server/files/patch-xymond-client-freebsd.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- xymond/client/freebsd.c.orig	2012-11-13 07:48:19.217106974 -0600
-+++ xymond/client/freebsd.c	2012-11-13 07:49:45.416552261 -0600
-@@ -85,8 +85,16 @@
- 	if (vmtotalstr) {
- 		p = strstr(vmtotalstr, "\nFree Memory Pages:");
- 		if (p) {
--			memphysfree = atol(p + 18);
-+			memphysfree = atol(p + 19)/1024;
-+			memphysused = memphystotal - memphysfree;
- 			found++;
-+		} else {
-+			p = strstr(vmtotalstr, "\nFree Memory:");
-+			if (p) {
-+				memphysfree = atol(p + 13)/1024;
-+				memphysused = memphystotal - memphysfree;
-+				found++;
-+			}
- 		}
- 	}
- 
diff --git a/net-mgmt/xymon-server/files/patch-xymonnet-Makefile b/net-mgmt/xymon-server/files/patch-xymonnet-Makefile
deleted file mode 100644
index 027b491b770e..000000000000
--- a/net-mgmt/xymon-server/files/patch-xymonnet-Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
---- xymonnet/Makefile.orig	2010-11-14 18:21:19.000000000 +0100
-+++ xymonnet/Makefile	2011-03-31 07:14:12.000000000 +0200
-@@ -100,8 +100,8 @@
- 	cp -fp $(EXTENSIONS) $(INSTALLROOT)$(INSTALLEXTDIR)/
- 
- install-config:
--	../build/convert-bbservices $(INSTALLROOT)$(INSTALLETCDIR)/protocols.cfg
--	../build/merge-sects protocols.cfg $(INSTALLROOT)$(INSTALLETCDIR)/protocols.cfg
-+	../build/convert-bbservices $(INSTALLROOT)$(INSTALLETCDIR)/protocols.cfg.DIST
-+	../build/merge-sects protocols.cfg $(INSTALLROOT)$(INSTALLETCDIR)/protocols.cfg.DIST
- 
- install-man:
- 	mkdir -p $(INSTALLROOT)$(MANROOT)/man1 $(INSTALLROOT)$(MANROOT)/man5
diff --git a/net-mgmt/xymon-server/pkg-plist b/net-mgmt/xymon-server/pkg-plist
index da71b6271888..abaf7b73a3d0 100644
--- a/net-mgmt/xymon-server/pkg-plist
+++ b/net-mgmt/xymon-server/pkg-plist
@@ -1,6 +1,3 @@
-@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
@@ -385,38 +382,22 @@
 %%WWWDIR%%/server/www/menu/xymonmenu-blue.css
 %%WWWDIR%%/server/www/menu/xymonmenu-grey.css
 %%WWWDIR%%/server/xymon.sh
-@exec mkdir %D/%%WWWDIR%%/data
-@exec mkdir %D/%%WWWDIR%%/data/acks
-@exec mkdir %D/%%WWWDIR%%/data/data
-@exec mkdir %D/%%WWWDIR%%/data/disabled
-@exec mkdir %D/%%WWWDIR%%/data/hist
-@exec mkdir %D/%%WWWDIR%%/data/histlogs
-@exec mkdir %D/%%WWWDIR%%/data/hostdata
-@exec mkdir %D/%%WWWDIR%%/data/logs
-@exec mkdir %D/%%WWWDIR%%/data/rrd
-@exec mkdir %D/%%WWWDIR%%/server/download
-@exec mkdir %D/%%WWWDIR%%/server/tmp
-@exec mkdir %D/%%WWWDIR%%/server/www/html
-@exec mkdir %D/%%WWWDIR%%/server/www/notes
-@exec mkdir %D/%%WWWDIR%%/server/www/rep
-@exec mkdir %D/%%WWWDIR%%/server/www/snap
-@exec mkdir %D/%%WWWDIR%%/server/www/wml
-@exec chown %%XYMONUSER%% %D/%%WWWDIR%%/data
-@exec chown %%XYMONUSER%% %D/%%WWWDIR%%/data/acks
-@exec chown %%XYMONUSER%% %D/%%WWWDIR%%/data/data
-@exec chown %%XYMONUSER%% %D/%%WWWDIR%%/data/disabled
-@exec chown %%XYMONUSER%% %D/%%WWWDIR%%/data/hist
-@exec chown %%XYMONUSER%% %D/%%WWWDIR%%/data/histlogs
-@exec chown %%XYMONUSER%% %D/%%WWWDIR%%/data/hostdata
-@exec chown %%XYMONUSER%% %D/%%WWWDIR%%/data/logs
-@exec chown %%XYMONUSER%% %D/%%WWWDIR%%/data/rrd
-@exec chown %%XYMONUSER%% %D/%%WWWDIR%%/server/download
-@exec chown %%XYMONUSER%% %D/%%WWWDIR%%/server/tmp
-@exec chown %%XYMONUSER%% %D/%%WWWDIR%%/server/www/html
-@exec chown %%XYMONUSER%% %D/%%WWWDIR%%/server/www/notes
-@exec chown %%XYMONUSER%% %D/%%WWWDIR%%/server/www/rep
-@exec chown %%XYMONUSER%% %D/%%WWWDIR%%/server/www/snap
-@exec chown %%XYMONUSER%% %D/%%WWWDIR%%/server/www/wml
+@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
 @dirrm %%WWWDIR%%/server/www/wml
 @dirrm %%WWWDIR%%/server/www/snap
 @dirrm %%WWWDIR%%/server/www/rep
@@ -450,8 +431,5 @@
 @dirrm %%WWWDIR%%/cgi-secure
 @dirrm %%WWWDIR%%/cgi-bin
 @dirrmtry %%WWWDIR%%
-@exec mkdir -p %%VARBASE%%/log/xymon
-@exec chown %%XYMONUSER%% %%VARBASE%%/log/xymon
-@cwd %%VARBASE%%
-@dirrmtry log/xymon
-@cwd
+@exec install -d -o %%XYMONUSER%% -p %%VARBASE%%/log/xymon
+@dirrmtry %%VARBASE%%/log/xymon