Bump to libmpeg3-1.3nb5: fix building on MacOS X:

 * patch-ac: define bswap_16 and bswap_32 as appropriate for NetBSD,
             Linux and MacOS X
 * patch-ae: Pull in headers for 'struct stat'. Hello Linux!

4 files changed, 29 insertions, 21 deletions

diff --git a/multimedia/libmpeg3/Makefile b/multimedia/libmpeg3/Makefile
index 0266247ab52..28cdbb510d4 100644
--- a/multimedia/libmpeg3/Makefile
+++ b/multimedia/libmpeg3/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2005/05/22 20:08:21 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2005/06/07 23:38:34 hubertf Exp $
 #
 
 DISTNAME=	libmpeg3-1.3
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	devel audio graphics multimedia
 MASTER_SITES=	http://heroines.sourceforge.net/
 
diff --git a/multimedia/libmpeg3/distinfo b/multimedia/libmpeg3/distinfo
index 0d96c69192b..a0a70904999 100644
--- a/multimedia/libmpeg3/distinfo
+++ b/multimedia/libmpeg3/distinfo
@@ -1,13 +1,13 @@
-$NetBSD: distinfo,v 1.2 2005/02/24 11:24:03 agc Exp $
+$NetBSD: distinfo,v 1.3 2005/06/07 23:38:34 hubertf Exp $
 
 SHA1 (libmpeg3-1.3.tar.gz) = e7e8b03ab45d5593558b0d19e31f0694cfdfa2b5
 RMD160 (libmpeg3-1.3.tar.gz) = b1751f681d26758873746aa38368150eb0a4bafd
 Size (libmpeg3-1.3.tar.gz) = 154062 bytes
 SHA1 (patch-aa) = a5665a330234b964aca00a5c4c6f00a9f1bd11ff
 SHA1 (patch-ab) = 844cfcbd99269f1f0b4bef76e0a8567522070707
-SHA1 (patch-ac) = fa32047a70936d0ab81100a4f4b3b0ccdcd3a708
+SHA1 (patch-ac) = 2893fe6a8973bdf63302b868e2827e496e82d77d
 SHA1 (patch-ad) = 86edf9af264370bf89050b02e956b5bacc86881e
-SHA1 (patch-ae) = 55cf13476c59da1844fb4bc2bff7b50a78a6a4f1
+SHA1 (patch-ae) = 8b42cf175aab6f72386b56f324e5bb631134496f
 SHA1 (patch-af) = 7e62a236ee0a7398c1b1a3e994261ebb9be50bae
 SHA1 (patch-ag) = bf321ac689b82889ca1a2bb8a96cb6e387280f32
 SHA1 (patch-ah) = 58ffda3df9be3b089de362451ddf249a74fac5be
diff --git a/multimedia/libmpeg3/patches/patch-ac b/multimedia/libmpeg3/patches/patch-ac
index 987729d8d3a..f41cfd9f44f 100644
--- a/multimedia/libmpeg3/patches/patch-ac
+++ b/multimedia/libmpeg3/patches/patch-ac
@@ -1,19 +1,26 @@
-$NetBSD: patch-ac,v 1.1 2004/06/26 18:00:21 grant Exp $
-
---- mpeg3ifo.c.orig	Tue Jul 31 17:18:25 2001
-+++ mpeg3ifo.c	Tue Jul 31 17:18:56 2001
-@@ -1,9 +1,13 @@
+--- mpeg3ifo.c.orig	2001-05-20 05:05:26.000000000 +0200
++++ mpeg3ifo.c	2005-06-08 01:20:54.000000000 +0200
+@@ -1,10 +1,22 @@
 -#include <byteswap.h>
  #include <dirent.h>
  #include <fcntl.h>
  #include <stdlib.h>
  #include <string.h>
  #include <sys/types.h>
-+
-+#include <sys/endian.h>
-+#include <machine/bswap.h>
-+#define bswap_16(x) bswap16(x)
-+#define bswap_32(x) bswap32(x)
  
++#if defined(__NetBSD__)
++#  include <sys/endian.h>
++#  include <machine/bswap.h>
++#  define bswap_16(x) bswap16(x)
++#  define bswap_32(x) bswap32(x)
++#elif defined(linux)
++#  include <byteswap.h>
++#elif defined(__APPLE__) || defined(__MACH__) /* MacOS X */
++#  include <libkern/OSByteOrder.h>
++#  define bswap_16(x) OSSwapInt16(x)
++#  define bswap_32(x) OSSwapInt32(x)
++#endif
++
  #include "ifo.h"
  #include "mpeg3private.h"
+ #include "mpeg3protos.h"
diff --git a/multimedia/libmpeg3/patches/patch-ae b/multimedia/libmpeg3/patches/patch-ae
index 945eb272c37..94c490468e6 100644
--- a/multimedia/libmpeg3/patches/patch-ae
+++ b/multimedia/libmpeg3/patches/patch-ae
@@ -1,8 +1,6 @@
-$NetBSD: patch-ae,v 1.1 2004/06/26 18:00:21 grant Exp $
-
---- mpeg3io.c.orig	2001-05-20 13:05:26.000000000 +1000
-+++ mpeg3io.c	2004-05-04 23:48:36.000000000 +1000
-@@ -1,11 +1,17 @@
+--- mpeg3io.c.orig	2001-05-20 05:05:26.000000000 +0200
++++ mpeg3io.c	2005-06-08 00:54:51.000000000 +0200
+@@ -1,11 +1,20 @@
  #include "mpeg3private.h"
  #include "mpeg3protos.h"
  
@@ -19,10 +17,13 @@ $NetBSD: patch-ae,v 1.1 2004/06/26 18:00:21 grant Exp $
 +# endif
 +#endif
 +
++#include <sys/types.h>
++#include <sys/stat.h>
++
  mpeg3_fs_t* mpeg3_new_fs(char *path)
  {
  	mpeg3_fs_t *fs = calloc(1, sizeof(mpeg3_fs_t));
-@@ -88,27 +94,15 @@
+@@ -88,27 +97,15 @@
  
  int mpeg3io_device(char *path, char *device)
  {