[pkgsrc/trunk]: pkgsrc/audio/xmms-meta-csound Make xmms-meta-csound work with...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/f160a6620939
branches:  trunk
changeset: 465536:f160a6620939
user:      ben <ben%pkgsrc.org@localhost>
date:      Thu Jan 01 14:03:08 2004 +0000

description:
Make xmms-meta-csound work with csound-bath as well as csound-dev.

diffstat:

 audio/xmms-meta-csound/Makefile        |   6 +++---
 audio/xmms-meta-csound/files/csound.sh |  22 +++++++++++++++++-----
 2 files changed, 20 insertions(+), 8 deletions(-)

diffs (57 lines):

diff -r 4a7b6cb8721c -r f160a6620939 audio/xmms-meta-csound/Makefile
--- a/audio/xmms-meta-csound/Makefile   Thu Jan 01 12:34:20 2004 +0000
+++ b/audio/xmms-meta-csound/Makefile   Thu Jan 01 14:03:08 2004 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2003/12/24 09:53:48 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2004/01/01 14:03:08 ben Exp $
 #
 
-DISTNAME=              xmms-meta-csound-0.1
+DISTNAME=              xmms-meta-csound-0.2
 WRKSRC=                        ${WRKDIR}
 CATEGORIES=            audio
 MASTER_SITES=          # empty
@@ -11,7 +11,7 @@
 HOMEPAGE=              # empty
 COMMENT=               XMMS meta input script for csound
 
-DEPENDS+=              csound-dev-[0-9]*:../../audio/csound-dev
+DEPENDS+=              csound-[bd]*-[0-9]*:../../audio/csound-dev
 DEPENDS+=              sox-[0-9]*:../../audio/sox
 
 USE_BUILDLINK2=                yes
diff -r 4a7b6cb8721c -r f160a6620939 audio/xmms-meta-csound/files/csound.sh
--- a/audio/xmms-meta-csound/files/csound.sh    Thu Jan 01 12:34:20 2004 +0000
+++ b/audio/xmms-meta-csound/files/csound.sh    Thu Jan 01 14:03:08 2004 +0000
@@ -27,14 +27,26 @@
                fi
                exit 1
        fi
+       if [ -f XXXPREFIXXXX/bin/csound32 ]
+       then
+               player=XXXPREFIXXXX/bin/csound32
+       fi
+       if [ -f XXXPREFIXXXX/bin/csound ]
+       then
+               player=XXXPREFIXXXX/bin/csound
+       fi
+       if [ -z "$player" ]
+       then
+               echo "Could not find csound."
+               exit 1
+       fi
        if [ $channels -eq 1 ]
        then
-               XXXPREFIXXXX/bin/csound32 -d -ostdout -h -s -r 44100 -k 4410 \
-                       "$i" 2>/dev/null | XXXPREFIXXXX/bin/sox -t raw \
-                       -r 44100 -s -w -c 1 - -t raw -r 44100 -s -w -c 2 -
+               $player -d -ostdout -h -s -r 44100 -k 4410 "$i" 2>/dev/null |\
+                       XXXPREFIXXXX/bin/sox -t raw -r 44100 -s -w -c 1 - \
+                               -t raw -r 44100 -s -w -c 2 -
        else
-               XXXPREFIXXXX/bin/csound32 -d -ostdout -h -s -r 44100 -k 4410 \
-                       "$i" 2>/dev/null
+               $player -d -ostdout -h -s -r 44100 -k 4410 "$i" 2>/dev/null
        fi
        if [ ! -z "$tempfile" ]
        then