[pkgsrc/trunk]: pkgsrc/audio/musicbox Fix ossaudio usage. Add DragonFly support.

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/41d835f4636f
branches:  trunk
changeset: 504510:41d835f4636f
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Mon Dec 12 15:03:45 2005 +0000

description:
Fix ossaudio usage. Add DragonFly support.

diffstat:

 audio/musicbox/Makefile         |   3 ++-
 audio/musicbox/distinfo         |   6 +++---
 audio/musicbox/patches/patch-aa |   4 ++--
 audio/musicbox/patches/patch-ab |  15 +++++++++++----
 4 files changed, 18 insertions(+), 10 deletions(-)

diffs (73 lines):

diff -r 3059892fc1dd -r 41d835f4636f audio/musicbox/Makefile
--- a/audio/musicbox/Makefile   Mon Dec 12 14:56:07 2005 +0000
+++ b/audio/musicbox/Makefile   Mon Dec 12 15:03:45 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2005/12/05 20:49:49 rillig Exp $
+# $NetBSD: Makefile,v 1.21 2005/12/12 15:03:45 joerg Exp $
 
 DISTNAME=      musicbox-1.01p2
 CATEGORIES=    audio
@@ -22,4 +22,5 @@
        ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/musicbox/README
 
 .include "../../x11/qt1/buildlink3.mk"
+.include "../../mk/ossaudio.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 3059892fc1dd -r 41d835f4636f audio/musicbox/distinfo
--- a/audio/musicbox/distinfo   Mon Dec 12 14:56:07 2005 +0000
+++ b/audio/musicbox/distinfo   Mon Dec 12 15:03:45 2005 +0000
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.8 2005/02/23 20:39:49 agc Exp $
+$NetBSD: distinfo,v 1.9 2005/12/12 15:03:45 joerg Exp $
 
 SHA1 (musicbox-1.01p2.tgz) = 7dd8b192349783746918b0d3074bec11f3aaf9d8
 RMD160 (musicbox-1.01p2.tgz) = d203bc9ef749ad425785ce5bf667fc204dccdebd
 Size (musicbox-1.01p2.tgz) = 44119 bytes
-SHA1 (patch-aa) = 8cd4a1224d6ca6a5f0367d34cc3a7e13d832f0c7
-SHA1 (patch-ab) = a59f798aebc8df7b61cfb3036add624c385a3884
+SHA1 (patch-aa) = f1d397ac8e83a8fd9a2da17a088c545cff1b458a
+SHA1 (patch-ab) = 7ec8774288810e824d65a910bb2794c107b5eff7
 SHA1 (patch-ac) = 3341b7bb5f265f5df000e3593a2a0493d32edec1
 SHA1 (patch-ad) = 890faa63701b85766320cf654d1d858c03227a41
 SHA1 (patch-ae) = c8c6c17dad38c705eba931f11cbbb1a515def9f0
diff -r 3059892fc1dd -r 41d835f4636f audio/musicbox/patches/patch-aa
--- a/audio/musicbox/patches/patch-aa   Mon Dec 12 14:56:07 2005 +0000
+++ b/audio/musicbox/patches/patch-aa   Mon Dec 12 15:03:45 2005 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.7 2004/11/02 13:27:45 wiz Exp $
+$NetBSD: patch-aa,v 1.8 2005/12/12 15:03:45 joerg Exp $
 
 --- Makefile.orig      1997-11-12 20:01:58.000000000 +0100
 +++ Makefile
@@ -32,7 +32,7 @@
  
  all:  ${ALL}
 -      ${GCC} ${ALL} -o ${PKG} -L${LIB} -I${INC} -lqt
-+      ${GCC} ${ALL} -o ${PKG} ${LIB}  -lqt -lX11 -lXext -lossaudio
++      ${GCC} ${ALL} -o ${PKG} ${LIB}  -lqt -lX11 -lXext ${LIBOSSAUDIO}
  
 -player.o:
 -      ${GCC} -c player.cpp -o player.o ${CFLAGS} -L${LIB} -I${INC}
diff -r 3059892fc1dd -r 41d835f4636f audio/musicbox/patches/patch-ab
--- a/audio/musicbox/patches/patch-ab   Mon Dec 12 14:56:07 2005 +0000
+++ b/audio/musicbox/patches/patch-ab   Mon Dec 12 15:03:45 2005 +0000
@@ -1,8 +1,15 @@
-$NetBSD: patch-ab,v 1.2 1999/06/10 08:42:43 tron Exp $
+$NetBSD: patch-ab,v 1.3 2005/12/12 15:03:45 joerg Exp $
 
---- ListView.h.orig    Fri Feb 12 07:13:07 1999
-+++ ListView.h Fri Feb 12 07:34:19 1999
-@@ -18,6 +18,10 @@
+--- ListView.h.orig    1997-11-16 13:56:31.000000000 +0000
++++ ListView.h
+@@ -12,12 +12,16 @@
+ #include <qdialog.h>
+ #include "MultiListBox.h"
+ 
+-#ifdef FreeBSD
++#if defined(FreeBSD) || defined(__DragonFly__)
+ #include <machine/soundcard.h>
+ #endif
  #ifdef Linux
  #include <sys/soundcard.h>
  #endif