diff options
| author | minskim <minskim> | 2004-05-04 23:36:16 +0000 |
|---|---|---|
| committer | minskim <minskim> | 2004-05-04 23:36:16 +0000 |
| commit | 742265c837eef9d6d7dba26d54fc304f1182bf2a (patch) | |
| tree | d617bbcfc7f40929ed0cf79d8eda2c59995a3b08 | |
| parent | 05dfef048892c9f35a12646270ed98777d59c069 (diff) | |
| download | pkgsrc-742265c837eef9d6d7dba26d54fc304f1182bf2a.tar.gz | |
statvfs fix for NetBSD-current>=2.0D.
| -rw-r--r-- | sysutils/libgtop2/distinfo | 5 | ||||
| -rw-r--r-- | sysutils/libgtop2/patches/patch-aa | 17 | ||||
| -rw-r--r-- | sysutils/libgtop2/patches/patch-ac | 16 |
3 files changed, 32 insertions, 6 deletions
diff --git a/sysutils/libgtop2/distinfo b/sysutils/libgtop2/distinfo index bb15297cc11..954dea134c9 100644 --- a/sysutils/libgtop2/distinfo +++ b/sysutils/libgtop2/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.3 2004/04/12 15:53:42 jmmv Exp $ +$NetBSD: distinfo,v 1.4 2004/05/04 23:36:16 minskim Exp $ SHA1 (libgtop-2.6.0.tar.bz2) = e6c61a3f7d458b8afa6c9361e71bbdadeafe7e3b Size (libgtop-2.6.0.tar.bz2) = 946822 bytes -SHA1 (patch-aa) = 5ebb407abdaedb77ed02c01adbaba70113b333b6 +SHA1 (patch-aa) = 5fe5ccdf8444b3efaaa1bc3cff4c2d4944729f1e SHA1 (patch-ab) = a8eebfb379887dfc338d7422a70821511b79f94e +SHA1 (patch-ac) = dea1b6fba42d77a4fe6b2e9269cdab0521d3a305 diff --git a/sysutils/libgtop2/patches/patch-aa b/sysutils/libgtop2/patches/patch-aa index 8de4c24acf2..223ada9a227 100644 --- a/sysutils/libgtop2/patches/patch-aa +++ b/sysutils/libgtop2/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.1.1.1 2004/04/02 12:09:16 jmmv Exp $ +$NetBSD: patch-aa,v 1.2 2004/05/04 23:36:16 minskim Exp $ ---- configure.orig 2003-12-13 08:32:17.000000000 +0100 -+++ configure 2003-12-13 08:33:16.000000000 +0100 -@@ -19717,13 +19717,13 @@ +--- configure.orig 2004-04-07 05:19:43.000000000 -0500 ++++ configure +@@ -20463,13 +20463,13 @@ echo $ECHO_N "checking for libgtop sysde libgtop_sysdeps_dir=freebsd libgtop_use_machine_h=yes libgtop_need_server=yes @@ -18,3 +18,12 @@ $NetBSD: patch-aa,v 1.1.1.1 2004/04/02 12:09:16 jmmv Exp $ ;; aix*) libgtop_sysdeps_dir=aix +@@ -30110,7 +30110,7 @@ cat >>conftest.$ac_ext <<_ACEOF + + _ACEOF + if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | +- $EGREP "f_type;" >/dev/null 2>&1; then ++ $EGREP "f_type;|struct statvfs" >/dev/null 2>&1; then + ok=yes + fi + rm -f conftest* diff --git a/sysutils/libgtop2/patches/patch-ac b/sysutils/libgtop2/patches/patch-ac new file mode 100644 index 00000000000..17d6de48ab1 --- /dev/null +++ b/sysutils/libgtop2/patches/patch-ac @@ -0,0 +1,16 @@ +$NetBSD: patch-ac,v 1.1 2004/05/04 23:36:16 minskim Exp $ + +--- sysdeps/common/mountlist.c.orig 2003-10-20 09:29:03.000000000 -0500 ++++ sysdeps/common/mountlist.c +@@ -334,7 +334,11 @@ read_filesystem_list (need_fs_type, all_ + + #ifdef MOUNTED_GETMNTINFO /* 4.4BSD. */ + { ++#ifdef STAT_STATVFS ++ struct statvfs *fsp; ++#else + struct statfs *fsp; ++#endif + int entries; + + entries = getmntinfo (&fsp, MNT_NOWAIT); |