From 3a2f0bb9a40c59d7ea5e34c02ceee56961477880 Mon Sep 17 00:00:00 2001
From: xtraeme <xtraeme@pkgsrc.org>
Date: Fri, 23 Apr 2004 15:13:07 +0000
Subject: Make this build in NetBSD -current (statfs->statvfs).

---
 sysutils/gkrellm/distinfo         |  3 ++-
 sysutils/gkrellm/patches/patch-aa | 34 ++++++++++++++++++++++++++++++++++
 2 files changed, 36 insertions(+), 1 deletion(-)
 create mode 100644 sysutils/gkrellm/patches/patch-aa

(limited to 'sysutils')

diff --git a/sysutils/gkrellm/distinfo b/sysutils/gkrellm/distinfo
index af5b92ee01f..20887e7ddff 100644
--- a/sysutils/gkrellm/distinfo
+++ b/sysutils/gkrellm/distinfo
@@ -1,4 +1,5 @@
-$NetBSD: distinfo,v 1.19 2004/03/29 06:47:30 cube Exp $
+$NetBSD: distinfo,v 1.20 2004/04/23 15:13:07 xtraeme Exp $
 
 SHA1 (gkrellm-2.1.28.tar.bz2) = 3c02b156b1218ba6d164ec652b4dec47f33f88b4
 Size (gkrellm-2.1.28.tar.bz2) = 633487 bytes
+SHA1 (patch-aa) = 1e911cd06c638081b5fd0ea0ce8b7557ca53b2f1
diff --git a/sysutils/gkrellm/patches/patch-aa b/sysutils/gkrellm/patches/patch-aa
new file mode 100644
index 00000000000..65880caebe5
--- /dev/null
+++ b/sysutils/gkrellm/patches/patch-aa
@@ -0,0 +1,34 @@
+$NetBSD: patch-aa,v 1.11 2004/04/23 15:13:07 xtraeme Exp $
+
+--- src/sysdeps/bsd-common.c.orig	2004-04-23 16:59:41.000000000 +0200
++++ src/sysdeps/bsd-common.c	2004-04-23 17:04:14.000000000 +0200
+@@ -255,7 +255,11 @@
+ gkrellm_sys_fs_get_mounts_list(void)
+ 	{
+ 	gchar		*s, *dev, *dir, *type;
++#if (defined(__NetBSD__) && __NetBSD_Version__ >= 200040000) /* NetBSD 2.0D */
++	struct statvfs	*mntbuf;
++#else
+ 	struct statfs	*mntbuf;
++#endif
+ 	gint		mntsize, i;
+ 
+ 	if ((mntsize = getmntinfo(&mntbuf, MNT_NOWAIT)) == 0)
+@@ -281,9 +285,17 @@
+ void
+ gkrellm_sys_fs_get_fsusage(gpointer fs, gchar *dir)
+ 	{
++#if (defined(__NetBSD__) && __NetBSD_Version__ >= 200040000) /* NetBSD 2.0D */
++	struct statvfs	st;
++#else
+ 	struct statfs	st;
++#endif
+ 
++#if (defined(__NetBSD__) && __NetBSD_Version__ >= 200040000) /* NetBSD 2.0D */
++	if (!statvfs(dir, &st))
++#else
+ 	if (!statfs(dir, &st))
++#endif
+ 		gkrellm_fs_assign_fsusage_data(fs,
+ 					(glong) st.f_blocks, (glong) st.f_bavail,
+ 					(glong) st.f_bfree, (glong) st.f_bsize);
-- 
cgit v1.2.3