From 98931e3773d670a3a99d9e7d5a5b11c5092b9081 Mon Sep 17 00:00:00 2001
From: joerg <joerg@pkgsrc.org>
Date: Wed, 30 Aug 2006 16:26:58 +0000
Subject: Consistently use statfs on DragonFly.

---
 sysutils/gentoo/distinfo         |  5 +++--
 sysutils/gentoo/patches/patch-af | 11 ++++++++++-
 sysutils/gentoo/patches/patch-ah | 13 +++++++++++++
 3 files changed, 26 insertions(+), 3 deletions(-)
 create mode 100644 sysutils/gentoo/patches/patch-ah

(limited to 'sysutils/gentoo')

diff --git a/sysutils/gentoo/distinfo b/sysutils/gentoo/distinfo
index cfd56e11953..e9fb724a9d1 100644
--- a/sysutils/gentoo/distinfo
+++ b/sysutils/gentoo/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.19 2006/06/24 09:50:12 joerg Exp $
+$NetBSD: distinfo,v 1.20 2006/08/30 16:26:58 joerg Exp $
 
 SHA1 (gentoo-0.11.55.tar.gz) = 5ba1627d0c7caba8ba0064dde5fd8850a38a092e
 RMD160 (gentoo-0.11.55.tar.gz) = 30b4edd10a892709a39ac3f83cc5385652a965e2
@@ -8,5 +8,6 @@ SHA1 (patch-ab) = 1aaa154789866b436303b0a8f6f20707301d8b7f
 SHA1 (patch-ac) = 4e5d52849887b816eb4388fb2c75aefb3443f5c8
 SHA1 (patch-ad) = 0ac9fca5454c98633aa6c0bacfcaa364c34df37f
 SHA1 (patch-ae) = daa7cbed8d66af155f2624a0066b2f578e9a93c6
-SHA1 (patch-af) = a5a67031ed8e18423ad9373a5a22cf91f96b3465
+SHA1 (patch-af) = c86f68937cbf2c086cf1282ec12df5db156f66d5
 SHA1 (patch-ag) = 3045a4eb72f8c50d147fe09256ec791359053418
+SHA1 (patch-ah) = a2d8839860ccdbc56cdd7ca11f945b29c32917ae
diff --git a/sysutils/gentoo/patches/patch-af b/sysutils/gentoo/patches/patch-af
index 80e2821d6c2..948b97d4e83 100644
--- a/sysutils/gentoo/patches/patch-af
+++ b/sysutils/gentoo/patches/patch-af
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.1 2006/06/20 20:41:22 joerg Exp $
+$NetBSD: patch-af,v 1.2 2006/08/30 16:26:58 joerg Exp $
 
 --- src/gentoo.h.orig	2005-01-30 21:49:56.000000000 +0000
 +++ src/gentoo.h
@@ -29,3 +29,12 @@ $NetBSD: patch-af,v 1.1 2006/06/20 20:41:22 joerg Exp $
  #define GENTOO_ON_BSD
  #endif
  
+@@ -458,7 +458,7 @@ typedef struct {
+ 
+ typedef struct {			/* Some trivial file system information. Updated on rescan. */
+ 	gboolean	valid;			/* Set if the structure's contents are valid. */
+-#if defined HAVE_STRUCT_STATVFS
++#if defined HAVE_STRUCT_STATVFS && !defined(__DragonFly__)
+ 	struct statvfs	stat;			/* Holds information about filesystem. */
+ #elif defined HAVE_STRUCT_STATFS || defined GENTOO_ON_BSD
+ 	struct statfs	stat;
diff --git a/sysutils/gentoo/patches/patch-ah b/sysutils/gentoo/patches/patch-ah
new file mode 100644
index 00000000000..c7f4eb02074
--- /dev/null
+++ b/sysutils/gentoo/patches/patch-ah
@@ -0,0 +1,13 @@
+$NetBSD: patch-ah,v 1.1 2006/08/30 16:26:58 joerg Exp $
+
+--- src/dirpane.c.orig	2006-08-30 15:45:45.000000000 +0000
++++ src/dirpane.c
+@@ -1394,7 +1394,7 @@ static void update_fs_info(DirPane *dp)
+ {
+ 	gint	old_errno = errno;
+ 
+-#if defined HAVE_STRUCT_STATVFS
++#if defined HAVE_STRUCT_STATVFS && !defined(__DragonFly__)
+ 	dp->dir.fs.valid = statvfs(dp->dir.path, &dp->dir.fs.stat) == 0;
+ #else
+ 	dp->dir.fs.valid = statfs(dp->dir.path, &dp->dir.fs.stat) == 0;
-- 
cgit v1.2.3