From a65ecee3d3ce423bb474a11b20b2b014080726c1 Mon Sep 17 00:00:00 2001
From: "Philip M. Gollucci" <pgollucci@FreeBSD.org>
Date: Thu, 16 Feb 2012 04:39:19 +0000
Subject: [PATCH] - Update to 1.6.4

PR:             ports/160205
Submitted by:   Radim Kolar <hsn@sendmail.cz>
Approved by:    maintainer timeout (skv ; 170 days)
---
 sysutils/hyperic-sigar/Makefile               | 11 ++--------
 sysutils/hyperic-sigar/distinfo               |  4 ++--
 .../hyperic-sigar/files/patch-darwin_sigar.c  | 21 -------------------
 3 files changed, 4 insertions(+), 32 deletions(-)
 delete mode 100644 sysutils/hyperic-sigar/files/patch-darwin_sigar.c

diff --git a/sysutils/hyperic-sigar/Makefile b/sysutils/hyperic-sigar/Makefile
index 85f2bcceb41e..72e0ddd1ebb2 100644
--- a/sysutils/hyperic-sigar/Makefile
+++ b/sysutils/hyperic-sigar/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	hyperic-sigar
-PORTVERSION=	1.6.3
-PORTREVISION=	1
+PORTVERSION=	1.6.4
 CATEGORIES=	sysutils
 MASTER_SITES=	SF
 MASTER_SITE_SUBDIR=	sigar/sigar/${PORTVERSION:C/\.[0-9]+$//}
@@ -27,12 +26,6 @@ USE_LDCONFIG=	yes
 SHLIB_MAJOR=	0
 PLIST_SUB=	SHLIB_MAJOR="${SHLIB_MAJOR}"
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} > 900007
-BROKEN=		fails to build with new utmpx
-.endif
-
 do-install:
 	${MKDIR} ${PREFIX}/include ${PREFIX}/lib ${JAVAJARDIR}
 	${INSTALL_DATA} ${WRKSRC}/sigar-bin/include/*.h ${PREFIX}/include/
@@ -40,4 +33,4 @@ do-install:
 	${LN} -sf ${PREFIX}/lib/libsigar.so.${SHLIB_MAJOR} ${PREFIX}/lib/libsigar.so
 	${INSTALL_DATA} ${WRKSRC}/sigar-bin/lib/sigar.jar ${JAVAJARDIR}/
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/sysutils/hyperic-sigar/distinfo b/sysutils/hyperic-sigar/distinfo
index 7724153cdeb3..33f2c22bd833 100644
--- a/sysutils/hyperic-sigar/distinfo
+++ b/sysutils/hyperic-sigar/distinfo
@@ -1,2 +1,2 @@
-SHA256 (hyperic-sigar-1.6.3-src.tar.gz) = 3583e8f6d0cb166d27717d31e7932664ac0f57a4d58df769989dff9610e8c900
-SIZE (hyperic-sigar-1.6.3-src.tar.gz) = 1375297
+SHA256 (hyperic-sigar-1.6.4-src.tar.gz) = dcf8348e3979b6f5d9b129571cf4bbc8fce87b866f5b9a682880d99f6c3e692f
+SIZE (hyperic-sigar-1.6.4-src.tar.gz) = 1253729
diff --git a/sysutils/hyperic-sigar/files/patch-darwin_sigar.c b/sysutils/hyperic-sigar/files/patch-darwin_sigar.c
deleted file mode 100644
index 456129eb26e0..000000000000
--- a/sysutils/hyperic-sigar/files/patch-darwin_sigar.c
+++ /dev/null
@@ -1,21 +0,0 @@
---- ../../src/os/darwin/darwin_sigar.c
-+++ ../../src/os/darwin/darwin_sigar.c
-@@ -23,7 +23,9 @@
- 
- #include <sys/param.h>
- #include <sys/mount.h>
-+#if !(defined(__FreeBSD__) && (__FreeBSD_version >= 800000))
- #include <nfs/rpcv2.h>
-+#endif
- #include <nfs/nfsproto.h>
- 
- #ifdef DARWIN
-@@ -3146,7 +3148,7 @@
-     return SIGAR_OK;
- }
- 
--#if defined(__FreeBSD__)
-+#if defined(__FreeBSD__) && /*XXX*/ (__FreeBSD_version < 800000)
- 
- #define _KERNEL
- #include <sys/file.h>