3 files changed, 4 insertions, 143 deletions

diff --git a/audio/snd/Makefile b/audio/snd/Makefile
index b50895fc429e..c1cb248b7105 100644
--- a/audio/snd/Makefile
+++ b/audio/snd/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	snd
-PORTVERSION=	12.11
-PORTREVISION=	1
+PORTVERSION=	12.12
 CATEGORIES=	audio
 MASTER_SITES=	ftp://ccrma-ftp.stanford.edu/pub/Lisp/ \
 		http://mirror.mcx2.org/
@@ -15,10 +14,8 @@ MASTER_SITES=	ftp://ccrma-ftp.stanford.edu/pub/Lisp/ \
 MAINTAINER=	dhn@FreeBSD.org
 COMMENT=	Multitracking sound editor and utilities
 
-OPTIONS=	ESD	"Use Enlightened Sound Daemon"		on  \
-		FFTW3	"Use FFTW"				on  \
+OPTIONS=	FFTW3	"Use FFTW"				on  \
 		GSL	"Use GNU Scientific Library"		on  \
-		GUILE	"Use Guile as the extension language"	on  \
 		S7	"Use S7 as the extension language"	off  \
 		LADSPA	"Include support for LADSPA plugins"	on  \
 		MOTIF	"Make Snd with Motif graphics support"	off \
@@ -44,11 +41,6 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 BROKEN=		does not compile on sparc64
 .endif
 
-.if !defined(WITHOUT_ESD)
-USE_GNOME+=	esound
-CONFIGURE_ARGS+=	--with-esd
-.endif
-
 .if !defined(WITHOUT_FFTW3)
 LIB_DEPENDS+=	fftw3:${PORTSDIR}/math/fftw3
 .else
@@ -61,17 +53,8 @@ LIB_DEPENDS+=	gsl.16:${PORTSDIR}/math/gsl
 CONFIGURE_ARGS+=	--without-gsl
 .endif
 
-.if !defined(WITHOUT_GUILE)
-CONFIGURE_ARGS+=	--with-guile
-LIB_DEPENDS+=	guile.21:${PORTSDIR}/lang/guile
-PLIST_SUB+=	SCHEME=""
-.else
-CONFIGURE_ARGS+=	--without-guile
-.endif
-
 .if !defined(WITHOUT_S7)
 CONFIGURE_ARGS+=	--with-s7
-PLIST_SUB+=	SCHEME=""
 .else
 CONFIGURE_ARGS+=	--without-s7
 .endif
@@ -86,17 +69,14 @@ CONFIGURE_ARGS+=	--without-ladspa
 .if defined(WITH_GTK2)
 USE_GNOME+=	gtk20
 CONFIGURE_ARGS+=	--with-gtk
-PLIST_SUB+=	X11=""
 .endif
 .if defined(WITH_MOTIF)
 USE_MOTIF=	yes
 CONFIGURE_ARGS+=	--with-motif
-PLIST_SUB+=	X11=""
 .endif
 
 .if defined(WITHOUT_X11)
 CONFIGURE_ARGS+=	--with-no-gui
-PLIST_SUB+=	X11="@comment "
 .endif
 
 post-patch:
@@ -111,22 +91,6 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${i} ${PREFIX}/bin
 .endfor
 	${INSTALL_MAN} ${WRKSRC}/snd.1 ${MANPREFIX}/man/man1/
-.if !defined(WITHOUT_GUILE)
-	@${MKDIR} ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/*.scm ${DATADIR}
-	@${MKDIR} ${DATADIR}/tools
-	${INSTALL_DATA} ${WRKSRC}/tools/*.scm ${DATADIR}/tools
-	@${MKDIR} ${DATADIR}/sndins/samples
-	${INSTALL_DATA} ${WRKSRC}/sndins/samples/*.scm ${DATADIR}/sndins/samples
-.endif
-.if !defined(WITHOUT_GAUCHE)
-	@${MKDIR} ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/*.scm ${DATADIR}
-	@${MKDIR} ${DATADIR}/tools
-	${INSTALL_DATA} ${WRKSRC}/tools/*.scm ${DATADIR}/tools
-	@${MKDIR} ${DATADIR}/sndins/samples
-	${INSTALL_DATA} ${WRKSRC}/sndins/samples/*.scm ${DATADIR}/sndins/samples
-.endif
 .if !defined(WITHOUT_S7)
 	@${MKDIR} ${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/*.scm ${DATADIR}
diff --git a/audio/snd/distinfo b/audio/snd/distinfo
index d3cd77efcc48..2a83bfbc2f3a 100644
--- a/audio/snd/distinfo
+++ b/audio/snd/distinfo
@@ -1,2 +1,2 @@
-SHA256 (snd-12.11.tar.gz) = da0768860bd2640d315f220847364f6580fa31e3c89547fcdde94d5dd7327ecf
-SIZE (snd-12.11.tar.gz) = 15484554
+SHA256 (snd-12.12.tar.gz) = 0ee7dd1c9365aa7878262acab988fcd048588e0cb6610fc035fee9090b951b71
+SIZE (snd-12.12.tar.gz) = 15519641
diff --git a/audio/snd/pkg-plist b/audio/snd/pkg-plist
index fbbf09447091..18f9d7fd4fa5 100644
--- a/audio/snd/pkg-plist
+++ b/audio/snd/pkg-plist
@@ -347,109 +347,6 @@ bin/sndplay
 %%PORTDOCS%%%%DOCSDIR%%/tutorial/images/jpg/4_01-snd_pan_env.jpg
 %%PORTDOCS%%%%DOCSDIR%%/xen.html
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/DotEmacs
-%%SCHEME%%%%DATADIR%%/analog-filter.scm
-%%SCHEME%%%%DATADIR%%/animals.scm
-%%SCHEME%%%%DATADIR%%/autosave.scm
-%%SCHEME%%%%DATADIR%%/bess.scm
-%%SCHEME%%%%DATADIR%%/bess1.scm
-%%SCHEME%%%%DATADIR%%/big-gens.scm
-%%SCHEME%%%%DATADIR%%/binary-io.scm
-%%SCHEME%%%%DATADIR%%/bird.scm
-%%SCHEME%%%%DATADIR%%/clean.scm
-%%SCHEME%%%%DATADIR%%/clm-ins.scm
-%%SCHEME%%%%DATADIR%%/clm23.scm
-%%SCHEME%%%%DATADIR%%/dlocsig.scm
-%%SCHEME%%%%DATADIR%%/draw.scm
-%%SCHEME%%%%DATADIR%%/dsp.scm
-%%SCHEME%%%%DATADIR%%/edit-menu.scm
-%%SCHEME%%%%DATADIR%%/edit123.scm
-%%SCHEME%%%%DATADIR%%/effects-utils.scm
-%%SCHEME%%%%DATADIR%%/env.scm
-%%SCHEME%%%%DATADIR%%/enved.scm
-%%SCHEME%%%%DATADIR%%/examp.scm
-%%SCHEME%%%%DATADIR%%/expr.scm
-%%SCHEME%%%%DATADIR%%/expandn.scm
-%%SCHEME%%%%DATADIR%%/extensions.scm
-%%SCHEME%%%%DATADIR%%/fade.scm
-%%SCHEME%%%%DATADIR%%/fft-menu.scm
-%%SCHEME%%%%DATADIR%%/fmv.scm
-%%SCHEME%%%%DATADIR%%/fullmix.scm
-%%SCHEME%%%%DATADIR%%/frame.scm
-%%SCHEME%%%%DATADIR%%/freeverb.scm
-%%SCHEME%%%%DATADIR%%/generators.scm
-%%SCHEME%%%%DATADIR%%/grani.scm
-%%SCHEME%%%%DATADIR%%/gtk-effects-utils.scm
-%%SCHEME%%%%DATADIR%%/gtk-effects.scm
-%%SCHEME%%%%DATADIR%%/hooks.scm
-%%SCHEME%%%%DATADIR%%/index.scm
-%%SCHEME%%%%DATADIR%%/jcrev.scm
-%%SCHEME%%%%DATADIR%%/jcvoi.scm
-%%SCHEME%%%%DATADIR%%/kmenu.scm
-%%SCHEME%%%%DATADIR%%/lint.scm
-%%SCHEME%%%%DATADIR%%/maraca.scm
-%%SCHEME%%%%DATADIR%%/marks-menu.scm
-%%SCHEME%%%%DATADIR%%/marks.scm
-%%SCHEME%%%%DATADIR%%/maxf.scm
-%%SCHEME%%%%DATADIR%%/misc.scm
-%%SCHEME%%%%DATADIR%%/mix.scm
-%%SCHEME%%%%DATADIR%%/mixer.scm
-%%SCHEME%%%%DATADIR%%/moog.scm
-%%SCHEME%%%%DATADIR%%/musglyphs.scm
-%%SCHEME%%%%DATADIR%%/nb.scm
-%%SCHEME%%%%DATADIR%%/new-backgrounds.scm
-%%SCHEME%%%%DATADIR%%/new-effects.scm
-%%SCHEME%%%%DATADIR%%/noise.scm
-%%SCHEME%%%%DATADIR%%/numerics.scm
-%%SCHEME%%%%DATADIR%%/nrev.scm
-%%SCHEME%%%%DATADIR%%/oscope.scm
-%%SCHEME%%%%DATADIR%%/primes.scm
-%%SCHEME%%%%DATADIR%%/peak-phases.scm
-%%SCHEME%%%%DATADIR%%/piano.scm
-%%SCHEME%%%%DATADIR%%/play.scm
-%%SCHEME%%%%DATADIR%%/poly.scm
-%%SCHEME%%%%DATADIR%%/prc95.scm
-%%SCHEME%%%%DATADIR%%/pretty-print.scm
-%%SCHEME%%%%DATADIR%%/pvoc.scm
-%%SCHEME%%%%DATADIR%%/rgb.scm
-%%SCHEME%%%%DATADIR%%/rtio.scm
-%%SCHEME%%%%DATADIR%%/rubber.scm
-%%SCHEME%%%%DATADIR%%/selection.scm
-%%SCHEME%%%%DATADIR%%/singer.scm
-%%SCHEME%%%%DATADIR%%/s7test.scm
-%%SCHEME%%%%DATADIR%%/s7-slib-init.scm
-%%SCHEME%%%%DATADIR%%/snd-gl.scm
-%%SCHEME%%%%DATADIR%%/snd-gtk.scm
-%%SCHEME%%%%DATADIR%%/snd-motif.scm
-%%SCHEME%%%%DATADIR%%/snd-test.scm
-%%SCHEME%%%%DATADIR%%/snd11.scm
-%%SCHEME%%%%DATADIR%%/snd12.scm
-%%SCHEME%%%%DATADIR%%/snddiff.scm
-%%SCHEME%%%%DATADIR%%/sndlib-ws.scm
-%%SCHEME%%%%DATADIR%%/sndins/samples/agn.scm
-%%SCHEME%%%%DATADIR%%/sndins/samples/fmviolin.scm
-%%SCHEME%%%%DATADIR%%/sndins/samples/ws_s.scm
-%%SCHEME%%%%DATADIR%%/sndwarp.scm
-%%SCHEME%%%%DATADIR%%/special-menu.scm
-%%SCHEME%%%%DATADIR%%/spectr.scm
-%%SCHEME%%%%DATADIR%%/spokenword.scm
-%%SCHEME%%%%DATADIR%%/stochastic.scm
-%%SCHEME%%%%DATADIR%%/strad.scm
-%%SCHEME%%%%DATADIR%%/tools/check-help.scm
-%%SCHEME%%%%DATADIR%%/tools/gldata.scm
-%%SCHEME%%%%DATADIR%%/tools/make-index.scm
-%%SCHEME%%%%DATADIR%%/tools/makegl.scm
-%%SCHEME%%%%DATADIR%%/tools/makexg.scm
-%%SCHEME%%%%DATADIR%%/tools/table.scm
-%%SCHEME%%%%DATADIR%%/tools/va.scm
-%%SCHEME%%%%DATADIR%%/tools/xgdata.scm
-%%SCHEME%%%%DATADIR%%/v.scm
-%%SCHEME%%%%DATADIR%%/ws.scm
-%%SCHEME%%%%DATADIR%%/xm-enved.scm
-%%SCHEME%%%%DATADIR%%/zip.scm
-%%SCHEME%%@dirrm %%DATADIR%%/tools
-%%SCHEME%%@dirrm %%DATADIR%%/sndins/samples
-%%SCHEME%%@dirrm %%DATADIR%%/sndins
-%%SCHEME%%@dirrm %%DATADIR%%
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/tutorial/images/jpg
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/tutorial/images