git: c3aebaed06b4 - main - net-mgmt/xymon-server: Update to 4.3.31

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Mark Felder <feld_at_FreeBSD.org>
Date: Fri, 06 Nov 2026 22:35:44 UTC
The branch main has been updated by feld:

URL: https://cgit.FreeBSD.org/ports/commit/?id=c3aebaed06b45db9fd3d73e0457e35e905a21e69

commit c3aebaed06b45db9fd3d73e0457e35e905a21e69
Author:     Mark Felder <feld@FreeBSD.org>
AuthorDate: 2026-11-06 22:24:30 +0000
Commit:     Mark Felder <feld@FreeBSD.org>
CommitDate: 2026-11-06 22:35:35 +0000

    net-mgmt/xymon-server: Update to 4.3.31
    
    This release is a rollup of over 100 bugfixes and improvements to the
    codebase which has been reinvigorated by a new active development
    community.
    
    - A pre-generated Makefile is no longer necessary
    - A default newsyslog config is included so logs automatically rotate
    - The NETSNMP option builds the forgotten "xymon-snmpcollect" binary
---
 net-mgmt/xymon-server/Makefile                     |  45 +++++----
 net-mgmt/xymon-server/distinfo                     |   6 +-
 net-mgmt/xymon-server/files/Makefile               | 101 ---------------------
 net-mgmt/xymon-server/files/patch-bbcombotest-fix  |  18 ----
 net-mgmt/xymon-server/files/patch-fix_tls13_banner |  39 --------
 .../xymon-server/files/patch-md5_buffer_overflow   |  17 ----
 net-mgmt/xymon-server/files/patch-nousemultipart   |  29 ------
 net-mgmt/xymon-server/files/patch-upgrade430.sh    |  51 -----------
 net-mgmt/xymon-server/files/patch-xymond-Makefile  |  36 --------
 .../files/patch-xymond_rrd_do__vmstat.c            |  60 ------------
 .../xymon-server/files/patch-xymonnet_Makefile     |  11 ---
 net-mgmt/xymon-server/files/xymon-server.in        |   1 +
 .../files/xymon-server.newsyslog.conf.sample       |  19 ++++
 net-mgmt/xymon-server/pkg-plist                    |  16 ++++
 14 files changed, 64 insertions(+), 385 deletions(-)

diff --git a/net-mgmt/xymon-server/Makefile b/net-mgmt/xymon-server/Makefile
index 863493510599..316ab7e5311b 100644
--- a/net-mgmt/xymon-server/Makefile
+++ b/net-mgmt/xymon-server/Makefile
@@ -1,25 +1,25 @@
 PORTNAME=	xymon
-PORTVERSION=	4.3.30
-PORTREVISION=	5
+PORTVERSION=	4.3.31
+PORTREVISION=	0
 CATEGORIES=	net-mgmt www
-MASTER_SITES=	SF/xymon/Xymon/${PORTVERSION}
 PKGNAMESUFFIX=	-server${PKGNAMESUFFIX2}
-DIST_SUBDIR=	repacked
 
 MAINTAINER=	feld@FreeBSD.org
 COMMENT=	System for monitoring servers and networks
-WWW=		http://xymon.sourceforge.net/
+WWW=		https://github.com/xymon-monitoring/xymon
 
 LICENSE=	GPLv2
 
 BUILD_DEPENDS=	rrdtool:databases/rrdtool
-LIB_DEPENDS=	libpng.so:graphics/png \
-		libpcre.so:devel/pcre \
+LIB_DEPENDS=	libpng16.so:graphics/png \
+		libpcre2-8.so:devel/pcre2 \
 		libcares.so:dns/c-ares
 RUN_DEPENDS=	rrdtool:databases/rrdtool \
 		fping:net/fping \
 		mtr:net/mtr@nox11
 
+USES=		compiler:c11 cpe gmake shebangfix ssl
+
 USERS=		xymon
 GROUPS=		xymon
 
@@ -28,10 +28,9 @@ XYMONUSER?=	xymon
 XYMONHOSTNAME?=	xymon.example.com
 XYMONHOSTIP?=	127.0.0.1
 
-USES=		compiler:c11 cpe gmake shebangfix ssl
 SHEBANG_FILES=	${WRKSRC}/xymond/xymonreports.sh.DIST ${WRKSRC}/build/upgrade430.sh
 MAKE_JOBS_UNSAFE=	yes
-CONFIGURE_ENV=	MAKE=gmake
+CONFIGURE_ENV=	MAKE=${MAKE_CMD} XYMONTOPDIR=${WWWDIR} MANROOT=${PREFIX}/share/man
 MAKE_ENV+=	XYMONUSER="${XYMONUSER}"
 MAKE_ENV+=	XYMONHOSTNAME="${XYMONHOSTNAME}"
 MAKE_ENV+=	XYMONHOSTIP="${XYMONHOSTIP}"
@@ -42,29 +41,38 @@ USE_RC_SUBR=	xymon-server
 SUB_LIST+=	XYMONUSER="${XYMONUSER}"
 PLIST_SUB+=	XYMONUSER="${XYMONUSER}"
 
-CONFIG_FILES=	cgioptions.cfg client-local.cfg \
+CONFIG_FILES=	critical.cfg cgioptions.cfg client-local.cfg \
 		columndoc.csv graphs.cfg protocols.cfg \
 		tasks.cfg xymonserver.cfg xymon-apache.conf
 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
 
+USE_GITHUB=	yes
+GH_ACCOUNT=	xymon-monitoring
+GH_PROJECT=	xymon
+GH_TAGNAME=	rel-${PORTVERSION}
+
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS+=--server --fping=${PREFIX}/bin/fping
+
 OPTIONS_DEFINE=DEBUG LDAP NETSNMP
+OPTIONS_DEFAULT=	LDAP NETSNMP
+OPTIONS_SUB=	yes
 NETSNMP_DESC=Enable Net-SNMP support
 
 LDAP_USES=	ldap
 LDAP_MAKE_ENV=	WITH_LDAP=1
-NETSNMP_LIB_DEPENDS=	libnetsnmp.so:net-mgmt/net-snmp
+NETSNMP_LIB_DEPENDS=	libnetsnmp.so:net-mgmt/net-snmp \
+			libpkg.so:${PKG_ORIGIN}
 NETSNMP_MAKE_ENV=	WITH_NETSNMP=1
+NETSNMP_CONFIGURE_ENV=	SNMP=1
 
 post-patch:
 	${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"|' ${WRKSRC}/xymond/etcfiles/xymonserver.cfg.DIST
 	${REINPLACE_CMD} -e 's|TRACEROUTEOPTS="-n -q 2 -w 2 -m 15"|TRACEROUTEOPTS="-n -c 2 -w 2 -m 15 --report"|' ${WRKSRC}/xymond/etcfiles/xymonserver.cfg.DIST
-	${RM} ${WRKSRC}/docs/manpages/man1/xymonping.1.html
-	${RM} ${WRKSRC}/xymonnet/xymonping.1
 	${REINPLACE_CMD} -e 's|@CGIDIR@|${WWWDIR}/server/cgi-bin|g' \
 	-e 's|@SECURECGIDIR@|${WWWDIR}/server/cgi-secure|g' \
 	-e 's|@INSTALLETCDIR@|${WWWDIR}/server/etc|g' \
@@ -73,11 +81,9 @@ post-patch:
 	-e 's|@XYMONCGIURL@|/cgi-bin|g' \
 	-e 's|@XYMONHOSTURL@|/xymon|g' ${WRKSRC}/xymond/etcfiles/xymon-apache-*.DIST
 
-# Configure script is interactive
-do-configure:
-	${CP} ${FILESDIR}/Makefile ${WRKSRC}/
-
 post-install:
+	${MKDIR} ${STAGEDIR}${PREFIX}/etc/newsyslog.conf.d
+	${INSTALL} ${FILESDIR}/xymon-server.newsyslog.conf.sample ${STAGEDIR}${PREFIX}/etc/newsyslog.conf.d/xymon-server.conf.sample
 	${MKDIR} ${STAGEDIR}${WWWDIR}/data
 	${MKDIR} ${STAGEDIR}${WWWDIR}/data/acks
 	${MKDIR} ${STAGEDIR}${WWWDIR}/data/data
@@ -94,7 +100,6 @@ post-install:
 	${MKDIR} ${STAGEDIR}${WWWDIR}/server/www/rep
 	${MKDIR} ${STAGEDIR}${WWWDIR}/server/www/snap
 	${MKDIR} ${STAGEDIR}${WWWDIR}/server/www/wml
-	${LN} -s ${LOCALBASE}/sbin/fping ${STAGEDIR}${WWWDIR}/server/bin/xymonping
 	${INSTALL_SCRIPT} ${WRKSRC}/build/upgrade430.sh ${STAGEDIR}${WWWDIR}/server/bin/
 	${INSTALL_PROGRAM} ${WRKSRC}/build/renamevars ${STAGEDIR}${WWWDIR}/server/bin/
 .for i in ${FIXME1}
@@ -104,7 +109,7 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/xymond/etcfiles/${i} ${STAGEDIR}${WWWDIR}/server/etc/${i}.sample
 .endfor
 .for i in ${CONFIG_FILES}
-	${MV} ${STAGEDIR}${WWWDIR}/server/etc/${i}.DIST ${STAGEDIR}${WWWDIR}/server/etc/${i}.sample
+	${MV} ${STAGEDIR}${WWWDIR}/server/etc/${i} ${STAGEDIR}${WWWDIR}/server/etc/${i}.sample
 .endfor
 
 .include <bsd.port.mk>
diff --git a/net-mgmt/xymon-server/distinfo b/net-mgmt/xymon-server/distinfo
index 4f6cf91bc844..d630ae763a6a 100644
--- a/net-mgmt/xymon-server/distinfo
+++ b/net-mgmt/xymon-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1579022137
-SHA256 (repacked/xymon-4.3.30.tar.gz) = 8ed51771c8e1e15df96725072c61a21286ab0e6105a0e1edac956225201bf5f5
-SIZE (repacked/xymon-4.3.30.tar.gz) = 3549653
+TIMESTAMP = 1794001169
+SHA256 (xymon-monitoring-xymon-4.3.31-rel-4.3.31_GH0.tar.gz) = 9344134da9ad9bde1ea8ab83485245873f84a45a5fa803072b5f63db84801cb4
+SIZE (xymon-monitoring-xymon-4.3.31-rel-4.3.31_GH0.tar.gz) = 2648253
diff --git a/net-mgmt/xymon-server/files/Makefile b/net-mgmt/xymon-server/files/Makefile
deleted file mode 100644
index 5593d9056584..000000000000
--- a/net-mgmt/xymon-server/files/Makefile
+++ /dev/null
@@ -1,101 +0,0 @@
-# Toplevel Makefile for Xymon
-
-BUILDTOPDIR=`pwd`
-
-# configure settings for Xymon
-#
-# Toplevel dir
-XYMONTOPDIR = ${PREFIX}/www/xymon
-# Server home dir for etc/, bin/
-XYMONHOME = ${PREFIX}/www/xymon/server
-# Server data dir for hist/ etc.
-XYMONVAR = ${PREFIX}/www/xymon/data
-# CGI scripts go in CGIDIR
-CGIDIR = ${PREFIX}/www/xymon/cgi-bin
-# Admin CGI scripts go in SECURECGIDIR
-SECURECGIDIR = ${PREFIX}/www/xymon/cgi-secure
-# Where to put logfiles
-XYMONLOGDIR = /var/log/xymon
-# Where to install manpages
-MANROOT = ${PREFIX}/share/man
-# How to run fping or xymonping
-FPING = fping
-
-# Username running xymon
-#XYMONUSER = nobody
-# Xymon server hostname
-#XYMONHOSTNAME = xymon.example.com
-# Xymon server IP-address
-#XYMONHOSTIP = 127.0.0.1
-# Xymon server OS
-XYMONHOSTOS = freebsd
-
-# URL for Xymon webpages
-XYMONHOSTURL = /xymon
-# URL for Xymon CGIs
-XYMONCGIURL = /xymon-cgi
-# URL for Xymon Admin CGIs
-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
-RPATHVAL += ${LOCALBASE}/lib
-
-# RRDtool settings
-RRDDEF = -DRRDTOOL12
-RRDINCDIR = -I${LOCALBASE}/include
-RRDLIBS = -L${LOCALBASE}/lib -lrrd -L${LOCALBASE}/lib -lpng
-RPATHVAL += ${LOCALBASE}/lib
-DORRD = yes
-#
-# OpenSSL settings
-SSLFLAGS = -DHAVE_OPENSSL
-
-ifneq (${OPENSSLLIB},/usr/lib)
-SSLINCDIR = -I${OPENSSLINC}
-SSLLIBS = -L${OPENSSLLIB} -lssl -lcrypto
-RPATHVAL += ${OPENSSLLIB}
-else
-SSLLIBS = -lssl -lcrypto
-endif
-DOSSL = yes
-#
-ifdef WITH_LDAP
-# OpenLDAP settings
-LDAPFLAGS = -DXYMON_LDAP -DXYMON_LDAP_USESTARTTLS -DHAVE_LDAP
-LDAPINCDIR = -I${PREFIX}/include
-LDAPLIBS = -L${PREFIX}/lib -lldap -llber
-ifneq (${OPENSSLLIB},/usr/lib)
-RPATHVAL += ${PREFIX}/lib
-endif
-RPATHVAL += /usr/local/lib
-DOLDAP = yes
-endif
-#
-# clock_gettime() settings
-LIBRTDEF =
-
-ifdef WITH_NETSNMP
-# Net-SNMP settings
-DOSNMP = yes
-else
-DOSNMP = no
-endif
-
-# Large File Support settings
-LFSDEF = -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
-
-include build/Makefile.FreeBSD
-
-# Add local CFLAGS, etc. settings here
-
-include build/Makefile.rules
diff --git a/net-mgmt/xymon-server/files/patch-bbcombotest-fix b/net-mgmt/xymon-server/files/patch-bbcombotest-fix
deleted file mode 100644
index a71d722b739b..000000000000
--- a/net-mgmt/xymon-server/files/patch-bbcombotest-fix
+++ /dev/null
@@ -1,18 +0,0 @@
-Description: Fix bbcombotest: "Could not access hobbitd board, error 0"
-Author: Christoph Berg <myon@debian.org>
-Forwarded: no
-Last-Update: 2015-09-10
-
-Index: xymon/xymond/combostatus.c
-===================================================================
---- xymond/combostatus.c	2012-07-23 23:39:37.000000000 +0200
-+++ xymond/combostatus.c	2012-07-23 23:41:04.000000000 +0200
-@@ -207,7 +207,7 @@
- 		xymondresult = sendmessage("xymondboard fields=hostname,testname,color", NULL, XYMON_TIMEOUT, sres);
- 		board = getsendreturnstr(sres, 1);
- 
--		if ((xymondresult != XYMONSEND_OK) || (board == NULL)) {
-+		if (xymondresult != XYMONSEND_OK) {
- 			board = "";
- 			*errptr += sprintf(*errptr, "Could not access xymond board, error %d\n", xymondresult);
- 			return COL_CLEAR;
diff --git a/net-mgmt/xymon-server/files/patch-fix_tls13_banner b/net-mgmt/xymon-server/files/patch-fix_tls13_banner
deleted file mode 100644
index ebcffdcfdf30..000000000000
--- a/net-mgmt/xymon-server/files/patch-fix_tls13_banner
+++ /dev/null
@@ -1,39 +0,0 @@
-From: Andreas Oberritter <obi@saftware.de>
-Date: Tue, 11 May 2021 13:05:10 +0200
-Subject: Fix reading service banners from TLS-1.3-enabled hosts
-
-Bug-Debian: https://bugs.debian.org/930532
-Forwarded: https://lists.xymon.com/archive/2024-February/048290.html
-Last-Update: 2021-05-11
-
-
-Related discussion:
-https://lists.xymon.com/archive/2019-July/046585.html
-https://lists.xymon.com/archive/2019-November/046893.html
-https://lists.xymon.com/archive/2020-February/046986.html
-https://lists.xymon.com/archive/2020-March/046987.html
-https://sourceforge.net/p/xymon/discussion/435278/thread/c0359f08e7/
----
- xymonnet/contest.c | 9 ++++-----
- 1 file changed, 4 insertions(+), 5 deletions(-)
-
---- xymonnet/contest.c
-+++ xymonnet/contest.c
-@@ -1347,13 +1347,12 @@ restartselect:
- 							}
- 						}
- 
--						if ((item->svcinfo->flags & TCP_HTTP) && 
--						    ((res > 0) || item->sslagain)     &&
--						    (!datadone) ) {
-+						if (((item->svcinfo->flags & TCP_HTTP) && res > 0) || item->sslagain) {
- 							/*
--							 * HTTP : Grab the entire response.
-+							 * Grab the entire HTTP response or wait for
-+							 * TLS handshake to complete.
- 							 */
--							wantmoredata = 1;
-+							wantmoredata = !datadone;
- 						}
- 
- 						if (!wantmoredata) {
diff --git a/net-mgmt/xymon-server/files/patch-md5_buffer_overflow b/net-mgmt/xymon-server/files/patch-md5_buffer_overflow
deleted file mode 100644
index 3b4d1a92ae89..000000000000
--- a/net-mgmt/xymon-server/files/patch-md5_buffer_overflow
+++ /dev/null
@@ -1,17 +0,0 @@
-From: Roland Rosenfeld <roland@debian.org>
-Date: Tue, 24 Sep 2024 21:53:18 +0200
-Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/xymon/+bug/2078638
-Subject: Fix buffer overflow in md5hash
- This is triggered/found by -D_FORTIFY_SOURCE=3
-
---- lib/digest.c
-+++ lib/digest.c
-@@ -41,7 +41,7 @@ char *md5hash(char *input)
- 	myMD5_Final(md_value, ctx->mdctx);
- 
- 	for(i = 0, p = md_string; (i < sizeof(md_value)); i++) 
--		p += snprintf(p, (sizeof(md_string) - (md_string - p)), "%02x", md_value[i]);
-+		p += snprintf(p, (sizeof(md_string) - (p - md_string)), "%02x", md_value[i]);
- 	*p = '\0';
- 
- 	return md_string;
diff --git a/net-mgmt/xymon-server/files/patch-nousemultipart b/net-mgmt/xymon-server/files/patch-nousemultipart
deleted file mode 100644
index 44cc7550971a..000000000000
--- a/net-mgmt/xymon-server/files/patch-nousemultipart
+++ /dev/null
@@ -1,29 +0,0 @@
-From: Roland Rosenfeld <roland@debian.org>
-Date: Mon, 12 Jul 2021 13:34:10 +0200
-Forwarded: https://lists.xymon.com/archive/2024-February/048287.html
-Subject: Fix Snapshort and Availability Report on Firefox
-
-Bug-Debian: https://bugs.debian.org/990989
-
---- web/report.c
-+++ web/report.c
-@@ -204,7 +204,7 @@ int main(int argc, char *argv[])
- 	int argi, newargi;
- 	char *envarea = NULL;
- 	char *useragent = NULL;
--	int usemultipart = 1;
-+	int usemultipart = 0;
- 
- 	SBUF_MALLOC(outdir, PATH_MAX+1024);
- 	SBUF_MALLOC(xymonwebenv, PATH_MAX+1024);
---- web/snapshot.c
-+++ web/snapshot.c
-@@ -145,7 +145,7 @@ int main(int argc, char *argv[])
- 	int argi, newargi;
- 	char *envarea = NULL;
- 	char *useragent;
--	int usemultipart = 1;
-+	int usemultipart = 0;
- 
- 	SBUF_MALLOC(xymongencmd, 2048+PATH_MAX);
- 	SBUF_MALLOC(xymonwebenv, 4096);
diff --git a/net-mgmt/xymon-server/files/patch-upgrade430.sh b/net-mgmt/xymon-server/files/patch-upgrade430.sh
deleted file mode 100644
index 4061f1ad9e17..000000000000
--- a/net-mgmt/xymon-server/files/patch-upgrade430.sh
+++ /dev/null
@@ -1,51 +0,0 @@
---- build/upgrade430.sh.orig	2010-11-17 07:35:58.000000000 +0100
-+++ build/upgrade430.sh	2011-04-02 10:17:51.000000000 +0200
-@@ -119,6 +119,8 @@
- 	ln -s xymonserver.cfg hobbitserver.cfg
- fi
- 
-+if test -f /nonexistent
-+then
- cd $BBHOME || (echo "Cannot cd to BBHOME directory"; exit 1)
- if test ! -w .; then echo "Cannot write to BBHOME directory"; exit 1; fi
- renameandlink hobbit.sh xymon.sh
-@@ -249,6 +251,7 @@
- renameandlink hobbit-nkedit.sh criticaleditor.sh
- renameandlink hobbit-ackinfo.sh ackinfo.sh
- renameandlink hobbit-useradm.sh useradm.sh
-+fi
- 
- 
- cd $BBSERVERROOT/client/etc || (echo "Cannot cd to client/etc directory"; exit 1)
-@@ -268,6 +271,8 @@
- 	ln -s xymonclient.cfg hobbitclient.cfg
- fi
- 
-+if test -f /nonexistent
-+then
- cd $BBSERVERROOT/client/bin || (echo "Cannot cd to client/bin directory"; exit 1)
- if test ! -w .; then echo "Cannot write to client/bin directory"; exit 1; fi
- renameandlink bb xymon
-@@ -289,6 +294,7 @@
- renameandlink hobbitclient-sunos.sh xymonclient-sunos.sh
- renameandlink hobbitlaunch xymonlaunch
- renameandlink orcahobbit orcaxymon
-+fi
- 
- 
- cd $BBRRDS/$MACHINEDOTS || (echo "Cannot cd to Xymon-servers\' RRD directory"; exit 1)
-@@ -313,11 +319,14 @@
- if test -d hobbitd; then mv hobbitd xymond; fi
- if test -d bbproxy; then mv bbproxy xymonproxy; fi
- 
-+if test -f /nonexistent
-+then
- cd $BBWWW || (echo "Cannot cd to Xymon-servers\' www directory"; exit 1)
- if test ! -w .; then echo "Cannot write to Xymon-servers\' www directory"; exit 1; fi
- renameandlink bb.html xymon.html
- renameandlink bb2.html nongreen.html
- renameandlink bbnk.html critical.html
-+fi
- 
- 
- echo ""
diff --git a/net-mgmt/xymon-server/files/patch-xymond-Makefile b/net-mgmt/xymon-server/files/patch-xymond-Makefile
deleted file mode 100644
index 30d1ede61c56..000000000000
--- a/net-mgmt/xymon-server/files/patch-xymond-Makefile
+++ /dev/null
@@ -1,36 +0,0 @@
---- xymond/Makefile.orig	2014-02-10 21:13:18 UTC
-+++ xymond/Makefile
-@@ -180,25 +180,20 @@
- 	cp -fp *.8 $(INSTALLROOT)$(MANROOT)/man8/
- 
- install-cfg:
--	cd etcfiles; ../../build/merge-lines xymonserver.cfg $(INSTALLROOT)$(INSTALLETCDIR)/xymonserver.cfg LARRDCOLUMN=TRENDSCOLUMN LARRDS=TEST2RRD
--	cd etcfiles; ../../build/merge-lines cgioptions.cfg $(INSTALLROOT)$(INSTALLETCDIR)/cgioptions.cfg
--	cd etcfiles; ../../build/merge-sects tasks.cfg $(INSTALLROOT)$(INSTALLETCDIR)/tasks.cfg larrdstatus=rrdstatus larrddata=rrddata
--	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; 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; 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
- 	cd webfiles; find . | grep -v RCS | grep -v ".svn" | grep -v DIST | ../../build/setup-newfiles $(INSTALLROOT)$(INSTALLWEBDIR)/ ../../build/md5.dat
--	touch $(INSTALLROOT)$(INSTALLETCDIR)/critical.cfg $(INSTALLROOT)$(INSTALLETCDIR)/critical.cfg.bak
--	chmod 664 $(INSTALLROOT)$(INSTALLETCDIR)/critical.cfg $(INSTALLROOT)$(INSTALLETCDIR)/critical.cfg.bak
--	mkdir -p $(INSTALLROOT)$(XYMONLOGDIR); chmod 755 $(INSTALLROOT)$(XYMONLOGDIR)
- 	mkdir -p $(INSTALLROOT)$(INSTALLETCDIR)/tasks.d; chmod 755 $(INSTALLROOT)$(INSTALLETCDIR)/tasks.d
- ifndef PKGBUILD
--	chown $(XYMONUSER) $(INSTALLROOT)$(XYMONLOGDIR) $(INSTALLROOT)$(XYMONHOME) $(INSTALLROOT)$(XYMONHOME)/* $(INSTALLROOT)$(INSTALLBINDIR)/* $(INSTALLROOT)$(INSTALLETCDIR)/* $(INSTALLROOT)$(INSTALLEXTDIR)/* $(INSTALLROOT)$(INSTALLWEBDIR)/* $(INSTALLROOT)$(INSTALLWWWDIR)/gifs $(INSTALLROOT)$(INSTALLWWWDIR)/gifs/* $(INSTALLROOT)$(INSTALLWWWDIR)/menu $(INSTALLROOT)$(INSTALLWWWDIR)/menu/* $(INSTALLROOT)$(INSTALLWWWDIR)/help $(INSTALLROOT)$(INSTALLWWWDIR)/notes $(INSTALLROOT)$(INSTALLWWWDIR)/html $(INSTALLROOT)$(INSTALLWWWDIR)/wml $(INSTALLROOT)$(XYMONVAR) $(INSTALLROOT)$(XYMONVAR)/*
-+	chown $(XYMONUSER) $(INSTALLROOT)$(XYMONHOME) $(INSTALLROOT)$(XYMONHOME)/* $(INSTALLROOT)$(INSTALLBINDIR)/* $(INSTALLROOT)$(INSTALLETCDIR)/* $(INSTALLROOT)$(INSTALLEXTDIR)/* $(INSTALLROOT)$(INSTALLWEBDIR)/* $(INSTALLROOT)$(INSTALLWWWDIR)/gifs $(INSTALLROOT)$(INSTALLWWWDIR)/gifs/* $(INSTALLROOT)$(INSTALLWWWDIR)/menu $(INSTALLROOT)$(INSTALLWWWDIR)/menu/* $(INSTALLROOT)$(INSTALLWWWDIR)/help $(INSTALLROOT)$(INSTALLWWWDIR)/notes $(INSTALLROOT)$(INSTALLWWWDIR)/html $(INSTALLROOT)$(INSTALLWWWDIR)/wml $(INSTALLROOT)$(XYMONVAR) $(INSTALLROOT)$(XYMONVAR)/*
- 	chgrp `$(IDTOOL) -g $(XYMONUSER)` $(INSTALLROOT)$(XYMONLOGDIR) $(INSTALLROOT)$(XYMONHOME) $(INSTALLROOT)$(XYMONHOME)/* $(INSTALLROOT)$(INSTALLBINDIR)/* $(INSTALLROOT)$(INSTALLETCDIR)/* $(INSTALLROOT)$(INSTALLEXTDIR)/* $(INSTALLROOT)$(INSTALLWEBDIR)/* $(INSTALLROOT)$(INSTALLWWWDIR)/gifs $(INSTALLROOT)$(INSTALLWWWDIR)/gifs/* $(INSTALLROOT)$(INSTALLWWWDIR)/menu $(INSTALLROOT)$(INSTALLWWWDIR)/menu/* $(INSTALLROOT)$(INSTALLWWWDIR)/help $(INSTALLROOT)$(INSTALLWWWDIR)/notes $(INSTALLROOT)$(INSTALLWWWDIR)/html $(INSTALLROOT)$(INSTALLWWWDIR)/wml $(INSTALLROOT)$(XYMONVAR) $(INSTALLROOT)$(XYMONVAR)/*
--	chgrp $(HTTPDGID) $(INSTALLROOT)$(INSTALLETCDIR)/critical.cfg $(INSTALLROOT)$(INSTALLETCDIR)/critical.cfg.bak
--	chmod 664 $(INSTALLROOT)$(INSTALLETCDIR)/critical.cfg $(INSTALLROOT)$(INSTALLETCDIR)/critical.cfg.bak
- 
- 	chown root $(INSTALLROOT)$(INSTALLBINDIR)/xymonping || echo "Could not make xymonping owned by root, continuing"
- 	chmod 4755 $(INSTALLROOT)$(INSTALLBINDIR)/xymonping || echo "Could not make xymonping suid-root, continuing"
diff --git a/net-mgmt/xymon-server/files/patch-xymond_rrd_do__vmstat.c b/net-mgmt/xymon-server/files/patch-xymond_rrd_do__vmstat.c
deleted file mode 100644
index 8a08a8ebfef1..000000000000
--- a/net-mgmt/xymon-server/files/patch-xymond_rrd_do__vmstat.c
+++ /dev/null
@@ -1,60 +0,0 @@
---- xymond/rrd/do_vmstat.c.orig	2025-12-10 23:19:34 UTC
-+++ xymond/rrd/do_vmstat.c
-@@ -116,30 +116,6 @@ static vmstat_layout_t vmstat_irix_layout[] = {
- 	{ -1, NULL }
- };
- 
--/* This one matches FreeBSD 4.10 */
--/* LARRD 0.43c compatible */
--static vmstat_layout_t vmstat_freebsd4_layout[] = {
--	{ 0, "cpu_r" },
--	{ 1, "cpu_b" },
--	{ 2, "cpu_w" },
--	{ 3, "mem_avm" },
--	{ 4, "mem_free" },
--	{ 5, "mem_flt" },
--	{ 6, "mem_re" },
--	{ 7, "mem_pi" },
--	{ 8, "mem_po" },
--	{ 9, "mem_fr" },
--	{ 10, "sr" },
--	{ 11, "dsk_da0" },
--	{ 12, "dsk_fd0" },
--	{ 13, "cpu_int" },
--	{ 15, "cpu_csw" },
--	{ 16, "cpu_sys" },
--	{ 17, "cpu_usr" },
--	{ 18, "cpu_idl" },
--	{ -1, NULL }
--};
--
- /* FreeBSD v6 and later, possibly v5 also */
- static vmstat_layout_t vmstat_freebsd_layout[] = {
- 	{ 0, "cpu_r" },
-@@ -418,25 +394,7 @@ int do_vmstat_rrd(char *hostname, char *testname, char
- 	  case OS_HPUX: 
- 		layout = vmstat_hpux_layout; break;
- 	  case OS_FREEBSD:
--		/* 
--		 * Special, because there are two layouts for FreeBSD
--		 * FreeBSD v4.x has 19 fields, later versions of FreeBSD
--		 * are the same as OpenBSD, with 18 fields.
--		 */
--		{
--			char **dsnames = NULL;
--			int dscount, i;
--
--			dscount = rrddatasets(hostname, &dsnames);
--			layout = ((dscount == 19) ? vmstat_freebsd4_layout : vmstat_freebsd_layout);
--
--			if ((dscount > 0) && dsnames) {
--				/* Free the dsnames list */
--				for (i=0; (i<dscount); i++) xfree(dsnames[i]);
--				xfree(dsnames);
--			}
--		}
--		break;
-+		layout = vmstat_freebsd_layout; break;
- 	  case OS_NETBSD:
- 		layout = vmstat_netbsd_layout; break;
- 	  case OS_OPENBSD:
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 ddf9300f82ab..000000000000
--- a/net-mgmt/xymon-server/files/patch-xymonnet_Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- xymonnet/Makefile.orig	2015-05-27 15:59:55 UTC
-+++ xymonnet/Makefile
-@@ -14,7 +14,7 @@ ifeq ($(SYSTEMCARES),no)
- 	LOCALCARES = libcares.a
- endif
- 
--PROGRAMS = xymonnet xymonping beastat
-+PROGRAMS = xymonnet beastat
- EXTENSIONS = xymonnet-again.sh
- SNMPPROGRAMS = xymon-snmpcollect
- DBGTOOLS = contest
diff --git a/net-mgmt/xymon-server/files/xymon-server.in b/net-mgmt/xymon-server/files/xymon-server.in
index 7f282b16dc73..463cbc93ad1a 100644
--- a/net-mgmt/xymon-server/files/xymon-server.in
+++ b/net-mgmt/xymon-server/files/xymon-server.in
@@ -12,6 +12,7 @@ rcvar=xymon_server_enable
 load_rc_config "$name"
 : ${xymon_server_enable:=NO}
 : ${xymon_server_user:=%%XYMONUSER%%}
+: ${xymon_server_umask:=022}
 
 command="%%WWWDIR%%/server/xymon.sh"
 command_args=start
diff --git a/net-mgmt/xymon-server/files/xymon-server.newsyslog.conf.sample b/net-mgmt/xymon-server/files/xymon-server.newsyslog.conf.sample
new file mode 100644
index 000000000000..0febda0b29bc
--- /dev/null
+++ b/net-mgmt/xymon-server/files/xymon-server.newsyslog.conf.sample
@@ -0,0 +1,19 @@
+# configuration file for newsyslog for xymon-server
+#
+# see newsyslog.conf(5) for details
+#
+# logfilename          [owner:group]    mode count size when  flags [/pid_file] [sig_num]
+/var/log/xymon/acknowledge.log	xymon:wheel      644  7     100  *     Z /var/log/xymon/xymond.pid
+/var/log/xymon/alert.log	xymon:wheel      644  7     100  *     Z /var/log/xymon/xymond.pid
+/var/log/xymon/clientdata.log	xymon:wheel      644  7     100  *     Z /var/log/xymon/xymond.pid
+/var/log/xymon/combostatus.log	xymon:wheel      644  7     100  *     Z /var/log/xymon/xymond.pid
+/var/log/xymon/history.log	xymon:wheel      644  7     100  *     Z /var/log/xymon/xymond.pid
+/var/log/xymon/hostdata.log	xymon:wheel      644  7     100  *     Z /var/log/xymon/xymond.pid
+/var/log/xymon/notifications.log	xymon:wheel      644  7     100  *     Z /var/log/xymon/xymond.pid
+/var/log/xymon/rrd-data.log	xymon:wheel      644  7     100  *     Z /var/log/xymon/xymond.pid
+/var/log/xymon/rrd-status.log	xymon:wheel      644  7     100  *     Z /var/log/xymon/xymond.pid
+/var/log/xymon/xymond.log	xymon:wheel      644  7     100  *     Z /var/log/xymon/xymond.pid
+/var/log/xymon/xymongen.log	xymon:wheel      644  7     100  *     Z /var/log/xymon/xymond.pid
+/var/log/xymon/xymonlaunch.log	xymon:wheel      644  7     100  *     Z /var/log/xymon/xymond.pid
+/var/log/xymon/xymonnet.log	xymon:wheel      644  7     100  *     Z /var/log/xymon/xymond.pid
+/var/log/xymon/xymonnetagain.log	xymon:wheel      644  7     100  *     Z /var/log/xymon/xymond.pid
diff --git a/net-mgmt/xymon-server/pkg-plist b/net-mgmt/xymon-server/pkg-plist
index b1404a041fc5..18c6434f62ff 100644
--- a/net-mgmt/xymon-server/pkg-plist
+++ b/net-mgmt/xymon-server/pkg-plist
@@ -1,3 +1,4 @@
+@sample etc/newsyslog.conf.d/xymon-server.conf.sample
 share/man/man1/ackinfo.cgi.1.gz
 share/man/man1/acknowledge.cgi.1.gz
 share/man/man1/appfeed.cgi.1.gz
@@ -30,6 +31,7 @@ share/man/man1/xymongrep.1.gz
 share/man/man1/xymonnet-again.sh.1.gz
 share/man/man1/xymonnet.1.gz
 share/man/man1/xymonpage.cgi.1.gz
+share/man/man1/%%XYMONUSER%%ping.1.gz
 share/man/man5/alerts.cfg.5.gz
 share/man/man5/analysis.cfg.5.gz
 share/man/man5/cgioptions.cfg.5.gz
@@ -167,6 +169,7 @@ share/man/man8/xymonproxy.8.gz
 %%WWWDIR%%/server/bin/xymonping
 %%WWWDIR%%/server/bin/xymonproxy
 %%WWWDIR%%/server/bin/xymonreports.sh
+%%NETSNMP%%%%WWWDIR%%/server/bin/%%XYMONUSER%%-snmpcollect
 %%WWWDIR%%/server/etc/xymon-apache-open.sample
 %%WWWDIR%%/server/etc/xymon-apache-secure.sample
 %%WWWDIR%%/server/etc/xymon-apache.conf.sample
@@ -176,6 +179,7 @@ share/man/man8/xymonproxy.8.gz
 @sample %%WWWDIR%%/server/etc/client-local.cfg.sample
 @sample %%WWWDIR%%/server/etc/columndoc.csv.sample
 @sample %%WWWDIR%%/server/etc/combo.cfg.sample
+@sample %%WWWDIR%%/server/etc/critical.cfg.sample
 @sample %%WWWDIR%%/server/etc/graphs.cfg.sample
 @sample %%WWWDIR%%/server/etc/holidays.cfg.sample
 @sample %%WWWDIR%%/server/etc/hosts.cfg.sample
@@ -373,6 +377,8 @@ share/man/man8/xymonproxy.8.gz
 %%WWWDIR%%/server/www/help/manpages/man1/xymonnet-again.sh.1.html
 %%WWWDIR%%/server/www/help/manpages/man1/xymonnet.1.html
 %%WWWDIR%%/server/www/help/manpages/man1/xymonpage.cgi.1.html
+%%WWWDIR%%/server/www/help/manpages/man1/%%XYMONUSER%%ping.1.html
+%%WWWDIR%%/server/www/help/manpages/man1/%%XYMONUSER%%tools.1.html
 %%WWWDIR%%/server/www/help/manpages/man5/alerts.cfg.5.html
 %%WWWDIR%%/server/www/help/manpages/man5/analysis.cfg.5.html
 %%WWWDIR%%/server/www/help/manpages/man5/client-local.cfg.5.html
@@ -409,6 +415,7 @@ share/man/man8/xymonproxy.8.gz
 %%WWWDIR%%/server/www/help/manpages/man8/xymonfetch.8.html
 %%WWWDIR%%/server/www/help/manpages/man8/xymonlaunch.8.html
 %%WWWDIR%%/server/www/help/manpages/man8/xymonproxy.8.html
+%%WWWDIR%%/server/www/help/manpages/mandoc.css
 %%WWWDIR%%/server/www/help/stdview-detail-acked.jpg
 %%WWWDIR%%/server/www/help/upgrade-to-430.txt
 %%WWWDIR%%/server/www/help/xymon-alerts.html
@@ -439,6 +446,14 @@ share/man/man8/xymonproxy.8.gz
 @dir %%WWWDIR%%/server/download
 @owner
 @dir %%WWWDIR%%/server/etc/tasks.d
+@dir %%WWWDIR%%/server/etc/alerts.d
+@dir %%WWWDIR%%/server/etc/analysis.d
+@dir %%WWWDIR%%/server/etc/client-local.d
+@dir %%WWWDIR%%/server/etc/combo.d
+@dir %%WWWDIR%%/server/etc/graphs.d
+@dir %%WWWDIR%%/server/etc/hosts.d
+@dir %%WWWDIR%%/server/etc/rrddefinitions.d
+@dir %%WWWDIR%%/server/%%ETCDIR%%server.d
 @owner %%XYMONUSER%%
 @dir %%WWWDIR%%/server/tmp
 @dir %%WWWDIR%%/server/www
@@ -447,4 +462,5 @@ share/man/man8/xymonproxy.8.gz
 @dir %%WWWDIR%%/server/www/rep
 @dir %%WWWDIR%%/server/www/snap
 @dir %%WWWDIR%%/server/www/wml
+@dir /var/log/%%XYMONUSER%%
 @owner