[pkgsrc/trunk]: pkgsrc/multimedia/mpeg4ip Add DragonFly support. Override all...

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/f89a84a0096d
branches:  trunk
changeset: 511967:f89a84a0096d
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Fri Apr 28 10:02:41 2006 +0000

description:
Add DragonFly support. Override all libtool instances.

diffstat:

 multimedia/mpeg4ip/Makefile         |   3 ++-
 multimedia/mpeg4ip/distinfo         |   4 +++-
 multimedia/mpeg4ip/patches/patch-ac |  17 +++++++++++++++++
 multimedia/mpeg4ip/patches/patch-ad |  22 ++++++++++++++++++++++
 4 files changed, 44 insertions(+), 2 deletions(-)

diffs (78 lines):

diff -r 58b30ace96c3 -r f89a84a0096d multimedia/mpeg4ip/Makefile
--- a/multimedia/mpeg4ip/Makefile       Fri Apr 28 09:53:05 2006 +0000
+++ b/multimedia/mpeg4ip/Makefile       Fri Apr 28 10:02:41 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2006/04/12 21:39:38 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2006/04/28 10:02:41 joerg Exp $
 #
 
 DISTNAME=              mpeg4ip-1.4.1
@@ -13,6 +13,7 @@
 USE_LIBTOOL=           yes
 GNU_CONFIGURE=         yes
 CONFIGURE_SCRIPT=      bootstrap
+LIBTOOL_OVERRIDE=      libtool */libtool */*/libtool */*/*/libtool
 
 .include "../../devel/SDL/buildlink3.mk"
 .include "../../mk/x11.buildlink3.mk"
diff -r 58b30ace96c3 -r f89a84a0096d multimedia/mpeg4ip/distinfo
--- a/multimedia/mpeg4ip/distinfo       Fri Apr 28 09:53:05 2006 +0000
+++ b/multimedia/mpeg4ip/distinfo       Fri Apr 28 10:02:41 2006 +0000
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.2 2006/04/16 23:50:09 wiz Exp $
+$NetBSD: distinfo,v 1.3 2006/04/28 10:02:41 joerg Exp $
 
 SHA1 (mpeg4ip-1.4.1.tar.gz) = f0a4b9ecfb281c6c20b332002a7e341e27a9ea10
 RMD160 (mpeg4ip-1.4.1.tar.gz) = 656d06433d490aadadd8c6fd8e8d5727870e8766
 Size (mpeg4ip-1.4.1.tar.gz) = 4791075 bytes
 SHA1 (patch-aa) = c35f7bfd5f8fe229fd022def69a7030ffa837c07
 SHA1 (patch-ab) = 93875dfe86b50c399113915fbac523becae3e2aa
+SHA1 (patch-ac) = 9e4683fdbbfa3b85941243547773814ea50125a9
+SHA1 (patch-ad) = e5dd062d7f17230bf27ffde0fc2db72d8357fd56
diff -r 58b30ace96c3 -r f89a84a0096d multimedia/mpeg4ip/patches/patch-ac
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/multimedia/mpeg4ip/patches/patch-ac       Fri Apr 28 10:02:41 2006 +0000
@@ -0,0 +1,17 @@
+$NetBSD: patch-ac,v 1.1 2006/04/28 10:02:41 joerg Exp $
+
+--- include/mpeg4ip_byteswap.h.orig    2006-04-28 09:17:18.000000000 +0000
++++ include/mpeg4ip_byteswap.h
+@@ -50,6 +50,12 @@
+ #define B2N_32(x) x = swap32(x)
+ #define B2N_64(x) x = swap64(x)
+ 
++#elif defined(__DragonFly__)
++#include <sys/endian.h>
++#define B2N_16(x) x = be16toh(x)
++#define B2N_32(x) x = be32toh(x)
++#define B2N_64(x) x = be64toh(x)
++
+ /* This is a slow but portable implementation, it has multiple evaluation 
+  * problems so beware.
+  * FreeBSD and Solaris don't have <byteswap.h> or any other such 
diff -r 58b30ace96c3 -r f89a84a0096d multimedia/mpeg4ip/patches/patch-ad
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/multimedia/mpeg4ip/patches/patch-ad       Fri Apr 28 10:02:41 2006 +0000
@@ -0,0 +1,22 @@
+$NetBSD: patch-ad,v 1.1 2006/04/28 10:02:41 joerg Exp $
+
+--- lib/SDLAudio/configure.orig        2006-04-28 09:21:28.000000000 +0000
++++ lib/SDLAudio/configure
+@@ -23435,7 +23435,7 @@ fi;
+ # causes Carbon.p complaints?
+ #            pthread_cflags="-D_REENTRANT -D_THREAD_SAFE"
+             ;;
+-        *-*-freebsd*)
++        *-*-freebsd* | *-*-dragonfly*)
+             pthread_cflags="-D_REENTRANT -D_THREAD_SAFE"
+             pthread_lib="-pthread"
+             ;;
+@@ -24553,7 +24553,7 @@ case "$target" in
+         # Set up files for the thread library
+         # Set up files for the timer library
+         ;;
+-    *-*-freebsd*)
++    *-*-freebsd* | *-*-dragonfly*)
+         ARCH=freebsd
+ 
+         CheckDiskAudio