statfs -> statvfs in current.

Patches from John R. Shannon in PR 25327 and PR 25328 with suggestion from
Christos Zoulas

3 files changed, 61 insertions, 1 deletions

diff --git a/x11/kdebase3/distinfo b/x11/kdebase3/distinfo
index 8f98ee7bc50..1ca56c8b48f 100644
--- a/x11/kdebase3/distinfo
+++ b/x11/kdebase3/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.45 2004/04/20 12:33:56 markd Exp $
+$NetBSD: distinfo,v 1.46 2004/04/26 11:31:25 markd Exp $
 
 SHA1 (kdebase-3.2.2.tar.bz2) = bc941b3faa4440ca2048d9332371c974d0e17f5b
 Size (kdebase-3.2.2.tar.bz2) = 17216476 bytes
@@ -11,6 +11,8 @@ SHA1 (patch-ab) = 5ddff11c04fb004a8ddaedbec2655fdd3cf3d466
 SHA1 (patch-ac) = 8be0f15be839f4f01d3e079501b83e27f1fab2eb
 SHA1 (patch-ad) = 031e5622acb376ce1867d08b35c55bce101e8855
 SHA1 (patch-ae) = 5d9902de9990efc1883f11563f49ac8639fe743d
+SHA1 (patch-af) = 8095a6cdfd5348d6ab9ed67fc625bd944a860c00
+SHA1 (patch-ag) = 89f50ee8b328cd654aebf1da5424e87eb6b42628
 SHA1 (patch-bb) = 1b6c717a1bedafbeae0037ee382795d8aa59f081
 SHA1 (patch-bc) = 2d54d0700b30f5471eb60d104148ecf5ac835f58
 SHA1 (patch-bx) = d58d16fd484fc0a46c1ae93267af19e73af6f990
diff --git a/x11/kdebase3/patches/patch-af b/x11/kdebase3/patches/patch-af
new file mode 100644
index 00000000000..f6b90598b81
--- /dev/null
+++ b/x11/kdebase3/patches/patch-af
@@ -0,0 +1,28 @@
+$NetBSD: patch-af,v 1.4 2004/04/26 11:31:25 markd Exp $
+
+--- kcontrol/info/info_netbsd.cpp.orig	2003-01-21 02:17:16.000000000 +1300
++++ kcontrol/info/info_netbsd.cpp
+@@ -272,7 +272,11 @@ bool GetInfo_Partitions (QListView *lbox
+ 	FILE *pipe = popen("/sbin/mount", "r");
+ 	QTextStream *t;
+ 	u_int64_t tsz, fsz;
++#ifdef ST_RDONLY
++	struct statvfs sfs;
++#else
+ 	struct statfs sfs;
++#endif
+ 	int ok;
+ 
+ 	if (!pipe) {
+@@ -312,7 +316,11 @@ bool GetInfo_Partitions (QListView *lbox
+ 			flags = "";
+ 		}
+ 
++#ifdef ST_RDONLY
++		if (statvfs(mountpoint, &sfs) == 0) {
++#else
+ 		if (statfs(mountpoint, &sfs) == 0) {
++#endif
+ 			tsz = ((1LL * sfs.f_blocks * sfs.f_bsize / 1024) + 513)
+ 					/ 1024;
+ 			fsz = ((1LL * sfs.f_bfree * sfs.f_bsize / 1024) + 513)
diff --git a/x11/kdebase3/patches/patch-ag b/x11/kdebase3/patches/patch-ag
new file mode 100644
index 00000000000..d7bc16cd0f2
--- /dev/null
+++ b/x11/kdebase3/patches/patch-ag
@@ -0,0 +1,30 @@
+$NetBSD: patch-ag,v 1.6 2004/04/26 11:31:25 markd Exp $
+
+--- ksysguard/ksysguardd/NetBSD/diskstat.c.orig	2003-03-13 01:26:05.000000000 +1300
++++ ksysguard/ksysguardd/NetBSD/diskstat.c
+@@ -64,7 +64,11 @@ char *getMntPnt(const char *cmd)
+ 
+ int numMntPnt(void)
+ {
++#ifdef ST_RDONLY
++	struct statvfs *fs_info;
++#else
+ 	struct statfs *fs_info;
++#endif
+ 	int i, n, counter = 0;
+ 
+ 	n = getmntinfo(&fs_info, MNT_WAIT);
+@@ -130,8 +134,13 @@ void exitDiskStat(void)
+ 
+ int updateDiskStat(void)
+ {
++#ifdef ST_RDONLY
++	struct statvfs *fs_info;
++	struct statvfs fs;
++#else
+ 	struct statfs *fs_info;
+ 	struct statfs fs;
++#endif
+ 	float percent;
+ 	int i, mntcount;
+ 	DiskInfo *disk_info;