[pkgsrc/trunk]: pkgsrc/audio/mad123 Add DragonFly support. Make the options m...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/2e81a1aade54
branches:  trunk
changeset: 502957:2e81a1aade54
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Fri Nov 11 18:58:18 2005 +0000

description:
Add DragonFly support. Make the options more useful by allowing full
selection of output. This adds oss and sun. By default, oss and sun
are now active on all platforms, but DraognFly. Bump the revision
to annotate that.

diffstat:

 audio/mad123/Makefile         |  16 ++++++++++++++--
 audio/mad123/distinfo         |   5 ++++-
 audio/mad123/patches/patch-aa |  12 ++++++++++++
 audio/mad123/patches/patch-ab |  28 ++++++++++++++++++++++++++++
 audio/mad123/patches/patch-ac |  40 ++++++++++++++++++++++++++++++++++++++++
 5 files changed, 98 insertions(+), 3 deletions(-)

diffs (149 lines):

diff -r ecfd5588ea19 -r 2e81a1aade54 audio/mad123/Makefile
--- a/audio/mad123/Makefile     Fri Nov 11 18:50:23 2005 +0000
+++ b/audio/mad123/Makefile     Fri Nov 11 18:58:18 2005 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.15 2005/06/16 06:57:39 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2005/11/11 18:58:18 joerg Exp $
 #
 
 DISTNAME=      mad123-0.8.5
+PKGREVISION=   1
 CATEGORIES=    audio
 MASTER_SITES=  http://www.mctavish.co.uk/mad123/
 
@@ -9,8 +10,14 @@
 HOMEPAGE=      http://www.mctavish.co.uk/mad123/
 COMMENT=       Command-line MPEG audio player
 
+.include "../../mk/bsd.prefs.mk"
+
 PKG_OPTIONS_VAR=       PKG_OPTIONS.mad123
-PKG_SUPPORTED_OPTIONS= arts oss
+PKG_SUPPORTED_OPTIONS= arts oss sun
+PKG_DEFAULT_OPTIONS+=  oss
+.if ${OPSYS} != "DragonFly"
+PKG_DEFAULT_OPTIONS+=  sun
+.endif
 
 .include "../../mk/bsd.options.mk"
 
@@ -20,9 +27,14 @@
 .endif
 
 .if !empty(PKG_OPTIONS:Moss)
+MAKE_FLAGS+=   USE_OSS=yes
 .  include "../../mk/ossaudio.buildlink3.mk"
 .endif
 
+.if !empty(PKG_OPTIONS:Msun)
+MAKE_FLAGS+=   USE_SUN=yes
+.endif
+
 INSTALLATION_DIRS=     bin man/man1
 
 do-install:
diff -r ecfd5588ea19 -r 2e81a1aade54 audio/mad123/distinfo
--- a/audio/mad123/distinfo     Fri Nov 11 18:50:23 2005 +0000
+++ b/audio/mad123/distinfo     Fri Nov 11 18:58:18 2005 +0000
@@ -1,5 +1,8 @@
-$NetBSD: distinfo,v 1.5 2005/02/23 20:39:48 agc Exp $
+$NetBSD: distinfo,v 1.6 2005/11/11 18:58:18 joerg Exp $
 
 SHA1 (mad123-0.8.5.tar.gz) = 97c5d6185a54e2262d52a687ff3a3714ff260af8
 RMD160 (mad123-0.8.5.tar.gz) = bd2bf0b79a3c9d3513583daccdfc182a2d17cc41
 Size (mad123-0.8.5.tar.gz) = 24836 bytes
+SHA1 (patch-aa) = 16aecc1f75178cb62bca7d5012cea4dffe393f9c
+SHA1 (patch-ab) = eea40969ca88bd65666aada085742a3bdd5d9eba
+SHA1 (patch-ac) = 7c150b2f15cbc00876c8619b80ee29c73b0b71df
diff -r ecfd5588ea19 -r 2e81a1aade54 audio/mad123/patches/patch-aa
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/audio/mad123/patches/patch-aa     Fri Nov 11 18:58:18 2005 +0000
@@ -0,0 +1,12 @@
+$NetBSD: patch-aa,v 1.1 2005/11/11 18:58:18 joerg Exp $
+
+--- mad123.c.orig      2005-11-11 18:19:59.000000000 +0000
++++ mad123.c
+@@ -20,6 +20,7 @@
+ */
+ 
+ #include <sys/types.h>
++#include <sys/stat.h>
+ #include <sys/time.h>
+ #include <sys/resource.h>
+ #include <sys/poll.h>
diff -r ecfd5588ea19 -r 2e81a1aade54 audio/mad123/patches/patch-ab
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/audio/mad123/patches/patch-ab     Fri Nov 11 18:58:18 2005 +0000
@@ -0,0 +1,28 @@
+$NetBSD: patch-ab,v 1.1 2005/11/11 18:58:18 joerg Exp $
+
+--- audio_dev.c.orig   2004-09-22 09:23:43.000000000 +0000
++++ audio_dev.c
+@@ -43,6 +43,10 @@
+ #undef WORDS_BIGENDIAN
+ #endif
+ 
++#ifdef __DragonFly__
++typedef unsigned int nfds_t;
++#endif
++
+ #define PCM_BUFFSIZE  ((sizeof(((struct mad_pcm *)0)->samples) / \
+                           sizeof(mad_fixed_t)) * 2)
+ struct pcm_data {
+@@ -97,8 +101,12 @@ static void        audio_convert_dither(unsigne
+ 
+ 
+ static const struct audio_dev_backend *audio_dev_backends[] = {
++#ifndef NOSUN
+       &audio_dev_sun,
++#endif
++#ifndef NOOSS
+       &audio_dev_pcm,
++#endif
+ #ifndef NOARTS
+       &audio_dev_arts,
+ #endif
diff -r ecfd5588ea19 -r 2e81a1aade54 audio/mad123/patches/patch-ac
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/audio/mad123/patches/patch-ac     Fri Nov 11 18:58:18 2005 +0000
@@ -0,0 +1,40 @@
+$NetBSD: patch-ac,v 1.1 2005/11/11 18:58:18 joerg Exp $
+
+--- Makefile.orig      2004-10-21 13:03:25.000000000 +0000
++++ Makefile
+@@ -19,7 +19,6 @@
+ 
+ PROG= mad123
+ SRCS= mad123.c mp3_stream.c audio_dev.c
+-SRCS+=        audio_dev_sun.c audio_dev_pcm.c
+ 
+ BINDIR?=/usr/local/bin
+ 
+@@ -29,6 +28,8 @@ USE_CURL?=yes
+ USE_TAGLIB?=yes
+ USE_ID3LIB?=no
+ USE_ARTS?=no
++USE_SUN?=no
++USE_OSS?=no
+ 
+ .if ${USE_CURL} != "no"
+ CURLLIB= -lcurl
+@@ -50,6 +51,18 @@ CPPFLAGS+= -DNOID3LIB
+ .endif
+ .endif        # USE_TAGLIB
+ 
++.if ${USE_SUN} != "no"
++SRCS += audio_dev_sun.c
++.else
++CPPFLAGS+= -DNOSUN
++.endif
++
++.if ${USE_OSS} != "no"
++SRCS+= audio_dev_pcm.c
++.else
++CPPFLAGS+= -DNOOSS
++.endif
++
+ .if ${USE_ARTS} != "no"
+ ARTSLIB= -lartsc
+ SRCS+=        audio_dev_arts.c