Initial import of csound-bath, supplied by Ben Collver in pkg/11758.

Similar to csound, but the 'original' bath version.

17 files changed, 446 insertions, 0 deletions

diff --git a/audio/csound-bath/Makefile b/audio/csound-bath/Makefile
new file mode 100644
index 00000000000..bac45aaf7b3
--- /dev/null
+++ b/audio/csound-bath/Makefile
@@ -0,0 +1,34 @@
+# $NetBSD: Makefile,v 1.1.1.1 2001/04/27 17:17:16 wiz Exp $
+#
+
+DISTNAME=		Csound4.12
+PKGNAME=		csound-bath-4.12
+NO_WRKSUBDIR=		yes
+CATEGORIES=		audio
+MASTER_SITES=		ftp://ftp.maths.bath.ac.uk/pub/dream/newest/
+
+MAINTAINER=		collver@softhome.net
+HOMEPAGE=		http://www.csound.org
+COMMENT=		software synthesizer and sequencer
+
+LICENSE=		csound-license
+NO_SRC_ON_CDROM=	"no for-fee-redistribution"
+NO_BIN_ON_CDROM=	${NO_SRC_ON_CDROM}
+
+DIST_SUBDIR=		csound
+MAKE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
+			LDFLAGS="-L${LOCALBASE}/lib"
+CONFLICTS=		csound-4*
+
+#pre-build:
+#	${CHMOD} -R 644 ${WRKDIR}
+
+#do-install:
+#	${INSTALL_DATA_DIR} ${PREFIX}/share/csound
+#	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/csound
+#	${INSTALL_DATA} ${WRKSRC}/csound.txt ${PREFIX}/share/csound/
+#	for i in `${FIND} ${WRKDIR} -type f -perm 755`; do \
+#		${INSTALL_PROGRAM} $${i} ${PREFIX}/bin ; \
+#	done
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/audio/csound-bath/distinfo b/audio/csound-bath/distinfo
new file mode 100644
index 00000000000..d25c0ec67f2
--- /dev/null
+++ b/audio/csound-bath/distinfo
@@ -0,0 +1,17 @@
+$NetBSD: distinfo,v 1.1.1.1 2001/04/27 17:17:16 wiz Exp $
+
+SHA1 (csound/Csound4.12.tar.gz) = 5f8b6d70c5373f95f69689c724e124457f7a9f7d
+Size (csound/Csound4.12.tar.gz) = 893317 bytes
+SHA1 (patch-aa) = 336b2fc76c21993817c190e8b708eaa61321d697
+SHA1 (patch-ab) = 144e538a12127d6ea5c29fe0e64771164d17346c
+SHA1 (patch-ad) = a09ad93b20b367d74e441736dfe267a9f4e30df5
+SHA1 (patch-ae) = 68689eea46c27ff27c0bac9cb341d22567a735a7
+SHA1 (patch-af) = c298bf79b7d81d986c0e88b1c3349c9ce83bc034
+SHA1 (patch-ag) = ad644879744664669cb1316be0851463e93af3de
+SHA1 (patch-ai) = df656bd83fb107caa4f7d6de97a8ede0f68d4610
+SHA1 (patch-aj) = cd6796b3fc7016b815632336b32831b37b6cb678
+SHA1 (patch-ak) = af233b89afa2b9b4ba2473dc8f33472e9a630ca2
+SHA1 (patch-al) = b4e8ec2ba935e205bd28aa7ffdfe4d0def7dc4dc
+SHA1 (patch-am) = f925c70452402bf90f63b953fa1b6ef02480d912
+SHA1 (patch-an) = c0d2052fef1eb16a88c14e3c7cc6471b9a15dcf8
+SHA1 (patch-ao) = f8e2d2ea177d0f5fa97aa3a04e0775dcc50b179d
diff --git a/audio/csound-bath/patches/patch-aa b/audio/csound-bath/patches/patch-aa
new file mode 100644
index 00000000000..c45bfe1c06e
--- /dev/null
+++ b/audio/csound-bath/patches/patch-aa
@@ -0,0 +1,83 @@
+$NetBSD: patch-aa,v 1.1.1.1 2001/04/27 17:17:17 wiz Exp $
+
+--- Makefile.orig	Sun Mar 25 18:53:17 2001
++++ Makefile
+@@ -1,11 +1,11 @@
+ #								Csound Makefile
+ # edit the following definitions according to need:
+ 
+-INCLUDE	= /usr/local/include
+-LIB	= /usr/local/lib
+-DEST	= /usr/local/bin
+-SHARE	= /usr/share/csound
+-MAN	= /usr/local/man
++INCLUDE	= $(PREFIX)/include
++LIB	= $(PREFIX)/lib
++DEST	= $(PREFIX)/bin
++SHARE	= $(PREFIX)/share/csound
++MAN	= $(PREFIX)/man
+ MAN1	= $(MAN)/man1
+ CAT1	= $(MAN)/cat1
+ # these directories must exist for stages beyond 'make csound'
+@@ -24,7 +24,7 @@
+ #	.c.o:
+ #		$(CC) $(CFLAGS) -c $*.c -o $@
+ 
+-DEFINES = -DWINDOWS -DRTAUDIO -DSFIRCAM -DSYS5 -DLINUX -DPIPES -DMACROS -DTCLTK
++DEFINES = -DRTAUDIO -DSFIRCAM -DSYS5 -DLINUX -DPIPES -DMACROS -DBSD -DPREFIX=\"$(PREFIX)\"
+ # choose any of -
+ #	-DSYS5	    invoke System 5 headers (e.g. 'string.h' for 'strings.h')
+ #	-DWINDOWS   include window system calls (X11, SGI, or FG graphics)
+@@ -52,7 +52,7 @@
+ # Be sure to include 'LINUXaudio.o' under 'AUDOBJ' below as well.
+ #                                  --  Jonathan Mohr  1995 Oct 17
+ 
+-CFLAGS = -O2 $(RPM_OPT_FLAGS) $(DEFINES)
++CFLAGS = $(RPM_OPT_FLAGS) $(DEFINES)
+ #	-O		Simple optimisation
+ #	-O2		to be more specific about the optimization level
+ #	-f		compile single-precision floats (4.3,VAX,DEC-RISC)
+@@ -73,7 +73,7 @@
+ #	-I/usr/openwin/include		Solaris openwin interface
+ #	-I/usr/demo/SOUND/include	Solaris sound interface
+ 
+-LIBS =	-L /usr/X11R6/lib -lX11 -lbsd -ltcl -ltk -lm 
++LIBS =	$(LDFLAGS) -lossaudio -lm 
+ #	-lefence
+ #	-lm		    		required
+ #	-lX11				for X window calls
+@@ -90,8 +90,8 @@
+ #	-L/usr/demo/SOUND/lib		on Solaris 2.4
+ #	-L/usr/X11R6/li			on LINUX
+ 
+-WINSRC = winX11.c
+-WINOBJ = winX11.o
++WINSRC =
++WINOBJ =
+ # ;if WINDOWS enabled in DEFINES, choose one of -
+ #	winX11.o	for X11 window graphics
+ #	winSGI.o	for SGI window graphics
+@@ -335,15 +335,15 @@
+ 		cd midifils; rm -f *.bak *~
+ 		cd cscofils; rm -f *.bak *~
+ 
+-CSLinux.bin.tgz: /usr/local/bin/csound /usr/local/bin/hetro \
+-	/usr/local/bin/lpanal /usr/local/bin/pvanal /usr/local/bin/scot \
+-	/usr/local/bin/scsort /usr/local/bin/extract /usr/local/bin/sndinfo \
+-	/usr/local/bin/scale /usr/local/bin/mixer /usr/local/bin/extractor \
+-	/usr/local/bin/envext /usr/local/bin/pvlook /usr/local/bin/sdif2ad \
+-	/usr/local/bin/dnoise /usr/local/bin/srconv /usr/local/lib/csound.txt
+-	(cd /usr/local/bin; tar cvzf ~/csound/CSLinux.bin.tgz csound \
++CSNetBSD.bin.tgz: $(PREFIX)/bin/csound $(PREFIX)/bin/hetro \
++	$(PREFIX)/bin/lpanal $(PREFIX)/bin/pvanal $(PREFIX)/bin/scot \
++	$(PREFIX)/bin/scsort $(PREFIX)/bin/extract $(PREFIX)/bin/sndinfo \
++	$(PREFIX)/bin/scale $(PREFIX)/bin/mixer $(PREFIX)/bin/extractor \
++	$(PREFIX)/bin/envext $(PREFIX)/bin/pvlook $(PREFIX)/bin/sdif2ad \
++	$(PREFIX)/bin/dnoise $(PREFIX)/bin/srconv $(PREFIX)/lib/csound.txt
++	(cd $(PREFIX)/bin; tar cvzf ~/csound/CSLinux.bin.tgz csound \
+ 	hetro lpanal pvanal scot scsort extract sndinfo scale mixer \
+-	extractor envext pvlook sdif2ad dnoise srconv -C /usr/local/lib csound.txt)
++	extractor envext pvlook sdif2ad dnoise srconv -C $(PREFIX)/lib csound.txt)
+ 
+ Csound.tar.gz:  all_files \
+ 	$(CSRCS) $(HDRS) \
diff --git a/audio/csound-bath/patches/patch-ab b/audio/csound-bath/patches/patch-ab
new file mode 100644
index 00000000000..9e1463ada83
--- /dev/null
+++ b/audio/csound-bath/patches/patch-ab
@@ -0,0 +1,23 @@
+$NetBSD: patch-ab,v 1.1.1.1 2001/04/27 17:17:17 wiz Exp $
+
+--- getstring.c.orig	Sat May 13 08:52:27 2000
++++ getstring.c	Thu Apr  5 14:12:02 2001
+@@ -99,14 +99,14 @@
+       db = fopen(name, "rb");
+     }
+     if (db == NULL) {
+-      strcpy(name, "/usr/local/lib/csound.txt");
+-      db = fopen("/usr/local/lib/csound.txt", "rb");
++      sprintf(name, "%s/share/csound/csound.txt", PREFIX);
++      db = fopen(name, "rb");
+     }
+     if (db == NULL) {
+       fprintf(stderr, "failed to find Strings DataBase file.\n"
+               "Use the CSSTRNGS environment variable or you must put the \n"
+-              "file \"csound.txt\" in your local, SFDIR, SADIR, SSDIR or \n"
+-              "system directories for csound to work\n");
++              "file \"csound.txt\" in your %s/share/csound, SFDIR, SADIR, SSDIR or \n"
++              "system directories for csound to work\n", PREFIX);
+       exit(1);
+     }
+     err_printf("Using %s\n", name);
diff --git a/audio/csound-bath/patches/patch-ad b/audio/csound-bath/patches/patch-ad
new file mode 100644
index 00000000000..3271495484c
--- /dev/null
+++ b/audio/csound-bath/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.1.1.1 2001/04/27 17:17:17 wiz Exp $
+
+--- midirecv.c.orig	Sun Mar 25 05:42:24 2001
++++ midirecv.c	Thu Apr  5 13:39:35 2001
+@@ -3,6 +3,8 @@
+ #include "midiops.h"
+ #include "oload.h"
+ 
++#include <sys/ioctl_compat.h>
++
+ #ifdef SGI
+ /************************************/
+ /* obsolete SGI code                */
diff --git a/audio/csound-bath/patches/patch-ae b/audio/csound-bath/patches/patch-ae
new file mode 100644
index 00000000000..9cb86c77e30
--- /dev/null
+++ b/audio/csound-bath/patches/patch-ae
@@ -0,0 +1,17 @@
+$NetBSD: patch-ae,v 1.1.1.1 2001/04/27 17:17:17 wiz Exp $
+
+--- midisend.c.orig	Sun Oct 15 13:29:23 2000
++++ midisend.c	Sat Dec 16 21:52:52 2000
+@@ -16,8 +16,10 @@
+ #include <ctype.h>
+ #include <sys/ioctl.h>
+ #include <fcntl.h>
+-#ifdef FREE_BSD
+-#  include <sys/soundcard.h>
++#ifdef BSD
++#  include <soundcard.h>
++#define SEQ_DEFINEBUF(x); /*SEQ_DEFINEBUF(x)*/
++#define SEQ_MIDIOUT(x,y); /*SEQ_MIDIOUT(x,y)*/
+ #else
+ #  include <linux/soundcard.h>
+ #endif
diff --git a/audio/csound-bath/patches/patch-af b/audio/csound-bath/patches/patch-af
new file mode 100644
index 00000000000..3906fb89660
--- /dev/null
+++ b/audio/csound-bath/patches/patch-af
@@ -0,0 +1,16 @@
+$NetBSD: patch-af,v 1.1.1.1 2001/04/27 17:17:17 wiz Exp $
+
+--- LINUXaudio.c.orig	Sat Dec 16 21:44:39 2000
++++ LINUXaudio.c	Sat Dec 16 21:46:10 2000
+@@ -21,7 +21,11 @@
+ 
+ #include <unistd.h>
+ #include <sys/ioctl.h>
++#ifdef BSD
++#include <soundcard.h>
++#else
+ #include <sys/soundcard.h>
++#endif
+ #include "cs.h"
+ #include "soundio.h"
+ 
diff --git a/audio/csound-bath/patches/patch-ag b/audio/csound-bath/patches/patch-ag
new file mode 100644
index 00000000000..f1b342e51fb
--- /dev/null
+++ b/audio/csound-bath/patches/patch-ag
@@ -0,0 +1,54 @@
+$NetBSD: patch-ag,v 1.1.1.1 2001/04/27 17:17:17 wiz Exp $
+
+--- extract.c.orig	Sat Dec 16 21:46:53 2000
++++ extract.c	Sat Dec 16 21:47:36 2000
+@@ -6,7 +6,7 @@
+ static char    inslst[INSMAX];                 /*   values set by readxfil     */
+ static int     onsect, offsect;                /*      "       "       "       */
+ static MYFLT   onbeat, offbeat;                /*      "       "       "       */
+-static MYFLT   ontime, offtime;                /* set by readxfil, mod by w-stmnt */
++static MYFLT   ontime, cs_offtime;                /* set by readxfil, mod by w-stmnt */
+ 
+ static SRTBLK *frstout, *prvout;        /* links for building new outlist */
+ 
+@@ -56,7 +56,7 @@
+ 		for(ip = &inslst[0]; ip < &inslst[INSMAX]; *ip++ = 1);
+ 	}
+ 	ontime = a0.newp3 = a0.p3val = onbeat;
+-	offtime = f0.newp2 = f0.p2val = offbeat;
++	cs_offtime = f0.newp2 = f0.p2val = offbeat;
+ }
+ 
+ void extract(void)	/* extract instr events within the time period */
+@@ -101,7 +101,7 @@
+         if (sectno == onsect && warped)
+           ontime = a0.newp3 = realt(onbeat);
+         if (sectno == offsect && warped)
+-          offtime = f0.newp2 = realt(offbeat);
++          cs_offtime = f0.newp2 = realt(offbeat);
+         include(bp);
+         break;
+       case 't':
+@@ -110,7 +110,7 @@
+       case 'f':   
+       casef: if (sectno == onsect && bp->newp2 < ontime)
+         bp->newp2 = ontime;
+-      else if (sectno == offsect && bp->newp2 > offtime)
++      else if (sectno == offsect && bp->newp2 > cs_offtime)
+         break;
+       if (sectno == onsect && !a0done) {
+         if (onbeat > 0)
+@@ -137,10 +137,10 @@
+           }
+         }
+         if (sectno == offsect) {
+-          if (bp->newp2 >= offtime)
++          if (bp->newp2 >= cs_offtime)
+             break;
+-          if (turnoff > offtime) {
+-            bp->newp3 = offtime - bp->newp2;
++          if (turnoff > cs_offtime) {
++            bp->newp3 = cs_offtime - bp->newp2;
+             bp->p3val = offbeat - bp->p2val;
+           }
+         }
diff --git a/audio/csound-bath/patches/patch-ai b/audio/csound-bath/patches/patch-ai
new file mode 100644
index 00000000000..2fc9de2b62f
--- /dev/null
+++ b/audio/csound-bath/patches/patch-ai
@@ -0,0 +1,35 @@
+$NetBSD: patch-ai,v 1.1.1.1 2001/04/27 17:17:18 wiz Exp $
+
+--- anal/adsyn/makef.orig	Sun Dec 17 06:18:36 2000
++++ anal/adsyn/makef	Sun Dec 17 06:18:45 2000
+@@ -6,7 +6,7 @@
+ 
+ OBJS =  main.o $T/hetro.o $T/filopen.o $T/sfheader.o $T/soundin.o \
+ 	$T/ulaw.o $T/aiff.o $T/ieee80.o $T/memalloc.o $T/wave.o \
+-	$T/window.o $T/winX11.o $T/winEPS.o $T/aifc.o $T/winascii.o \
++	$T/window.o $T/winEPS.o $T/aifc.o $T/winascii.o \
+         $T/sdif.o $T/sdif-mem.o $T/getstring.o
+ 
+ adsyns:	hetro
+--- anal/lpc/makef.orig	Sun Dec 17 06:19:25 2000
++++ anal/lpc/makef	Sun Dec 17 06:19:40 2000
+@@ -6,7 +6,7 @@
+ 
+ OBJS =   main.o $T/lpanal.o $T/lptrkfns.o $T/filopen.o $T/sfheader.o \
+ 	$T/soundin.o $T/ulaw.o $T/aiff.o $T/wave.o $T/ieee80.o \
+-        $T/memalloc.o $T/window.o $T/winX11.o $T/winascii.o $T/winEPS.o \
++        $T/memalloc.o $T/window.o $T/winascii.o $T/winEPS.o \
+         $T/aifc.o $T/getstring.o
+ 
+ lpcs:		lpanal
+--- anal/pvoc/makef.orig	Sun Dec 17 06:21:30 2000
++++ anal/pvoc/makef	Sun Dec 17 06:21:42 2000
+@@ -6,7 +6,7 @@
+ 
+ OBJS =  main.o $T/pvanal.o $T/filopen.o $T/sfheader.o \
+ 	$T/soundin.o $T/ulaw.o $T/aiff.o $T/wave.o $T/ieee80.o $T/memalloc.o \
+-	$T/pvoc.o $T/fft.o $T/dsputil.o $T/window.o $T/winX11.o $T/winascii.o \
++	$T/pvoc.o $T/fft.o $T/dsputil.o $T/window.o $T/winascii.o \
+ 	$T/winEPS.o $T/aifc.o $T/getstring.o
+ 
+ pvocs:	pvanal
diff --git a/audio/csound-bath/patches/patch-aj b/audio/csound-bath/patches/patch-aj
new file mode 100644
index 00000000000..756667a4f55
--- /dev/null
+++ b/audio/csound-bath/patches/patch-aj
@@ -0,0 +1,26 @@
+$NetBSD: patch-aj,v 1.1.1.1 2001/04/27 17:17:17 wiz Exp $
+
+--- DECplay.c.orig	Thu Apr  5 13:20:06 2001
++++ DECplay.c	Thu Apr  5 13:25:46 2001
+@@ -245,10 +245,11 @@
+     if ((void *)LoFiOpen("/dev/lofi") == NULL)
+ 	{ err_printf(Str(X_211,"Cannot open LoFi\n"));
+ 	  return(0);	}
+-    if ((loddir = getenv("LODDIR")) == NULL)
++    if ((loddir = strdup(getenv("LODDIR"))) == NULL)
+ 	{
+ /*	err_printf("no LODDIR env variable\n");	return(0);	*/
+-	loddir = "/usr/local/lib/lod";	/* give it a go if no env */
++	loddir = malloc(strlen(PREFIX) + 9);
++	sprintf(loddir, "%s/lib/lod", PREFIX);	/* give it a go if no env */
+ 	}
+     /* assume only decaudio supported.  Choose poss sampling rate */
+     if (srate > 26000)        { bootFile = "play44ext.lod"; 
+@@ -259,6 +260,7 @@
+ 			       usPerFrame = 90.703; }
+ 
+     sprintf(bootPath,"%s/%s",loddir,bootFile);
++    free(loddir);
+     err_printf(Str(X_618,"bootfile: %s\n"),bootPath);	/* */
+ 
+     LoFiSetCSR(FED, 0);		/* disable DSP */
diff --git a/audio/csound-bath/patches/patch-ak b/audio/csound-bath/patches/patch-ak
new file mode 100644
index 00000000000..5c62272dec8
--- /dev/null
+++ b/audio/csound-bath/patches/patch-ak
@@ -0,0 +1,28 @@
+$NetBSD: patch-ak,v 1.1.1.1 2001/04/27 17:17:17 wiz Exp $
+
+--- aops.c.orig	Thu Apr  5 13:41:56 2001
++++ aops.c	Thu Apr  5 13:42:30 2001
+@@ -1,8 +1,13 @@
+ #include "cs.h"		/*					AOPS.C	*/
+ #include "aops.h"
+-#include <math.h>

++#include <math.h>
+ #include <time.h>
+ 
++#ifdef LINUX
++#include <sys/time.h>
++#include <unistd.h>
++#endif
++
+ static	double	eipt3=8.3333333, oct;
+ #define	logtwo	(0.693147)
+ 
+@@ -421,8 +426,6 @@
+ #ifdef LINUX
+ void rtclock(EVAL *p)
+ {
+-#include <sys/time.h>
+-#include <unistd.h>
+     struct timeval tv;
+     struct timezone tz;
+     gettimeofday(&tv, &tz);
diff --git a/audio/csound-bath/patches/patch-al b/audio/csound-bath/patches/patch-al
new file mode 100644
index 00000000000..7a25d2068c7
--- /dev/null
+++ b/audio/csound-bath/patches/patch-al
@@ -0,0 +1,13 @@
+$NetBSD: patch-al,v 1.1.1.1 2001/04/27 17:17:18 wiz Exp $
+
+--- english-strings.orig	Thu Apr  5 14:27:57 2001
++++ english-strings	Thu Apr  5 14:28:31 2001
+@@ -174,7 +174,7 @@
+ 174,"...done!\n"
+ 175,"/dev/audio: cannot do AUDIO_GETINFO"
+ 176,"/dev/audio: could not write all bytes requested\n"
+-177,"/dev/dsp: could not write all bytes requested\n"
++177,"/dev/audio: could not write all bytes requested\n"
+ 178,"100th system exclusive $%x, length %d\n"
+ 179,"6-channel"
+ 180,"AIFF does not support %s encoding"
diff --git a/audio/csound-bath/patches/patch-am b/audio/csound-bath/patches/patch-am
new file mode 100644
index 00000000000..aab95fca5a0
--- /dev/null
+++ b/audio/csound-bath/patches/patch-am
@@ -0,0 +1,13 @@
+$NetBSD: patch-am,v 1.1.1.1 2001/04/27 17:17:18 wiz Exp $
+
+--- french-strings.orig	Thu Apr  5 14:28:59 2001
++++ french-strings	Thu Apr  5 14:29:08 2001
+@@ -174,7 +174,7 @@
+ 174,"...fait !\n"
+ *175,"/dev/audio : cannot do AUDIO_GETINFO"
+ *176,"/dev/audio : couldn't write all bytes requested\n"
+-*177,"/dev/dsp : couldn't write all bytes requested\n"
++*177,"/dev/audio : couldn't write all bytes requested\n"
+ *178,"100th system exclusive $%x, length %d\n"
+ 179,"6-channel"
+ 180,"L'AIFF ne supporte pas le codage de %s"
diff --git a/audio/csound-bath/patches/patch-an b/audio/csound-bath/patches/patch-an
new file mode 100644
index 00000000000..b1d8d806f69
--- /dev/null
+++ b/audio/csound-bath/patches/patch-an
@@ -0,0 +1,22 @@
+$NetBSD: patch-an,v 1.1.1.1 2001/04/27 17:17:18 wiz Exp $
+
+--- rtaudio.c.orig	Thu Apr  5 14:29:45 2001
++++ rtaudio.c	Thu Apr  5 14:30:08 2001
+@@ -45,7 +45,7 @@
+ #ifdef LINUX                                  /* Jonathan Mohr  1995 Oct 17 */
+ #include <unistd.h>
+ #include <fcntl.h>
+-#define DSP_NAME    "/dev/dsp"
++#define DSP_NAME    "/dev/audio"
+ static int dspfd;
+ void setsndparms(int, int, int, float, unsigned);
+ void setvolume(unsigned);
+@@ -688,7 +688,7 @@
+ 
+ #ifdef LINUX                                       /*  J. Mohr  1995 Oct 17 */
+         if (write(dspfd, outbuf, nbytes) < nbytes)
+-            printf(Str(X_177,"/dev/dsp: couldn't write all bytes requested\n"));
++            printf(Str(X_177,"/dev/audio: couldn't write all bytes requested\n"));
+ #endif
+ #ifdef __BEOS__
+         while (nbytes > 0) {
diff --git a/audio/csound-bath/patches/patch-ao b/audio/csound-bath/patches/patch-ao
new file mode 100644
index 00000000000..0d40d8fbdae
--- /dev/null
+++ b/audio/csound-bath/patches/patch-ao
@@ -0,0 +1,22 @@
+$NetBSD: patch-ao,v 1.1.1.1 2001/04/27 17:17:18 wiz Exp $
+
+--- rtlinux.c.orig	Thu Apr  5 14:30:43 2001
++++ rtlinux.c	Thu Apr  5 14:30:57 2001
+@@ -10,7 +10,7 @@
+ 
+ #include <unistd.h>
+ #include <fcntl.h>
+-#define DSP_NAME    "/dev/dsp"
++#define DSP_NAME    "/dev/audio"
+ static int dspfd;
+ void setsndparms(int, int, int, MYFLT, unsigned);
+ void setvolume(unsigned);
+@@ -111,7 +111,7 @@
+         long sampframes = nbytes >> oshift;
+         /*  J. Mohr  1995 Oct 17 */
+         if (write(dspfd, outbuf, nbytes) < nbytes)
+-            printf(Str(X_177,"/dev/dsp: couldn't write all bytes requested\n"));
++            printf(Str(X_177,"/dev/audio: couldn't write all bytes requested\n"));
+         nrecs++;
+ }
+ 
diff --git a/audio/csound-bath/pkg/DESCR b/audio/csound-bath/pkg/DESCR
new file mode 100644
index 00000000000..909beaee389
--- /dev/null
+++ b/audio/csound-bath/pkg/DESCR
@@ -0,0 +1,8 @@
+Csound is a software synthesis package in the tradition of so-called
+music-N languages, among which the best-known is Music V.  It consists
+of an orchestra- and score-driven executable, written in C for
+portability.  Since Csound is a computational language, it is highly
+flexible and efficient; complexity is gained only at the expense of
+computation time.  Basically Csound reads some files and creates the
+result as a file on disk or, on faster machines, through a DAC in real
+time.
diff --git a/audio/csound-bath/pkg/PLIST b/audio/csound-bath/pkg/PLIST
new file mode 100644
index 00000000000..93b721e1625
--- /dev/null
+++ b/audio/csound-bath/pkg/PLIST
@@ -0,0 +1,22 @@
+@comment $NetBSD: PLIST,v 1.1.1.1 2001/04/27 17:17:16 wiz Exp $
+bin/csound
+bin/hetro
+bin/lpanal
+bin/pvanal
+bin/scot
+bin/extract
+bin/scsort
+bin/sndinfo
+bin/scale
+bin/mixer
+bin/extractor
+bin/envext
+bin/pvlook
+bin/srconv
+bin/dnoise
+bin/sdif2ad
+share/csound/csound.txt
+include/cscore.h
+lib/libcsound.a
+lib/libcscore.a
+@dirrm share/csound