summaryrefslogtreecommitdiff
path: root/audio
diff options
context:
space:
mode:
authorben <ben>2003-12-13 20:18:25 +0000
committerben <ben>2003-12-13 20:18:25 +0000
commit8c0121968a5645a7399c388e3218442fb8fc3975 (patch)
tree8b49eadac78fcbb4c99a13aa194cf12f1f890196 /audio
parent22031c5ef12a7200f469e7f377af5086ccef7d53 (diff)
downloadpkgsrc-8c0121968a5645a7399c388e3218442fb8fc3975.tar.gz
The unofficial-csound package is no longer being developed. I plan to add
csound-dev as a more up-to-date replacement.
Diffstat (limited to 'audio')
-rw-r--r--audio/csound/DESCR8
-rw-r--r--audio/csound/Makefile27
-rw-r--r--audio/csound/PLIST37
-rw-r--r--audio/csound/distinfo26
-rw-r--r--audio/csound/files/rtNetBSD.c309
-rw-r--r--audio/csound/files/rtNetBSD.h20
-rw-r--r--audio/csound/patches/patch-aa13
-rw-r--r--audio/csound/patches/patch-ab107
-rw-r--r--audio/csound/patches/patch-ac13
-rw-r--r--audio/csound/patches/patch-ad10
-rw-r--r--audio/csound/patches/patch-ae69
-rw-r--r--audio/csound/patches/patch-af54
-rw-r--r--audio/csound/patches/patch-ag13
-rw-r--r--audio/csound/patches/patch-ah84
-rw-r--r--audio/csound/patches/patch-ai13
-rw-r--r--audio/csound/patches/patch-aj13
-rw-r--r--audio/csound/patches/patch-ak50
-rw-r--r--audio/csound/patches/patch-an13
-rw-r--r--audio/csound/patches/patch-ao161
-rw-r--r--audio/csound/patches/patch-ap13
-rw-r--r--audio/csound/patches/patch-aq14
-rw-r--r--audio/csound/patches/patch-ar13
-rw-r--r--audio/csound/patches/patch-as22
-rw-r--r--audio/csound/patches/patch-at30
-rw-r--r--audio/csound/patches/patch-au13
-rw-r--r--audio/csound/patches/patch-av19
-rw-r--r--audio/csound/patches/patch-aw43
-rw-r--r--audio/csound/patches/patch-ax101
28 files changed, 0 insertions, 1308 deletions
diff --git a/audio/csound/DESCR b/audio/csound/DESCR
deleted file mode 100644
index 909beaee389..00000000000
--- a/audio/csound/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/Makefile b/audio/csound/Makefile
deleted file mode 100644
index 93b5a3d6007..00000000000
--- a/audio/csound/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-# $NetBSD: Makefile,v 1.11 2003/07/22 05:14:43 martti Exp $
-#
-
-DISTNAME= unofficial-csound-4.13.0.2a-linux.src
-PKGNAME= csound-4.13.0.2a
-CATEGORIES= audio
-MASTER_SITES= ftp://mustec.bgsu.edu/pub/linux/
-
-MAINTAINER= collver1@comcast.net
-HOMEPAGE= http://www.csound.org/
-COMMENT= Software synthesizer and sequencer
-
-LICENSE= csound-license
-RESTRICTED= "no for-fee-redistribution"
-NO_SRC_ON_CDROM= ${RESTRICTED}
-NO_BIN_ON_CDROM= ${RESTRICTED}
-
-DIST_SUBDIR= csound
-USE_GMAKE= yes
-GNU_CONFIGURE= yes
-CONFIGURE_ARGS+= --without-x --enable-rtaudio=netbsd
-CONFLICTS= csound-bath*
-
-pre-configure:
- ${CP} ${FILESDIR}/rtNetBSD.h ${FILESDIR}/rtNetBSD.c ${WRKSRC}/new-src/
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/csound/PLIST b/audio/csound/PLIST
deleted file mode 100644
index 0cc72de8974..00000000000
--- a/audio/csound/PLIST
+++ /dev/null
@@ -1,37 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2002/03/23 02:36:45 wiz Exp $
-bin/csound
-bin/cvanal
-bin/dnoise
-bin/envelope
-bin/extract
-bin/extractor
-bin/het_export
-bin/het_import
-bin/hetro
-bin/lpanal
-bin/lpc_export
-bin/mixer
-bin/pv_export
-bin/pv_import
-bin/pvanal
-bin/pvlook
-bin/scale
-bin/scot
-bin/scsort
-bin/sndinfo
-bin/srconv
-include/cscore.h
-include/dsputil.h
-include/fft.h
-include/lpc.h
-include/pvoc.h
-include/sfheader.h
-include/sysdep.h
-lib/libcscore.so
-lib/libcscore.so.4
-lib/libcscore.so.4.13.0.2a
-lib/libcsound.so
-lib/libcsound.so.4
-lib/libcsound.so.4.13.0.2a
-share/csound/csound.txt
-@dirrm share/csound
diff --git a/audio/csound/distinfo b/audio/csound/distinfo
deleted file mode 100644
index 5915bd90e3b..00000000000
--- a/audio/csound/distinfo
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: distinfo,v 1.7 2003/12/04 00:34:06 kristerw Exp $
-
-SHA1 (csound/unofficial-csound-4.13.0.2a-linux.src.tar.gz) = 4c329ff4148a775fba9af7e39ce6ba59912d809c
-Size (csound/unofficial-csound-4.13.0.2a-linux.src.tar.gz) = 1076545 bytes
-SHA1 (patch-aa) = 4a3a50375d301d3c8ec5c3a6037ed573dfbb2e79
-SHA1 (patch-ab) = 35e90d6265b2b7e2b51a0ab1b32ce81202952f5a
-SHA1 (patch-ac) = 3d99734ab4e7324fc5339530e2f0a326ff963c91
-SHA1 (patch-ad) = cd4c34a1ced10383c456cf409f053c366092d7ae
-SHA1 (patch-ae) = e3755458138c0905068ea8f084fe06a4b74ae815
-SHA1 (patch-af) = 4f330a2468fe0a0b97c19076a7f682f6319cc198
-SHA1 (patch-ag) = 6cc2cf7c1ac03a5a44ecdefeb7fb43c87f4f2529
-SHA1 (patch-ah) = 379b41165b1ff39e5021f80809a9ab2e7db66668
-SHA1 (patch-ai) = a50611b09c6dbd481ee47ff90bf101058cbcbc19
-SHA1 (patch-aj) = 2d18cf881d09e447969a623c88866c0624b19990
-SHA1 (patch-ak) = eef2e5bf815a0359ca9c5474a26c8da038c5da0a
-SHA1 (patch-an) = 29c786bdfbed4b1ae022b8dfdf4fa17409fbd9c9
-SHA1 (patch-ao) = 4b2dbffc454127035a84193f0047b5fd87c19c98
-SHA1 (patch-ap) = a9bec9f3f85295544c8dca5c6e5fb8407e018764
-SHA1 (patch-aq) = 1cbcf5bf584a1cd2510a6feeba4ab0124334b05b
-SHA1 (patch-ar) = 853370ab5104e116d44fd36f4c7552992603ce12
-SHA1 (patch-as) = 41a3409f389bd146ff9a21d0b983a7ec2e2ff4b6
-SHA1 (patch-at) = 4d545c4fabcb5cf6211a0f00ea2ea983adb83cd7
-SHA1 (patch-au) = bf1d88e516b9d09d1ea6c6c87101654a30ba98fa
-SHA1 (patch-av) = 194dc38b80780a5626fb2b5262fa2b56d68d337e
-SHA1 (patch-aw) = 0444633e551c5dd293be377477a748fd48744cd5
-SHA1 (patch-ax) = 0333e4289152d8f80b1967ee6331ca697b1729b9
diff --git a/audio/csound/files/rtNetBSD.c b/audio/csound/files/rtNetBSD.c
deleted file mode 100644
index abc066f9d89..00000000000
--- a/audio/csound/files/rtNetBSD.c
+++ /dev/null
@@ -1,309 +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;
-
-static int ishift = 0, oshift = 0, oMaxLag;
-extern long nrecs;
- long inrecs;
-extern OPARMS O;
-extern int Linefd;
-#ifdef PIPES
-extern FILE* Linepipe;
-# 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 fd,
- const char *message,
- audio_info_t *info)
-{
- audio_encoding_t encoding;
- char *encoding_name;
-
- encoding.index = info->play.encoding;
- if (ioctl(fd, 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 fd,
- int format,
- int nchnls,
- MYFLT esr,
- 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 = nchnls;
- info.play.sample_rate = (unsigned int) esr;
-
- /* 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(fd, AUDIO_SETINFO, &info) == -1) {
- display_audio_info(fd, "requested", &info);
- if (ioctl(fd, AUDIO_GETINFO, &info) != -1)
- display_audio_info(fd, "got", &info);
- die("unable to configure soundcard");
- }
-}
-
-int find_mixer_label(int fd, 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(fd, 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 fd;
- int i;
- int output_class;
- int vol_output;
- mixer_devinfo_t info;
- mixer_ctrl_t value;
-
- /* volume must be between 0 and 255 */
-
- if ((fd = open(NETBSD_MIXER, O_WRONLY)) == -1)
- die("unable to open soundcard mixer for setting volume");
-
- output_class = find_mixer_label(fd, 0, "outputs");
- vol_output = find_mixer_label(fd, output_class, "master");
-
- if (vol_output == -1)
- die("Could not find mixer control for audio output.");
-
-
- info.index = vol_output;
- ioctl(fd, AUDIO_MIXER_DEVINFO, &info);
-
- value.dev = vol_output;
- value.type = info.type;
- value.un.value.num_channels = 2;
- if (ioctl(fd, AUDIO_MIXER_READ, &value) < 0) {
- value.un.value.num_channels = 1;
- if (ioctl(fd, 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(fd, AUDIO_MIXER_WRITE, &value) < 0) {
- die("unable to set output volume on soundcard");
- }
-}
-
-
-void NetBSD_open(int nchnls, int dsize, MYFLT esr, int scale, int audio_mode)
-{
- int dup;
- 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 = open(NETBSD_SAMPLER, O_RDONLY)) == -1)
- die("error while opening soundcard for audio input");
- setsndparms(dspfd, O.informat, nchnls, esr, wbufsiz);
- ishift = getshift(dsize);
- break;
- case NETBSD_PLAY:
- if ((dspfd = open(NETBSD_SAMPLER, O_WRONLY)) == -1) {
- perror("foo");
- die("error while opening soundcard for audio output");
- }
- setsndparms(dspfd, O.outformat, nchnls, esr, wbufsiz);
- /* 'oshift' is not currently used by the Linux driver, but... */
- oshift = getshift(nchnls * dsize);
- break;
- case NETBSD_DUPLEX:
- if ((dspfd = open(NETBSD_SAMPLER, O_RDWR)) == -1)
- die("error during soundcard duplex mode query:");
- ioctl(dspfd, AUDIO_GETPROPS, &audio_props);
- if (!(audio_props | AUDIO_PROP_FULLDUPLEX))
- die("hardware does not support full duplex mode");
- setsndparms(dspfd, O.outformat, nchnls, esr, wbufsiz);
- if (ioctl(dspfd, AUDIO_SETFD, audio_props) == -1)
- die("error setting hardware to full duplex mode");
- /* are these functions both required? */
- oshift = getshift(nchnls * dsize);
- ishift = getshift(dsize);
- break;
- default:
- fprintf(stderr, "mode specification error in NetBSD_open: ");
- fprintf(stderr, "unknown argument %d\n", audio_mode);
- exit(1);
- }
-
- ioctl(dspfd, AUDIO_GETDEV, &device_info);
- fprintf(stderr, "NetBSD 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, 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, 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 (close(dspfd) == -1)
- die("unable to close DSP device");
- if (O.Linein) {
-#ifdef PIPES
- if (O.Linename[0]=='|') _pclose(Linepipe);
- else
-#endif
- if (strcmp(O.Linename, "stdin")!=0) close(Linefd);
- }
-}
diff --git a/audio/csound/files/rtNetBSD.h b/audio/csound/files/rtNetBSD.h
deleted file mode 100644
index ddb410227e1..00000000000
--- a/audio/csound/files/rtNetBSD.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/* rtNetBSD.h */
-
-#ifndef _RTNETBSD_INCLUDED
-#define _RTNETBSD_INCLUDED
-
-#define NETBSD_RECORD 0
-#define NETBSD_PLAY 1
-#define NETBSD_DUPLEX 2
-
-#define USE_SETSCHEDULER
-
-#define NETBSD_MIXER "/dev/mixer0"
-#define NETBSD_SAMPLER "/dev/sound0"
-
-#define recopen(a,b,c,d) NetBSD_open(a,b,c,d,NETBSD_DUPLEX)
-#define playopen(a,b,c,d) NetBSD_open(a,b,c,d,NETBSD_PLAY)
-
-extern void NetBSD_open(int, int, MYFLT, int, int);
-
-#endif /* _RTNETBSD_INCLUDED */
diff --git a/audio/csound/patches/patch-aa b/audio/csound/patches/patch-aa
deleted file mode 100644
index bfb9dd5e147..00000000000
--- a/audio/csound/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2003/12/04 00:34:06 kristerw Exp $
-
---- linevent.c.orig Wed Dec 3 23:44:39 2003
-+++ linevent.c Wed Dec 3 23:45:53 2003
-@@ -11,7 +11,7 @@
- # include <unistd.h>
- #else
- extern int close(int);
--#if !defined(_macintosh) && !defined(SYMANTEC) && !defined(LINUX)
-+#if !defined(_macintosh) && !defined(SYMANTEC) && !defined(LINUX) && !defined(__NetBSD__)
- extern int read(int, void*, unsigned);
- #endif
- #endif
diff --git a/audio/csound/patches/patch-ab b/audio/csound/patches/patch-ab
deleted file mode 100644
index 94d093d0a34..00000000000
--- a/audio/csound/patches/patch-ab
+++ /dev/null
@@ -1,107 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2002/01/21 11:30:03 wiz Exp $
-
---- Make.Targets.orig Wed Oct 11 16:33:34 2000
-+++ Make.Targets
-@@ -48,26 +48,26 @@
- anals: $(ANALS)
-
- $(ANALS): $(CSLIB)
-- $(MAKE) -C $@ -$(MAKEFLAGS)
-+ $(MAKE) -C $@ $(MAKEFLAGS)
-
- utils1: $(UTIL1)
-
- $(UTIL1): $(CSLIB)
-- $(MAKE) -C $@ -$(MAKEFLAGS)
-+ $(MAKE) -C $@ $(MAKEFLAGS)
-
- utils2: $(UTIL2)
-
- $(UTIL2): $(CSLIB)
-- $(MAKE) -C $@ -$(MAKEFLAGS)
-+ $(MAKE) -C $@ $(MAKEFLAGS)
-
- $(STRINGSDB):
-- $(MAKE) -C locale -$(MAKEFLAGS)
-+ $(MAKE) -C locale $(MAKEFLAGS)
-
- install: install-$(CSLIB) install-progs install-headers install-shares
-
- install-progs: $(PROGS)
- if [ ! -d $(DEST) ]; then $(INSTALL) -d -m 755 $(DEST); fi
-- $(INSTALL) -s -o root -g root -m $(INSTALL_MODE)\
-+ $(INSTALL) -s -o root -g wheel -m $(INSTALL_MODE)\
- $(CSOUND_PROG) $(DEST)
- if [ -n "$(OTHER_PROGS)" ]; \
- then \
-@@ -78,14 +78,14 @@
- fi
- for i in $(SUBDIRS);\
- do \
-- $(MAKE) -C $$i -$(MAKEFLAGS) install; \
-+ $(MAKE) -C $$i $(MAKEFLAGS) install; \
- done
-
- install-$(CSADYNSO): $(CSADYNSO)
- if [ ! -d $(LIB) ]; then $(INSTALL) -d -m 755 $(LIB); fi
- $(INSTALL) -m 755 $(CSADYNSO) $(LIB)/$(CSADYNSO)
-+ ln -sf $(CSADYNSO) $(LIB)/$(CSADYN).4
- ln -sf $(CSADYNSO) $(LIB)/$(CSADYN)
-- /sbin/ldconfig -N $(LIB)
-
- install-$(CSASTAT): $(CSASTAT)
- if [ ! -d $(LIB) ]; then $(INSTALL) -d -m 755 $(LIB); fi
-@@ -99,7 +99,7 @@
- done
-
- install-shares:
-- $(MAKE) -C locale -$(MAKEFLAGS) install
-+ $(MAKE) -C locale $(MAKEFLAGS) install
-
- bin-distrib: $(LINUX_BINDISTRIB).gz
-
-@@ -109,7 +109,7 @@
- tar cf $@ $(CSLIB) $(PROGS) $(DOC_FILES)
- for i in $(SUBDIRS); \
- do \
-- $(MAKE) -C $$i -$(MAKEFLAGS) $@; \
-+ $(MAKE) -C $$i $(MAKEFLAGS) $@; \
- done
-
-
-@@ -125,7 +125,7 @@
- for i in $(SRCDISTRIB_DIRS); \
- do \
- $(INSTALL) -d -m 755 $(LINUX_SRCDISTRIBDIR)/$$i; \
-- $(MAKE) -C $$i -$(MAKEFLAGS) $@; \
-+ $(MAKE) -C $$i $(MAKEFLAGS) $@; \
- done
- for i in $(SRCDISTRIB_FILES); \
- do \
-@@ -141,7 +141,7 @@
- clean-subdirs:
- for i in $(SUBDIRS); \
- do \
-- $(MAKE) -$(MAKEFLAGS) -C $$i $(PASSED_FLAGS) clean; \
-+ $(MAKE) $(MAKEFLAGS) -C $$i $(PASSED_FLAGS) clean; \
- done
-
- clean: clean-subdirs
-@@ -154,7 +154,7 @@
- realclean-subdirs:
- for i in $(SUBDIRS); \
- do \
-- $(MAKE) -$(MAKEFLAGS) -C $$i $(PASSED_FLAGS) realclean; \
-+ $(MAKE) $(MAKEFLAGS) -C $$i $(PASSED_FLAGS) realclean; \
- done
-
- realclean: clean realclean-subdirs
-@@ -164,7 +164,7 @@
-
- depend:
- $(RM) $(CDEP)
-- $(MAKE) -$(MAKEFLAGS) $(CDEP)
-+ $(MAKE) $(MAKEFLAGS) $(CDEP)
-
- $(CDEP):
- @echo "Building dependencies (this may take some time)..."
diff --git a/audio/csound/patches/patch-ac b/audio/csound/patches/patch-ac
deleted file mode 100644
index 89b35f6fd80..00000000000
--- a/audio/csound/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2002/03/23 02:36:47 wiz Exp $
-
---- Make.Variables.in.orig Sun Sep 9 10:54:48 2001
-+++ Make.Variables.in
-@@ -253,7 +253,7 @@
- $(DIST_MALDONADO_WIDGET_HEADER)
- SRCDISTRIB_DIRS=$(SUBDIRS) $(DOC_DIRS)
- STRINGSDB=csound.txt
--CSLIBDIR=${prefix}/lib/csound/${VERSION}
-+CSLIBDIR=${prefix}/share/csound
- ZIP=gzip -f --best
- MKDIR=mkdir -p
- EXE=
diff --git a/audio/csound/patches/patch-ad b/audio/csound/patches/patch-ad
deleted file mode 100644
index 8fd14f2ccac..00000000000
--- a/audio/csound/patches/patch-ad
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2001/06/29 18:39:03 wiz Exp $
-
---- acconfig.h.orig Sun Jun 3 19:12:50 2001
-+++ acconfig.h Sun Jun 3 19:13:22 2001
-@@ -0,0 +1,5 @@
-+/* these are here to silence autoreconf */
-+#undef FORCE_STDOUT_LBUF
-+#undef NEEDS_MINSHORT
-+#undef NEEDS_SAFE_FCLOSE
-+#undef HAVE_INLINE
diff --git a/audio/csound/patches/patch-ae b/audio/csound/patches/patch-ae
deleted file mode 100644
index 15c3952c062..00000000000
--- a/audio/csound/patches/patch-ae
+++ /dev/null
@@ -1,69 +0,0 @@
-$NetBSD: patch-ae,v 1.3 2002/03/23 02:36:47 wiz Exp $
-
---- configure.in.orig Sun Sep 9 10:54:48 2001
-+++ configure.in
-@@ -32,6 +32,7 @@
- AC_PROG_CC
- AC_PROG_CXX
- AC_CANONICAL_HOST
-+AC_C_BIGENDIAN
-
- dnl Below here is the result of running autoscan on the csound sources
- dnl Process this file with autoconf to produce a configure script.
-@@ -345,19 +346,21 @@
- dnl [enable_ALSA_driver="no"])dnl
-
- dnl
--dnl --enable-rtaudio={oss,alsa,esd} (default=oss)
-+dnl --enable-rtaudio={oss,alsa,esd,netbsd} (default=oss)
- dnl
- dnl The oss module has been provided by Steve Kersten {steve@k-hornz.de}
- dnl The esd module has been provided by Nicola Bernardini {nicb@axnet.it}
- dnl The alsa module has been provided by Markus Gruber {gruber@eikon.tum.de}
-+dnl The netbsd module has been provided by Ben {collver@linuxfreemail.com}
- dnl
- dnl
- AC_ARG_ENABLE(rtaudio,
-- [ --enable-rtaudio={oss|alsa|esd} enable real-time audio (default: oss)],
-+ [ --enable-rtaudio={oss|alsa|esd|netbsd} enable real-time audio (default: oss)],
- [case "${enable_rtaudio}" in
- oss) ;;
- alsa) ;;
- esd) ;;
-+ netbsd) ;;
- *) AC_MSG_ERROR(bad value ${enable_rtaudio} for the real-time audio option) ;;
- esac],
- [enable_rtaudio="oss"])dnl
-@@ -384,6 +387,13 @@
- DEFS=["${DEFS} -DESDRTAUDIO"]
- fi
-
-+if test "${enable_rtaudio}" = "netbsd"
-+then
-+ CSOUND_CONF_MESSAGE(enable the netbsd audio driver...)
-+ RTAUDIO_DRIVER=[\${LINUX_DISTRIB_DIR}/rtNetBSD.c]
-+ DEFS=["${DEFS} -DNETBSDRTAUDIO"]
-+fi
-+
- dnl
- dnl --enable-OSC-opcodes (default=no)
- dnl
-@@ -653,8 +663,8 @@
- dnl
-
- case $host in
-- *linux)
-- local_defines="-DRTAUDIO -DLINUX ${DEFS}"
-+ *linux|*bsd)
-+ local_defines="-DRTAUDIO -DLINUX -DBSD ${DEFS}"
- ;;
- *)
- ;;
-@@ -736,6 +746,7 @@
- AC_SUBST(LD)dnl
- AC_SUBST(CSOUND_INSTALLATION_MODE)dnl
- AC_SUBST(csound_float)dnl
-+AC_SUBST(WORDS_BIGENDIAN)dnl
-
- AC_OUTPUT(Make.Variables new-src/version.h)
- CSOUND_CONF_MESSAGE(configure process terminated; you should now run 'make depend; make')
diff --git a/audio/csound/patches/patch-af b/audio/csound/patches/patch-af
deleted file mode 100644
index d246280a6c2..00000000000
--- a/audio/csound/patches/patch-af
+++ /dev/null
@@ -1,54 +0,0 @@
-$NetBSD: patch-af,v 1.1.1.1 2001/03/13 13:18:24 wiz Exp $
-
---- extract.c.orig Thu Sep 21 21:55:32 2000
-+++ 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 */
-
-@@ -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/patches/patch-ag b/audio/csound/patches/patch-ag
deleted file mode 100644
index a952352e249..00000000000
--- a/audio/csound/patches/patch-ag
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ag,v 1.1.1.1 2001/03/13 13:18:24 wiz Exp $
-
---- locale/all_strings.orig Sun Dec 10 16:37:55 2000
-+++ locale/all_strings
-@@ -174,7 +174,7 @@
- 174,"...done!\n"
- 175,"/dev/audio: can't 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,"AIFF does not support %s encoding"
diff --git a/audio/csound/patches/patch-ah b/audio/csound/patches/patch-ah
deleted file mode 100644
index f308c1317fc..00000000000
--- a/audio/csound/patches/patch-ah
+++ /dev/null
@@ -1,84 +0,0 @@
-$NetBSD: patch-ah,v 1.2 2002/03/23 02:36:47 wiz Exp $
-
---- midisend.c.orig Mon Feb 22 09:20:19 1999
-+++ midisend.c
-@@ -22,6 +22,8 @@
- dlphilp@bright.net
- */
-
-+#undef USE_DLP_MIDI_OUT_CODE
-+
- #ifdef LINUX
-
- #include <unistd.h>
-@@ -29,8 +31,20 @@
- #include <ctype.h>
- #include <sys/ioctl.h>
- #include <fcntl.h>
--#ifdef FREE_BSD
--# include <sys/soundcard.h>
-+#ifdef BSD
-+#ifdef USE_DLP_MIDI_OUT_CODE
-+#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);}
-+#endif
- #else
- # include <linux/soundcard.h>
- #endif
-@@ -55,7 +69,7 @@
-
- /* Older DLP code begins here */
-
--/*
-+#ifdef USE_DLP_MIDI_OUT_CODE
- int MIDIoutDONE = 0;
-
- #ifdef LINUX
-@@ -77,8 +91,6 @@
- _seqbufptr = 0;
- }
-
--#define _gotMIDIout (1)
--
- void send_midi_message(int status, int data1, int data2)
- {
- SEQ_MIDIOUT(DEVNUM,status);
-@@ -150,10 +162,10 @@
-
- #endif
-
--*/
--
- /* End of older DLP code */
-
-+#else /* ! USE_DLP_MIDI_OUT_CODE */
-+
- /* Begin MIDI code from Paul Barton-Davis */
-
- int MIDIoutDONE = 0;
-@@ -247,7 +259,7 @@
- {
- char devname[64];
-
-- sprintf (devname, "/dev/midi%02d", midi_out);
-+ sprintf (devname, "/dev/rmidi%d", midi_out);
- printf ("opening %s as MIDI out\n", devname);
- if (MIDIoutDONE==0 && (midifd= open(devname, O_WRONLY)) < 0)
- printf("Can't open MIDI device\n");
-@@ -257,6 +269,7 @@
- #endif LINUX
-
- /* End of Paul Barton-Davis code */
-+#endif /* ! USE_DLP_MIDI_OUT_CODE */
-
- /* ********************************* */
- /* This section for Windows95 and NT */
diff --git a/audio/csound/patches/patch-ai b/audio/csound/patches/patch-ai
deleted file mode 100644
index 577c42e6605..00000000000
--- a/audio/csound/patches/patch-ai
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ai,v 1.3 2003/12/04 00:34:06 kristerw Exp $
-
---- aiff.c.orig Wed Dec 3 23:55:11 2003
-+++ aiff.c Wed Dec 3 23:56:19 2003
-@@ -15,7 +15,7 @@
- #if defined(__BEOS__)
- #include <unistd.h>
- #else
--#if !defined(macintosh) && !defined( SYMANTEC ) && !defined( LINUX )
-+#if !defined(macintosh) && !defined( SYMANTEC ) && !defined( LINUX ) && !defined(__NetBSD__)
- extern int write(int, const void*, unsigned int);
- #endif
- extern off_t lseek(int, off_t, int);
diff --git a/audio/csound/patches/patch-aj b/audio/csound/patches/patch-aj
deleted file mode 100644
index 29d13560faa..00000000000
--- a/audio/csound/patches/patch-aj
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aj,v 1.1.1.1 2001/03/13 13:18:24 wiz Exp $
-
---- new-src/ipc-sliders.c.orig Sat Dec 26 22:14:26 1998
-+++ new-src/ipc-sliders.c
-@@ -190,7 +190,7 @@
- pid_t father_pid = getpid();
- pid_t child_pid = 0;
-
-- syscall_warning(setpgrp(), "setpgrp() - cannot set csound as process group leader");
-+ syscall_warning(setpgid(0,0), "setpgid(0,0) - cannot set csound as process group leader");
- child_pid = syscall_fatal(vfork(), FORK_FAILED, "fork failed");
-
- if (!child_pid) /* this is the child */
diff --git a/audio/csound/patches/patch-ak b/audio/csound/patches/patch-ak
deleted file mode 100644
index 8ace9e9b535..00000000000
--- a/audio/csound/patches/patch-ak
+++ /dev/null
@@ -1,50 +0,0 @@
-$NetBSD: patch-ak,v 1.2 2001/06/29 18:39:03 wiz Exp $
-
---- new-src/scheduler.c.orig Sat Dec 12 12:16:30 1998
-+++ new-src/scheduler.c
-@@ -3,25 +3,28 @@
- *
-- * Written by Fred Floberg <emng@geocities.com>
-- *
- */
--#include <sched.h>
-+
-+#include <sys/time.h>
-+#include <sys/resource.h>
- #include <stdio.h>
--#include "cs.h"
-+
-+#define HIGH_PRIORITY -20
-+
- void setscheduler(void)
- {
-- struct sched_param sched_param;
- extern int scheduler_priority;
-
-- if(!scheduler_priority) return; /* Check commandline option */
-- if (sched_getparam(0, &sched_param)<0) {
-- err_printf("Scheduler getparam failed...\n");
-- return;
-- }
-- sched_param.sched_priority = sched_get_priority_max(SCHED_RR);
-- if (!sched_setscheduler(0, SCHED_RR, &sched_param)) {
-- err_printf("Scheduler set to Round Robin with priority %i...\n", sched_param.sched_priority);
-- fflush(stderr);
-- return;
-- }
-- err_printf("!!!Scheduler set to Round Robin with priority %i FAILED!!!\n", sched_param.sched_priority);
-+ if (scheduler_priority == 0)
-+ return;
-+
-+ if (setpriority(PRIO_PROCESS, 0, HIGH_PRIORITY) == 0) {
-+ err_printf("Scheduler set to priority %i...\n",
-+ HIGH_PRIORITY);
-+ fflush(stderr);
-+ return;
-+ }
-+
-+ err_printf("Scheduler set to priority %i FAILED!!!\n",
-+ HIGH_PRIORITY);
-+ fflush(stderr);
-+ return;
- }
diff --git a/audio/csound/patches/patch-an b/audio/csound/patches/patch-an
deleted file mode 100644
index 35e321f9e43..00000000000
--- a/audio/csound/patches/patch-an
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-an,v 1.1.1.1 2001/03/13 13:18:24 wiz Exp $
-
---- util1/cscore/Makefile.orig Wed Oct 11 16:33:37 2000
-+++ util1/cscore/Makefile
-@@ -41,7 +41,7 @@
-
- install-$(LIBCSCORE_DYNSO): $(LIBCSCORE_DYNSO)
- install -m 755 $(LIBCSCORE_DYNSO) $(LIB)
-+ ln -sf $(LIBCSCORE_DYNSO) $(LIB)/$(LIBCSCORE_DYN).4
- ln -sf $(LIBCSCORE_DYNSO) $(LIB)/$(LIBCSCORE_DYN)
-- /sbin/ldconfig $(LIB)
-
- include $(TOP)/Make.Subdirs
diff --git a/audio/csound/patches/patch-ao b/audio/csound/patches/patch-ao
deleted file mode 100644
index b984bfeec03..00000000000
--- a/audio/csound/patches/patch-ao
+++ /dev/null
@@ -1,161 +0,0 @@
-$NetBSD: patch-ao,v 1.2 2002/03/23 02:36:48 wiz Exp $
-
---- configure.orig Sun Sep 9 10:55:54 2001
-+++ configure
-@@ -20,7 +20,7 @@
- ac_help="$ac_help
- --enable-debug enable debug flags (default: no)"
- ac_help="$ac_help
-- --enable-rtaudio={oss|alsa|esd} enable real-time audio (default: oss)"
-+ --enable-rtaudio={oss|alsa|esd|netbsd} enable real-time audio (default: oss)"
- ac_help="$ac_help
- --enable-OSC-opcodes enable OSC opcodes (default: no)
- (requires the OSC library - read new-src/README.OSC)"
-@@ -969,6 +969,96 @@
- host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
- echo "$ac_t""$host" 1>&6
-
-+echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6
-+echo "configure:974: checking whether byte ordering is bigendian" >&5
-+if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then
-+ echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+ ac_cv_c_bigendian=unknown
-+# See if sys/param.h defines the BYTE_ORDER macro.
-+cat > conftest.$ac_ext <<EOF
-+#line 981 "configure"
-+#include "confdefs.h"
-+#include <sys/types.h>
-+#include <sys/param.h>
-+int main() {
-+
-+#if !BYTE_ORDER || !BIG_ENDIAN || !LITTLE_ENDIAN
-+ bogus endian macros
-+#endif
-+; return 0; }
-+EOF
-+if { (eval echo configure:992: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+ rm -rf conftest*
-+ # It does; now see whether it defined to BIG_ENDIAN or not.
-+cat > conftest.$ac_ext <<EOF
-+#line 996 "configure"
-+#include "confdefs.h"
-+#include <sys/types.h>
-+#include <sys/param.h>
-+int main() {
-+
-+#if BYTE_ORDER != BIG_ENDIAN
-+ not big endian
-+#endif
-+; return 0; }
-+EOF
-+if { (eval echo configure:1007: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+ rm -rf conftest*
-+ ac_cv_c_bigendian=yes
-+else
-+ echo "configure: failed program was:" >&5
-+ cat conftest.$ac_ext >&5
-+ rm -rf conftest*
-+ ac_cv_c_bigendian=no
-+fi
-+rm -f conftest*
-+else
-+ echo "configure: failed program was:" >&5
-+ cat conftest.$ac_ext >&5
-+fi
-+rm -f conftest*
-+if test $ac_cv_c_bigendian = unknown; then
-+if test "$cross_compiling" = yes; then
-+ { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
-+else
-+ cat > conftest.$ac_ext <<EOF
-+#line 1027 "configure"
-+#include "confdefs.h"
-+main () {
-+ /* Are we little or big endian? From Harbison&Steele. */
-+ union
-+ {
-+ long l;
-+ char c[sizeof (long)];
-+ } u;
-+ u.l = 1;
-+ exit (u.c[sizeof (long) - 1] == 1);
-+}
-+EOF
-+if { (eval echo configure:1040: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+then
-+ ac_cv_c_bigendian=no
-+else
-+ echo "configure: failed program was:" >&5
-+ cat conftest.$ac_ext >&5
-+ rm -fr conftest*
-+ ac_cv_c_bigendian=yes
-+fi
-+rm -fr conftest*
-+fi
-+
-+fi
-+fi
-+
-+echo "$ac_t""$ac_cv_c_bigendian" 1>&6
-+if test $ac_cv_c_bigendian = yes; then
-+ cat >> confdefs.h <<\EOF
-+#define WORDS_BIGENDIAN 1
-+EOF
-+
-+fi
-+
-
-
- # Find a good install program. We prefer a C program (faster),
-@@ -1213,7 +1303,7 @@
- fi
- fi
-
--for ac_prog in gawk mawk nawk awk
-+for ac_prog in mawk gawk nawk awk
- do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
-@@ -2451,6 +2541,7 @@
- oss) ;;
- alsa) ;;
- esd) ;;
-+ netbsd) ;;
- *) { echo "configure: error: bad value ${enable_rtaudio} for the real-time audio option" 1>&2; exit 1; } ;;
- esac
- else
-@@ -2482,6 +2573,14 @@
- DEFS="${DEFS} -DESDRTAUDIO"
- fi
-
-+if test "${enable_rtaudio}" = "netbsd"
-+then
-+ echo "enable the netbsd audio driver..." 1>&6
-+echo "configure:2580: enable the netbsd audio driver..." >&5
-+ RTAUDIO_DRIVER=\${LINUX_DISTRIB_DIR}/rtNetBSD.c
-+ DEFS="${DEFS} -DNETBSDRTAUDIO"
-+fi
-+
- # Check whether --enable-OSC_opcodes or --disable-OSC_opcodes was given.
- if test "${enable_OSC_opcodes+set}" = set; then
- enableval="$enable_OSC_opcodes"
-@@ -3020,8 +3119,8 @@
-
-
- case $host in
-- *linux)
-- local_defines="-DRTAUDIO -DLINUX ${DEFS}"
-+ *linux|*bsd)
-+ local_defines="-DRTAUDIO -DLINUX -DBSD ${DEFS}"
- ;;
- *)
- ;;
-@@ -3249,6 +3348,7 @@
- s%@LD@%$LD%g
- s%@CSOUND_INSTALLATION_MODE@%$CSOUND_INSTALLATION_MODE%g
- s%@csound_float@%$csound_float%g
-+s%@WORDS_BIGENDIAN@%$WORDS_BIGENDIAN%g
-
- CEOF
- EOF
diff --git a/audio/csound/patches/patch-ap b/audio/csound/patches/patch-ap
deleted file mode 100644
index 94234b8f560..00000000000
--- a/audio/csound/patches/patch-ap
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ap,v 1.1 2002/01/21 11:30:04 wiz Exp $
-
---- sread.c.orig Thu Apr 5 18:58:53 2001
-+++ sread.c
-@@ -1055,7 +1055,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/patches/patch-aq b/audio/csound/patches/patch-aq
deleted file mode 100644
index 0bd9e94bf5a..00000000000
--- a/audio/csound/patches/patch-aq
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-aq,v 1.1 2002/01/21 11:30:04 wiz Exp $
-
---- cs.h.orig Mon Feb 22 18:20:17 1999
-+++ cs.h
-@@ -86,9 +86,7 @@
- int ringbell, termifend, stdoutfd;
- int rewrt_hdr, heartbeat, gen01defer;
- int scheduler_priority; /* emng@geocities.com 12/05/98 */
--#ifdef LINUX
- int Volume; /* Jonathan Mohr 1995 Oct 17 */
--#endif
- long sr_override, kr_override;
- long instxtcount, optxtsize;
- long poolcount, gblfixed, gblacount;
diff --git a/audio/csound/patches/patch-ar b/audio/csound/patches/patch-ar
deleted file mode 100644
index 52d2de8d3ff..00000000000
--- a/audio/csound/patches/patch-ar
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ar,v 1.1 2002/01/21 11:30:04 wiz Exp $
-
---- new-src/maldonado/OpcLoad.c.orig Thu Sep 21 21:56:03 2000
-+++ new-src/maldonado/OpcLoad.c
-@@ -8,7 +8,7 @@
- # include <direct.h>
- # include <windows.h>
- #endif /* defined(WIN32) */
--#if defined(LINUX)
-+#if defined(LINUX) || defined(__NetBSD__)
- # include <limits.h>
- # define MAX_PATH PATH_MAX
- # define _MAX_PATH PATH_MAX
diff --git a/audio/csound/patches/patch-as b/audio/csound/patches/patch-as
deleted file mode 100644
index 5255a9eea60..00000000000
--- a/audio/csound/patches/patch-as
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-as,v 1.1 2002/01/21 11:30:04 wiz Exp $
-
---- main.c.orig Thu Apr 5 18:58:52 2001
-+++ main.c
-@@ -52,7 +52,7 @@
- int peakchunks = 1; /* Ditto */
- long opcodeCount = 0; /* needed by dyn linking */
-
--#ifdef LINUX
-+#if defined(LINUX) || defined(__NetBSD__)
- int midi_out;
- extern void openMIDIout(void);
- #endif
-@@ -74,7 +74,7 @@
-
- #include <signal.h>
-
--#if !defined(LINUX) && !defined(SGI) && !defined(__BEOS__)
-+#if !defined(LINUX) && !defined(SGI) && !defined(__BEOS__) && !defined(__NetBSD__)
- static char *signal_to_string(int sig)
- {
- switch(sig) {
diff --git a/audio/csound/patches/patch-at b/audio/csound/patches/patch-at
deleted file mode 100644
index 0a9bfad1ae6..00000000000
--- a/audio/csound/patches/patch-at
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-at,v 1.1 2002/03/23 02:36:48 wiz Exp $
-
---- cs.h.orig Sat May 19 03:29:57 2001
-+++ cs.h
-@@ -8,6 +8,25 @@
-
- #include "new-src/config.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
-+ WORDS_BIGENDIAN is defined in new-src/config.h, info autoconf
-+ */
-+#ifdef __NetBSD__
-+#undef BIG_ENDIAN
-+#undef LITTLE_ENDIAN
-+#endif
-+
-+#ifdef WORDS_BIGENDIAN
-+#define __BIG_ENDIAN__
-+#define BIG_ENDIAN
-+#else
-+#define __LITTLE_ENDIAN__
-+#define LITTLE_ENDIAN
-+#endif
-+
- #define VMSGS 1
- #if VMSGS
- #define VMSG(x) if (odebug) x
diff --git a/audio/csound/patches/patch-au b/audio/csound/patches/patch-au
deleted file mode 100644
index 09a5656cae1..00000000000
--- a/audio/csound/patches/patch-au
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-au,v 1.1 2002/03/23 02:36:48 wiz Exp $
-
---- sdif.h.orig Tue Dec 5 10:06:31 2000
-+++ sdif.h
-@@ -53,7 +53,7 @@
- #ifndef __SDIF_H
- #define __SDIF_H
-
--
-+#include "cs.h"
-
- /****************************************************/
- /* Create 32-bit and 64-bit int and float typedefs. */
diff --git a/audio/csound/patches/patch-av b/audio/csound/patches/patch-av
deleted file mode 100644
index 4d88e97141c..00000000000
--- a/audio/csound/patches/patch-av
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-av,v 1.1 2002/03/23 02:36:48 wiz Exp $
-
---- sftype.h.orig Tue Dec 5 10:06:31 2000
-+++ sftype.h
-@@ -1,3 +1,4 @@
-+#include "cs.h"
-
- #if !defined(_SFTYPE_H)
- #ifdef __GNUC__
-@@ -25,7 +26,8 @@
-
- typedef struct
- {
--#if defined(macintosh) || defined(SGI) /* and any such bigendian m/c */
-+#if defined(macintosh) || defined(SGI) || defined(__BIG_ENDIAN__)
-+ /* and any such bigendian m/c */
- BYTE byHi PACKED;
- BYTE byLo PACKED;
- #else
diff --git a/audio/csound/patches/patch-aw b/audio/csound/patches/patch-aw
deleted file mode 100644
index d8e6f887172..00000000000
--- a/audio/csound/patches/patch-aw
+++ /dev/null
@@ -1,43 +0,0 @@
-$NetBSD: patch-aw,v 1.2 2003/12/04 00:34:06 kristerw Exp $
-
---- soundio.c.orig Sat May 19 12:29:57 2001
-+++ soundio.c Wed Dec 3 23:54:20 2003
-@@ -57,7 +57,7 @@
- extern int rtrecord(char *, int);
- extern void rtplay(char *, int);
- extern void rtclose(void);
--# ifndef OSSRTAUDIO
-+# if !defined(OSSRTAUDIO) && !defined(NETBSDRTAUDIO)
- extern void recopen(int, int, MYFLT, int);
- extern void playopen(int, int, MYFLT, int);
- # endif
-@@ -70,6 +70,9 @@
- # include "OSSrtaudio.h"
- static int oss_mode = OSS_RECORD; /* Module-global state variable */
- # endif
-+# ifdef NETBSDRTAUDIO
-+# include "rtNetBSD.h"
-+# endif
- #ifdef PIPES
- FILE* pin=NULL, *pout=NULL;
- /*sbrandon: added NeXT to line below*/
-@@ -166,7 +169,7 @@
- return(sreadin(isfd,inbuf,nbytes,p));
- }
-
--#if !defined(SYMANTEC) && !defined(_macintosh) && !defined(LINUX) && !defined(__BEOS__)
-+#if !defined(SYMANTEC) && !defined(_macintosh) && !defined(LINUX) && !defined(__BEOS__) && !defined(__NetBSD__)
- extern int write(int, const void*, unsigned int);
- #endif
- /* RWD.2.98 WAVE floats format must be NORMALIZED +- 1 */
-@@ -469,6 +472,10 @@
- #endif
- # ifdef LINUX
- || strcmp(O.outfilename,"/dev/dsp") ==0
-+# endif
-+# ifdef BSD
-+ || strncmp(O.outfilename,"/dev/sound",10) ==0
-+ || strncmp(O.outfilename,"/dev/audio",10) ==0
- # endif
- || strcmp(O.outfilename,"dac") == 0) {
- #ifdef WIN32
diff --git a/audio/csound/patches/patch-ax b/audio/csound/patches/patch-ax
deleted file mode 100644
index 216e23dc866..00000000000
--- a/audio/csound/patches/patch-ax
+++ /dev/null
@@ -1,101 +0,0 @@
-$NetBSD: patch-ax,v 1.1 2002/03/23 02:36:49 wiz Exp $
-
---- new-src/config.h.in.orig Fri Mar 22 10:42:32 2002
-+++ new-src/config.h.in Fri Mar 22 10:44:05 2002
-@@ -10,8 +10,6 @@
- * you that towards the end of the process).
- *
- */
--#if !defined(_new_src_config_h_)
--# define _new_src_config_h_
-
- /* Define to empty if the keyword does not work. */
- #undef const
-@@ -52,12 +50,25 @@
- /* Define vfork as fork if vfork does not work. */
- #undef vfork
-
-+/* Define if your processor stores words with the most significant
-+ byte first (like Motorola and SPARC, unlike Intel and VAX). */
-+#undef WORDS_BIGENDIAN
-+
-+/* these are here to silence autoreconf */
-+#undef FORCE_STDOUT_LBUF
-+#undef NEEDS_MINSHORT
-+#undef NEEDS_SAFE_FCLOSE
-+#undef HAVE_INLINE
-+
- /* Define if you have the getcwd function. */
- #undef HAVE_GETCWD
-
- /* Define if you have the getopt_long function. */
- #undef HAVE_GETOPT_LONG
-
-+/* Define if you have the itoa function. */
-+#undef HAVE_ITOA
-+
- /* Define if you have the putenv function. */
- #undef HAVE_PUTENV
-
-@@ -76,9 +87,6 @@
- /* Define if you have the strtoul function. */
- #undef HAVE_STRTOUL
-
--/* Define if you have the itoa function. */
--#undef HAVE_ITOA
--
- /* Define if you have the <fcntl.h> header file. */
- #undef HAVE_FCNTL_H
-
-@@ -106,50 +114,6 @@
- /* Define if you have the <unistd.h> header file. */
- #undef HAVE_UNISTD_H
-
--/* Define if you need the safe_close() function */
--#undef NEEDS_SAFE_FCLOSE
--
--/* Define if you need the safe_close() function */
--#undef NEEDS_MINSHORT
--
--/* Define if you need the safe_close() function */
--#undef FORCE_STDOUT_LBUF
--
--/* Define if your compiler supports the inline keyword */
--#undef HAVE_INLINE
--
--/* Define if you have the fltk toolkit library */
-+/* yes */
- #undef HAVE_FLTK
-
--#if defined(NEEDS_MINSHORT)
--# if HAVE_LIMITS_H
--# include <limits.h>
--# endif /* HAVE_LIMITS_H */
--# define MINSHORT SHRT_MIN
--#endif /* defined(HAVE_SHRT_MIN) */
--
--#if defined(NEEDS_SAFE_FCLOSE)
--# include <stdio.h>
--# define fclose safe_fclose
--
-- int safe_fclose(FILE *);
--#endif /* defined(NEEDS_SAFE_FCLOSE) */
--
--#if defined(HAVE_INLINE)
--# define INLINE inline
--#else
--# define INLINE /* empty on purpose */
--#endif /* defined(HAVE_INLINE) */
--
--#if !defined(HAVE_ITOA)
--# if defined(__cplusplus)
-- extern "C"
-- {
--# endif /* defined(__cplusplus) */
-- char* itoa(int, char *, int);/* add substitute definition */
--# if defined(__cplusplus)
-- };
--# endif /* defined(__cplusplus) */
--#endif /* !defined(HAVE_ITOA) */
--
--#endif /* !defined(_new_src_config_h_) */