7 files changed, 47 insertions, 177 deletions
diff --git a/audio/snd/Makefile b/audio/snd/Makefile
index 97050990d70..3788cf26982 100644
--- a/audio/snd/Makefile
+++ b/audio/snd/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.84 2016/09/15 14:32:40 wiz Exp $
+# $NetBSD: Makefile,v 1.85 2016/09/15 17:02:24 wiz Exp $
 
-DISTNAME=		snd-9.9
-PKGREVISION=		27
+DISTNAME=		snd-16.8
 CATEGORIES=		audio
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=snd/}
 
@@ -20,14 +19,6 @@ USE_TOOLS+=		gmake msgfmt pkg-config
 
 BUILD_TARGET=		snd
 MAKE_FILE=		makefile
-WRKSRC=			${WRKDIR}/snd-9
-
-INSTALLATION_DIRS=	${PKGLOCALEDIR}/locale/de/LC_MESSAGES
-INSTALL_MAKE_FLAGS+=	localedir=${DESTDIR}${PREFIX}/${PKGLOCALEDIR}/locale
-
-post-install:
-	${INSTALL_DATA} ${WRKSRC}/po/de.gmo \
-	    ${DESTDIR}${PREFIX}/${PKGLOCALEDIR}/locale/de/LC_MESSAGES/snd.mo
 
 .include "options.mk"
 
diff --git a/audio/snd/PLIST b/audio/snd/PLIST
index 24434917eaf..beaec333fb6 100644
--- a/audio/snd/PLIST
+++ b/audio/snd/PLIST
@@ -1,7 +1,7 @@
-@comment $NetBSD: PLIST,v 1.6 2009/06/14 17:32:22 joerg Exp $
+@comment $NetBSD: PLIST,v 1.7 2016/09/15 17:02:24 wiz Exp $
 bin/snd
 man/man1/snd.1
-share/locale/de/LC_MESSAGES/snd.mo
+share/snd/CM_patterns.scm
 share/snd/analog-filter.rb
 share/snd/analog-filter.scm
 share/snd/animals.scm
@@ -10,6 +10,8 @@ share/snd/bess.rb
 share/snd/bess.scm
 share/snd/bess1.rb
 share/snd/bess1.scm
+share/snd/big-gens.scm
+share/snd/binary-io.scm
 share/snd/bird.fsm
 share/snd/bird.rb
 share/snd/bird.scm
@@ -18,8 +20,9 @@ share/snd/clm-ins.fs
 share/snd/clm-ins.rb
 share/snd/clm-ins.scm
 share/snd/clm.fs
+share/snd/clm.rb
 share/snd/clm23.scm
-share/snd/debug.scm
+share/snd/cload.scm
 share/snd/dlocsig.rb
 share/snd/dlocsig.scm
 share/snd/draw.fs
@@ -38,40 +41,40 @@ share/snd/env.rb
 share/snd/env.scm
 share/snd/enved.fs
 share/snd/enved.scm
-share/snd/eval-c.scm
-share/snd/event.scm
 share/snd/examp.fs
 share/snd/examp.rb
 share/snd/examp.scm
-share/snd/export-all.scm
+share/snd/expandn.scm
 share/snd/extensions.fs
 share/snd/extensions.rb
 share/snd/extensions.scm
 share/snd/fade.scm
 share/snd/fft-menu.scm
-share/snd/fix-optargs.scm
 share/snd/fmv.scm
-share/snd/frame.scm
 share/snd/freeverb.rb
 share/snd/freeverb.scm
-share/snd/gauche-format.scm
-share/snd/gauche-optargs.scm
+share/snd/fullmix.scm
+share/snd/funcs.scm
 share/snd/generators.scm
+share/snd/grani.rb
 share/snd/grani.scm
-share/snd/green.scm
 share/snd/gtk-effects-utils.scm
 share/snd/gtk-effects.scm
-share/snd/gtk-popup.scm
-share/snd/gui.scm
+share/snd/heart.scm
 share/snd/hooks.fs
 share/snd/hooks.rb
 share/snd/hooks.scm
 share/snd/index.rb
 share/snd/index.scm
 share/snd/jcrev.scm
-share/snd/kmenu.scm
-share/snd/ladspa-help.scm
-share/snd/ladspa.scm
+share/snd/jcvoi.scm
+share/snd/libc.scm
+share/snd/libdl.scm
+share/snd/libgdbm.scm
+share/snd/libgsl.scm
+share/snd/libm.scm
+share/snd/libutf8proc.scm
+share/snd/lint.scm
 share/snd/maraca.rb
 share/snd/maraca.scm
 share/snd/marks-menu.scm
@@ -84,32 +87,19 @@ share/snd/misc.scm
 share/snd/mix.fs
 share/snd/mix.rb
 share/snd/mix.scm
-share/snd/mixer.scm
+share/snd/mockery.scm
 share/snd/moog.scm
 share/snd/musglyphs.rb
 share/snd/musglyphs.scm
 share/snd/nb.rb
 share/snd/nb.scm
 share/snd/new-backgrounds.scm
-share/snd/new-buttons.scm
 share/snd/new-effects.scm
 share/snd/noise.rb
 share/snd/noise.scm
+share/snd/nrev.scm
 share/snd/numerics.scm
-share/snd/oo.scm
-share/snd/oscope.scm
-share/snd/panic.scm
-share/snd/pd-add.scm
-share/snd/pd-any.scm
-share/snd/pd-fm.scm
-share/snd/pd-global.scm
-share/snd/pd-inout.scm
-share/snd/pd-local.scm
-share/snd/pd-mozilla.scm
-share/snd/pd-send_receive.scm
-share/snd/pd-stochastic.scm
-share/snd/peak-env.fs
-share/snd/peak-env.scm
+share/snd/peak-phases.scm
 share/snd/piano.rb
 share/snd/piano.scm
 share/snd/play.rb
@@ -118,46 +108,41 @@ share/snd/poly.rb
 share/snd/poly.scm
 share/snd/popup.fs
 share/snd/popup.rb
-share/snd/popup.scm
 share/snd/prc95.rb
 share/snd/prc95.scm
+share/snd/primes.scm
+share/snd/profile.scm
 share/snd/pvoc.rb
 share/snd/pvoc.scm
+share/snd/r7rs.scm
+share/snd/repl.scm
 share/snd/rgb.fs
 share/snd/rgb.rb
 share/snd/rgb.scm
-share/snd/rt-clm-ins.scm
-share/snd/rt-compiler.scm
-share/snd/rt-engine.scm
-share/snd/rt-examples.scm
-share/snd/rt-faust.scm
-share/snd/rt-player.scm
-share/snd/rtio.rb
-share/snd/rtio.scm
 share/snd/rubber.fs
 share/snd/rubber.rb
 share/snd/rubber.scm
+share/snd/s7-slib-init.scm
+share/snd/s7test.scm
 share/snd/selection.scm
 share/snd/singer.rb
 share/snd/singer.scm
+share/snd/snd-forth-docs.fs
 share/snd/snd-forth-init.fs
 share/snd/snd-gl.scm
 share/snd/snd-gtk.scm
-share/snd/snd-hobbit.scm
+share/snd/snd-lint.scm
 share/snd/snd-motif.scm
 share/snd/snd-test.fs
 share/snd/snd-test.rb
 share/snd/snd-test.scm
 share/snd/snd-xm.fs
 share/snd/snd-xm.rb
-share/snd/snd4.scm
-share/snd/snd5.scm
-share/snd/snd6.scm
-share/snd/snd7.scm
-share/snd/snd8.scm
-share/snd/snd9.scm
-share/snd/snd_conffile.scm
+share/snd/snd13.scm
+share/snd/snd14.scm
+share/snd/snd15.scm
 share/snd/snddiff.scm
+share/snd/sndlib-ws.scm
 share/snd/sndwarp.scm
 share/snd/special-menu.scm
 share/snd/spectr.fs
@@ -167,9 +152,10 @@ share/snd/spokenword.scm
 share/snd/stochastic.scm
 share/snd/strad.rb
 share/snd/strad.scm
-share/snd/toolbar.scm
+share/snd/stuff.scm
 share/snd/v.rb
 share/snd/v.scm
+share/snd/write.scm
 share/snd/ws.rb
 share/snd/ws.scm
 share/snd/xm-enved.fs
diff --git a/audio/snd/distinfo b/audio/snd/distinfo
index 8f5bb45a428..b97554bb47a 100644
--- a/audio/snd/distinfo
+++ b/audio/snd/distinfo
@@ -1,9 +1,6 @@
-$NetBSD: distinfo,v 1.18 2015/11/03 01:12:50 agc Exp $
+$NetBSD: distinfo,v 1.19 2016/09/15 17:02:24 wiz Exp $
 
-SHA1 (snd-9.9.tar.gz) = 8c00b1d48d66032a9085b8ae652a5d25c8ef14a2
-RMD160 (snd-9.9.tar.gz) = 39561a38d8bba7ead73a16fc7647cb2bd6ef275a
-SHA512 (snd-9.9.tar.gz) = f02cb71805e8518fa013236a5bc1991af257aa90e9e4b95dc4adab7302a4c57c876864a941fde1b754641fc79df57a257670a716747b08d5e5794de02f8b6465
-Size (snd-9.9.tar.gz) = 12349176 bytes
-SHA1 (patch-aa) = 187d033726161b14c341c2dd31f365c26f40bc75
-SHA1 (patch-ab) = c6f2a3c134c2fb2adee67b672f66a092e7962b75
-SHA1 (patch-audio.c) = 88beedda1dbb9a93655d184c73703c2b90104dc4
+SHA1 (snd-16.8.tar.gz) = c39ca568f5ae3b28bb700ab281ec59e64dff2a45
+RMD160 (snd-16.8.tar.gz) = b53496fc0dc161bd4938951e84fd72a756214fd1
+SHA512 (snd-16.8.tar.gz) = a5d1121104d1828deeb9ab762567de7b42ba2b50fe362ccd14672338d8b70c4e57ba7834ee78d18f9ff761a1b3e670614ef734c419711352440ff263e3e9819a
+Size (snd-16.8.tar.gz) = 15018578 bytes
diff --git a/audio/snd/options.mk b/audio/snd/options.mk
index 2be3860ddf6..0217e16313b 100644
--- a/audio/snd/options.mk
+++ b/audio/snd/options.mk
@@ -1,36 +1,21 @@
-# $NetBSD: options.mk,v 1.6 2016/09/15 16:52:36 wiz Exp $
+# $NetBSD: options.mk,v 1.7 2016/09/15 17:02:24 wiz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.snd
-PKG_SUPPORTED_OPTIONS=	esound guile
-# fftw2 fftw3 ladspa gamin/fam mpg123 timidity
+PKG_SUPPORTED_OPTIONS=
+# ruby, forth, alsa, oss, jack, pulseaudio, gmp, ladspa
 PKG_OPTIONS_REQUIRED_GROUPS=	frontend
 PKG_OPTIONS_GROUP.frontend=	gtk motif
-PKG_SUGGESTED_OPTIONS=	gtk guile
+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"
-LDFLAGS.DragonFly=	-lX11
 .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 "../../mk/motif.buildlink3.mk"
diff --git a/audio/snd/patches/patch-aa b/audio/snd/patches/patch-aa
deleted file mode 100644
index 059a9459fed..00000000000
--- a/audio/snd/patches/patch-aa
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-aa,v 1.6 2012/01/11 20:21:54 hans Exp $
-
---- configure.orig	2008-04-24 19:29:25.000000000 +0200
-+++ configure
-@@ -20970,6 +20970,16 @@ _ACEOF
- 	LIBS="$LIBS -lm"
- 	AUDIO_SYSTEM=Sun
-         ;;
-+    *-*-solaris2.11)
-+	cat >>confdefs.h <<\_ACEOF
-+#define MUS_LINUX 1
-+#define HAVE_OSS 1
-+_ACEOF
-+
-+	LIBS="$LIBS -lm -ldl"
-+	AUDIO_SYSTEM=OSS
-+	LDSO_FLAGS="-G"
-+	;;
-     *-*-solaris*)
- 	cat >>confdefs.h <<\_ACEOF
- #define MUS_SUN 1
-@@ -24530,7 +24540,7 @@ fi
- if test "$ac_snd_have_extension_language" = no ; then
-   if test "$ac_snd_have_gui" = no ; then
-     if test "$ac_cv_header_dlfcn_h" = yes ; then
--      LDFLAGS="$LDFLAGS -ldl"
-+      LDFLAGS="$LDFLAGS ${DL_LDFLAGS} ${DL_LIBS}"
-     fi
-     { $as_echo "$as_me:$LINENO: WARNING: Snd needs either an extension language (Guile or Ruby), or a graphics toolkit (Gtk or Motif), or preferably both.  All four packages are available free, normally prepackaged and ready-to-use.  As currently configured, this version of Snd is useless." >&5
- $as_echo "$as_me: WARNING: Snd needs either an extension language (Guile or Ruby), or a graphics toolkit (Gtk or Motif), or preferably both.  All four packages are available free, normally prepackaged and ready-to-use.  As currently configured, this version of Snd is useless." >&2;}
diff --git a/audio/snd/patches/patch-ab b/audio/snd/patches/patch-ab
deleted file mode 100644
index 32585526068..00000000000
--- a/audio/snd/patches/patch-ab
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-ab,v 1.4 2009/08/18 16:47:18 joerg Exp $
-
---- makefile.in.orig	2009-08-18 18:34:38.000000000 +0200
-+++ makefile.in
-@@ -190,14 +190,14 @@ audinfo: $(SNDLIB_HEADERS)
- 	$(CC) $(LDFLAGS) $(CFLAGS) headers.o io.o audio.o sound.o audinfo.o -o audinfo $(JACK_LIBS) $(AUDIO_LIB) $(LIBS)
- 
- install: snd
--	${SHELL} ${top_srcdir}/mkinstalldirs ${bindir}
--	${SHELL} ${top_srcdir}/mkinstalldirs ${mandir}
--	${SHELL} ${top_srcdir}/mkinstalldirs ${mandir}/man1
--	${SHELL} ${top_srcdir}/mkinstalldirs ${pkgdatadir}
-+	${SHELL} ${top_srcdir}/mkinstalldirs ${DESTDIR}${bindir}
-+	${SHELL} ${top_srcdir}/mkinstalldirs ${DESTDIR}${mandir}
-+	${SHELL} ${top_srcdir}/mkinstalldirs ${DESTDIR}${mandir}/man1
-+	${SHELL} ${top_srcdir}/mkinstalldirs ${DESTDIR}${pkgdatadir}
- 	(cd po && $(MAKE) install)
--	$(INSTALL) snd ${bindir}/snd
--	$(INSTALL) ${top_srcdir}/snd.1 ${mandir}/man1
--	(cd ${top_srcdir} && for f in ${SND_SCRIPTS}; do ${INSTALL_DATA} ${top_srcdir}/$${f} ${pkgdatadir}/$${f}; done)
-+	$(BSD_INSTALL_PROGRAM) snd ${DESTDIR}${bindir}/snd
-+	$(INSTALL) ${top_srcdir}/snd.1 ${DESTDIR}${mandir}/man1
-+	(cd ${top_srcdir} && for f in ${SND_SCRIPTS}; do ${INSTALL_DATA} ${top_srcdir}/$${f} ${DESTDIR}${pkgdatadir}/$${f}; done)
- 
- uninstall:
- 	rm -f ${bindir}/snd
diff --git a/audio/snd/patches/patch-audio.c b/audio/snd/patches/patch-audio.c
deleted file mode 100644
index 8818d9a206e..00000000000
--- a/audio/snd/patches/patch-audio.c
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD: patch-audio.c,v 1.1 2012/01/11 20:21:54 hans Exp $
-
-No midi support on SunOS.
-
---- audio.c.orig	2008-04-09 14:10:30.000000000 +0200
-+++ audio.c	2012-01-02 16:13:15.136170006 +0100
-@@ -2927,8 +2927,10 @@ static void oss_describe_audio_state_1(v
-   int fd;
-   int status = 0, level, i, recsrc, devmask, recmask, stereodevs, caps;
-   int numdevs = 0, rate = 0, channels = 0, blocksize = 0, formats = 0, deffmt = 0, min_rate = 0, max_rate = 0;
-+#ifndef __sun
-   struct synth_info sinfo;
-   struct midi_info minfo;
-+#endif
-   const char *sound_device_names[] = SOUND_DEVICE_LABELS;
-   char dsp_name[LABEL_BUFFER_SIZE];
-   char version[LABEL_BUFFER_SIZE];
-@@ -2996,6 +2998,7 @@ static void oss_describe_audio_state_1(v
-     }
-   pprint("\n\n");
- 
-+#ifndef __sun
-   fd = open(SYNTH_NAME, O_RDWR, 0);
-   if (fd == -1) fd = open(SYNTH_NAME, O_RDONLY, 0);
-   if (fd == -1) 
-@@ -3050,6 +3053,7 @@ static void oss_describe_audio_state_1(v
-     }
-   if (fd != -1) close(fd);
-   pprint("--------------------------------\n");
-+#endif
- 
- MIXER_INFO:
-   mus_snprintf(dsp_name, LABEL_BUFFER_SIZE, "%s%d", MIXER_NAME, dsp_num);