diff options
| author | joerg <joerg@pkgsrc.org> | 2005-12-12 15:03:45 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2005-12-12 15:03:45 +0000 |
| commit | ea77ed85e55f7103d0181f76a3e8b1e97fe82c5b (patch) | |
| tree | ff937e569fbf2264e138a875fdf761d8bab6f5a2 /audio/musicbox | |
| parent | 32c8dc50e27fcac5eecb4852cedc04c76a952715 (diff) | |
| download | pkgsrc-ea77ed85e55f7103d0181f76a3e8b1e97fe82c5b.tar.gz | |
Fix ossaudio usage. Add DragonFly support.
Diffstat (limited to 'audio/musicbox')
| -rw-r--r-- | audio/musicbox/Makefile | 3 | ||||
| -rw-r--r-- | audio/musicbox/distinfo | 6 | ||||
| -rw-r--r-- | audio/musicbox/patches/patch-aa | 4 | ||||
| -rw-r--r-- | audio/musicbox/patches/patch-ab | 15 |
4 files changed, 18 insertions, 10 deletions
diff --git a/audio/musicbox/Makefile b/audio/musicbox/Makefile index c8c1c5963ff..5767e6fcd71 100644 --- a/audio/musicbox/Makefile +++ b/audio/musicbox/Makefile @@ -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 @@ do-install: ${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 --git a/audio/musicbox/distinfo b/audio/musicbox/distinfo index 81d55e4066c..f9c6e6f1e5d 100644 --- a/audio/musicbox/distinfo +++ b/audio/musicbox/distinfo @@ -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 --git a/audio/musicbox/patches/patch-aa b/audio/musicbox/patches/patch-aa index 5445c408e65..3a84af5f812 100644 --- a/audio/musicbox/patches/patch-aa +++ b/audio/musicbox/patches/patch-aa @@ -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 @@ $NetBSD: patch-aa,v 1.7 2004/11/02 13:27:45 wiz Exp $ 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 --git a/audio/musicbox/patches/patch-ab b/audio/musicbox/patches/patch-ab index 2755dc176ce..4edb1ac38f0 100644 --- a/audio/musicbox/patches/patch-ab +++ b/audio/musicbox/patches/patch-ab @@ -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 |