Attachment #133794 for bug #178322

Lines 1-8 Link Here

(-)./Makefile (-9 / +7 lines)
1	# $FreeBSD: ports/net-mgmt/xymon-server/Makefile,v 1.35 2012/12/10 19:24:04 svnexp Exp $	1	# $FreeBSD: ports/net-mgmt/xymon-server/Makefile,v 1.35 2012/12/10 19:24:04 svnexp Exp $
2		2
3	PORTNAME= xymon	3	PORTNAME= xymon
4	PORTVERSION= 4.3.10	4	PORTVERSION= 4.3.11
5	PORTREVISION= 3
6	CATEGORIES= net-mgmt www	5	CATEGORIES= net-mgmt www
7	MASTER_SITES= SF/xymon/Xymon/${PORTVERSION}	6	MASTER_SITES= SF/xymon/Xymon/${PORTVERSION}
8	PKGNAMESUFFIX= -server${PKGNAMESUFFIX2}	7	PKGNAMESUFFIX= -server${PKGNAMESUFFIX2}
Lines 18-24 Link Here
18	pcre:${PORTSDIR}/devel/pcre	17	pcre:${PORTSDIR}/devel/pcre
19	RUN_DEPENDS= rrdtool:${PORTSDIR}/databases/rrdtool	18	RUN_DEPENDS= rrdtool:${PORTSDIR}/databases/rrdtool
20		19
21	MAKE_JOBS_UNSAFE= yes	20	USERS= xymon
		21	GROUPS= xymon
22		22
23	# Options	23	# Options
24	XYMONUSER?= xymon	24	XYMONUSER?= xymon
Lines 79-96 Link Here
79	post-patch:	79	post-patch:
80	${REINPLACE_CMD} -e 's\|!/bin/bash\|!/usr/local/bin/bash\|' \	80	${REINPLACE_CMD} -e 's\|!/bin/bash\|!/usr/local/bin/bash\|' \
81	${WRKSRC}/xymond/xymonreports.sh.DIST	81	${WRKSRC}/xymond/xymonreports.sh.DIST
		82	${REINPLACE_CMD} -e 's\|web-build client\|web-build\|' ${WRKSRC}/build/Makefile.rules
		83	${REINPLACE_CMD} -e 's\|install-docs install-client\|install-docs\|' ${WRKSRC}/build/Makefile.rules
		84	${REINPLACE_CMD} -e 's\|$(INSTALLETCDIR)/protocols.cfg\|$(INSTALLETCDIR)/protocols.cfg.DIST\|' ${WRKSRC}/xymonnet/Makefile
82		85
83	# Configure script is interactive	86	# Configure script is interactive
84	do-configure:	87	do-configure:
85	${CP} ${FILESDIR}/Makefile ${WRKSRC}/	88	${CP} ${FILESDIR}/Makefile ${WRKSRC}/
86		89
87	pre-install:
88	if ! pw groupshow ${XYMONUSER}; then pw groupadd ${XYMONUSER} -g 280; fi
89	if ! pw usershow ${XYMONUSER}; then pw useradd ${XYMONUSER} -g ${XYMONUSER} -u 280 \
90	-h - -d ${WWWDIR} -s /usr/sbin/nologin -c "Xymon Monitor"; fi
91
92	post-install:	90	post-install:
93	-${MKDIR} ${WWWDIR}/server/etc	91	${MKDIR} ${WWWDIR}/server/etc
94	${INSTALL_SCRIPT} ${WRKSRC}/build/upgrade430.sh ${WWWDIR}/server/bin/	92	${INSTALL_SCRIPT} ${WRKSRC}/build/upgrade430.sh ${WWWDIR}/server/bin/
95	${INSTALL_PROGRAM} ${WRKSRC}/build/renamevars ${WWWDIR}/server/bin/	93	${INSTALL_PROGRAM} ${WRKSRC}/build/renamevars ${WWWDIR}/server/bin/
96	.for i in ${FIXME1}	94	.for i in ${FIXME1}

Lines 1-2 Link Here

(-)./distinfo (-2 / +2 lines)
1	SHA256 (repacked/xymon-4.3.10.tar.gz) = 06b519cbe94b93a4b1ea5601d55e58f3ad8304acf555cf3d11ba04cee47455c1	1	SHA256 (repacked/xymon-4.3.11.tar.gz) = d36f4ea320816375377d97784b7f0e04b8df3dfd19f75a2f1ff4b9f86e6829ee
2	SIZE (repacked/xymon-4.3.10.tar.gz) = 2754807	2	SIZE (repacked/xymon-4.3.11.tar.gz) = 2760418




--- 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
 




--- 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++;
+			}
 		}
 	}
 




--- 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

Return to bug 178322

Lines 1-15 Link Here

(-)./files/patch-build-Makefile.rules (-15 lines)
1	--- build/Makefile.rules.orig 2011-02-14 12:00:30.000000000 +0100
2	+++ build/Makefile.rules 2011-03-31 07:16:54.000000000 +0200
3	@@ -22,9 +22,9 @@
4	INSTALLTARGETS = install-client install-clientmsg
5	endif
6	else
7	- BUILDTARGETS = lib-build common-build xymongen-build xymonnet-build xymonproxy-build docs-build build-build xymond-build web-build client
8	- CLIENTTARGETS = lib-client common-client build-build
9	- INSTALLTARGETS = install-xymongen install-xymonnet install-xymonproxy install-man install-xymond install-web install-docs install-client install-servermsg
10	+ BUILDTARGETS = lib-build common-build xymongen-build xymonnet-build xymonproxy-build docs-build build-build xymond-build web-build
11	+ CLIENTTARGETS =
12	+ INSTALLTARGETS = install-xymongen install-xymonnet install-xymonproxy install-man install-xymond install-web install-docs install-servermsg
13	CFLAGS += $(PCREINCDIR)
14	endif
15

Lines 1-20 Link Here

(-)./files/patch-xymond-client-freebsd.c (-20 lines)
1	--- xymond/client/freebsd.c.orig 2012-11-13 07:48:19.217106974 -0600
2	+++ xymond/client/freebsd.c 2012-11-13 07:49:45.416552261 -0600
3	@@ -85,8 +85,16 @@
4	if (vmtotalstr) {
5	p = strstr(vmtotalstr, "\nFree Memory Pages:");
6	if (p) {
7	- memphysfree = atol(p + 18);
8	+ memphysfree = atol(p + 19)/1024;
9	+ memphysused = memphystotal - memphysfree;
10	found++;
11	+ } else {
12	+ p = strstr(vmtotalstr, "\nFree Memory:");
13	+ if (p) {
14	+ memphysfree = atol(p + 13)/1024;
15	+ memphysused = memphystotal - memphysfree;
16	+ found++;
17	+ }
18	}
19	}
20

Lines 1-13 Link Here

(-)./files/patch-xymonnet-Makefile (-13 lines)
1	--- xymonnet/Makefile.orig 2010-11-14 18:21:19.000000000 +0100
2	+++ xymonnet/Makefile 2011-03-31 07:14:12.000000000 +0200
3	@@ -100,8 +100,8 @@
4	cp -fp $(EXTENSIONS) $(INSTALLROOT)$(INSTALLEXTDIR)/
5
6	install-config:
7	- ../build/convert-bbservices $(INSTALLROOT)$(INSTALLETCDIR)/protocols.cfg
8	- ../build/merge-sects protocols.cfg $(INSTALLROOT)$(INSTALLETCDIR)/protocols.cfg
9	+ ../build/convert-bbservices $(INSTALLROOT)$(INSTALLETCDIR)/protocols.cfg.DIST
10	+ ../build/merge-sects protocols.cfg $(INSTALLROOT)$(INSTALLETCDIR)/protocols.cfg.DIST
11
12	install-man:
13	mkdir -p $(INSTALLROOT)$(MANROOT)/man1 $(INSTALLROOT)$(MANROOT)/man5