4 files changed, 10 insertions, 71 deletions

diff --git a/audio/snd/Makefile b/audio/snd/Makefile
index 66a393122098..72c2e4bef270 100644
--- a/audio/snd/Makefile
+++ b/audio/snd/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	snd
-PORTVERSION=	11.1
-PORTREVISION=	1
+PORTVERSION=	11.3
 CATEGORIES=	audio
 MASTER_SITES=	ftp://ccrma-ftp.stanford.edu/pub/Lisp/ \
 		http://mirror.mcx2.org/
@@ -21,7 +20,6 @@ OPTIONS=	ESD	"Use Enlightened Sound Daemon"		on  \
 		GUILE	"Use Guile as the extension language"	on  \
 		S7	"Use S7 as the extension language"	off  \
 		LADSPA	"Include support for LADSPA plugins"	on  \
-		NLS	"Native Language Support"		on  \
 		MOTIF	"Make Snd with Motif graphics support"	off \
 		GTK2	"Make Snd with Gtk+ graphics support"	on \
 		X11	"Make Snd with GUI support"	on
@@ -31,7 +29,7 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--with-float-samples
 MAKEFILE=	makefile
-ALL_TARGET=	audinfo snd snd-info sndplay sndrecord
+ALL_TARGET=	audinfo snd snd-info sndplay
 MAKE_JOBS_UNSAFE=	yes
 
 MAN1=		snd.1
@@ -85,14 +83,6 @@ RUN_DEPENDS+=	${LOCALBASE}/include/ladspa.h:${PORTSDIR}/audio/ladspa
 CONFIGURE_ARGS+=	--without-ladspa
 .endif
 
-.if !defined(WITHOUT_NLS)
-USE_GETTEXT=	yes
-PLIST_SUB+=	NLS=""
-.else
-CONFIGURE_ARGS+=	--disable-nls
-PLIST_SUB+=	NLS="@comment "
-.endif
-
 .if defined(WITH_GTK2)
 USE_GNOME+=	gtk20
 CONFIGURE_ARGS+=	--with-gtk
@@ -113,23 +103,17 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|^ _Complex| Vaiolate _Complex|g ; \
 		 s|-O2 -I|-I|g ; \
 		 s|LDFLAGS -ldl|LDFLAGS|g' ${WRKSRC}/configure
-.for i in makefile.in makefile.no-gettext
 	@${REINPLACE_CMD} -e 's|^sndinfo:|snd-info:|g ; \
-		 s|-o sndinfo|-o snd-info|g' ${WRKSRC}/${i}
-.endfor
+		 s|-o sndinfo|-o snd-info|g' ${WRKSRC}/makefile.in
 
 do-install:
-.for i in audinfo snd snd-info sndplay sndrecord
+.for i in audinfo snd snd-info sndplay
 	${INSTALL_PROGRAM} ${WRKSRC}/${i} ${PREFIX}/bin
 .endfor
 	${INSTALL_MAN} ${WRKSRC}/snd.1 ${MANPREFIX}/man/man1/
 .if !defined(WITHOUT_X11)
 	${INSTALL_DATA} ${WRKSRC}/Snd.ad ${PREFIX}/lib/X11/app-defaults/
 .endif
-.if !defined(WITHOUT_NLS)
-	${INSTALL_DATA} ${WRKSRC}/po/de.gmo \
-		${PREFIX}/share/locale/de/LC_MESSAGES/snd.mo
-.endif
 .if !defined(WITHOUT_GUILE)
 	@${MKDIR} ${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/*.scm ${DATADIR}
diff --git a/audio/snd/distinfo b/audio/snd/distinfo
index d1ad114ea86a..32f2390e448b 100644
--- a/audio/snd/distinfo
+++ b/audio/snd/distinfo
@@ -1,3 +1,3 @@
-MD5 (snd-11.1.tar.gz) = 3cad0541dc49dd48918dc2017b5c8ca5
-SHA256 (snd-11.1.tar.gz) = 9d8db7bf2b0f1538d677c0f89c85e55c9779c47e6b7291a345ab9a1d7884bf4a
-SIZE (snd-11.1.tar.gz) = 19989114
+MD5 (snd-11.3.tar.gz) = 71168f92e77a14f80c6bcf5c1dd3df26
+SHA256 (snd-11.3.tar.gz) = 12dd4b30bd411e3d27a293bec048bb2accccb883ef7d4f0ee1ca987c6fba02e1
+SIZE (snd-11.3.tar.gz) = 19201566
diff --git a/audio/snd/files/patch-snd-file_c b/audio/snd/files/patch-snd-file_c
deleted file mode 100644
index 67894a800a75..000000000000
--- a/audio/snd/files/patch-snd-file_c
+++ /dev/null
@@ -1,16 +0,0 @@
---- snd-file.c.orig	2008-04-05 00:09:20.000000000 +0900
-+++ snd-file.c	2008-04-27 02:22:44.000000000 +0900
-@@ -13,11 +13,11 @@
-   #include <sys/statvfs.h>
- #endif
- 
--#if __bsdi__ || HAVE_SYS_PARAM_H
-+#if __bsdi__ || __FreeBSD__ || HAVE_SYS_PARAM_H
-   #include <sys/param.h>
- #endif
- 
--#if (HAVE_SYS_MOUNT_H && MUS_MAC_OSX) || __bsdi__ || MUS_NETBSD
-+#if (HAVE_SYS_MOUNT_H && MUS_MAC_OSX) || __bsdi__ || __FreeBSD__ || MUS_NETBSD
-   #include <sys/mount.h>
- #endif
- 
diff --git a/audio/snd/pkg-plist b/audio/snd/pkg-plist
index 45021de99d4b..4ff1aaa05b12 100644
--- a/audio/snd/pkg-plist
+++ b/audio/snd/pkg-plist
@@ -2,7 +2,6 @@ bin/audinfo
 bin/snd
 bin/snd-info
 bin/sndplay
-bin/sndrecord
 %%X11%%lib/X11/app-defaults/Snd.ad
 %%PORTDOCS%%%%DOCSDIR%%/HISTORY.Snd
 %%PORTDOCS%%%%DOCSDIR%%/README.Snd
@@ -12,6 +11,8 @@ bin/sndrecord
 %%PORTDOCS%%%%DOCSDIR%%/index.html
 %%PORTDOCS%%%%DOCSDIR%%/libxm.html
 %%PORTDOCS%%%%DOCSDIR%%/s7.html
+%%PORTDOCS%%%%DOCSDIR%%/pix/all57.png
+%%PORTDOCS%%%%DOCSDIR%%/pix/odd57.png
 %%PORTDOCS%%%%DOCSDIR%%/pix/1f.png
 %%PORTDOCS%%%%DOCSDIR%%/pix/2pole.png
 %%PORTDOCS%%%%DOCSDIR%%/pix/4grfs.png
@@ -281,7 +282,6 @@ bin/sndrecord
 %%PORTDOCS%%%%DOCSDIR%%/pix/sinesummation.png
 %%PORTDOCS%%%%DOCSDIR%%/pix/smoothsq.png
 %%PORTDOCS%%%%DOCSDIR%%/pix/snd-gtkrc.png
-%%PORTDOCS%%%%DOCSDIR%%/pix/snd-ls.png
 %%PORTDOCS%%%%DOCSDIR%%/pix/sndcmn.png
 %%PORTDOCS%%%%DOCSDIR%%/pix/sndosc.png
 %%PORTDOCS%%%%DOCSDIR%%/pix/sos.png
@@ -293,7 +293,6 @@ bin/sndrecord
 %%PORTDOCS%%%%DOCSDIR%%/pix/srates.png
 %%PORTDOCS%%%%DOCSDIR%%/pix/ssbam.png
 %%PORTDOCS%%%%DOCSDIR%%/pix/ssbambank.png
-%%PORTDOCS%%%%DOCSDIR%%/pix/stochastic.png
 %%PORTDOCS%%%%DOCSDIR%%/pix/sum2.png
 %%PORTDOCS%%%%DOCSDIR%%/pix/sum5.png
 %%PORTDOCS%%%%DOCSDIR%%/pix/t5sum.png
@@ -358,7 +357,6 @@ bin/sndrecord
 %%PORTDOCS%%%%DOCSDIR%%/xen.html
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/DotEmacs
 %%X11%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Snd.gtkrc
-%%NLS%%share/locale/de/LC_MESSAGES/snd.mo
 %%SCHEME%%%%DATADIR%%/analog-filter.scm
 %%SCHEME%%%%DATADIR%%/animals.scm
 %%SCHEME%%%%DATADIR%%/autosave.scm
@@ -377,13 +375,11 @@ bin/sndrecord
 %%SCHEME%%%%DATADIR%%/effects-utils.scm
 %%SCHEME%%%%DATADIR%%/env.scm
 %%SCHEME%%%%DATADIR%%/enved.scm
-%%SCHEME%%%%DATADIR%%/eval-c.scm
 %%SCHEME%%%%DATADIR%%/examp.scm
 %%SCHEME%%%%DATADIR%%/expandn.scm
 %%SCHEME%%%%DATADIR%%/extensions.scm
 %%SCHEME%%%%DATADIR%%/fade.scm
 %%SCHEME%%%%DATADIR%%/fft-menu.scm
-%%SCHEME%%%%DATADIR%%/fix-optargs.scm
 %%SCHEME%%%%DATADIR%%/fmv.scm
 %%SCHEME%%%%DATADIR%%/fullmix.scm
 %%SCHEME%%%%DATADIR%%/frame.scm
@@ -393,14 +389,11 @@ bin/sndrecord
 %%SCHEME%%%%DATADIR%%/gtk-effects-utils.scm
 %%SCHEME%%%%DATADIR%%/gtk-effects.scm
 %%SCHEME%%%%DATADIR%%/gtk-popup.scm
-%%SCHEME%%%%DATADIR%%/gui.scm
 %%SCHEME%%%%DATADIR%%/hooks.scm
 %%SCHEME%%%%DATADIR%%/index.scm
 %%SCHEME%%%%DATADIR%%/jcrev.scm
 %%SCHEME%%%%DATADIR%%/jcvoi.scm
 %%SCHEME%%%%DATADIR%%/kmenu.scm
-%%SCHEME%%%%DATADIR%%/ladspa-help.scm
-%%SCHEME%%%%DATADIR%%/ladspa.scm
 %%SCHEME%%%%DATADIR%%/maraca.scm
 %%SCHEME%%%%DATADIR%%/marks-menu.scm
 %%SCHEME%%%%DATADIR%%/marks.scm
@@ -412,25 +405,13 @@ bin/sndrecord
 %%SCHEME%%%%DATADIR%%/musglyphs.scm
 %%SCHEME%%%%DATADIR%%/nb.scm
 %%SCHEME%%%%DATADIR%%/new-backgrounds.scm
-%%SCHEME%%%%DATADIR%%/new-buttons.scm
 %%SCHEME%%%%DATADIR%%/new-effects.scm
 %%SCHEME%%%%DATADIR%%/noise.scm
 %%SCHEME%%%%DATADIR%%/numerics.scm
 %%SCHEME%%%%DATADIR%%/nrev.scm
-%%SCHEME%%%%DATADIR%%/oo.scm
-%%SCHEME%%%%DATADIR%%/osc.scm
 %%SCHEME%%%%DATADIR%%/oscope.scm
+%%SCHEME%%%%DATADIR%%/primes.scm
 %%SCHEME%%%%DATADIR%%/panic.scm
-%%SCHEME%%%%DATADIR%%/pd-add.scm
-%%SCHEME%%%%DATADIR%%/pd-any.scm
-%%SCHEME%%%%DATADIR%%/pd-fm.scm
-%%SCHEME%%%%DATADIR%%/pd-global.scm
-%%SCHEME%%%%DATADIR%%/pd-inout.scm
-%%SCHEME%%%%DATADIR%%/pd-local.scm
-%%SCHEME%%%%DATADIR%%/pd-mozilla.scm
-%%SCHEME%%%%DATADIR%%/pd-send_receive.scm
-%%SCHEME%%%%DATADIR%%/pd-stochastic.scm
-%%SCHEME%%%%DATADIR%%/peak-env.scm
 %%SCHEME%%%%DATADIR%%/peak-phases.scm
 %%SCHEME%%%%DATADIR%%/piano.scm
 %%SCHEME%%%%DATADIR%%/play.scm
@@ -440,14 +421,6 @@ bin/sndrecord
 %%SCHEME%%%%DATADIR%%/pretty-print.scm
 %%SCHEME%%%%DATADIR%%/pvoc.scm
 %%SCHEME%%%%DATADIR%%/rgb.scm
-%%SCHEME%%%%DATADIR%%/rt-clm-ins.scm
-%%SCHEME%%%%DATADIR%%/rt-compiler.scm
-%%SCHEME%%%%DATADIR%%/rt-coroutines.scm
-%%SCHEME%%%%DATADIR%%/rt-engine.scm
-%%SCHEME%%%%DATADIR%%/rt-examples.scm
-%%SCHEME%%%%DATADIR%%/rt-faust.scm
-%%SCHEME%%%%DATADIR%%/rt-player.scm
-%%SCHEME%%%%DATADIR%%/rt-stalin.scm
 %%SCHEME%%%%DATADIR%%/rtio.scm
 %%SCHEME%%%%DATADIR%%/rubber.scm
 %%SCHEME%%%%DATADIR%%/selection.scm
@@ -456,7 +429,6 @@ bin/sndrecord
 %%SCHEME%%%%DATADIR%%/s7-slib-init.scm
 %%SCHEME%%%%DATADIR%%/snd-gl.scm
 %%SCHEME%%%%DATADIR%%/snd-gtk.scm
-%%SCHEME%%%%DATADIR%%/snd-hobbit.scm
 %%SCHEME%%%%DATADIR%%/snd-motif.scm
 %%SCHEME%%%%DATADIR%%/snd-test.scm
 %%SCHEME%%%%DATADIR%%/snd6.scm
@@ -465,7 +437,6 @@ bin/sndrecord
 %%SCHEME%%%%DATADIR%%/snd9.scm
 %%SCHEME%%%%DATADIR%%/snd10.scm
 %%SCHEME%%%%DATADIR%%/snd11.scm
-%%SCHEME%%%%DATADIR%%/snd_conffile.scm
 %%SCHEME%%%%DATADIR%%/snddiff.scm
 %%SCHEME%%%%DATADIR%%/sndlib-ws.scm
 %%SCHEME%%%%DATADIR%%/sndins/samples/agn.scm