Update to 7.15:

About 7 years of development. Includes among others:
support for flac, speex, ogg/vorbis; a choice of frontends between
motif and gtk; esound support; guile scripting support; and native
NetBSD audio code.

Some possible future work on this package:
Add options for fftw2 fftw3 ladspa gamin/fam mpg123 timidity ruby

24 files changed, 69 insertions, 498 deletions

diff --git a/audio/snd/DESCR b/audio/snd/DESCR
index ceb77357aa9..85aafe1ffbc 100644
--- a/audio/snd/DESCR
+++ b/audio/snd/DESCR
@@ -1,12 +1,4 @@
-Snd is a sound editor modelled loosely after Emacs and an old, sorely-missed
-PDP-10 sound editor named Dpysnd. It can accomodate any number of sounds at
-once, each with any number of channels. Each channel is normally displayed
-in its own window, with its own cursor, edit history, and marks; each sound
-has a 'control panel' to try out various changes quickly, and an expression
-parser, used mainly during searches; there is an overall stack of 'regions'
-that can be browsed and edited; channels and sounds can be grouped together
-during editing; edits can be undone and redone without restriction
-('unlimited undo'); Snd can be customized using an Emacs-lisp-like syntax;
-it can also be extended with user-supplied editing or display functions
-loaded at run time; and it's free; the code is available via anonymous ftp
-from ccrma-ftp.stanford.edu as pub/Lisp/snd.tar.gz.
+Snd is a sound editor modelled loosely after Emacs and an old,
+sorely-missed PDP-10 sound editor named Dpysnd. It can accommodate
+any number of sounds each with any number of channels, and can be
+customized and extended using either Guile or Ruby. Snd is free.
diff --git a/audio/snd/Makefile b/audio/snd/Makefile
index ad9f95c67a1..d1121301e00 100644
--- a/audio/snd/Makefile
+++ b/audio/snd/Makefile
@@ -1,36 +1,34 @@
-# $NetBSD: Makefile,v 1.39 2005/06/01 18:02:38 jlam Exp $
+# $NetBSD: Makefile,v 1.40 2005/11/23 22:39:12 wiz Exp $
 #
 
-DISTNAME=		snd
-PKGNAME=		snd-19980212
-PKGREVISION=		2
+DISTNAME=		snd-7.15
 CATEGORIES=		audio
-MASTER_SITES=		${MASTER_SITE_LOCAL}
+MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=snd/}
 
 MAINTAINER=		tech-pkg@NetBSD.org
-HOMEPAGE=		http://ccrma-www.stanford.edu/CCRMA/Software/snd/snd.html
+HOMEPAGE=		http://ccrma.stanford.edu/software/snd/
 COMMENT=		X based sound editor
 
-NO_SRC_ON_FTP=		Already on MASTER_SITE_LOCAL
+DEPENDS+=		flac-[0-9]*:../../audio/flac
+DEPENDS+=		speex-[0-9]*:../../audio/speex
+DEPENDS+=		vorbis-tools-[0-9]*:../../audio/vorbis-tools
 
-PKG_INSTALLATION_TYPES=	overwrite pkgviews
+USE_PKGLOCALEDIR=	yes
+GNU_CONFIGURE=		yes
+USE_TOOLS+=		gmake pkg-config
 
-WRKSRC=			${WRKDIR}
-
-MAKEFILE=		makefile.netbsd
 BUILD_TARGET=		snd
+MAKEFILE=		makefile
+WRKSRC=			${WRKDIR}/snd-7
 
-HTMLDIR=		${PREFIX}/share/doc/html/snd
-
-INSTALLATION_DIRS=	bin lib/X11/app-defaults
-
-do-install:
-	cd ${WRKSRC} ; ${INSTALL_PROGRAM} snd ${PREFIX}/bin
-	cd ${WRKSRC} ; ${INSTALL_DATA} Snd.ad ${PREFIX}/lib/X11/app-defaults/Snd
-	${INSTALL_DATA_DIR} ${HTMLDIR}
-	cd ${WRKSRC} ; ${INSTALL_DATA} *.gif *.html *.txt README.Snd ${HTMLDIR}
+post-install:
+	${INSTALL_DATA} ${WRKSRC}/po/de.gmo \
+		${PREFIX}/${PKGLOCALEDIR}/locale/de/LC_MESSAGES/snd.mo
 
-.include "../../graphics/xpm/buildlink3.mk"
-.include "../../mk/motif.buildlink3.mk"
+.include "options.mk"
 
+.include "../../converters/libiconv/buildlink3.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../math/gsl/buildlink3.mk"
+.include "../../mk/ossaudio.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/snd/PLIST b/audio/snd/PLIST
index 7aec368b4b8..cd1c75fc839 100644
--- a/audio/snd/PLIST
+++ b/audio/snd/PLIST
@@ -1,20 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:17:54 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2005/11/23 22:39:12 wiz Exp $
 bin/snd
-lib/X11/app-defaults/Snd
-share/doc/html/snd/README.Snd
-share/doc/html/snd/auto.gif
-share/doc/html/snd/controls.gif
-share/doc/html/snd/d.gif
-share/doc/html/snd/fft.gif
-share/doc/html/snd/files.gif
-share/doc/html/snd/mixer.gif
-share/doc/html/snd/n.gif
-share/doc/html/snd/rec.gif
-share/doc/html/snd/regions.gif
-share/doc/html/snd/s.gif
-share/doc/html/snd/save.gif
-share/doc/html/snd/snd-widgets.txt
-share/doc/html/snd/snd.html
-share/doc/html/snd/snd.txt
-share/doc/html/snd/title.gif
-@dirrm share/doc/html/snd
+man/man1/snd.1
+${PKGLOCALEDIR}/locale/de/LC_MESSAGES/snd.mo
diff --git a/audio/snd/distinfo b/audio/snd/distinfo
index 5239d28ec49..72556e4f8cd 100644
--- a/audio/snd/distinfo
+++ b/audio/snd/distinfo
@@ -1,24 +1,5 @@
-$NetBSD: distinfo,v 1.9 2005/09/06 08:10:57 abs Exp $
+$NetBSD: distinfo,v 1.10 2005/11/23 22:39:12 wiz Exp $
 
-SHA1 (snd.tar.gz) = cb48922170602f30553b604bda039974c1706b65
-RMD160 (snd.tar.gz) = 69f665f4710fbdd671f6677cec6f91467789f4a1
-Size (snd.tar.gz) = 735422 bytes
-SHA1 (patch-aa) = 3aa0e5bcc54730628d220515919d8dbf11951c1a
-SHA1 (patch-ab) = de7027da166eda24e9f19c8ffc86192027e7eee1
-SHA1 (patch-ac) = d3073b7d102abcd05d7588b57eb8a053f20b74a7
-SHA1 (patch-ad) = 19a185e3e5a9800e56c904c06613b5d9645e6d17
-SHA1 (patch-ae) = f3968df5d034d5b3629aef8708cfff7e7a033fd9
-SHA1 (patch-af) = a8cf1931093397bcf88be08d36bd11efd9d4c161
-SHA1 (patch-ag) = 7a19ce85c0c45ef2844ca22bca74de9238aa3ad1
-SHA1 (patch-ah) = bade0ce099e74626c1db30c3689220cefa214758
-SHA1 (patch-ai) = 8447999b934cb8af70deb2c1ccc2b4b3d9bc61a8
-SHA1 (patch-aj) = 94c096717006f564a5d200ee07f4bccd2f2c13cb
-SHA1 (patch-ak) = 8732fd50e181bf02db4b7e63d2464f71e44e2f1e
-SHA1 (patch-al) = 7edd5495f5caf1c82c1a43db78e3b2e54adb4ca3
-SHA1 (patch-am) = 46955a9e33ceefdb88871e7f32443c839a46138c
-SHA1 (patch-an) = 4498dff116f9394767ba6e8f06670b549e4fce5b
-SHA1 (patch-ao) = 67b88decbf4b8b4c3c00a4edccd26df89ba1755f
-SHA1 (patch-ap) = 1416ab82eca6a907920ef876b2e54fd51425650a
-SHA1 (patch-aq) = 574db781f41d3689325d1fe7b3ae95b76ab9650f
-SHA1 (patch-ar) = 838ff0663e7b6aebfa09223a66f445b49f6f0e97
-SHA1 (patch-as) = 6ee5137a2e6703b95b41849836fcaa4ed091ec36
+SHA1 (snd-7.15.tar.gz) = 17d092df3e85c2eed7b17d1c8ebcadfc8db6f272
+RMD160 (snd-7.15.tar.gz) = c28a2a1c19ca404b47061644d42700bc6bdf6396
+Size (snd-7.15.tar.gz) = 6546108 bytes
diff --git a/audio/snd/options.mk b/audio/snd/options.mk
new file mode 100644
index 00000000000..32f3f1cdbcb
--- /dev/null
+++ b/audio/snd/options.mk
@@ -0,0 +1,38 @@
+# $NetBSD: options.mk,v 1.1 2005/11/23 22:39:12 wiz Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.snd
+PKG_SUPPORTED_OPTIONS=	esound guile
+# fftw2 fftw3 ladspa gamin/fam mpg123 timidity
+PKG_OPTIONS_REQUIRED_GROUPS=	frontend
+PKG_OPTIONS_GROUP.frontend=	gtk motif
+PKG_SUGGESTED_OPTIONS=	gtk
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mesound)
+CONFIGURE_ARGS+=	--with-esd
+.include "../../audio/esound/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=	--without-esd
+.endif
+
+.if !empty(PKG_OPTIONS:Mgtk)
+CONFIGURE_ARGS+=	--with-gtk
+.include "../../x11/gtk2/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=	--without-gtk
+.endif
+
+.if !empty(PKG_OPTIONS:Mguile)
+CONFIGURE_ARGS+=	--with-guile
+.include "../../lang/guile/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=	--without-guile
+.endif
+
+.if !empty(PKG_OPTIONS:Mmotif)
+CONFIGURE_ARGS+=	--with-motif
+.include "../../x11/openmotif/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=	--without-motif
+.endif
diff --git a/audio/snd/patches/patch-aa b/audio/snd/patches/patch-aa
deleted file mode 100644
index a7e0488e9ee..00000000000
--- a/audio/snd/patches/patch-aa
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-aa,v 1.2 1998/08/07 10:36:08 agc Exp $
-
---- snd.orig/snd.h	Thu Feb 12 15:36:40 1998
-+++ snd.h	Sun Feb 22 02:19:27 1998
-@@ -21,17 +21,21 @@
- #include "sound_types.h"
- #include "cmus_prototypes.h"
- 
--#if defined(SGI) || defined(LINUX) || defined(NEXT) || defined(SCO5) || defined(UW2) || defined(SOLARIS)
-+#ifndef HAVE_MOTIF
-+#if defined(SGI) || defined(LINUX) || defined(NEXT) || defined(SCO5) || defined(UW2) || defined(SOLARIS) || defined(__NetBSD__)
-   #define HAVE_MOTIF 1
- #else
-   #define HAVE_MOTIF 0
- #endif
-+#endif /* HAVE_MOTIF */
- 
--#if defined(LINUX) || defined(SCO5) || defined(UW2)
-+#ifndef HAVE_OSS
-+#if defined(LINUX) || defined(SCO5) || defined(UW2) || defined(__NetBSD__)
-   #define HAVE_OSS 1
- #else
-   #define HAVE_OSS 0
- #endif
-+#endif /* HAVE_OSS */
- 
- #include "snd-0.h"
- 
diff --git a/audio/snd/patches/patch-ab b/audio/snd/patches/patch-ab
deleted file mode 100644
index d571c4a5f52..00000000000
--- a/audio/snd/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.2 1998/08/07 10:36:09 agc Exp $
-
---- snd.orig/cmus.h	Thu Jan 22 15:08:02 1998
-+++ cmus.h	Sun Feb 22 02:04:51 1998
-@@ -17,7 +17,7 @@
- 
- /* due to project builder stupidity, we can't always depend on -D flags here (maybe we need a CLM_SND_OS macro?) */
- 
--#if (!(defined(SGI))) && (!(defined(NEXT))) && (!(defined(LINUX))) && (!(defined(MACOS))) && (!(defined(BEOS))) && (!(defined(SUN))) && (!(defined(UW2))) && (!(defined(SCO5)))
-+#if (!(defined(SGI))) && (!(defined(NEXT))) && (!(defined(LINUX))) && (!(defined(MACOS))) && (!(defined(BEOS))) && (!(defined(SUN))) && (!(defined(UW2))) && (!(defined(SCO5)))  && (!(defined(__NetBSD__))) 
-   #if defined(__dest_os)
-     /* we're in Metrowerks Land */
-     #if (__dest_os == __be_os)
diff --git a/audio/snd/patches/patch-ac b/audio/snd/patches/patch-ac
deleted file mode 100644
index a59a2242558..00000000000
--- a/audio/snd/patches/patch-ac
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ac,v 1.2 1998/08/07 10:36:09 agc Exp $
-
---- snd.orig/cmus_prototypes.h	Thu Feb 12 15:36:33 1998
-+++ cmus_prototypes.h	Sun Feb 22 02:05:30 1998
-@@ -208,7 +208,7 @@
- #endif
- 
- /* pipe.c */
--#if defined(SGI) || defined(LINUX)
-+#if defined(SGI) || defined(LINUX) || defined(__NetBSD__)
-   int write_snd_fifo(char *buf, int len);
- #endif
- 
-@@ -229,7 +229,7 @@
-   void set_rt_record_p (int rt);
-   int clm_read_any(int tfd, int beg, int chans, int nints, int **bufs, int *cm);
- 
--#if defined(SGI) || defined(LINUX)
-+#if defined(SGI) || defined(LINUX) || defined(__NetBSD__)
-   float c_control (int n);
-   float c_set_control (int n, float val);
-   int c_open_controls (int size);
diff --git a/audio/snd/patches/patch-ad b/audio/snd/patches/patch-ad
deleted file mode 100644
index d8e2463b73e..00000000000
--- a/audio/snd/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.2 1998/08/07 10:36:09 agc Exp $
-
---- snd.orig/io.c	Mon Feb  2 14:59:54 1998
-+++ io.c	Sun Feb 22 02:06:44 1998
-@@ -399,7 +399,7 @@
-  * many cases -- the output buffer can collect many notes before flushing, etc.
-  */
- 
--#if defined(SGI) || defined(LINUX) || defined(UW2) || defined(SCO5)
-+#if defined(SGI) || defined(LINUX) || defined(UW2) || defined(SCO5) || defined(__NetBSD__)
-   #define FILE_DESCRIPTORS 256
-   #define BASE_FILE_DESCRIPTORS 200
- #else
diff --git a/audio/snd/patches/patch-ae b/audio/snd/patches/patch-ae
deleted file mode 100644
index 07754910daf..00000000000
--- a/audio/snd/patches/patch-ae
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD: patch-ae,v 1.9 2002/09/21 01:02:05 jlam Exp $
-
---- makefile.netbsd.orig	Mon Aug  9 19:22:24 1999
-+++ makefile.netbsd	Mon Aug  9 19:25:36 1999
-@@ -0,0 +1,30 @@
-+# Snd make file for NetBSD, assuming Motif is available (audio currently stubbed out)
-+
-+#CC = gcc
-+#CFLAGS = -O2 -DXPM -DHAVE_OSS -I${X11BASE}/include
-+CFLAGS += -DXPM -DHAVE_OSS -I${X11BASE}/include
-+CFLAGS += -g
-+
-+LIBS = ${LDFLAGS} -lMrm -lXm -lXpm -lXmu -lSM -lXt -lXext -lX11 -lm -lossaudio
-+CLM_HEADERS = cmus_prototypes.h cmus.h sound_types.h
-+SND_HEADERS = snd.h snd-0.h snd-1.h snd-ufun.h snd-strings.h sndclm.h
-+SND_X_HEADERS = snd-x0.h snd-x1.h
-+
-+CLM_O_FILES = io.o headers.o
-+
-+O_FILES = snd-io.o snd-utils.o snd-parser.o snd-axis.o snd-data.o snd-fft.o snd-marks.o snd-file.o snd-edits.o snd-chn.o snd-dac.o snd-clip.o snd-find.o snd-snd.o snd-help.o snd-clm.o snd-main.o snd-print.o snd-ufun.o snd-ufunex.o snd-apply.o snd-trans.o snd-mix.o snd.o snd-env.o 
-+
-+X_O_FILES = snd-xutils.o snd-xdata.o snd-xmenu.o snd-xchn.o snd-xsnd.o snd-xdac.o snd-xclip.o snd-xmain.o snd-xclm.o snd-xmix.o snd-xrec.o snd-xenv.o
-+
-+snd: $(CLM_HEADERS) $(SND_HEADERS) $(SND_X_HEADERS) $(CLM_O_FILES) $(O_FILES) $(X_O_FILES)
-+	$(CC) $(CLM_O_FILES) $(O_FILES) $(X_O_FILES) -o snd $(LIBS)
-+
-+$(CLM_O_FILES): $(CLM_HEADERS)
-+$(O_FILES): $(SND_HEADERS) $(SND_X_HEADERS)
-+$(X_O_FILES): $(SND_HEADERS) $(SND_X_HEADERS)
-+
-+clean:
-+	rm -f $(CLM_O_FILES)
-+	rm -f $(O_FILES)
-+	rm -f $(X_O_FILES)
-+
diff --git a/audio/snd/patches/patch-af b/audio/snd/patches/patch-af
deleted file mode 100644
index 507792d82e0..00000000000
--- a/audio/snd/patches/patch-af
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-af,v 1.2 1998/08/07 10:36:09 agc Exp $
-
---- snd.orig/snd-clm.c	Thu Feb 12 15:37:13 1998
-+++ snd-clm.c	Sun Feb 22 02:20:40 1998
-@@ -753,7 +753,11 @@
- {
-   /* turn off inputs (they create an unbelievable amount of noise) and maximize outputs */
-   int fd,amp,devmask;
-+#ifdef __NetBSD__
-+  fd = open("/dev/audio",O_WRONLY,0);
-+#else /* !__NetBSD__ */
-   fd = open("/dev/dsp",O_WRONLY,0);
-+#endif /* __NetBSD__ */
-   if (fd == -1) return;
-   amp = 0;
-   ioctl(fd,SOUND_MIXER_READ_DEVMASK,&devmask);
diff --git a/audio/snd/patches/patch-ag b/audio/snd/patches/patch-ag
deleted file mode 100644
index a3ecfbdf48b..00000000000
--- a/audio/snd/patches/patch-ag
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ag,v 1.2 1998/08/07 10:36:10 agc Exp $
-
---- snd.orig/snd-dac.c	Mon Dec 22 17:22:48 1997
-+++ snd-dac.c	Sun Feb 22 02:25:39 1998
-@@ -200,7 +200,11 @@
-   #include <soundcard.h>
- #endif
- 
--#define DAC_NAME "/dev/dsp"
-+#ifdef LINUX
-+#  define DAC_NAME "/dev/dsp"
-+#else /* !LINUX */
-+#  define DAC_NAME "/dev/audio"     /* /dev/sound?  - HF */
-+#endif /* LINUX */
- #define FRAGMENTS 2
- #define FRAGMENT_SIZE 10
- 
diff --git a/audio/snd/patches/patch-ah b/audio/snd/patches/patch-ah
deleted file mode 100644
index 718e15310b9..00000000000
--- a/audio/snd/patches/patch-ah
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-ah,v 1.4 2005/09/06 08:10:57 abs Exp $
-
---- snd-file.c.orig	1998-02-10 08:42:41.000000000 -0600
-+++ snd-file.c
-@@ -15,6 +15,14 @@
-   #include <sys/vfs.h>
- #endif
- 
-+#if defined (__NetBSD__)
-+  #include <sys/param.h>
-+  #include <sys/mount.h>
-+  #if (__NetBSD_Version__ >= 299000900) /* NetBSD 2.99.9 */
-+    #define statfs statvfs
-+  #endif
-+#endif
-+
- #ifdef BEOS
- int disk_kspace (int fd) {return(1234567);}
- time_t file_write_date(char *filename) {return(1234567);}
-@@ -26,7 +34,7 @@ int disk_kspace (int fd)
- #if defined(SGI) || defined(SCO5) || defined(UW2) || defined(SOLARIS)
-   err = fstatfs(fd,&buf,sizeof(buf),0);
- #endif
--#if defined(LINUX) || defined(NEXT)
-+#if defined(LINUX) || defined(NEXT) || defined(__NetBSD__)
-   err = fstatfs(fd,&buf);
- #endif
-   /* in 32 bit land, the number of bytes can easily go over 2^32, so we'll look at kbytes here */
diff --git a/audio/snd/patches/patch-ai b/audio/snd/patches/patch-ai
deleted file mode 100644
index a04b21f7d84..00000000000
--- a/audio/snd/patches/patch-ai
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ai,v 1.2 1998/08/07 10:36:10 agc Exp $
-
---- snd.orig/snd-ufun.c	Mon Dec 22 17:24:11 1997
-+++ snd-ufun.c	Sun Feb 22 02:12:45 1998
-@@ -2,7 +2,7 @@
- 
- #ifndef NEXT
- 
--#if defined(SGI) || defined(SCO5) || defined(UW2)
-+#if defined(SGI) || defined(SCO5) || defined(UW2) || defined(__NetBSD__)
-   #include <dlfcn.h>
- #endif
- 
diff --git a/audio/snd/patches/patch-aj b/audio/snd/patches/patch-aj
deleted file mode 100644
index 6d3356dd20b..00000000000
--- a/audio/snd/patches/patch-aj
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-aj,v 1.2 1998/08/07 10:36:10 agc Exp $
-
---- snd.orig/snd-x0.h	Wed Dec 17 19:12:04 1997
-+++ snd-x0.h	Sun Feb 22 02:14:17 1998
-@@ -14,14 +14,14 @@
-  * All the documentation says this is dangerous, so it's on this switch
-  */
- 
--#if defined(LINUX) || defined(SCO5) || defined(UW2) || defined(SOLARIS)
-+#if defined(LINUX) || defined(SCO5) || defined(UW2) || defined(SOLARIS) || defined(__NetBSD__)
-   #define RESIZE_DIALOG 1
-   /* these versions of Motif need to be told to allow a dialog to include resize controls */
- #else
-   #define RESIZE_DIALOG 0
- #endif
- 
--#if defined(LINUX) || defined(SCO5) || defined(UW2) || defined(SOLARIS)
-+#if defined(LINUX) || defined(SCO5) || defined(UW2) || defined(SOLARIS) || defined(__NetBSD__)
-   #define MANAGE_DIALOG 1
-   /* these versions of Motif need to "manage" a dialog before dealing with its children */
- #else
-@@ -67,7 +67,7 @@
-   #define CONTROLS_MARGIN 0
- #endif
- 
--#if defined(LINUX) || defined(SCO5) || defined(UW2) || defined(SOLARIS)
-+#if defined(LINUX) || defined(SCO5) || defined(UW2) || defined(SOLARIS) || defined(__NetBSD__)
-   #define LINE_MARGIN 4
-   #define CONTROLS_MARGIN 1
-   #define TOGGLE_SIZE 13
diff --git a/audio/snd/patches/patch-ak b/audio/snd/patches/patch-ak
deleted file mode 100644
index b96f868d94d..00000000000
--- a/audio/snd/patches/patch-ak
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ak,v 1.2 1998/08/07 10:36:10 agc Exp $
-
---- snd.orig/snd-x1.h	Thu Jan 22 15:08:49 1998
-+++ snd-x1.h	Sun Feb 22 02:14:34 1998
-@@ -328,7 +328,7 @@
- void reflect_group_speed_change(snd_state *ss, grp_info *g, float speed);
- void reflect_group_tempo_change(grp_info *g, float speed);
- 
--#ifdef LINUX
-+#if defined(LINUX) || defined(__NetBSD__)
-   void override_toggle_translation(Widget w);
- #endif
- 
diff --git a/audio/snd/patches/patch-al b/audio/snd/patches/patch-al
deleted file mode 100644
index 5c664e67fc9..00000000000
--- a/audio/snd/patches/patch-al
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-al,v 1.2 1998/08/07 10:36:11 agc Exp $
-
---- snd.orig/snd-xmain.c	Mon Feb  2 15:00:56 1998
-+++ snd-xmain.c	Sun Feb 22 02:14:56 1998
-@@ -42,7 +42,7 @@
-   #define OPEN_CTRLS_HEIGHT 185
-   #define ICON_TYPE 1
- #endif
--#if defined(LINUX) || defined(SCO5) || defined(UW2) || defined(SOLARIS)
-+#if defined(LINUX) || defined(SCO5) || defined(UW2) || defined(SOLARIS) || defined(__NetBSD__)
-   #define BUTTON_FONT "-*-times-medium-r-*-*-12-*-*-*-*-*-iso8859-1"
-   #define BOLD_BUTTON_FONT "-*-times-bold-r-*-*-12-*-*-*-*-*-iso8859-1"
-   #define AXIS_LABEL_FONT "-*-times-medium-r-normal-*-16-*-*-*-*-*-iso8859-1"
diff --git a/audio/snd/patches/patch-am b/audio/snd/patches/patch-am
deleted file mode 100644
index 63339db6959..00000000000
--- a/audio/snd/patches/patch-am
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-am,v 1.2 1998/08/07 10:36:11 agc Exp $
-
---- snd.orig/snd-xmenu.c	Thu Feb  5 15:01:39 1998
-+++ snd-xmenu.c	Sun Feb 22 02:15:33 1998
-@@ -2900,7 +2900,7 @@
-   XtSetArg(args[n],XmNtopAttachment,(last_row) ? XmATTACH_WIDGET : XmATTACH_FORM); n++;
-   if (last_row) {XtSetArg(args[n],XmNtopWidget,last_row); n++;}
-   XtSetArg(args[n],XmNbottomAttachment,XmATTACH_NONE); n++;
--#if defined(LINUX) || defined(SCO5) || defined(UW2) || defined(SUN)
-+#if defined(LINUX) || defined(SCO5) || defined(UW2) || defined(SUN) || defined(__NetBSD__)
-   XtSetArg(args[n],XmNheight,17); n++; 
- #else
-   XtSetArg(args[n],XmNheight,20); n++; 
diff --git a/audio/snd/patches/patch-an b/audio/snd/patches/patch-an
deleted file mode 100644
index 7fb54979cb9..00000000000
--- a/audio/snd/patches/patch-an
+++ /dev/null
@@ -1,42 +0,0 @@
-$NetBSD: patch-an,v 1.3 2004/07/28 08:05:32 agc Exp $
-
---- snd-xrec.c.orig	1998-02-02 14:01:06.000000000 +0000
-+++ snd-xrec.c	2004-07-28 09:01:33.000000000 +0100
-@@ -134,8 +134,8 @@
- 		{
- 		  for (j=0;j<by0;j++)
- 		    {
--		      inx = tx + round((x+(float)i/xscl)*matrix[0] + (y+(float)j/yscl)*matrix[2]);  if (inx<0) inx=0; if (inx>=nwidth) inx=nwidth-1;
--		      iny = ty + round((x+(float)i/xscl)*matrix[1] + (y+(float)j/yscl)*matrix[3]);  if (iny<0) iny=0; if (iny>=nheight) iny=nheight-1;
-+		      inx = tx + snd_round((x+(float)i/xscl)*matrix[0] + (y+(float)j/yscl)*matrix[2]);  if (inx<0) inx=0; if (inx>=nwidth) inx=nwidth-1;
-+		      iny = ty + snd_round((x+(float)i/xscl)*matrix[1] + (y+(float)j/yscl)*matrix[3]);  if (iny<0) iny=0; if (iny>=nheight) iny=nheight-1;
- 		      XPutPixel(after,inx,iny,px);
- 		    }
- 		}
-@@ -1314,7 +1314,11 @@
-   #include <soundcard.h>
- #endif
- 
--#define DAC_NAME "/dev/dsp"
-+#ifdef LINUX
-+#  define DAC_NAME "/dev/dsp"
-+#else  /* !LINUX */
-+#  define DAC_NAME "/dev/audio"
-+#endif /* LINUX */
- #define FRAGMENTS 2
- #define FRAGMENT_SIZE 10
- 
-@@ -1415,8 +1419,11 @@
-       if ((audio_fd = open(DAC_NAME,O_RDONLY,0)) == -1)
- 	{
- 	  record_report(rec,"can't open any inputs!");
--	  if ((errno == EACCES) || (errno == ENOENT))
--	    record_report(rec,"(to get input in Linux, we need read permission on /dev/dsp)");
-+	  if ((errno == EACCES) || (errno == ENOENT)){
-+	    char buf[256];
-+	    snprintf(buf,256,"(to get input in Linux, we need read permission on %s)",DAC_NAME);
-+	    record_report(rec,buf);
-+	  }
- 	  return(-1);
- 	}
-     }
diff --git a/audio/snd/patches/patch-ao b/audio/snd/patches/patch-ao
deleted file mode 100644
index 929a98b9ba8..00000000000
--- a/audio/snd/patches/patch-ao
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ao,v 1.1 2004/07/28 08:05:32 agc Exp $
-
---- snd-1.h	2004/07/28 07:54:48	1.1
-+++ snd-1.h	2004/07/28 07:55:08
-@@ -474,7 +474,7 @@
- char *sound_type(int type);
- char *sound_format (int format);
- char *copy_string (char *str);
--int round(float x);
-+int snd_round(float x);
- void snd_error (char *msg);
- char *filename_without_home_directory(char *name);
- char *just_filename(char *name);
diff --git a/audio/snd/patches/patch-ap b/audio/snd/patches/patch-ap
deleted file mode 100644
index 7ee8e2fe107..00000000000
--- a/audio/snd/patches/patch-ap
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ap,v 1.1 2004/07/28 08:05:32 agc Exp $
-
---- snd-snd.c	2004/07/28 07:57:26	1.1
-+++ snd-snd.c	2004/07/28 07:58:29
-@@ -668,7 +668,7 @@
-       break;
-     case SPEED_AS_SEMITONE: 
-       /* find closest semitone to val */
--      semi = round(log(val)*((float)tones/log(2.0)));
-+      semi = snd_round(log(val)*((float)tones/log(2.0)));
-       /* space until (-) num (-52 to 52 is its range if 12-tone) */
-       for (i=0;i<3;i++) srcbuf[i] = ' '; 
-       sprintf(src_txt_buf,"%d",semi);
diff --git a/audio/snd/patches/patch-aq b/audio/snd/patches/patch-aq
deleted file mode 100644
index fa1f593da6d..00000000000
--- a/audio/snd/patches/patch-aq
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-aq,v 1.1 2004/07/28 08:05:32 agc Exp $
-
---- snd-xenv.c	2004/07/28 07:57:26	1.1
-+++ snd-xenv.c	2004/07/28 07:57:56
-@@ -278,8 +278,8 @@
-   int cols,rows,i,j,width,height,x,y,k;
-   if (all_envs_top > 1)
-     {
--      cols = round(sqrt((float)(all_envs_top * env_window_width) / (float)env_window_height));
--      rows = round((float)all_envs_top/(float)cols);
-+      cols = snd_round(sqrt((float)(all_envs_top * env_window_width) / (float)env_window_height));
-+      rows = snd_round((float)all_envs_top/(float)cols);
-       if ((rows*cols) < all_envs_top) rows++;
-     }
-   else
-@@ -312,8 +312,8 @@
- 	return(0);
-       else
- 	{
--	  cols = round(sqrt((float)(all_envs_top * env_window_width) / (float)env_window_height));
--	  rows = round((float)all_envs_top/(float)cols);
-+	  cols = snd_round(sqrt((float)(all_envs_top * env_window_width) / (float)env_window_height));
-+	  rows = snd_round((float)all_envs_top/(float)cols);
- 	  if ((rows*cols) < all_envs_top) rows++;
- 	  width = (int)((float)env_window_width/(float)cols);
- 	  height = (int)((float)env_window_height/(float)rows);
diff --git a/audio/snd/patches/patch-ar b/audio/snd/patches/patch-ar
deleted file mode 100644
index 04a1e111c07..00000000000
--- a/audio/snd/patches/patch-ar
+++ /dev/null
@@ -1,62 +0,0 @@
-$NetBSD: patch-ar,v 1.1 2004/07/28 08:05:32 agc Exp $
-
---- snd-xsnd.c	2004/07/28 07:57:26	1.1
-+++ snd-xsnd.c	2004/07/28 07:58:15
-@@ -429,10 +429,10 @@
-     val = 0;
-   else
-     {
--      val = round(amp / (float)(SCROLLBAR_LINEAR_MULT));
-+      val = snd_round(amp / (float)(SCROLLBAR_LINEAR_MULT));
-       if (val > SCROLLBAR_LINEAR_MAX)
- 	{
--	  val = round((log(amp)*((float)SCROLLBAR_MAX*.2)) + SCROLLBAR_MID);
-+	  val = snd_round((log(amp)*((float)SCROLLBAR_MAX*.2)) + SCROLLBAR_MID);
- 	}
-     }
-   return(val);
-@@ -501,7 +501,7 @@
- int snd_srate_to_int(float val)
- {
-   if (val > 0.0)
--    return(round(450.0 + 150.0 * log(val)));
-+    return(snd_round(450.0 + 150.0 * log(val)));
-   else return(0);
- }
- 
-@@ -556,7 +556,7 @@
- {
-   int val;
-   val = ep/.0009697;
--  if (val>100) val = round(450+150*log(ep));
-+  if (val>100) val = snd_round(450+150*log(ep));
-   return(val);
- }
- 
-@@ -623,7 +623,7 @@
- 
- int snd_contrast_to_int(float val)
- {
--  return(round(val*10));
-+  return(snd_round(val*10));
- }
- 
- void snd_contrast_changed(snd_info *sp, int val)
-@@ -688,7 +688,7 @@
- 
- int snd_revscl_to_int(float val)
- {
--  return(round(pow(val,0.333)*60.0));
-+  return(snd_round(pow(val,0.333)*60.0));
- }
- 
- void snd_revscl_changed(snd_info *sp, int val)
-@@ -751,7 +751,7 @@
- 
- int snd_revlen_to_int(float val)
- {
--  return(round(val*20.0));
-+  return(snd_round(val*20.0));
- }
- 
- void snd_revlen_changed(snd_info *sp, int val)
diff --git a/audio/snd/patches/patch-as b/audio/snd/patches/patch-as
deleted file mode 100644
index 1ff4ada894c..00000000000
--- a/audio/snd/patches/patch-as
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-as,v 1.1 2004/07/28 08:05:32 agc Exp $
-
---- snd-utils.c	2004/07/28 07:57:26	1.1
-+++ snd-utils.c	2004/07/28 07:58:23
-@@ -1,6 +1,6 @@
- #include "snd.h"
- 
--int round(float x)
-+int snd_round(float x)
- {
-   int i;
-   i=x;