Fix build for Darwin

- use the same work around for mntent.h as for NetBSD and DragonFly
- deactivate oss output for Darwin

This fixes PR pkg/38721

4 files changed, 34 insertions, 13 deletions

diff --git a/multimedia/libmpeg3/distinfo b/multimedia/libmpeg3/distinfo
index bf3ed9cd8d2..d01e2a8df84 100644
--- a/multimedia/libmpeg3/distinfo
+++ b/multimedia/libmpeg3/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.11 2008/02/20 09:56:44 xtraeme Exp $
+$NetBSD: distinfo,v 1.12 2008/05/21 19:21:33 tonio Exp $
 
 SHA1 (libmpeg3-1.7-src.tar.bz2) = 577da1ddf77f1e1fcd1deb69829eec3567daed36
 RMD160 (libmpeg3-1.7-src.tar.bz2) = f1989c4b52d97ee29833edc79efd731b6219f126
@@ -6,7 +6,8 @@ Size (libmpeg3-1.7-src.tar.bz2) = 320897 bytes
 SHA1 (patch-aa) = c05dfda5b2b43593044af2328244858453add46c
 SHA1 (patch-ac) = f83af5e90c93f7d02395923d2f93fb916057c434
 SHA1 (patch-ad) = 86edf9af264370bf89050b02e956b5bacc86881e
-SHA1 (patch-ae) = 4a9034c2fc0e424b8426aa4015f4910beb5a8406
+SHA1 (patch-ae) = 6029a14c3d3811919e0383cd7b57cb9a0bb8e4d5
 SHA1 (patch-ag) = bf321ac689b82889ca1a2bb8a96cb6e387280f32
-SHA1 (patch-ah) = 265b70c9f785b2ce80aec17d73f4e9719f71edba
+SHA1 (patch-ah) = 070f2285bb5173a73865bccf38c73a5429abce1c
 SHA1 (patch-ai) = 859735f677cb469b782e27da2a14bacd3fd02003
+SHA1 (patch-aj) = a5ee3f933c8caeebbc7d1f1aa3bd9a67dd019837
diff --git a/multimedia/libmpeg3/patches/patch-ae b/multimedia/libmpeg3/patches/patch-ae
index bda4b3fc3e2..55aa6139fd0 100644
--- a/multimedia/libmpeg3/patches/patch-ae
+++ b/multimedia/libmpeg3/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.7 2008/02/20 09:56:44 xtraeme Exp $
+$NetBSD: patch-ae,v 1.8 2008/05/21 19:21:33 tonio Exp $
 
 --- mpeg3io.c.orig	2005-05-01 07:57:56.000000000 +0200
 +++ mpeg3io.c	2008-02-19 19:25:09.000000000 +0100
-@@ -1,11 +1,27 @@
+@@ -1,11 +1,29 @@
  #include "mpeg3private.h"
  #include "mpeg3protos.h"
  
@@ -12,14 +12,16 @@ $NetBSD: patch-ae,v 1.7 2008/02/20 09:56:44 xtraeme Exp $
  #include <string.h>
 -#include <sys/stat.h>
 +
-+#if defined(__NetBSD__) || defined(__DragonFly__)
++#if defined(__NetBSD__) || defined(__DragonFly__) || (defined(__APPLE__) && defined(__MACH__))
 +# include <sys/param.h>
 +# include <sys/mount.h>
 +
-+# if defined(__NetBSD__) && __NetBSD_Version__ >= 299000900   /* 2.99.9 */
++# if (defined(__NetBSD__) && __NetBSD_Version__ >= 299000900 /* 2.99.9 */) || (defined(__APPLE__) && defined(__MACH__) /* MacOSX */)
 +#  define fopen64 fopen
 +#  define fseeko64 fseek
 +#  define stat64 stat
++# endif
++# if defined(__NetBSD__) && __NetBSD_Version__ >= 299000900 /* 2.99.9 */
 +#  define statfs statvfs
 +# endif
 +
@@ -36,7 +38,7 @@ $NetBSD: patch-ae,v 1.7 2008/02/20 09:56:44 xtraeme Exp $
  
  int mpeg3io_device(char *path, char *device)
  {
-+#if defined(__NetBSD__) || defined(__DragonFly__)
++#if defined(__NetBSD__) || defined(__DragonFly__) || (defined(__APPLE__) && defined(__MACH__))
 +	struct statfs file_st;
 +
 +	if (statfs(path, &file_st) < 0)
@@ -53,7 +55,7 @@ $NetBSD: patch-ae,v 1.7 2008/02/20 09:56:44 xtraeme Exp $
  		return 1;
  	}
  
-+#if defined(__NetBSD__) || defined(__DragonFly__)
++#if defined(__NetBSD__) || defined(__DragonFly__) || (defined(__APPLE__) && defined(__MACH__))
 +	strncpy(device, file_st.f_mntfromname, MPEG3_STRLEN);
 +#else
  	fp = setmntent(MOUNTED, "r");
diff --git a/multimedia/libmpeg3/patches/patch-ah b/multimedia/libmpeg3/patches/patch-ah
index ec968b20a02..cc9fc6dc140 100644
--- a/multimedia/libmpeg3/patches/patch-ah
+++ b/multimedia/libmpeg3/patches/patch-ah
@@ -1,19 +1,21 @@
-$NetBSD: patch-ah,v 1.3 2008/02/20 09:56:44 xtraeme Exp $
+$NetBSD: patch-ah,v 1.4 2008/05/21 19:21:33 tonio Exp $
 
 --- mpeg3tocutil.c.orig	2008-02-19 19:21:30.000000000 +0100
 +++ mpeg3tocutil.c	2008-02-19 19:22:41.000000000 +0100
-@@ -5,8 +5,21 @@
+@@ -5,8 +5,23 @@
  #include <stdio.h>
  #include <stdlib.h>
  #include <string.h>
 -#include <sys/stat.h>
 -
-+#if defined(__NetBSD__) || defined(__DragonFly__)
++#if defined(__NetBSD__) || defined(__DragonFly__) || (defined(__APPLE__) && defined(__MACH__))
 +# include <sys/param.h>
 +# include <sys/mount.h>
 +
-+# if defined(__NetBSD__) && __NetBSD_Version__ >= 299000900   /* 2.99.9 */
++# if (defined(__NetBSD__) && __NetBSD_Version__ >= 299000900 /* 2.99.9 */) || (defined(__APPLE__) && defined(__MACH__) /* MacOSX */)
 +#  define stat64 stat
++# endif
++# if defined(__NetBSD__) && __NetBSD_Version__ >= 299000900 /* 2.99.9 */
 +#  define statfs statvfs
 +# endif
 +
diff --git a/multimedia/libmpeg3/patches/patch-aj b/multimedia/libmpeg3/patches/patch-aj
new file mode 100644
index 00000000000..8d656da137a
--- /dev/null
+++ b/multimedia/libmpeg3/patches/patch-aj
@@ -0,0 +1,16 @@
+$NetBSD: patch-aj,v 1.1 2008/05/21 19:21:33 tonio Exp $
+
+Deactivate oss output for darwin
+
+--- a52dec-0.7.3/include/config.h.orig	2005-04-21 05:59:43.000000000 +0200
++++ a52dec-0.7.3/include/config.h
+@@ -56,7 +56,9 @@
+ /* #undef LIBAO_AL */
+ 
+ /* libao OSS support */
++#if !(defined(__APPLE__) && defined(__MACH__))
+ #define LIBAO_OSS 
++#endif
+ 
+ /* libao solaris support */
+ /* #undef LIBAO_SOLARIS */