4 files changed, 43 insertions, 34 deletions

diff --git a/audio/ecasound/Makefile b/audio/ecasound/Makefile
index 6b0a6b646d60..22091e3c7359 100644
--- a/audio/ecasound/Makefile
+++ b/audio/ecasound/Makefile
@@ -6,76 +6,94 @@
 #
 
 PORTNAME=	ecasound
-PORTVERSION=	2.8.1
+PORTVERSION=	2.9.0
 CATEGORIES=	audio
-MASTER_SITES=	http://ecasound.seul.org/download/
+MASTER_SITES=	http://ecasound.seul.org/download/ \
+		http://eca.cx/download/ \
+		http://ecawave.sourceforge.net/download/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Multitrack audio processing software
 
+LICENSE=	GPLv2 GPLv3
+LICENSE_COMB=	dual
+
 BUILD_DEPENDS=	${LOCALBASE}/include/ladspa.h:${PORTSDIR}/audio/ladspa
 
-OPTIONS_DEFINE=	ARTS AUDIOFILE JACK LO OIL SAMPLERATE
+OPTIONS_DEFINE=	ALSA ARTS AUDIOFILE JACK LO OIL PYTHON SAMPLERATE
+OPTIONS_DEFAULT=PYTHON
 AUDIOFILE_DESC=	Enable libaudiofile support
 LO_DESC=	Enable liblo support
 OIL_DESC=	Enable liboil support
 
-LICENSE=	GPLv2 GPLv3
-LICENSE_COMB=	dual
-
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
-CONFIGURE_ARGS=	--disable-pyecasound \
+CONFIGURE_ARGS=	--disable-liblilv \
 		--disable-rubyecasound \
 		--enable-sys-readline
 USE_LDCONFIG=	yes
+MAKE_JOBS_SAFE=	yes
+
+CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
 MAN1=		ecaconvert.1 ecafixdc.1 ecalength.1 ecamonitor.1 \
 		ecanormalize.1 ecaplay.1 ecasignalview.1 ecasound.1 \
 		ecasound-iam.1 ecatools.1
 MAN5=		ecasoundrc.5
 
-CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
-
 .include <bsd.port.options.mk>
 
-.if exists(${LOCALBASE}/lib/libreadline.so.6)
-LIB_DEPENDS+=	readline.6:${PORTSDIR}/devel/readline
+.if exists(${LOCALBASE}/lib/libreadline.so)
+LIB_DEPENDS+=	readline:${PORTSDIR}/devel/readline
+.endif
+
+.if ${PORT_OPTIONS:MALSA}
+LIB_DEPENDS+=	asound:${PORTSDIR}/audio/alsa-lib
+.else
+CONFIGURE_ARGS+=	--disable-alsa
 .endif
 
 .if ${PORT_OPTIONS:MARTS}
-LIB_DEPENDS+=	artsc.0:${PORTSDIR}/audio/arts
+LIB_DEPENDS+=	artsc:${PORTSDIR}/audio/arts
 .else
 CONFIGURE_ARGS+=	--disable-arts
 .endif
 
 .if ${PORT_OPTIONS:MAUDIOFILE}
-LIB_DEPENDS+=	audiofile.0:${PORTSDIR}/audio/libaudiofile
+LIB_DEPENDS+=	audiofile:${PORTSDIR}/audio/libaudiofile
 .else
 CONFIGURE_ARGS+=	--disable-audiofile
 .endif
 
 .if ${PORT_OPTIONS:MJACK}
-LIB_DEPENDS+=	jack.0:${PORTSDIR}/audio/jack
+LIB_DEPENDS+=	jack:${PORTSDIR}/audio/jack
 .else
 CONFIGURE_ARGS+=	--disable-jack
 .endif
 
 .if ${PORT_OPTIONS:MLO}
-LIB_DEPENDS+=	lo.7:${PORTSDIR}/audio/liblo
+LIB_DEPENDS+=	lo:${PORTSDIR}/audio/liblo
 .else
 CONFIGURE_ARGS+=	--disable-liblo
 .endif
 
 .if ${PORT_OPTIONS:MOIL}
-LIB_DEPENDS+=	oil-0.3.0:${PORTSDIR}/devel/liboil
+LIB_DEPENDS+=	oil-0.3:${PORTSDIR}/devel/liboil
 .else
 CONFIGURE_ARGS+=	--disable-liboil
 .endif
 
+.if ${PORT_OPTIONS:MPYTHON}
+USE_PYTHON=	yes
+CONFIGURE_ARGS+=	--enable-pyecasound
+PLIST_SUB+=	PYTHON=""
+.else
+PLIST_SUB+=	PYTHON="@comment "
+.endif
+
 .if ${PORT_OPTIONS:MSAMPLERATE}
-LIB_DEPENDS+=	samplerate.1:${PORTSDIR}/audio/libsamplerate
+LIB_DEPENDS+=	samplerate:${PORTSDIR}/audio/libsamplerate
 .else
 CONFIGURE_ARGS+=	--disable-libsamplerate --disable-sndfile
 .endif
diff --git a/audio/ecasound/distinfo b/audio/ecasound/distinfo
index 1acd804443e1..585d435fd8a3 100644
--- a/audio/ecasound/distinfo
+++ b/audio/ecasound/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ecasound-2.8.1.tar.gz) = e55accabeaf5cc5dcaac56cdb83dabb908ad1195d79c2a3df7718b834d328994
-SIZE (ecasound-2.8.1.tar.gz) = 1056331
+SHA256 (ecasound-2.9.0.tar.gz) = e2b0b8f8cce6074d660e460b3a02fc0132a51e1e982b78b3a68fa14e79fcc6c6
+SIZE (ecasound-2.9.0.tar.gz) = 1055913
diff --git a/audio/ecasound/files/patch-ecatools__ecaplay.c b/audio/ecasound/files/patch-ecatools__ecaplay.c
deleted file mode 100644
index 9c65ee084d89..000000000000
--- a/audio/ecasound/files/patch-ecatools__ecaplay.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- ecatools/ecaplay.c.orig	Mon Oct  3 06:44:57 2005
-+++ ecatools/ecaplay.c	Sun Jan 29 21:54:01 2006
-@@ -211,9 +211,10 @@
-   else {
-     static int once = 1;
-     if (once) {
-+      char *tmpstr;
-       eci_command_r(eci, "ao-iselect 1");
-       eci_command_r(eci, "ao-describe");
--      char *tmpstr = (char*)eci_last_string_r(eci);
-+      tmpstr = (char*)eci_last_string_r(eci);
-       /* skip the "-x:" prefix where x is one of [io] */
-       while(*tmpstr && *tmpstr++ != ':') 
- 	;
diff --git a/audio/ecasound/pkg-plist b/audio/ecasound/pkg-plist
index ea00b07b88de..e24d6643e0f6 100644
--- a/audio/ecasound/pkg-plist
+++ b/audio/ecasound/pkg-plist
@@ -34,6 +34,8 @@ include/libecasound/audiofx_compressor.h
 include/libecasound/audiofx_envelope_modulation.h
 include/libecasound/audiofx_filter.h
 include/libecasound/audiofx_ladspa.h
+include/libecasound/audiofx_lv2.h
+include/libecasound/audiofx_lv2_world.h
 include/libecasound/audiofx_misc.h
 include/libecasound/audiofx_mixing.h
 include/libecasound/audiofx_rcfilter.h
@@ -155,6 +157,9 @@ lib/libecasoundc.a
 lib/libecasoundc.la
 lib/libkvutils.a
 lib/libkvutils.la
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/ecacontrol.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/eci.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/pyeca.py
 %%DATADIR%%/ecasound.el
 %%DATADIR%%/ecasoundrc
 %%DATADIR%%/effect_presets