From owner-svn-ports-all@FreeBSD.ORG  Sat Nov 24 01:54:23 2012
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 9546BDDC;
 Sat, 24 Nov 2012 01:54:23 +0000 (UTC)
 (envelope-from swills@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 733258FC08;
 Sat, 24 Nov 2012 01:54:23 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qAO1sNMM040973;
 Sat, 24 Nov 2012 01:54:23 GMT (envelope-from swills@svn.freebsd.org)
Received: (from swills@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qAO1sNKJ040971;
 Sat, 24 Nov 2012 01:54:23 GMT (envelope-from swills@svn.freebsd.org)
Message-Id: <201211240154.qAO1sNKJ040971@svn.freebsd.org>
From: Steve Wills <swills@FreeBSD.org>
Date: Sat, 24 Nov 2012 01:54:23 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r307698 - in head/net-mgmt/xymon-server: . files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 24 Nov 2012 01:54:23 -0000

Author: swills
Date: Sat Nov 24 01:54:22 2012
New Revision: 307698
URL: http://svnweb.freebsd.org/changeset/ports/307698

Log:
  - Add patch that fixes memory usage reporting in FreeBSD 8.x and newer due to
    syntax changes in sysctl vm.vmtotal
  - Assign maintainer to submitter
  
  PR:		ports/173607
  Submitted by:	Mark Felder <feld@feld.me>
  Feature safe:	yes

Added:
  head/net-mgmt/xymon-server/files/patch-xymond-client-freebsd.c   (contents, props changed)
Modified:
  head/net-mgmt/xymon-server/Makefile   (contents, props changed)

Modified: head/net-mgmt/xymon-server/Makefile
==============================================================================
--- head/net-mgmt/xymon-server/Makefile	Fri Nov 23 23:34:40 2012	(r307697)
+++ head/net-mgmt/xymon-server/Makefile	Sat Nov 24 01:54:22 2012	(r307698)
@@ -2,13 +2,13 @@
 
 PORTNAME=	xymon
 PORTVERSION=	4.3.10
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-mgmt www
 MASTER_SITES=	SF/xymon/Xymon/${PORTVERSION}
 PKGNAMESUFFIX=	-server${PKGNAMESUFFIX2}
 DIST_SUBDIR=	repacked
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	feld@feld.me
 COMMENT=	System for monitoring servers and networks
 
 LICENSE=	GPLv2

Added: head/net-mgmt/xymon-server/files/patch-xymond-client-freebsd.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net-mgmt/xymon-server/files/patch-xymond-client-freebsd.c	Sat Nov 24 01:54:22 2012	(r307698)
@@ -0,0 +1,20 @@
+--- 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++;
++			}
+ 		}
+ 	}
+