summaryrefslogtreecommitdiff
path: root/sysutils
diff options
context:
space:
mode:
authorabs <abs@pkgsrc.org>2005-09-06 08:10:57 +0000
committerabs <abs@pkgsrc.org>2005-09-06 08:10:57 +0000
commit7487856bc8e2f45be7fbc43b539e15dafdf7fd27 (patch)
tree93bf2742fc4e1bf90527c6e25c8e73ae1da1c960 /sysutils
parent193dddddcdfb99536b1854801019f2a12046f27d (diff)
downloadpkgsrc-7487856bc8e2f45be7fbc43b539e15dafdf7fd27.tar.gz
Fix NetBSD statvfs check to be >= 299000900 not >= 200040000
No pkgrevision bumps needed.
Diffstat (limited to 'sysutils')
-rw-r--r--sysutils/dvd+rw-tools/distinfo4
-rw-r--r--sysutils/dvd+rw-tools/patches/patch-aa8
-rw-r--r--sysutils/gkrellm/distinfo4
-rw-r--r--sysutils/gkrellm/patches/patch-aa10
-rw-r--r--sysutils/gkrellm1/distinfo4
-rw-r--r--sysutils/gkrellm1/patches/patch-ad4
-rw-r--r--sysutils/ntfsprogs/distinfo4
-rw-r--r--sysutils/ntfsprogs/patches/patch-af8
-rw-r--r--sysutils/vobcopy/distinfo6
-rw-r--r--sysutils/vobcopy/patches/patch-aa4
-rw-r--r--sysutils/vobcopy/patches/patch-ab4
11 files changed, 30 insertions, 30 deletions
diff --git a/sysutils/dvd+rw-tools/distinfo b/sysutils/dvd+rw-tools/distinfo
index 1d30e0874fc..d5259da78b5 100644
--- a/sysutils/dvd+rw-tools/distinfo
+++ b/sysutils/dvd+rw-tools/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.8 2005/02/24 13:40:52 agc Exp $
+$NetBSD: distinfo,v 1.9 2005/09/06 08:10:59 abs Exp $
SHA1 (dvd+rw-tools-5.21.4.10.8.tar.gz) = 319a4529db3748f595aa9dc8f2e54564bb32a0e3
RMD160 (dvd+rw-tools-5.21.4.10.8.tar.gz) = 638f67ddfc24f89a4c2bc2abced652e679f4400f
Size (dvd+rw-tools-5.21.4.10.8.tar.gz) = 107045 bytes
-SHA1 (patch-aa) = 33096512b0bd21f62415885a3a8bac9fdba19eca
+SHA1 (patch-aa) = 9fcb1e2e8e0302cd9693dccee1045fa5edf5b347
diff --git a/sysutils/dvd+rw-tools/patches/patch-aa b/sysutils/dvd+rw-tools/patches/patch-aa
index 2abbc85b3a0..70dec429b84 100644
--- a/sysutils/dvd+rw-tools/patches/patch-aa
+++ b/sysutils/dvd+rw-tools/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.3 2004/06/30 00:11:23 wiz Exp $
+$NetBSD: patch-aa,v 1.4 2005/09/06 08:10:59 abs Exp $
--- transport.hxx.orig 2004-04-19 18:25:06.000000000 +0200
+++ transport.hxx
@@ -15,7 +15,7 @@ $NetBSD: patch-aa,v 1.3 2004/06/30 00:11:23 wiz Exp $
#include <fcntl.h>
#include <poll.h>
#include <sys/time.h>
-+#if __NetBSD_Version__ >= 200040000
++#if __NetBSD_Version__ >= 299000900
+#include <sys/statvfs.h>
+#endif
@@ -25,7 +25,7 @@ $NetBSD: patch-aa,v 1.3 2004/06/30 00:11:23 wiz Exp $
// mounted, so that it could as well just return 0;
int umount(int f=-1)
{ struct stat fsb,msb;
-+#if __NetBSD_Version__ >= 200040000
++#if __NetBSD_Version__ >= 299000900
+ struct statvfs *mntbuf;
+#else
struct statfs *mntbuf;
@@ -37,7 +37,7 @@ $NetBSD: patch-aa,v 1.3 2004/06/30 00:11:23 wiz Exp $
}
int umount(int f=-1)
{ struct stat fsb,msb;
-+#if __NetBSD_Version__ >= 200040000
++#if __NetBSD_Version__ >= 299000900
+ struct statvfs *mntbuf;
+#else
struct statfs *mntbuf;
diff --git a/sysutils/gkrellm/distinfo b/sysutils/gkrellm/distinfo
index 76e2f4095a2..57994a28b10 100644
--- a/sysutils/gkrellm/distinfo
+++ b/sysutils/gkrellm/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.32 2005/03/30 15:26:43 cube Exp $
+$NetBSD: distinfo,v 1.33 2005/09/06 08:10:59 abs Exp $
SHA1 (gkrellm-2.2.5.tar.bz2) = 4cbdf75828b3d8b216694c2e6978c29a4920595a
RMD160 (gkrellm-2.2.5.tar.bz2) = 7755fa7bbf88dfd53185e76604981b2a5c81d74d
Size (gkrellm-2.2.5.tar.bz2) = 668581 bytes
-SHA1 (patch-aa) = e7d7dc8f3189632a8a0855c3fc39479482407cc4
+SHA1 (patch-aa) = 9dbffbc0bc95ea3fced7162da0ec55333396d256
SHA1 (patch-ab) = de2ef6e1d083a32c274d2ec42fa1b9e9d3d65663
SHA1 (patch-ac) = 8890d5a5e8eaf21508a1bf91de788183fd6f7a75
SHA1 (patch-ad) = c33319783a40ad64f43015200047656efc1bcdb3
diff --git a/sysutils/gkrellm/patches/patch-aa b/sysutils/gkrellm/patches/patch-aa
index 1bea27ef41b..eb130356750 100644
--- a/sysutils/gkrellm/patches/patch-aa
+++ b/sysutils/gkrellm/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.14 2004/06/07 17:01:50 cube Exp $
+$NetBSD: patch-aa,v 1.15 2005/09/06 08:10:59 abs Exp $
--- src/sysdeps/bsd-common.c.orig 2004-05-01 19:46:38.000000000 +0200
+++ src/sysdeps/bsd-common.c
@@ -6,7 +6,7 @@ $NetBSD: patch-aa,v 1.14 2004/06/07 17:01:50 cube Exp $
gkrellm_sys_fs_get_mounts_list(void)
{
gchar *s, *dev, *dir, *type;
-+#if (defined(__NetBSD__) && __NetBSD_Version__ >= 200040000) /* NetBSD 2.0D */
++#if (defined(__NetBSD__) && __NetBSD_Version__ >= 299000900) /* NetBSD 2.99.9 */
+ struct statvfs *mntbuf;
+#else
struct statfs *mntbuf;
@@ -18,20 +18,20 @@ $NetBSD: patch-aa,v 1.14 2004/06/07 17:01:50 cube Exp $
void
gkrellm_sys_fs_get_fsusage(gpointer fs, gchar *dir)
{
-+#if (defined(__NetBSD__) && __NetBSD_Version__ >= 200040000) /* NetBSD 2.0D */
++#if (defined(__NetBSD__) && __NetBSD_Version__ >= 299000900) /* NetBSD 2.99.9 */
+ struct statvfs st;
+#else
struct statfs st;
+#endif
-+#if (defined(__NetBSD__) && __NetBSD_Version__ >= 200040000) /* NetBSD 2.0D */
++#if (defined(__NetBSD__) && __NetBSD_Version__ >= 299000900) /* NetBSD 2.99.9 */
+ if (!statvfs(dir, &st))
+#else
if (!statfs(dir, &st))
+#endif
gkrellm_fs_assign_fsusage_data(fs,
(glong) st.f_blocks, (glong) st.f_bavail,
-+#if (defined(__NetBSD__) && __NetBSD_Version__ >= 200040000) /* NetBSD 2.0D */
++#if (defined(__NetBSD__) && __NetBSD_Version__ >= 299000900) /* NetBSD 2.99.9 */
+ (glong) st.f_bfree, (glong) st.f_frsize);
+#else
(glong) st.f_bfree, (glong) st.f_bsize);
diff --git a/sysutils/gkrellm1/distinfo b/sysutils/gkrellm1/distinfo
index 176ddc9a7e7..0b5b051f4b9 100644
--- a/sysutils/gkrellm1/distinfo
+++ b/sysutils/gkrellm1/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2005/02/24 13:40:53 agc Exp $
+$NetBSD: distinfo,v 1.4 2005/09/06 08:10:59 abs Exp $
SHA1 (gkrellm-1.2.13.tar.bz2) = ab0282e663b69ecf0d622ad7c02db0c72b793bd3
RMD160 (gkrellm-1.2.13.tar.bz2) = a5d9b7e439788613ebab9718aa05eff0c39d0a9a
@@ -6,4 +6,4 @@ Size (gkrellm-1.2.13.tar.bz2) = 438917 bytes
SHA1 (patch-aa) = c2656b0d5372ef1e26479ccedcbd05f4e6dbb5e3
SHA1 (patch-ab) = a2f1d4b4a253323b6623200c1fca4e0cee0d46f2
SHA1 (patch-ac) = 0bdbe9b788e62e4732ec87a1d6d8dbcacde7da82
-SHA1 (patch-ad) = 96534caca72b0794589adf5948ea081388cbada9
+SHA1 (patch-ad) = 4de2da50a6bd95c6e9d564f933ec19008771624c
diff --git a/sysutils/gkrellm1/patches/patch-ad b/sysutils/gkrellm1/patches/patch-ad
index 2f151bd70a5..407ff4eaf2e 100644
--- a/sysutils/gkrellm1/patches/patch-ad
+++ b/sysutils/gkrellm1/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.1 2004/08/15 06:03:19 minskim Exp $
+$NetBSD: patch-ad,v 1.2 2005/09/06 08:10:59 abs Exp $
--- src/fs.c.orig 2002-06-30 21:20:15.000000000 -0500
+++ src/fs.c
@@ -6,7 +6,7 @@ $NetBSD: patch-ad,v 1.1 2004/08/15 06:03:19 minskim Exp $
#include "gkrellm_private_proto.h"
#include "gkrellm_threads.h"
-+#if defined(__NetBSD__) && (__NetBSD_Version__ >= 200040000) /* NetBSD 2.0D */
++#if defined(__NetBSD__) && (__NetBSD_Version__ >= 299000900) /* NetBSD 2.99.9 */
+#define statfs statvfs
+#endif
+
diff --git a/sysutils/ntfsprogs/distinfo b/sysutils/ntfsprogs/distinfo
index 63bf5b4472a..f2a44c710f9 100644
--- a/sysutils/ntfsprogs/distinfo
+++ b/sysutils/ntfsprogs/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2005/03/15 20:24:30 rillig Exp $
+$NetBSD: distinfo,v 1.4 2005/09/06 08:10:59 abs Exp $
SHA1 (ntfsprogs-1.9.4.tar.gz) = 1250e161f2ee7182bf6e473d4589b5139e3fda8a
RMD160 (ntfsprogs-1.9.4.tar.gz) = cdeeb8629d5c68a8af23d06adaf56bec62a282e6
@@ -8,7 +8,7 @@ SHA1 (patch-ab) = 6d571d962e702d776792c84a81bdaf8e7b8357e4
SHA1 (patch-ac) = 3ebaa59a289c4085cfec2e27b7e94ce95ff9e74d
SHA1 (patch-ad) = 576f8505b95965e0c49ec7e63516b49edd5f5679
SHA1 (patch-ae) = a72389126cda4a7c4cfb46760afdf7e14c94ece3
-SHA1 (patch-af) = f892b293fd235aec9ed4340a7ceb21620b2cbe5c
+SHA1 (patch-af) = f3df508bab7c3606d314488428c2b1db69ccb946
SHA1 (patch-ag) = 79883013e1ee78c7d8901601badbe9f1857dab65
SHA1 (patch-ah) = b6da89fc9b5bbc83fa503dd887f3f2ec493ad7c7
SHA1 (patch-ai) = aa2784d6c859d7cb1136808cd0750c45c026928a
diff --git a/sysutils/ntfsprogs/patches/patch-af b/sysutils/ntfsprogs/patches/patch-af
index a03f4a008f1..af5f2213d85 100644
--- a/sysutils/ntfsprogs/patches/patch-af
+++ b/sysutils/ntfsprogs/patches/patch-af
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.1.1.1 2004/10/05 12:39:38 agc Exp $
+$NetBSD: patch-af,v 1.2 2005/09/06 08:10:59 abs Exp $
--- ntfsprogs/ntfsclone.c.orig Sat Sep 4 06:16:32 2004
+++ ntfsprogs/ntfsclone.c
@@ -8,8 +8,8 @@ $NetBSD: patch-af,v 1.1.1.1 2004/10/05 12:39:38 agc Exp $
+#ifdef __NetBSD__
+# include <sys/param.h>
-+ /* NetBSD versions later than 2.0D have statvfs(2) instead of statfs(2) */
-+# if __NetBSD_Version__ >= 200040000
++ /* NetBSD versions later than 2.99.9 have statvfs(2) instead of statfs(2) */
++# if __NetBSD_Version__ >= 299000900
+# include <sys/statvfs.h>
+# define F_TYPE f_fsid
+# else
@@ -24,7 +24,7 @@ $NetBSD: patch-af,v 1.1.1.1 2004/10/05 12:39:38 agc Exp $
int restore_image;
char *output;
char *volume;
-+#if defined(__NetBSD__) && (__NetBSD_Version__ >= 200040000)
++#if defined(__NetBSD__) && (__NetBSD_Version__ >= 299000900)
+ struct statvfs stfs;
+#else
struct statfs stfs;
diff --git a/sysutils/vobcopy/distinfo b/sysutils/vobcopy/distinfo
index 26b17bd6c34..999860b410e 100644
--- a/sysutils/vobcopy/distinfo
+++ b/sysutils/vobcopy/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.3 2005/02/24 13:40:59 agc Exp $
+$NetBSD: distinfo,v 1.4 2005/09/06 08:10:59 abs Exp $
SHA1 (vobcopy-0.5.13.tar.gz) = dc1f931ed636f8583ddf438c4e195a0f8acec363
RMD160 (vobcopy-0.5.13.tar.gz) = 5512f0f16b02775b06971d04058fd98e69aa422e
Size (vobcopy-0.5.13.tar.gz) = 48423 bytes
-SHA1 (patch-aa) = e4a137071c662752bcdbfcf4abd34b93dedd0fd6
-SHA1 (patch-ab) = d02f258a134e3ba77fac24d4f197e7f7fdd1e7a0
+SHA1 (patch-aa) = 2ba3b61645cd499175d0e2d9d1063b4b621caadd
+SHA1 (patch-ab) = a2c0c73863a235b9d65b8fa96017b2b2eff87ab8
diff --git a/sysutils/vobcopy/patches/patch-aa b/sysutils/vobcopy/patches/patch-aa
index 79340ab334f..ca20b8e93df 100644
--- a/sysutils/vobcopy/patches/patch-aa
+++ b/sysutils/vobcopy/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.2 2004/04/22 15:28:47 drochner Exp $
+$NetBSD: patch-aa,v 1.3 2005/09/06 08:11:00 abs Exp $
--- dvd.c.orig 2004-03-26 19:53:10.000000000 +0100
+++ dvd.c 2004-04-22 16:27:45.000000000 +0200
@@ -10,7 +10,7 @@ $NetBSD: patch-aa,v 1.2 2004/04/22 15:28:47 drochner Exp $
+#if (defined(__unix__) || defined(unix)) && !defined(USG) || (defined(__APPLE__) && defined(__GNUC__)) || defined(__NetBSD__)
#include <sys/param.h>
+#define USE_GETMNTINFO
-+#if !defined(__NetBSD__) || (__NetBSD_Version__ < 200040000)
++#if !defined(__NetBSD__) || (__NetBSD_Version__ < 299000900)
#include <sys/mount.h>
+#define USE_STATFS_FOR_DEV
+#define GETMNTINFO_USES_STATFS
diff --git a/sysutils/vobcopy/patches/patch-ab b/sysutils/vobcopy/patches/patch-ab
index 1b5145d11c6..a876bbb8519 100644
--- a/sysutils/vobcopy/patches/patch-ab
+++ b/sysutils/vobcopy/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.2 2004/04/22 15:28:47 drochner Exp $
+$NetBSD: patch-ab,v 1.3 2005/09/06 08:11:00 abs Exp $
--- vobcopy.c.orig 2004-03-26 19:53:10.000000000 +0100
+++ vobcopy.c 2004-04-22 15:54:46.000000000 +0200
@@ -15,7 +15,7 @@ $NetBSD: patch-ab,v 1.2 2004/04/22 15:28:47 drochner Exp $
#include <dvdread/dvd_reader.h>
/* for solaris, but is also present in linux */
-#if (defined(BSD) && (BSD >= 199306)) ||(defined(__APPLE__) && defined(__GNUC__))
-+#if (defined(BSD) && (BSD >= 199306) && !defined(__NetBSD__)) ||(defined(__APPLE__) && defined(__GNUC__)) || (defined(__NetBSD__) && (__NetBSD_Version__ < 200040000))
++#if (defined(BSD) && (BSD >= 199306) && !defined(__NetBSD__)) ||(defined(__APPLE__) && defined(__GNUC__)) || (defined(__NetBSD__) && (__NetBSD_Version__ < 299000900))
/* I don't know if *BSD have getopt-long... please tell me! */
//#define HAVE_GETOPT_LONG
#include <sys/mount.h>
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-12 07:36:12 +0000