From d67462865bc047925fa8f2e62e4848a128f5ae1e Mon Sep 17 00:00:00 2001
From: joerg <joerg>
Date: Sat, 25 Mar 2006 17:14:40 +0000
Subject: Basic DragonFly support. Don't depend on conditional macros being 1
 when defined and otherwise being 0.

---
 sysutils/mesure/distinfo         |  4 +++-
 sysutils/mesure/patches/patch-aa | 17 +++++++++++++++++
 sysutils/mesure/patches/patch-ab | 35 +++++++++++++++++++++++++++++++++++
 3 files changed, 55 insertions(+), 1 deletion(-)
 create mode 100644 sysutils/mesure/patches/patch-aa
 create mode 100644 sysutils/mesure/patches/patch-ab

(limited to 'sysutils/mesure')

diff --git a/sysutils/mesure/distinfo b/sysutils/mesure/distinfo
index 128235112eb..8cae578de47 100644
--- a/sysutils/mesure/distinfo
+++ b/sysutils/mesure/distinfo
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.1.1.1 2005/09/26 23:27:37 xtraeme Exp $
+$NetBSD: distinfo,v 1.2 2006/03/25 17:14:40 joerg Exp $
 
 SHA1 (mesure-0.5.tar.gz) = 587f4cb2132b748cd127b0307269e658756a6ae3
 RMD160 (mesure-0.5.tar.gz) = 8c8a60fe903bdb220f427f444b3fc80b840f5b38
 Size (mesure-0.5.tar.gz) = 13374 bytes
+SHA1 (patch-aa) = 4f3692cf816c208178730ba3033700b840690c27
+SHA1 (patch-ab) = 9a350289e763bdf60cae78eb6e827181b6d1d9c8
diff --git a/sysutils/mesure/patches/patch-aa b/sysutils/mesure/patches/patch-aa
new file mode 100644
index 00000000000..a1c87c918e7
--- /dev/null
+++ b/sysutils/mesure/patches/patch-aa
@@ -0,0 +1,17 @@
+$NetBSD: patch-aa,v 1.1 2006/03/25 17:14:40 joerg Exp $
+
+--- src/iface.c.orig	2006-03-24 20:32:14.000000000 +0000
++++ src/iface.c
+@@ -4,10 +4,10 @@
+ #include <string.h>
+ #include <sys/types.h>
+ #include <sys/socket.h>
+-#if __FreeBSD__ || __APPLE__
++#if defined(__FreeBSD__) || defined(__APPLE__) || defined(__DragonFly__)
+ #include <ifaddrs.h>
+ #endif
+-#if __NetBSD__ || __OpenBSD__
++#if defined( __NetBSD__) || defined(__OpenBSD__)
+ #include <ifaddrs.h>
+ #include <net/if_media.h>
+ #endif
diff --git a/sysutils/mesure/patches/patch-ab b/sysutils/mesure/patches/patch-ab
new file mode 100644
index 00000000000..b98e567c99b
--- /dev/null
+++ b/sysutils/mesure/patches/patch-ab
@@ -0,0 +1,35 @@
+$NetBSD: patch-ab,v 1.1 2006/03/25 17:14:40 joerg Exp $
+
+--- src/mem.c.orig	2006-03-25 16:59:45.000000000 +0000
++++ src/mem.c
+@@ -7,10 +7,10 @@
+ #include <sys/fcntl.h>
+ #include <stdio.h>
+ #include <unistd.h>
+-#if !__linux__
++#if !defined(__linux__)
+ #include <sys/user.h>
+ #include <kvm.h>
+-#if __FreeBSD__ || __APPLE__
++#if defined(__FreeBSD__) || defined(__APPLE__) || defined(__DragonFly__)
+ #define KVM_NO_FILES O_RDONLY
+ #endif
+ #endif
+@@ -26,7 +26,7 @@ mem_get_value()
+ {
+ 	long total=0;
+ 
+-#if __linux__
++#if defined(__linux__)
+ 	FILE *fd;
+ 	char var[1024];
+ 	long val,memtotal,memfree;
+@@ -56,7 +56,7 @@ mem_get_value()
+ 	total*=1024;
+ 
+ #else
+-#if __FreeBSD__ || __APPLE__
++#if defined(__FreeBSD__) || defined(__APPLE__) || defined(__DragonFly__)
+ 	printf("Not yet supported on FreeBSD.\n");
+ 	exit(1);
+ #else
-- 
cgit v1.2.3