Remove csound-bath to make way for csound4.

26 files changed, 1 insertions, 917 deletions

diff --git a/audio/Makefile b/audio/Makefile
index 1dba5044bf0..6d50f82a5c0 100644
--- a/audio/Makefile
+++ b/audio/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.263 2004/11/06 23:15:42 dillo Exp $
+# $NetBSD: Makefile,v 1.264 2004/11/28 17:09:13 ben Exp $
 #
 
 COMMENT=	Audio tools
@@ -25,7 +25,6 @@ SUBDIR+=	cddbd
 SUBDIR+=	cdparanoia
 SUBDIR+=	cmp3
 SUBDIR+=	cs4235
-SUBDIR+=	csound-bath
 SUBDIR+=	csound-dev
 SUBDIR+=	csound-manual
 SUBDIR+=	daapd
diff --git a/audio/csound-bath/DESCR b/audio/csound-bath/DESCR
deleted file mode 100644
index 909beaee389..00000000000
--- a/audio/csound-bath/DESCR
+++ /dev/null
@@ -1,8 +0,0 @@
-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/Makefile b/audio/csound-bath/Makefile
deleted file mode 100644
index 395c1d196d2..00000000000
--- a/audio/csound-bath/Makefile
+++ /dev/null
@@ -1,49 +0,0 @@
-# $NetBSD: Makefile,v 1.17 2004/04/11 21:49:10 ben Exp $
-#
-
-DISTNAME=		Csound4.23
-PKGNAME=		csound-bath-4.23
-CATEGORIES=		audio
-MASTER_SITES=		ftp://ftp.cs.bath.ac.uk/pub/dream/newest/
-
-MAINTAINER=		ben@NetBSD.org
-HOMEPAGE=		http://www.csounds.com/
-COMMENT=		Software synthesizer and sequencer
-
-LICENSE=		csound-license
-RESTRICTED=		"no for-fee-redistribution"
-NO_SRC_ON_CDROM=	${RESTRICTED}
-NO_BIN_ON_CDROM=	${RESTRICTED}
-
-WRKSRC=			${WRKDIR}
-DIST_SUBDIR=		csound
-CONFLICTS=		csound-dev-4*
-USE_GNU_TOOLS+=		make
-
-.include "../../mk/bsd.prefs.mk"
-
-pre-patch:
-	 ${CP} ${FILESDIR}/rtNetBSD.c ${FILESDIR}/rtNetBSD.h ${WRKSRC}
-
-.if ${OPSYS} == "NetBSD"
-SUBST_CLASSES+=	rtaudio
-SUBST_MESSAGE.rtaudio=	"Configuring to use NetBSD real-time audio driver."
-SUBST_STAGE.rtaudio=	post-patch
-SUBST_FILES.rtaudio=	Makefile
-SUBST_SED.rtaudio=	-e 's,^AUDSRC.*,AUDSRC = rtNetBSD.c,' \
-			-e 's,^AUDOBJ.*,AUDOBJ = rtNetBSD.o,' \
-			-e 's,^\(DEFINES.*\),\1 -DRTAUDIO -DNETBSDAUDIO,'
-.endif
-
-.if ${OPSYS} == "Linux"
-SUBST_CLASSES+=	rtaudio
-SUBST_MESSAGE.rtaudio=	"Configuring to use Linux real-time audio driver."
-SUBST_STAGE.rtaudio=	post-patch
-SUBST_FILES.rtaudio=	Makefile
-SUBST_SED.rtaudio=	-e 's,^AUDSRC.*,AUDSRC = rtlinux.c LINUXaudio.c,' \
-			-e 's,^AUDOBJ.*,AUDOBJ = rtlinux.o LINUXaudio.o,' \
-			-e 's,^\(DEFINES.*\),\1 -DRTAUDIO,' \
-			-e 's,^\(LIBS.*\),\1 -ldl,'
-.endif
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/csound-bath/PLIST b/audio/csound-bath/PLIST
deleted file mode 100644
index 11c4c3040d9..00000000000
--- a/audio/csound-bath/PLIST
+++ /dev/null
@@ -1,21 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2003/01/19 21:31:08 hubertf Exp $
-bin/csound
-bin/hetro
-bin/lpanal
-bin/pvanal
-bin/cvanal
-bin/scot
-bin/extract
-bin/scsort
-bin/sndinfo
-bin/scale
-bin/mixer
-bin/extractor
-bin/envext
-bin/pvlook
-bin/srconv
-bin/dnoise
-bin/sdif2ad
-include/cscore.h
-lib/libcsound.a
-lib/libcscore.a
diff --git a/audio/csound-bath/distinfo b/audio/csound-bath/distinfo
deleted file mode 100644
index 1433a151c88..00000000000
--- a/audio/csound-bath/distinfo
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: distinfo,v 1.7 2004/04/11 21:49:10 ben Exp $
-
-SHA1 (csound/Csound4.23.tar.gz) = 15b18ee60b4690aa48593dc3b5d44a9473d0cb16
-Size (csound/Csound4.23.tar.gz) = 1172388 bytes
-SHA1 (patch-aa) = 6eeb263df9add94a79de7d6a67cb189e1dde3e5a
-SHA1 (patch-ab) = 3301b22ea79b0b87a4323835050f88eb3975c40e
-SHA1 (patch-ac) = 7b4838120b3337277732075fa4253090c6a892a4
-SHA1 (patch-ae) = 7a0840abf9bd6630205934fab8dd4a7b42d04e1a
-SHA1 (patch-af) = 59c0726958844315255f360f3ab6dfe2ed538d3d
-SHA1 (patch-ag) = 613350099e4890efa79de07c820325423fa8e13b
-SHA1 (patch-ai) = a66207be90ff96c975d906aa716b9ced63d021f2
-SHA1 (patch-ap) = 8547105765c6c0afa179869b87ce9db68a3afbab
-SHA1 (patch-aq) = ba44c4a8fb1ccb3bde72d1a28a7943b08e418bc2
-SHA1 (patch-ar) = 3219f640f11654b1502a4a9aebfadd4661efbcac
-SHA1 (patch-as) = a3c0097b29188c82432a07de9e5ef8ca7492feaf
-SHA1 (patch-at) = 1841be062be33ea5f1cdad561bb106e28d69ffab
-SHA1 (patch-au) = 8779283f3c375ee036af442dc28168f69e71e86e
-SHA1 (patch-av) = 8ab462bcd3ad550013d3b6e939f8fbe960b65b5c
-SHA1 (patch-aw) = a23249d81ebea09fa2bead35f39041e0e643d9a7
-SHA1 (patch-ax) = 84479915449e6dfddcd0c31f38418238bacbd013
-SHA1 (patch-ay) = 510334f831598ea5d423f798faeb6b991cb4c880
-SHA1 (patch-az) = a7a90801511f5142e797537cf9d62ff4f322e273
-SHA1 (patch-ba) = 5fba504106a30258308ef01b6900854251087e4b
diff --git a/audio/csound-bath/files/rtNetBSD.c b/audio/csound-bath/files/rtNetBSD.c
deleted file mode 100644
index 76834a44d41..00000000000
--- a/audio/csound-bath/files/rtNetBSD.c
+++ /dev/null
@@ -1,328 +0,0 @@
-/* 
-   --- rtNetBSD.c ---
-
-   Native NetBSD audio support.
-
-   Ben Collver, collver@linuxfreemail.com
-*/
-
-#include <sys/types.h>
-#include <sys/audioio.h>
-#include <sys/ioctl.h>
-#include <fcntl.h>
-#include <stdio.h>
-#include <unistd.h>
-
-#include "cs.h"
-#include "soundio.h"
-#include "rtNetBSD.h"
-
-static int dspfd_in = -1, dspfd_out = -1;
-
-static  int     ishift = 0, oshift = 0, oMaxLag;
-extern  OPARMS  O;
-#ifdef PIPES
-#  define _pclose pclose
-#endif
-
-static int getshift(int dsize)  /* turn sample- or frame-size into shiftsize */
-{
-  switch(dsize) {
-  case 1:  return(0);
-  case 2:  return(1);
-  case 4:  return(2);
-  case 8:  return(3);
-  default: die("rtaudio: illegal dsize");
-	return(-1);		/* Not reached */
-        }
-}
-  
-
-void display_audio_info(
-	int dspfd,
-	const char *message,
-	audio_info_t *info)
-{
-	audio_encoding_t encoding;
-	char *encoding_name;
-
-	encoding.index = info->play.encoding;
-	if (ioctl(dspfd, AUDIO_GETENC, &encoding) == -1) {
-		asprintf(&encoding_name, "%d", info->play.encoding);
-	} else {
-		encoding_name = strdup(encoding.name);
-	}
-	printf("%-9s\n", message);
-	printf("         info.play.precision = %d\n", info->play.precision);
-	printf("         info.play.encoding = %s\n", encoding_name);
-	printf("         info.play.channels = %d\n", info->play.channels);
-	printf("         info.play.sample_rate = %d\n", info->play.sample_rate);
-	printf("         info.blocksize = %d\n\n", info->blocksize);
-	free(encoding_name);
-}
-
-void setsndparms(
-	int dspfd,
-	int format,
-	int nchanls,
-	float sr, 
-	unsigned bufsiz)
-{
-	audio_info_t info;
-	int count;
-	int frag_size;
-
-	AUDIO_INITINFO(&info);
-
-	switch (format) {
-	case AE_UNCH:
-		info.play.precision = 8;
-		info.play.encoding = AUDIO_ENCODING_ULINEAR;
-		break;
-	case AE_CHAR:
-		info.play.precision = 8;
-		info.play.encoding = AUDIO_ENCODING_SLINEAR;
-		break;
-	case AE_ULAW:
-		info.play.precision = 8;
-		info.play.encoding = AUDIO_ENCODING_ULAW;
-		break;
-	case AE_ALAW:
-		info.play.precision = 8;
-		info.play.encoding = AUDIO_ENCODING_ALAW;
-		break;
-	case AE_SHORT:
-		/* audio(4) says AUDIO_ENCODING_SLINEAR uses platform's
-		   byte order, so the below will automatically be BE on
-		   a BE system, and LE on a LE system.  Good/Bad/Ok? */
-
-		info.play.precision = 16;
-		info.play.encoding = AUDIO_ENCODING_SLINEAR;
-		break;
-	case AE_LONG:
-		info.play.precision = 32;
-		info.play.encoding = AUDIO_ENCODING_SLINEAR;
-		break;
-	case AE_FLOAT:
-		die("NetBSD audio does not support floating-point samples");
-	default:
-		die("unknown sample format");
-	}
-
-	info.play.channels = nchanls;
-	info.play.sample_rate = (unsigned int) sr;
-
-	/* set DMA buffer fragment size to Csound's output buffer size */
-	/*
-	 * The or'ing is ABSOLUTELY crucial to obtaining quick response
-	 * of csound to MIDI input - Please don't touch this line unless
-	 * you know you can do better (in terms of MIDI response)
-	 * [nicb@axnet.it]
-	 */
-	frag_size = 16;
-	count = 4;
-	while (frag_size < bufsiz && count < 18) {
-		frag_size <<= 1;
-		count++;
-	}
-	count |= 0x0020000; /* Larry Troxler's Idea */
-	info.blocksize = frag_size;
-
-	/* from ossaudio.c ioctl SNDCTL_DSP_SETFRAGMENT */
-	info.hiwat = ((unsigned)count >> 16) & 0x7fff;
-	if (info.hiwat == 0)
-		info.hiwat = 65536;
-
-	if (ioctl(dspfd, AUDIO_SETINFO, &info) == -1) {
-		display_audio_info(dspfd, "requested", &info);
-		if (ioctl(dspfd, AUDIO_GETINFO, &info) != -1)
-			display_audio_info(dspfd, "got", &info);
-		die("unable to configure soundcard");
-	}
-}
-
-int find_mixer_label(int dspfd, int class, const char *name)
-{
-	int i;
-	int mclass;
-	int retval = -1;
-	mixer_devinfo_t info;
-
-        for (i = 0; ; i++) {
-                info.index = i;
-                if (ioctl(dspfd, AUDIO_MIXER_DEVINFO, &info) < 0)
-                        break;
-		mclass = info.mixer_class;
-		if ((info.index == mclass || class == mclass) &&
-			!strcmp(info.label.name, name))
-		{
-			retval = i;
-		}
-        }
-	return retval;
-}
-
-void setvolume(unsigned volume)
-{
-	int mixfd;
-	int output_class;
-	int vol_output;
-	mixer_devinfo_t info;
-	mixer_ctrl_t value;
-
-	/* volume must be between 0 and 255 */
-
-	if ((mixfd = open(NETBSD_MIXER, O_WRONLY)) == -1)
-		die("unable to open soundcard mixer for setting volume");
-
-	output_class = find_mixer_label(mixfd, 0, "outputs");
-	vol_output = find_mixer_label(mixfd, output_class, "master");
-
-	if (vol_output == -1)
-		die("Could not find mixer control for audio output.");
-
-
-	info.index = vol_output;
-	ioctl(mixfd, AUDIO_MIXER_DEVINFO, &info);
-
-	value.dev = vol_output;
-	value.type = info.type;
-	value.un.value.num_channels = 2;
-	if (ioctl(mixfd, AUDIO_MIXER_READ, &value) < 0) {
-		value.un.value.num_channels = 1;
-		if (ioctl(mixfd, AUDIO_MIXER_READ, &value) < 0)
-			die("unable to read mixer on soundcard"); 
-	}
-
-	value.un.value.level[0] = 192;
-	value.un.value.level[1] = 192;
-	if (ioctl(mixfd, AUDIO_MIXER_WRITE, &value) < 0) {
-		die("unable to set output volume on soundcard"); 
-	}
-}
-
-
-void NetBSD_open(int nchanls, int dsize, float sr, int scale, int audio_mode)
-{
-	int wbufsiz;
-	int audio_props;
-	audio_device_t device_info;
-#ifdef USE_SETSCHEDULER
-	extern void setscheduler(void);
-#endif
-
-	oMaxLag = O.oMaxLag;        /* import DAC setting from command line   */
-	if (oMaxLag <= 0)           /* if DAC sampframes ndef in command line */
-		oMaxLag = IODACSAMPS;     /* use the default value */
-	wbufsiz = oMaxLag * O.insampsiz;
-	switch (audio_mode) {
-	case NETBSD_RECORD:
-		if ((dspfd_in = open(NETBSD_SAMPLER, O_RDONLY)) == -1)
-			die("error while opening soundcard for audio input");
-		setsndparms(dspfd_in, O.informat, nchanls, sr, wbufsiz);
-		ishift = getshift(dsize);  
-		break;
-	case NETBSD_PLAY:
-		if ((dspfd_out = open(NETBSD_SAMPLER, O_WRONLY)) == -1) {
-			perror("foo");
-			die("error while opening soundcard for audio output");
-		}
-		setsndparms(dspfd_out, O.outformat, nchanls, sr, wbufsiz);
-		/* 'oshift' is not currently used by the Linux driver, but... */
-		oshift = getshift(nchanls * dsize);
-		break;
-	case NETBSD_DUPLEX:
-		if ((dspfd_out = dspfd_in = open(NETBSD_SAMPLER, O_RDWR)) == -1)
-			die("error during soundcard duplex mode query:");
-		ioctl(dspfd_in, AUDIO_GETPROPS, &audio_props);
-		if (!(audio_props | AUDIO_PROP_FULLDUPLEX))
-			die("hardware does not support full duplex mode");
-		setsndparms(dspfd_in, O.outformat, nchanls, sr, wbufsiz);
-		if (ioctl(dspfd_in, AUDIO_SETFD, audio_props) == -1)
-			die("error setting hardware to full duplex mode");
-		/* are these functions both required? */
-		oshift = getshift(nchanls * dsize);
-		ishift = getshift(dsize);
-		break;
-	default:
-		fprintf(stderr, "mode specification error in NetBSD_open: ");
-		fprintf(stderr, "unknown argument %d\n", audio_mode);
-		exit(1);
-	}
-
-	if (dspfd_in >= 0) {
-		ioctl(dspfd_in, AUDIO_GETDEV, &device_info);
-		fprintf(stderr, "NetBSD input audio info: %s, %s, %s\n",
-			device_info.name,
-			device_info.version,
-			device_info.config);
-	}
-
-	if (dspfd_out >= 0) {
-		ioctl(dspfd_out, AUDIO_GETDEV, &device_info);
-		fprintf(stderr, "NetBSD output audio info: %s, %s, %s\n",
-			device_info.name,
-			device_info.version,
-			device_info.config);
-	}
-
-#ifdef USE_SETSCHEDULER
-	setscheduler();
-#endif
-}
-
-int rtrecord_(char *inbuf, int nbytes) /* get samples from ADC */
-{
-    /*  J. Mohr  1995 Oct 17 */
-    if ( (nbytes = read(dspfd_in, inbuf, nbytes)) == -1 )
-      die("error while reading DSP device for audio input");
-    return(nbytes);
-}
-
-void rtplay_(char *outbuf, int nbytes) /* put samples to DAC  */
-    /* N.B. This routine serves as a THROTTLE in Csound Realtime Performance, */
-    /* delaying the actual writes and return until the hardware output buffer */
-    /* passes a sample-specific THRESHOLD.  If the I/O BLOCKING functionality */
-    /* is implemented ACCURATELY by the vendor-supplied audio-library write,  */
-    /* that is sufficient.  Otherwise, requires some kind of IOCTL from here. */
-    /* This functionality is IMPORTANT when other realtime I/O is occurring,  */
-    /* such as when external MIDI data is being collected from a serial port. */
-    /* Since Csound polls for MIDI input at the software synthesis K-rate     */
-    /* (the resolution of all software-synthesized events), the user can      */
-    /* eliminate MIDI jitter by requesting that both be made synchronous with */
-    /* the above audio I/O blocks, i.e. by setting -b to some 1 or 2 K-prds.  */
-{
-        /* long sampframes = nbytes >> oshift; */
-        /*  J. Mohr  1995 Oct 17 */
-        if (write(dspfd_out, outbuf, nbytes) < nbytes)
-            printf("/dev/audio: couldn't write all bytes requested\n");
-        nrecs++;
-}
-
-void rtclose_(void)              /* close the I/O device entirely  */
-{                               /* called only when both complete */
-    /*  J. Mohr  1995 Oct 17 */
-    if (dspfd_in >= 0 && close(dspfd_in) == -1)
-      die("unable to close DSP input device");
-
-    if (dspfd_out >= 0 && close(dspfd_out) == -1)
-      die("unable to close DSP output device");
-
-    if (O.Linein) {
-#ifdef PIPES
-      if (O.Linename[0]=='|') _pclose(Linepipe);
-      else
-#endif
-        if (strcmp(O.Linename, "stdin")!=0) close(Linefd);
-    }
-}
-
-void recopen_(int nchanls, int dsize, float sr, int scale)
-{
-	NetBSD_open(nchanls, dsize, sr, scale, NETBSD_DUPLEX);
-}
-
-void playopen_(int nchanls, int dsize, float sr, int scale)
-{
-	NetBSD_open(nchanls, dsize, sr, scale, NETBSD_PLAY);
-}
diff --git a/audio/csound-bath/files/rtNetBSD.h b/audio/csound-bath/files/rtNetBSD.h
deleted file mode 100644
index 56808affb1e..00000000000
--- a/audio/csound-bath/files/rtNetBSD.h
+++ /dev/null
@@ -1,15 +0,0 @@
-/* rtNetBSD.h */
-
-#ifndef _RTNETBSD_INCLUDED
-#define _RTNETBSD_INCLUDED
-
-#define NETBSD_RECORD 0
-#define NETBSD_PLAY   1
-#define NETBSD_DUPLEX 2
-
-#undef USE_SETSCHEDULER 
-
-#define NETBSD_MIXER "/dev/mixer0"
-#define NETBSD_SAMPLER "/dev/sound0"
-
-#endif /* _RTNETBSD_INCLUDED */
diff --git a/audio/csound-bath/patches/patch-aa b/audio/csound-bath/patches/patch-aa
deleted file mode 100644
index 91d9b505c54..00000000000
--- a/audio/csound-bath/patches/patch-aa
+++ /dev/null
@@ -1,89 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2004/04/11 21:49:10 ben Exp $
-
---- Makefile.orig	2002-12-16 00:32:21.000000000 -0800
-+++ Makefile
-@@ -1,10 +1,10 @@
- #								Csound Makefile
- # edit the following definitions according to need:
- 
--INCLUDE	= /usr/local/include
--LIB	= /usr/local/lib
--DEST	= /usr/local/bin
--MAN	= /usr/local/man
-+INCLUDE	= $(PREFIX)/include
-+LIB	= $(PREFIX)/lib
-+DEST	= $(PREFIX)/bin
-+MAN	= $(PREFIX)/man
- MAN1	= $(MAN)/man1
- CAT1	= $(MAN)/cat1
- # these directories must exist for stages beyond 'make csound'
-@@ -23,7 +23,7 @@ CC = cc
- #	.c.o:
- #		$(CC) $(CFLAGS) -c $*.c -o $@
- 
--DEFINES = -DWINDOWS -DRTAUDIO -DSFIRCAM -DSYS5 -DLINUX -DPIPES -DMACROS -DTCLTK -DIV_SCHED -DHAVE_FLTK
-+DEFINES = -DSFIRCAM -DSYS5 -DLINUX -DPIPES -DMACROS -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)
-@@ -50,7 +50,7 @@ DEFINES = -DWINDOWS -DRTAUDIO -DSFIRCAM 
- # (e.g., Linux on SPARC [not tested]), you should also define -
- #       -DLINUX_BE      Linux audio device handler for big-endian samples
- 
--CFLAGS = -Wall -O2 -malign-loops=4 -malign-jumps=4 -ffast-math -fomit-frame-pointer -finline-functions -funroll-loops -DWITHx87 $(RPM_OPT_FLAGS) $(DEFINES)
-+CFLAGS = -Wall $(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)
-@@ -90,12 +90,12 @@ CFLAGS = -Wall -O2 -malign-loops=4 -mali
- #
- CXX = g++
- CXXFLAGS = -fno-exceptions -fno-rtti
--FLTKSRC = widgets.cpp
--FLTKOBJ = widgets.o
-+FLTKSRC =
-+FLTKOBJ =
- # source and object files for FLTK widgets
- #FLTKLIB = -lfltk -lpthread -lg++
--FLTKLIB = /usr/local/lib/libfltk.a /usr/lib/libpthread.a \
--	  /usr/lib/libstdc++-libc6.2-2.a.3
-+FLTKLIB =
-+
- # libraries required by widgets.cpp
- #	-lfltk -lpthread -lg++			use dynamic libraries
- #
-@@ -105,7 +105,7 @@ FLTKLIB = /usr/local/lib/libfltk.a /usr/
- #						directiories and version
- #						numbers are system-dependent)
- 
--LIBS =	$(FLTKLIB) -L /usr/X11R6/lib -lX11 -ltcl -ltk -lm -ldl
-+LIBS =	$(LDFLAGS) -lm
- #	-lefence
- #	-lm		    		required
- #	-lX11				for X window calls
-@@ -124,8 +124,8 @@ LIBS =	$(FLTKLIB) -L /usr/X11R6/lib -lX1
- # note: SuSE 7.3 users should use -ltcl8.3 -ltk8.3, but another
- # (probably better) solution is to create symbolic links
- 
--WINSRC = winFLTK.c FL_graph.cpp
--WINOBJ = winFLTK.o FL_graph.o
-+WINSRC =
-+WINOBJ =
- # ;if WINDOWS enabled in DEFINES, choose one of -
- #	winX11.o	for X11 window graphics
- #	winSGI.o	for SGI window graphics
-@@ -133,10 +133,12 @@ WINOBJ = winFLTK.o FL_graph.o
- #	winFLTK.o and FL_graph.o for `improved' X graphics
- #	and many others....winbor, wincwin 
- 
-+AUDSRC =
-+AUDOBJ =
- #AUDSRC = rtlinux.c LINUXaudio.c
- #AUDOBJ = rtlinux.o LINUXaudio.o
--AUDSRC = rtalsa.c
--AUDOBJ = rtalsa.c
-+#AUDSRC = rtalsa.c
-+#AUDOBJ = rtalsa.c
- # ;if RTAUDIO enabled in DEFINES, include one of
- #	rtaudio.o		general interface to audio handlers & libraries
- #	rtDEC.c		rtSGI.c		rtHP.c		rtSUN.c
diff --git a/audio/csound-bath/patches/patch-ab b/audio/csound-bath/patches/patch-ab
deleted file mode 100644
index 22e327992f5..00000000000
--- a/audio/csound-bath/patches/patch-ab
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2002/04/28 14:44:14 tron Exp $
-
---- getstring.c.orig	Sat Jan 26 03:52:46 2002
-+++ getstring.c
-@@ -145,8 +145,8 @@
-       db = fopen(name, "rb");
-     }
-     if (db == NULL) {
--      strcpy(name, "/usr/local/lib/csound.xmg");
--      db = fopen("/usr/local/lib/csound.xmg", "rb");
-+      sprintf(name, "%s/share/csound/csound.xmg", PREFIX);
-+      db = fopen(name, "rb");
-     }
- #ifdef mills_macintosh
-     if (db == NULL) {
diff --git a/audio/csound-bath/patches/patch-ac b/audio/csound-bath/patches/patch-ac
deleted file mode 100644
index 6ad8fbad422..00000000000
--- a/audio/csound-bath/patches/patch-ac
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2003/01/19 21:31:11 hubertf Exp $
-
---- anal/lpc/makef.orig	Tue Oct  8 06:53:00 2002
-+++ anal/lpc/makef
-@@ -6,8 +6,8 @@
- 
- 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/winFLTK.o $T/winascii.o $T/winEPS.o \
--        $T/aifc.o $T/getstring.o $T/FL_graph.o
-+        $T/memalloc.o $T/window.o $T/winascii.o $T/winEPS.o \
-+        $T/aifc.o $T/getstring.o
- 
- lpcs:		lpanal
- 
diff --git a/audio/csound-bath/patches/patch-ae b/audio/csound-bath/patches/patch-ae
deleted file mode 100644
index 79f505723b0..00000000000
--- a/audio/csound-bath/patches/patch-ae
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-ae,v 1.3 2003/01/19 21:31:11 hubertf Exp $
-
---- midisend.c.orig	Mon Nov 11 01:01:15 2002
-+++ midisend.c
-@@ -16,10 +16,24 @@
- #include <ctype.h>
- #include <sys/ioctl.h>
- #include <fcntl.h>
-+#ifdef __NetBSD__
-+#  include <sys/midiio.h>
-+#  define SEQ_MIDIPUTC			SEQOLD_MIDIPUTC
-+#  define SEQ_DEFINEBUF(len)		unsigned char _seqbuf[len]; int _seqbuflen = len;int _seqbufptr = 0
-+#  define _SEQ_ADVBUF(len)		_seqbufptr += len
-+#  define _SEQ_NEEDBUF(len)		if ((_seqbufptr+(len)) > _seqbuflen) seqbuf_dump()
-+#  define SEQ_MIDIOUT(device, byte)	{_SEQ_NEEDBUF(4);\
-+					_seqbuf[_seqbufptr] = SEQ_MIDIPUTC;\
-+					_seqbuf[_seqbufptr+1] = (byte);\
-+					_seqbuf[_seqbufptr+2] = (device);\
-+					_seqbuf[_seqbufptr+3] = 0;\
-+					_SEQ_ADVBUF(4);}
-+#else
- #ifdef __FreeBSD__
- #  include <sys/soundcard.h>
- #else
- #  include <linux/soundcard.h>
-+#endif
- #endif
- 
- #define MIDI_DEV "/dev/sequencer"
diff --git a/audio/csound-bath/patches/patch-af b/audio/csound-bath/patches/patch-af
deleted file mode 100644
index 9a5b1f53b13..00000000000
--- a/audio/csound-bath/patches/patch-af
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-af,v 1.3 2003/01/19 21:31:11 hubertf Exp $
-
---- anal/pvoc/makef.orig	Tue Oct  8 06:53:33 2002
-+++ anal/pvoc/makef
-@@ -7,8 +7,8 @@
- OBJS =  main.o $T/pvanal.o $T/pvxanal.o $T/pvfileio.o $T/filopen.o \
-         $T/sfheader.o $T/mxfft.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/winFLTK.o $T/winascii.o \
--	$T/winEPS.o $T/aifc.o $T/getstring.o $T/FL_graph.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-ag b/audio/csound-bath/patches/patch-ag
deleted file mode 100644
index 3234e5dc44e..00000000000
--- a/audio/csound-bath/patches/patch-ag
+++ /dev/null
@@ -1,54 +0,0 @@
-$NetBSD: patch-ag,v 1.3 2003/01/19 21:31:11 hubertf Exp $
-
---- extract.c.orig	Sun Nov 10 06:54:08 2002
-+++ extract.c
-@@ -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 */
- 
-@@ -59,7 +59,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 */
-@@ -104,7 +104,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':
-@@ -113,7 +113,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)
-@@ -140,10 +140,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
deleted file mode 100644
index 83212a0709a..00000000000
--- a/audio/csound-bath/patches/patch-ai
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ai,v 1.4 2003/01/19 21:31:11 hubertf Exp $
-
---- anal/adsyn/makef.orig	Tue Oct  8 06:49:08 2002
-+++ anal/adsyn/makef
-@@ -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/winFLTK.o $T/FL_graph.o $T/winEPS.o $T/aifc.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
diff --git a/audio/csound-bath/patches/patch-ap b/audio/csound-bath/patches/patch-ap
deleted file mode 100644
index e002cbdd03a..00000000000
--- a/audio/csound-bath/patches/patch-ap
+++ /dev/null
@@ -1,43 +0,0 @@
-$NetBSD: patch-ap,v 1.4 2004/04/11 21:49:10 ben Exp $
-
---- cs.h.orig	2002-12-16 04:28:30.000000000 -0800
-+++ cs.h
-@@ -15,6 +15,24 @@ extern "C" {
- 
- #include "version.h"
- 
-+/*	__BIG_ENDIAN__ is used various places in csound
-+	BIG_ENDIAN   is used by the sdif code
-+	in NetBSD, (BIG|LITTLE)_ENDIAN is defined by sys/endian.h
-+	included in sys/types included in stdlib.h
-+*/
-+#ifdef __NetBSD__
-+#undef BIG_ENDIAN
-+#undef LITTLE_ENDIAN
-+#if _BYTE_ORDER == _BIG_ENDIAN
-+#define __BIG_ENDIAN__
-+#define BIG_ENDIAN
-+#else
-+#define __LITTLE_ENDIAN__
-+#define LITTLE_ENDIAN
-+#endif /* _BYTE_ORDER */
-+#endif /* __NetBSD__ */
-+
-+
- #define VMSGS 1
- #if VMSGS
- #define VMSG(x) if (O.odebug) x
-@@ -782,11 +800,8 @@ typedef struct GLOBALS_
- # define POLL_EVENTS() STasks()
- # define __cdecl
- #else
--#ifdef LINUX
--  extern int POLL_EVENTS(void);
--#else
--# define POLL_EVENTS()     (1)
--#endif
-+/* #define POLL_EVENTS() csoundYield() */
-+#define POLL_EVENTS() (1)
- # if !defined(__BEOS__) || defined(__MWERKS__)
- #  define __cdecl
- # endif
diff --git a/audio/csound-bath/patches/patch-aq b/audio/csound-bath/patches/patch-aq
deleted file mode 100644
index a440d44a614..00000000000
--- a/audio/csound-bath/patches/patch-aq
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-aq,v 1.2 2002/03/23 02:23:01 wiz Exp $
-
---- sdif.h.orig	Fri Jan 25 05:02:59 2002
-+++ sdif.h
-@@ -53,7 +53,8 @@
- #ifndef __SDIF_H
- #define __SDIF_H
- 
--
-+#include "cs.h"
-+#undef printf
- 
- /****************************************************/
- /* Create 32-bit and 64-bit int and float typedefs. */
diff --git a/audio/csound-bath/patches/patch-ar b/audio/csound-bath/patches/patch-ar
deleted file mode 100644
index 2513026f778..00000000000
--- a/audio/csound-bath/patches/patch-ar
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ar,v 1.2 2003/01/19 21:31:13 hubertf Exp $
-
---- sread.c.orig	Sun Dec 15 22:54:28 2002
-+++ sread.c
-@@ -1150,7 +1150,7 @@
-      * On Alpha we need to round up to 8 bytes (64 bits).
-      * heh 981101
-      */
--    bp = (SRTBLK *) ((((LONG) nxp) + 7) & ~0x7);
-+    bp = (SRTBLK *) ((((long) nxp) + 7) & ~0x7);
- #else
-     bp = (SRTBLK *) ((((long) nxp) + 3) & -4);
- #endif
diff --git a/audio/csound-bath/patches/patch-as b/audio/csound-bath/patches/patch-as
deleted file mode 100644
index 81d7393dbcd..00000000000
--- a/audio/csound-bath/patches/patch-as
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: patch-as,v 1.1 2002/03/23 02:23:01 wiz Exp $
-
---- sftype.h.orig	Mon Jan 28 02:02:01 2002
-+++ sftype.h
-@@ -1,3 +1,4 @@
-+#include "cs.h"
- 
- #if !defined(_SFTYPE_H)
- #ifdef          __GNUC__
diff --git a/audio/csound-bath/patches/patch-at b/audio/csound-bath/patches/patch-at
deleted file mode 100644
index 0029c92d78b..00000000000
--- a/audio/csound-bath/patches/patch-at
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-at,v 1.2 2003/01/19 21:31:13 hubertf Exp $
-
---- soundio.c.orig	Sun Dec  8 03:53:08 2002
-+++ soundio.c
-@@ -84,6 +84,9 @@
- #  define _pclose pclose
- # endif
- #endif
-+#ifdef NETBSDRTAUDIO
-+#include "rtNetBSD.h"
-+#endif
- void (*spinrecv)(void), (*spoutran)(void), (*nzerotran)(long);
- static void byterecv(void), charrecv(void),  alawrecv(void), ulawrecv(void),
-             shortrecv(void),longrecv(void), floatrecv(void);
-@@ -499,6 +502,10 @@
-              || strncmp(O.outfilename,"dac", 3) ==0
- # ifdef LINUX
-              || strcmp(O.outfilename,"/dev/dsp") ==0
-+# endif
-+# ifdef __NetBSD__
-+             || strncmp(O.outfilename,"/dev/audio",10) ==0
-+             || strncmp(O.outfilename,"/dev/sound",10) ==0
- # endif
-              || strcmp(O.outfilename,"dac") == 0) {
- #if defined(WIN32) || defined(HAVE_ALSA)
diff --git a/audio/csound-bath/patches/patch-au b/audio/csound-bath/patches/patch-au
deleted file mode 100644
index 71c616bb271..00000000000
--- a/audio/csound-bath/patches/patch-au
+++ /dev/null
@@ -1,56 +0,0 @@
-$NetBSD: patch-au,v 1.1 2003/01/19 21:31:13 hubertf Exp $
-
---- main.c.orig	Mon Dec 23 14:11:59 2002
-+++ main.c
-@@ -51,13 +51,21 @@
- #include <unistd.h>             /* Linux real-time by Istvan Varga, Jan 2002 */
- #include <sys/types.h>
- #include <errno.h>
-+#if defined(__NetBSD__)
-+#include <sys/time.h>
-+#include <sys/resource.h>
-+#define HIGH_PRIORITY -20
-+#else
- #include <sched.h>
- #include <sys/mman.h>
-+#endif
- 
- void set_rt_priority(int argc, char **argv)
- {
-     int     rtmode;
-+#if !defined(__NetBSD__)
-     struct sched_param p;
-+#endif
-     int     i;
- 
-     if (geteuid() != 0) return;    /* not root, nothing to do */
-@@ -88,7 +96,7 @@
-       return;
-     }
- 
--#ifndef __FreeBSD__
-+#if !defined(__FreeBSD__) && !defined(__NetBSD__)
-     /* lock all pages into physical memory */
-     if (mlockall(MCL_CURRENT | MCL_FUTURE) != 0) {
-       err_printf( "csound: cannot lock memory pages: %s\n",
-@@ -97,6 +105,12 @@ void set_rt_priority(int argc, char **ar
-     }
- #endif
- 
-+#if defined(__NetBSD__)
-+    if (setpriority(PRIO_PROCESS, 0, HIGH_PRIORITY) != 0) {
-+      err_printf( "csound: cannot set high priority: %s\n", strerror(errno));
-+      exit(-1);
-+    }
-+#else
-     /* set round robin mode with max. priority */
-     p.sched_priority = sched_get_priority_max(SCHED_RR);
-     if (sched_setscheduler(0, SCHED_RR, &p) != 0) {
-@@ -104,6 +118,7 @@
-                        strerror(errno));
-       exit(-1);
-     }
-+#endif
-     /* give up root permissions */
-     setuid(getuid());
- }
diff --git a/audio/csound-bath/patches/patch-av b/audio/csound-bath/patches/patch-av
deleted file mode 100644
index a9169bfeeea..00000000000
--- a/audio/csound-bath/patches/patch-av
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-av,v 1.1 2003/01/19 21:31:14 hubertf Exp $
-
---- dpwelib.h.orig	Fri Jul 12 03:48:14 2002
-+++ dpwelib.h
-@@ -56,7 +56,7 @@
- #else  /* ultrix, not NeXT */
- #ifdef clipper
- #else
--# if defined(LATTICE) || defined(WIN32) || defined(SGI) || defined(__FreeBSD__)
-+# if defined(LATTICE) || defined(WIN32) || defined(SGI) || defined(__FreeBSD__) || defined(__NetBSD__)
- #  include <stdlib.h>
- # else
- #  include <unistd.h>
diff --git a/audio/csound-bath/patches/patch-aw b/audio/csound-bath/patches/patch-aw
deleted file mode 100644
index af7408bc89e..00000000000
--- a/audio/csound-bath/patches/patch-aw
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aw,v 1.1 2003/01/19 21:31:14 hubertf Exp $
-
---- pvoc.c.orig	Fri Jul 12 03:48:14 2002
-+++ pvoc.c
-@@ -8,7 +8,7 @@
- #include "sysdep.h"
- 
- #include <stdio.h>
--#if defined(mac_classic) || defined(SYMANTEC) || defined(__FreeBSD__)
-+#if defined(mac_classic) || defined(SYMANTEC) || defined(__FreeBSD__) || defined(__NetBSD__)
- #  include <stdlib.h>           /* for malloc() */
- #  define READMODE "rb"
- #  define WRITEMODE "wb+"
diff --git a/audio/csound-bath/patches/patch-ax b/audio/csound-bath/patches/patch-ax
deleted file mode 100644
index 100790a48ba..00000000000
--- a/audio/csound-bath/patches/patch-ax
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ax,v 1.1 2003/01/19 21:31:15 hubertf Exp $
-
---- anal/convol/makef.orig	Tue Oct  8 06:54:44 2002
-+++ anal/convol/makef
-@@ -7,7 +7,7 @@ T = ../..
- OBJS =  main.o $T/cvanal.o $T/fft.o $T/dsputil.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/aifc.o $T/getstring.o \
--        $T/winFLTK.o $T/FL_graph.o $T/winEPS.o $T/winascii.o 
-+        $T/winEPS.o $T/winascii.o 
- 
- 
- cvl:	cvanal
diff --git a/audio/csound-bath/patches/patch-ay b/audio/csound-bath/patches/patch-ay
deleted file mode 100644
index 52a726d5f12..00000000000
--- a/audio/csound-bath/patches/patch-ay
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ay,v 1.1 2003/01/19 21:31:15 hubertf Exp $
-
---- util2/dnoise.dir/dnoise.c.orig	Sat Dec 14 05:01:18 2002
-+++ util2/dnoise.dir/dnoise.c
-@@ -109,6 +109,9 @@
- static long  bytes = 0;
- OPARMS	O = {0,0, 0,1,1,0, 0,0, 0,0, 0,0, 1,0,0,7, 0,0,0, 0,0,0,0, 0,0 };
- 
-+#ifdef POLL_EVENTS
-+#undef POLL_EVENTS
-+#endif
- int POLL_EVENTS(void)
- {
-     return 1;
diff --git a/audio/csound-bath/patches/patch-az b/audio/csound-bath/patches/patch-az
deleted file mode 100644
index c0de09259fd..00000000000
--- a/audio/csound-bath/patches/patch-az
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-az,v 1.1 2003/01/19 21:31:16 hubertf Exp $
-
---- util2/dnoise.dir/srconv.c.orig	Sat Dec 14 05:01:14 2002
-+++ util2/dnoise.dir/srconv.c
-@@ -78,6 +78,9 @@
- OPARMS	O = {0,0, 0,1,1,0, 0,0, 0,0, 0,0, 1,0,0,7, 0,0,0, 0,0,0,0, 0,0 };
- 
- 
-+#ifdef POLL_EVENTS
-+#undef POLL_EVENTS
-+#endif
- int POLL_EVENTS(void)
- {
-     return 1;
diff --git a/audio/csound-bath/patches/patch-ba b/audio/csound-bath/patches/patch-ba
deleted file mode 100644
index d9e559edacc..00000000000
--- a/audio/csound-bath/patches/patch-ba
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ba,v 1.1 2003/01/19 21:31:17 hubertf Exp $
-
---- util2/envext/envext.c.orig	Tue Oct 15 10:31:50 2002
-+++ util2/envext/envext.c
-@@ -13,6 +13,9 @@
- 
- /* Constants */
- 
-+#ifdef POLL_EVENTS
-+#undef POLL_EVENTS
-+#endif
- int POLL_EVENTS(void)
- {
-     return 1;