Use statvfs when sys/statvfs.h is available.

Fixes build on NetBSD-current.

5 files changed, 71 insertions, 1 deletions

diff --git a/audio/gqmpeg-devel/distinfo b/audio/gqmpeg-devel/distinfo
index cfd28983e05..ed7604edab6 100644
--- a/audio/gqmpeg-devel/distinfo
+++ b/audio/gqmpeg-devel/distinfo
@@ -1,4 +1,8 @@
-$NetBSD: distinfo,v 1.1.1.1 2004/11/03 03:21:13 sekiya Exp $
+$NetBSD: distinfo,v 1.2 2004/12/08 08:57:56 minskim Exp $
 
 SHA1 (gqmpeg-0.91.1.tar.gz) = 23d81dbf49a2d44ceda58bea2b324716b42edbb5
 Size (gqmpeg-0.91.1.tar.gz) = 1078478 bytes
+SHA1 (patch-aa) = a5f2f8c90a674019055c6d6d76b1ca5d708ea407
+SHA1 (patch-ab) = 2713a8e627acf2a52a77b42fc851062e6d60fa69
+SHA1 (patch-ac) = 0ff360b28488c30bebf23b52f0d641de9b6a1ea0
+SHA1 (patch-ad) = 2cb6902683999e88c3d3f39f8831086b132e68ad
diff --git a/audio/gqmpeg-devel/patches/patch-aa b/audio/gqmpeg-devel/patches/patch-aa
new file mode 100644
index 00000000000..0c61264ba0a
--- /dev/null
+++ b/audio/gqmpeg-devel/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.1 2004/12/08 08:57:56 minskim Exp $
+
+--- configure.in.orig	2004-04-07 08:05:11.000000000 -0500
++++ configure.in
+@@ -75,6 +75,8 @@ dnl Test for libpng
+ 
+ AC_SUBST(LIBPNG)
+ 
++AC_CHECK_HEADERS([sys/statvfs.h])
++
+ dnl Video4Linux
+ AC_CHECK_HEADER(linux/videodev.h, AC_DEFINE(HAVE_VIDEO4LINUX))
+ 
diff --git a/audio/gqmpeg-devel/patches/patch-ab b/audio/gqmpeg-devel/patches/patch-ab
new file mode 100644
index 00000000000..24837184b23
--- /dev/null
+++ b/audio/gqmpeg-devel/patches/patch-ab
@@ -0,0 +1,14 @@
+$NetBSD: patch-ab,v 1.1 2004/12/08 08:57:56 minskim Exp $
+
+--- config.h.in.orig	2004-04-07 08:08:10.000000000 -0500
++++ config.h.in
+@@ -164,6 +164,9 @@
+ /* Define to 1 if you have the <sys/param.h> header file. */
+ #undef HAVE_SYS_PARAM_H
+ 
++/* Define to 1 if you have the <sys/statvfs.h> header file. */
++#undef HAVE_SYS_STATVFS_H
++
+ /* Define to 1 if you have the <sys/stat.h> header file. */
+ #undef HAVE_SYS_STAT_H
+ 
diff --git a/audio/gqmpeg-devel/patches/patch-ac b/audio/gqmpeg-devel/patches/patch-ac
new file mode 100644
index 00000000000..30a8816c86e
--- /dev/null
+++ b/audio/gqmpeg-devel/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.1 2004/12/08 08:57:56 minskim Exp $
+
+--- configure.orig	2004-04-07 08:07:48.000000000 -0500
++++ configure
+@@ -4342,7 +4342,7 @@ echo "$as_me: error: GTK+ >= 2.2.0 not i
+ 
+ 
+ for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
+-                  inttypes.h stdint.h unistd.h
++                  inttypes.h stdint.h unistd.h sys/statvfs.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ echo "$as_me:$LINENO: checking for $ac_header" >&5
diff --git a/audio/gqmpeg-devel/patches/patch-ad b/audio/gqmpeg-devel/patches/patch-ad
new file mode 100644
index 00000000000..ad9b24bb863
--- /dev/null
+++ b/audio/gqmpeg-devel/patches/patch-ad
@@ -0,0 +1,26 @@
+$NetBSD: patch-ad,v 1.1 2004/12/08 08:57:56 minskim Exp $
+
+--- src/cpu_perc.c.orig	2002-05-06 21:50:10.000000000 -0500
++++ src/cpu_perc.c
+@@ -45,6 +45,9 @@
+   #include <fcntl.h>
+   #include <sys/mount.h>
+ #endif
++#ifdef HAVE_SYS_STATVFS_H
++#include <sys/statvfs.h>
++#endif
+ 
+ gfloat check_child_cpu_usage(int childs_pid)
+ {
+@@ -66,7 +69,11 @@ gfloat check_child_cpu_usage(int childs_
+ 	/* find where the proc fs is mounted, some strange people could mount it
+ 	   in another place than /proc, it can even be not mounted at all */
+ 	{
++#ifdef HAVE_SYS_STATVFS_H
++	  struct statvfs *mntbufp;
++#else
+ 	  struct statfs *mntbufp;
++#endif
+ 	  int fs_count;
+ 	  int procfs_found = 0;
+