[pkgsrc/trunk]: pkgsrc/audio/rioutil Add DragonFly support. Also unmask for F...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/ed8ec5a00078
branches:  trunk
changeset: 504247:ed8ec5a00078
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Wed Dec 07 17:35:37 2005 +0000

description:
Add DragonFly support. Also unmask for FreeBSD and OpenBSD, if it
doesn't work there, it should be fixed.

diffstat:

 audio/rioutil/Makefile         |   3 ++-
 audio/rioutil/distinfo         |   8 +++++++-
 audio/rioutil/patches/patch-aa |  18 ++++++++++++++++++
 audio/rioutil/patches/patch-ab |  13 +++++++++++++
 audio/rioutil/patches/patch-ac |  13 +++++++++++++
 audio/rioutil/patches/patch-ad |  13 +++++++++++++
 audio/rioutil/patches/patch-ae |  23 +++++++++++++++++++++++
 audio/rioutil/patches/patch-af |  13 +++++++++++++
 8 files changed, 102 insertions(+), 2 deletions(-)

diffs (150 lines):

diff -r bdd56deae119 -r ed8ec5a00078 audio/rioutil/Makefile
--- a/audio/rioutil/Makefile    Wed Dec 07 17:01:22 2005 +0000
+++ b/audio/rioutil/Makefile    Wed Dec 07 17:35:37 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2005/09/28 20:52:18 rillig Exp $
+# $NetBSD: Makefile,v 1.20 2005/12/07 17:35:37 joerg Exp $
 #
 
 DISTNAME=      rioutil-1.4.7
@@ -16,6 +16,7 @@
 ONLY_FOR_PLATFORM=     Darwin-*-* Linux-*-* NetBSD-1.6*-* NetBSD-[2-9]*-*
 # depends on -r1.6 of sys/dev/usb/urio.c
 ONLY_FOR_PLATFORM+=    NetBSD-1.5Z-* NetBSD-1.5Z[A-Z]-*
+ONLY_FOR_PLATFORM+=    DragonFly-*-* FreeBSD-*-* OpenBSD-*-*
 
 .include "../../audio/id3lib/buildlink3.mk"
 .include "../../devel/libusb/buildlink3.mk"
diff -r bdd56deae119 -r ed8ec5a00078 audio/rioutil/distinfo
--- a/audio/rioutil/distinfo    Wed Dec 07 17:01:22 2005 +0000
+++ b/audio/rioutil/distinfo    Wed Dec 07 17:35:37 2005 +0000
@@ -1,5 +1,11 @@
-$NetBSD: distinfo,v 1.8 2005/02/23 20:39:51 agc Exp $
+$NetBSD: distinfo,v 1.9 2005/12/07 17:35:37 joerg Exp $
 
 SHA1 (rioutil-1.4.7.tar.gz) = 956a75ce2f23fa0dfd62a4c1facbd1994b88cde6
 RMD160 (rioutil-1.4.7.tar.gz) = 8578338b2b77d3cc9477bc92a6bb8c28b4cf434e
 Size (rioutil-1.4.7.tar.gz) = 406844 bytes
+SHA1 (patch-aa) = 6932aee6f2fe76209e65d90e5dd5afb61bb5428b
+SHA1 (patch-ab) = 903135b95b821af8b056805f46e801ef37236e1e
+SHA1 (patch-ac) = 21c13d418b10c173e893365a10de40b4b1f5cc16
+SHA1 (patch-ad) = 3f92420ad40f48953ed3b313dc9452e6d31c9533
+SHA1 (patch-ae) = e803dca42db9f6ebf7af436d722646a223ed0b7b
+SHA1 (patch-af) = 1fc20cbf82272fbdc44f6dd909f64347d9927ea4
diff -r bdd56deae119 -r ed8ec5a00078 audio/rioutil/patches/patch-aa
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/audio/rioutil/patches/patch-aa    Wed Dec 07 17:35:37 2005 +0000
@@ -0,0 +1,18 @@
+$NetBSD: patch-aa,v 1.3 2005/12/07 17:35:37 joerg Exp $
+
+--- src/main.c.orig    2005-12-07 17:12:51.000000000 +0000
++++ src/main.c
+@@ -893,10 +893,10 @@ void usage(void){
+   printf("  -d, --delete=<int>     delete a track(s)\n\n");
+ 
+   printf(" options:\n");
+-#if !defined(__FreeBSD__) || !defined(__NetBSD__)
+-  printf("  -o, --device=<int>     minor number of rio (assigned by driver), /dev/usb/rio?\n");
+-#else
++#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
+   printf("  -o, --device=<int>     minor number of rio (assigned by driver), /dev/urio?\n");
++#else
++  printf("  -o, --device=<int>     minor number of rio (assigned by driver), /dev/usb/rio?\n");
+ #endif
+   printf("  -k, --nocolor          supress ansi color\n");
+   printf("  -m, --memory=<int>     memory unit to upload/download/delete/format to/from\n");
diff -r bdd56deae119 -r ed8ec5a00078 audio/rioutil/patches/patch-ab
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/audio/rioutil/patches/patch-ab    Wed Dec 07 17:35:37 2005 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.1 2005/12/07 17:35:37 joerg Exp $
+
+--- linux_driver/rio_usb.h.orig        2005-12-07 17:17:16.000000000 +0000
++++ linux_driver/rio_usb.h
+@@ -59,7 +59,7 @@ struct RioCommand {
+       int timeout;
+ };
+ 
+-#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
++#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
+ #define RIO_SEND_COMMAND       _IOWR('U', 200, struct RioCommand)
+ #define RIO_RECV_COMMAND       _IOWR('U', 201, struct RioCommand)
+ #else
diff -r bdd56deae119 -r ed8ec5a00078 audio/rioutil/patches/patch-ac
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/audio/rioutil/patches/patch-ac    Wed Dec 07 17:35:37 2005 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.1 2005/12/07 17:35:37 joerg Exp $
+
+--- librioutil/driver_standard.c.orig  2005-12-07 17:14:39.000000000 +0000
++++ librioutil/driver_standard.c
+@@ -33,7 +33,7 @@
+ #ifdef linux
+ #include <linux/usb.h>
+ #define RIODEVICE  "/dev/usb/rio"
+-#elif defined(__FreeBSD__)
++#elif defined(__FreeBSD__) || defined(__DragonFly__)
+ #define RIODEVICE "/dev/urio"
+ #elif defined(__NetBSD__)
+ #define RIODEVICE "/dev/urio"
diff -r bdd56deae119 -r ed8ec5a00078 audio/rioutil/patches/patch-ad
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/audio/rioutil/patches/patch-ad    Wed Dec 07 17:35:37 2005 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.1 2005/12/07 17:35:37 joerg Exp $
+
+--- include/rio_usb.h.orig     2005-12-07 17:15:13.000000000 +0000
++++ include/rio_usb.h
+@@ -54,7 +54,7 @@ struct RioCommand {
+       int timeout;
+ };
+ 
+-#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
++#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
+ #define RIO_SEND_COMMAND       _IOWR('U', 200, struct RioCommand)
+ #define RIO_RECV_COMMAND       _IOWR('U', 201, struct RioCommand)
+ #else
diff -r bdd56deae119 -r ed8ec5a00078 audio/rioutil/patches/patch-ae
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/audio/rioutil/patches/patch-ae    Wed Dec 07 17:35:37 2005 +0000
@@ -0,0 +1,23 @@
+$NetBSD: patch-ae,v 1.1 2005/12/07 17:35:37 joerg Exp $
+
+--- include/rio_internal.h.orig        2005-12-07 17:15:27.000000000 +0000
++++ include/rio_internal.h
+@@ -567,7 +567,7 @@ unsigned int crc32_rio (unsigned char *,
+ 
+ #if defined (__FreeBSD__) || defined(__MacOSX__)
+ u_int32_t bswap_32(u_int32_t);
+-#elif defined (__NetBSD__)
++#elif defined (__NetBSD__) || defined(__DragonFly__)
+ #define bswap_32(x) bswap32(x)
+ #endif
+ 
+@@ -585,6 +585,9 @@ char *basename(char *x);
+ 
+ #include <machine/endian.h>
+ 
++#elif defined(__DragonFly__)
++#include <sys/endian.h>
++
+ #else
+ 
+ #include <sys/endian.h>
diff -r bdd56deae119 -r ed8ec5a00078 audio/rioutil/patches/patch-af
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/audio/rioutil/patches/patch-af    Wed Dec 07 17:35:37 2005 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-af,v 1.1 2005/12/07 17:35:37 joerg Exp $
+
+--- librioutil/cksum.c.orig    2005-12-07 17:21:36.000000000 +0000
++++ librioutil/cksum.c
+@@ -29,6 +29,8 @@
+ #ifdef linux
+ #include <byteswap.h>
+ #include <endian.h>
++#elif defined(__DragonFly__)
++#include <sys/endian.h>
+ #elif defined(__FreeBSD__) || defined(__MacOSX__)
+ #include <machine/endian.h>
+ #else