ports/178322: [PATCH] net-mgmt/xymon-server: update to 4.3.11

Mark Felder feld at feld.me
Fri May 3 15:10:01 UTC 2013 

>Number:         178322
>Category:       ports
>Synopsis:       [PATCH] net-mgmt/xymon-server: update to 4.3.11
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Fri May 03 15:10:01 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     feld
>Release:        FreeBSD 9.1-RELEASE amd64
>Organization:
>Environment:
System: FreeBSD mwi1.coffeenet.org 9.1-RELEASE FreeBSD 9.1-RELEASE #6 r243808: Mon Dec  3 07:51:34
>Description:
- Update to 4.3.11

Cleanups, removed some unnecessary patches with REINPLACE
Removed MAKE_JOBS_UNSAFE as it worked for me with -j4
Proper usage of USERS and GROUPS

Generated with FreeBSD Port Tools 0.99_7 (mode: update, diff: suffix)
>How-To-Repeat:
>Fix:

--- xymon-server-4.3.11.patch begins here ---
diff -ruN ../xymon-server.orig/Makefile ./Makefile
--- ../xymon-server.orig/Makefile	2012-12-10 13:24:04.000000000 -0600
+++ ./Makefile	2013-05-03 09:53:25.727724625 -0500
@@ -1,8 +1,7 @@
 # $FreeBSD: ports/net-mgmt/xymon-server/Makefile,v 1.35 2012/12/10 19:24:04 svnexp Exp $
 
 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}
@@ -18,7 +17,8 @@
 		pcre:${PORTSDIR}/devel/pcre
 RUN_DEPENDS=	rrdtool:${PORTSDIR}/databases/rrdtool
 
-MAKE_JOBS_UNSAFE=	yes
+USERS=	xymon
+GROUPS=	xymon
 
 # Options
 XYMONUSER?=	xymon
@@ -79,18 +79,16 @@
 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
 
 # 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 -ruN ../xymon-server.orig/distinfo ./distinfo
--- ../xymon-server.orig/distinfo	2012-08-06 13:24:16.000000000 -0500
+++ ./distinfo	2013-04-23 07:43:10.000000000 -0500
@@ -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 -ruN ../xymon-server.orig/files/patch-build-Makefile.rules ./files/patch-build-Makefile.rules
--- ../xymon-server.orig/files/patch-build-Makefile.rules	2011-04-02 09:26:29.000000000 -0500
+++ ./files/patch-build-Makefile.rules	1969-12-31 18:00:00.000000000 -0600
@@ -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 -ruN ../xymon-server.orig/files/patch-xymond-client-freebsd.c ./files/patch-xymond-client-freebsd.c
--- ../xymon-server.orig/files/patch-xymond-client-freebsd.c	2012-11-23 19:56:24.000000000 -0600
+++ ./files/patch-xymond-client-freebsd.c	1969-12-31 18:00:00.000000000 -0600
@@ -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 -ruN ../xymon-server.orig/files/patch-xymonnet-Makefile ./files/patch-xymonnet-Makefile
--- ../xymon-server.orig/files/patch-xymonnet-Makefile	2011-04-02 09:26:29.000000000 -0500
+++ ./files/patch-xymonnet-Makefile	1969-12-31 18:00:00.000000000 -0600
@@ -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
--- xymon-server-4.3.11.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted:

More information about the freebsd-ports-bugs mailing list