Fix build under NetBSD current (>= 2.0D); statvfs problems.

4 files changed, 47 insertions, 1 deletions

diff --git a/audio/bmp/distinfo b/audio/bmp/distinfo
index f9818b74ee1..5d9d01fd2a0 100644
--- a/audio/bmp/distinfo
+++ b/audio/bmp/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2004/04/17 11:01:16 jmmv Exp $
+$NetBSD: distinfo,v 1.4 2004/05/15 09:34:53 jmmv Exp $
 
 SHA1 (bmp-0.9.6.1.tar.gz) = c07b55c7fa3e965ff07bf7794b1ca03d00606197
 Size (bmp-0.9.6.1.tar.gz) = 1472078 bytes
@@ -13,3 +13,6 @@ SHA1 (patch-aj) = e6d354777dd4c8c5bf3b0bf08bdb1a6bfa4855dc
 SHA1 (patch-ak) = 33c0a13036271b817a82dac7c0275130dc1dcede
 SHA1 (patch-al) = 3887309232a926fa689e4d996ab4747eff38cde8
 SHA1 (patch-am) = b1b15fe6deeee7e9d51ce3cb8739baf9886e3812
+SHA1 (patch-an) = da55750c5ee50acfd25e695813bfc025c4fc7b5f
+SHA1 (patch-ao) = 9043ce4618715ff2cfe12df0d31806a9745c25ed
+SHA1 (patch-ap) = fadea25b0758a15e63b7849005d21d4658b48025
diff --git a/audio/bmp/patches/patch-an b/audio/bmp/patches/patch-an
new file mode 100644
index 00000000000..9ff8775b3c5
--- /dev/null
+++ b/audio/bmp/patches/patch-an
@@ -0,0 +1,13 @@
+$NetBSD: patch-an,v 1.1 2004/05/15 09:34:53 jmmv Exp $
+
+--- configure.orig	2003-12-24 20:16:01.000000000 +0100
++++ configure
+@@ -30074,7 +30074,7 @@ fi
+ done
+ 
+ 
+-for ac_func in getmntinfo
++for ac_func in statvfs getmntinfo
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ echo "$as_me:$LINENO: checking for $ac_func" >&5
diff --git a/audio/bmp/patches/patch-ao b/audio/bmp/patches/patch-ao
new file mode 100644
index 00000000000..d690b6e3932
--- /dev/null
+++ b/audio/bmp/patches/patch-ao
@@ -0,0 +1,14 @@
+$NetBSD: patch-ao,v 1.1 2004/05/15 09:34:53 jmmv Exp $
+
+--- config.h.in.orig	2003-12-24 20:16:48.000000000 +0100
++++ config.h.in
+@@ -195,6 +195,9 @@
+ /* Define to 1 if you have the `srandomdev' function. */
+ #undef HAVE_SRANDOMDEV
+ 
++/* Define to 1 if you have the `statvfs' function. */
++#undef HAVE_STATVFS
++
+ /* Define to 1 if you have the <stddef.h> header file. */
+ #undef HAVE_STDDEF_H
+ 
diff --git a/audio/bmp/patches/patch-ap b/audio/bmp/patches/patch-ap
new file mode 100644
index 00000000000..60fdd0253ed
--- /dev/null
+++ b/audio/bmp/patches/patch-ap
@@ -0,0 +1,16 @@
+$NetBSD: patch-ap,v 1.1 2004/05/15 09:34:53 jmmv Exp $
+
+--- Input/cdaudio/cdaudio.c.orig	2003-12-24 14:27:54.000000000 +0100
++++ Input/cdaudio/cdaudio.c
+@@ -553,7 +553,11 @@ extern gboolean is_mounted(const char *d
+     FILE *mounts;
+     struct mntent *mnt;
+ #elif defined(HAVE_GETMNTINFO)
++#if defined(HAVE_STATVFS)
++    struct statvfs *fsp;
++#else
+     struct statfs *fsp;
++#endif
+     int entries;
+ #endif
+