diff options
author | mrg <mrg> | 2004-05-04 11:30:17 +0000 |
---|---|---|
committer | mrg <mrg> | 2004-05-04 11:30:17 +0000 |
commit | 1259d72515e78faba265986c61fa50c7e3d73fd7 (patch) | |
tree | 60ef9361de143750bde5b0ee14cbef3b5c429618 /multimedia/kdemultimedia3 | |
parent | 82f76d6d93d6b8d0aae467fb43588657381d89a9 (diff) | |
download | pkgsrc-1259d72515e78faba265986c61fa50c7e3d73fd7.tar.gz |
for NetBSD 2.0D and later, use statvfs(2).
XXX this should be a configure test...
Diffstat (limited to 'multimedia/kdemultimedia3')
-rw-r--r-- | multimedia/kdemultimedia3/distinfo | 3 | ||||
-rw-r--r-- | multimedia/kdemultimedia3/patches/patch-ad | 42 |
2 files changed, 44 insertions, 1 deletions
diff --git a/multimedia/kdemultimedia3/distinfo b/multimedia/kdemultimedia3/distinfo index 83b5d30ea98..1d5aa9da15f 100644 --- a/multimedia/kdemultimedia3/distinfo +++ b/multimedia/kdemultimedia3/distinfo @@ -1,10 +1,11 @@ -$NetBSD: distinfo,v 1.4 2004/04/20 13:13:42 markd Exp $ +$NetBSD: distinfo,v 1.5 2004/05/04 11:30:17 mrg Exp $ SHA1 (kdemultimedia-3.2.2.tar.bz2) = 2536393d2bc31f15448082218960b867315c1cf0 Size (kdemultimedia-3.2.2.tar.bz2) = 4911246 bytes SHA1 (patch-aa) = 1e0694a956357d759a73a010e9a4700d5072ebf7 SHA1 (patch-ab) = 29d8a451cd7e641f67190fa3b4980678ebe7dd70 SHA1 (patch-ac) = f13b1d7b0285a3189b9b039daef771d9294ad413 +SHA1 (patch-ad) = 272548cfda5b9d8ea2fd16d7d490ef74a5c349e6 SHA1 (patch-ar) = 604469ee9cedaccb5e75567abf1088cddab9bcbc SHA1 (patch-cs) = 6b00976b20b3d6af611f75921e20f88086061ce5 SHA1 (patch-ct) = b61875aa683a08e69f0a403a8111319469fa3c4e diff --git a/multimedia/kdemultimedia3/patches/patch-ad b/multimedia/kdemultimedia3/patches/patch-ad new file mode 100644 index 00000000000..8530589f698 --- /dev/null +++ b/multimedia/kdemultimedia3/patches/patch-ad @@ -0,0 +1,42 @@ +$NetBSD: patch-ad,v 1.1 2004/05/04 11:30:17 mrg Exp $ + +--- kscd/libwm/plat_freebsd.c.orig 2003-05-05 22:19:39.000000000 +1000 ++++ kscd/libwm/plat_freebsd.c 2004-05-04 19:17:17.000000000 +1000 +@@ -380,6 +380,14 @@ + return (ioctl(d->fd, CDIOCSTOP)); + } /* gen_stop() */ + ++/* XXX */ ++#ifdef __NetBSD__ ++# include <sys/param.h> ++# if __NetBSD_Version__ >= 200040000 /* 2.0D */ ++# define HAVE_SYS_STATVFS_H 1 ++# endif ++#endif ++ + /*----------------------------------------* + * Eject the current CD, if there is one. + *----------------------------------------*/ +@@ -388,14 +396,22 @@ + { + /* On some systems, we can check to see if the CD is mounted. */ + struct stat stbuf; ++#ifdef HAVE_SYS_STATVFS_H ++ struct statvfs buf; ++#else + struct statfs buf; ++#endif + int rval; + + if (fstat(d->fd, &stbuf) != 0) + return (-2); + + /* Is this a mounted filesystem? */ ++#ifdef HAVE_SYS_STATVFS_H ++ if (fstatvfs(stbuf.st_rdev, &buf) == 0) ++#else + if (fstatfs(stbuf.st_rdev, &buf) == 0) ++#endif + return (-3); + + rval = ioctl(d->fd, CDIOCALLOW); |