6 files changed, 45 insertions, 371 deletions

diff --git a/audio/ecasound/Makefile b/audio/ecasound/Makefile
index 6bce39eaf5db..55634314817c 100644
--- a/audio/ecasound/Makefile
+++ b/audio/ecasound/Makefile
@@ -6,77 +6,63 @@
 #
 
 PORTNAME=	ecasound
-PORTVERSION=	2.2.3
-PORTREVISION=	1
+PORTVERSION=	2.4.3
 CATEGORIES=	audio
 MASTER_SITES=	http://ecasound.seul.org/download/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Multitrack audio processing software
 
-USE_GMAKE=	yes
-USE_AUTOTOOLS=	automake:14 autoconf:213 libtool:13:inc
+USE_GNOME=	gnometarget
 USE_REINPLACE=	yes
+USE_GMAKE=	yes
+USE_AUTOTOOLS=	libtool:15
+CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
+CONFIGURE_ARGS=	--disable-pyecasound --disable-rubyecasound --with-largefile
 INSTALLS_SHLIB=	yes
 
-MAKE_ENV+=	${CONFIGURE_ENV}
+MAN1=		ecasound-iam.1 ecasound.1 ecatools.1 ecaconvert.1 \
+		ecafixdc.1 ecalength.1 ecamonitor.1 ecanormalize.1 \
+		ecaplay.1 ecasignalview.1
+MAN5=		ecasoundrc.5
+
+CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
-.if defined(WITH_MPG123)
-RUN_DEPENDS+=	mpg123:${PORTSDIR}/audio/mpg123
-.endif
+.include <bsd.port.pre.mk>
 
-.if defined(WITH_LAME)
-RUN_DEPENDS+=	lame:${PORTSDIR}/audio/lame
+.if ${OSVERSION} < 500000
+CFLAGS+=	-fpermissive
 .endif
 
-.if defined(WITH_MIKMOD)
-RUN_DEPENDS+=	mikmod:${PORTSDIR}/audio/mikmod
+.if defined(WITH_ARTS)
+LIB_DEPENDS+=	artsc.0:${PORTSDIR}/audio/arts
+.else
+CONFIGURE_ARGS+=	--disable-arts
 .endif
 
 .if defined(WITH_AUDIOFILE)
-# very crappy hack to detect audiofile properly
-CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include ${CPPFLAGS}" \
-		LDFLAGS="-L${LOCALBASE}/lib ${LDFLAGS}" \
-		CFLAGS="-I${LOCALBASE}/include ${CFLAGS}" \
-		CXXFLAGS="-I${LOCALBASE}/include ${CXXFLAGS}"
 LIB_DEPENDS+=	audiofile.0:${PORTSDIR}/audio/libaudiofile
 .else
 CONFIGURE_ARGS+=	--disable-audiofile
 .endif
 
-#.if defined(WITH_PYECASOUND)
-#USE_PYTHON=	yes
-#PLIST_SUB+=	WITH_PYECASOUND=""
-#.else
-CONFIGURE_ARGS+=	--disable-pyecasound
-PLIST_SUB+=	WITH_PYECASOUND="@comment "
-#.endif
-
-.if !defined(WITH_OPTIMIZED_CFLAGS)
-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-configure.in-optimizations
+.if defined(WITH_JACK)
+LIB_DEPENDS+=	jack.0:${PORTSDIR}/audio/jack
+.else
+CONFIGURE_ARGS+=	--disable-jack
 .endif
 
-MAN1=		ecasound-iam.1 ecasound.1 ecatools.1 ecaconvert.1 \
-		ecafixdc.1 ecalength.1 ecamonitor.1 ecanormalize.1 \
-		ecaplay.1 ecasignalview.1
-MAN5=		ecasoundrc.5
-
-pre-everything::
-.if !defined(WITH_OPTIMIZED_CFLAGS)
-	@${ECHO_MSG} "You can enable additional compilation optimizations"
-	@${ECHO_MSG} "by defining WITH_OPTIMIZED_CFLAGS"
-.endif
-.if !defined(WITH_AUDIOFILE)
-	@${ECHO_MSG} "You can enable AUDIOFILE support by defining WITH_AUDIOFILE."
+.if defined(WITH_SAMPLERATE)
+LIB_DEPENDS+=	samplerate.1:${PORTSDIR}/audio/libsndfile
+.else
+CONFIGURE_ARGS+=	--disable-libsamplerate --disable-sndfile
 .endif
 
 post-patch:
-.if !defined(WITH_OPTIMIZED_CFLAGS)
-	@${REINPLACE_CMD} -e 's!-O2 -ffast-math!!' ${WRKSRC}/kvutils/Makefile.am
-.endif
-
-#	${STRIP_CMD} ${PREFIX}/bin/ecaconvert ${PREFIX}/bin/ecafixdc \
-#${PREFIX}/bin/ecanormalize ${PREFIX}/bin/ecaplay ${PREFIX}/bin/ecasignalview \
-#${PREFIX}/bin/ecasound ${PREFIX}/bin/ecasound-config ${PREFIX}/bin/ecasoundc-config
+	@${REINPLACE_CMD} -e 's| $$EXTRAGCCFLAGS||g ; \
+		 s| -pthread||g ; \
+		 s| -D_THREAD_SAFE||g ; \
+		 s| -D_P1003_1B_VISIBLE||' ${WRKSRC}/configure
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/audio/ecasound/distinfo b/audio/ecasound/distinfo
index 2818904e3182..7855294ef654 100644
--- a/audio/ecasound/distinfo
+++ b/audio/ecasound/distinfo
@@ -1,2 +1,3 @@
-MD5 (ecasound-2.2.3.tar.gz) = 40a3f0213c30b18e1b4e7879faa6b454
-SIZE (ecasound-2.2.3.tar.gz) = 920102
+MD5 (ecasound-2.4.3.tar.gz) = ea4af6ffa9f00743270151927f7b4584
+SHA256 (ecasound-2.4.3.tar.gz) = 18e198993d4fe696ffc495b2229d99c75583015b4b2429349fab2d5219057945
+SIZE (ecasound-2.4.3.tar.gz) = 1112995
diff --git a/audio/ecasound/files/extra-patch-configure.in-optimizations b/audio/ecasound/files/extra-patch-configure.in-optimizations
deleted file mode 100644
index 33c2076e9178..000000000000
--- a/audio/ecasound/files/extra-patch-configure.in-optimizations
+++ /dev/null
@@ -1,12 +0,0 @@
---- configure.in.orig	Mon Mar 10 20:10:14 2003
-+++ configure.in	Thu Apr  3 19:22:56 2003
-@@ -67,7 +67,8 @@
- dnl modifies: CXXFLAGS, CFLAGS
- dnl ---
- EXTRAFLAGS="-D_REENTRANT"
--EXTRAGCCFLAGS="$EXTRAFLAGS -ffast-math -fstrict-aliasing -funroll-loops"
-+EXTRAGCCFLAGS="$EXTRAFLAGS"
-+dnl EXTRAGCCFLAGS="$EXTRAFLAGS -ffast-math -fstrict-aliasing -funroll-loops"
- if test x${GXX} = xyes; then
-    CXXFLAGS="$CXXFLAGS $EXTRAFLAGS $EXTRAGCCFLAGS"
- fi
diff --git a/audio/ecasound/files/patch-configure.in b/audio/ecasound/files/patch-configure.in
deleted file mode 100644
index d3434033cd4f..000000000000
--- a/audio/ecasound/files/patch-configure.in
+++ /dev/null
@@ -1,237 +0,0 @@
-===================================================================
-RCS file: /home/cvspsrv/cvsroot/sound/ecasound/configure.in,v
-retrieving revision 1.152
-retrieving revision 1.158
-diff -u -r1.152 -r1.158
---- configure.in	2003/04/02 20:14:10	1.152
-+++ configure.in	2003/05/30 19:28:47	1.158
-@@ -1,6 +1,6 @@
- dnl ---
- dnl configure.in for ecasound
--dnl last modified: 20030402-14
-+dnl last modified: 20030530-20
- dnl 
- dnl Many of the tests and macros in this file have been borrowed from 
- dnl other GPL-lisenced packages (Alsaplayer, ALSA, SIP, PyQt, 
-@@ -23,7 +23,7 @@
- dnl ---
- dnl Init automake
- dnl ---
--AM_INIT_AUTOMAKE(ecasound, 2.2.3)
-+AM_INIT_AUTOMAKE(ecasound, 2.2.4)
- AM_CONFIG_HEADER(config.h)
- 
- dnl ---
-@@ -32,15 +32,17 @@
- dnl defines: LIBECASOUND_VERSION, LIBECASOUNDC_VERSION, LIBKVUTILS_VERSION
- dnl ---
- 
--LIBECASOUND_VERSION=10
--LIBECASOUND_VERSION_AGE=1
-+LIBECASOUND_VERSION=11
-+LIBECASOUND_VERSION_AGE=2
- LIBECASOUNDC_VERSION=1
--LIBKVUTILS_VERSION=5
--LIBKVUTILS_VERSION_AGE=1
-+LIBECASOUNDC_VERSION_AGE=0
-+LIBKVUTILS_VERSION=6
-+LIBKVUTILS_VERSION_AGE=2
- 
- AC_SUBST(LIBECASOUND_VERSION)
- AC_SUBST(LIBECASOUND_VERSION_AGE)
- AC_SUBST(LIBECASOUNDC_VERSION)
-+AC_SUBST(LIBECASOUNDC_VERSION_AGE)
- AC_SUBST(LIBKVUTILS_VERSION)
- AC_SUBST(LIBKVUTILS_VERSION_AGE)
- 
-@@ -432,39 +434,46 @@
- dnl Checks for pyecasound
- dnl
- dnl defines: ECA_S_PYTHON_INCLUDES, ECA_S_PYTHON_DLMODULES, 
--dnl          ECA_AM_COMPILE_PYECASOUND, ECA_AM_HAVE_PYTHON
-+dnl          ECA_AM_PYECASOUND_CEXT, ECA_AM_PYECASOUND_INSTALL
- dnl --
- 
--compile_pyecasound=no
-+pyecasound_support=python
- 
- AC_ARG_ENABLE(pyecasound,
--	      [  --enable-pyecasound 	  Enable compilation of pyecasound (default = no)],
-+	      [  --enable-pyecasound 	  Enable compilation of pyecasound (default = python)],
- 	      [
- 	      case "$enableval" in
- 	        y | yes)
--		  AC_MSG_RESULT(yes)
--		  compile_pyecasound=yes
-+		  pyecasound_support=c
- 		;;
- 
--		n | no)
--		  AC_MSG_RESULT(no)
--		  compile_pyecasound=no
-+		n | no | none)
-+		  pyecasound_support=none
-+		;;
-+
-+		python)
-+		  pyecasound_support=python
-+		;;
-+
-+		c)
-+		  pyecasound_support=c
- 		;;
-         
- 		*)
--		  AC_MSG_ERROR([Invalid parameter value for --enable-pyecasound: $enableval])
-+		  pyecasound_support=python
- 		;;
- 	      esac
- 	      ])
- 
- dnl --
--dnl Python interpreter
-+dnl Python interpreter and installation prefix
- 
- AC_PATH_PROG(PYTHONPATH,python,none)
- if test x$PYTHONPATH = xnone; then
--  python_support=no
-+  pyecasound_support=none
-+  python_install_prefix=""
- else
--  python_support=yes
-+  python_install_prefix=`python -c "import sys; print (sys.prefix)"`
- fi
- 
- dnl --
-@@ -497,7 +506,10 @@
- if test "X$ECA_S_PYTHON_INCLUDES" = "X"
- then
- 	AC_MSG_WARN([Python.h not found])
--	compile_pyecasound=no
-+	if test x${pyecasound_support} = xc; then
-+	    dnl -- No python headers found, cannot compile C extension
-+	    pyecasound_support=python
-+	fi
- else
- 	AC_MSG_RESULT($ECA_S_PYTHON_INCLUDES)
- fi
-@@ -511,14 +523,35 @@
- 
- if test "X$with_python_modules" = "X"
- then
--    pymoddirs="/usr/local/lib /usr/lib"
--    dnl -- Double-brackets to espace the real brackets
--    pymoddirsmore=`python -c "import sys; print (sys.prefix + '/lib/python' + sys.version[[:3]])"`
--    pymoddirs="$pymoddirs $pymoddirsmore"
-+    if test x${python_install_prefix} != x${ecaprefix} -a \
-+            x${ecaprefix} != x/usr -a \
-+	    x${ecaprefix} != x/usr/local ; then
-+        pyecasound_support=none
-+	AC_MSG_RESULT([none])
-+	if test x$PYTHONPATH != xnone; then
-+	    python_prefix_tmp=`python -c "import sys; print (sys.prefix + '/lib/python' + sys.version[[:3]])"`
-+	else
-+	    python_prefix_tmp="DIR"
-+	fi
-+        AC_MSG_WARN([
-+	***
-+	*** Python modules won't be installed as the module install prefix does
-+	*** not match ecasound's build prefix! To override, set python
-+	*** module directory explicitly (for example 
-+	*** "--with-python-modules=${python_prefix_tmp}").
-+	***
-+	])
-+    else
-+        pymoddirs="/usr/local/lib /usr/lib"
-+        dnl -- Double-brackets to espace the real brackets
-+        pymoddirsmore=`python -c "import sys; print (sys.prefix + '/lib/python' + sys.version[[:3]])"`
-+        pymoddirs="$pymoddirs $pymoddirsmore"
-+	AC_MSG_RESULT($pymoddirs)
-+    fi
- else
-     pymoddirs=$with_python_modules
-+    AC_MSG_RESULT($pymoddirs)
- fi
--AC_MSG_RESULT($pymoddirs)
- 
- dnl ---
- dnl a hack to support broken debian python installs
-@@ -555,9 +588,9 @@
- AC_SUBST(ECA_S_PYTHON_MODULES)
- AC_SUBST(ECA_S_PYTHON_DLMODULES)
- 
--dnl if test x$disable_pyecasound = xyes ; then compile_pyecasound=no ; fi
--AM_CONDITIONAL(ECA_AM_COMPILE_PYECASOUND, test x$compile_pyecasound = xyes)
--AM_CONDITIONAL(ECA_AM_HAVE_PYTHON, test x$python_support = xyes)
-+dnl if test x$disable_pyecasound = xyes ; then pyecasound_support=no ; fi
-+AM_CONDITIONAL(ECA_AM_PYECASOUND_CEXT, test x$pyecasound_support = xc)
-+AM_CONDITIONAL(ECA_AM_PYECASOUND_INSTALL, test x$pyecasound_support != xnone)
- 
- dnl ------------------------------------------------------------------
- 
-@@ -621,12 +654,12 @@
- 	      case "$enableval" in
- 	        y | yes)
- 		  AC_MSG_RESULT(yes)
--		  termcap_library=yes
-+		  termcap_library=ncurses
- 		;;
- 
- 		n | no)
- 		  AC_MSG_RESULT(no)
--		  termcap_library=no
-+		  termcap_library=none
- 		;;
-         
- 		*)
-@@ -788,8 +821,14 @@
-      [AC_CHECK_HEADER(readline/history.h,,
-        AC_MSG_ERROR([*** readline history headers not installed ***]))])
- 
--  AC_CHECK_LIB(readline, main,, AC_MSG_ERROR([*** readline support not installed ***]))
--  AC_CHECK_LIB(history, main,, AC_MSG_ERROR([*** readline history support not installed ***]))
-+  if test x${termcap_library} = xnone; then
-+     readline_extra_libs="";
-+  else
-+     readline_extra_libs="-l${termcap_library}"
-+  fi
-+
-+  AC_CHECK_LIB(readline, main, readline_library="-lreadline", AC_MSG_ERROR([*** readline support not installed ***]), ${readline_extra_libs})
-+  AC_CHECK_LIB(history, main, readline_library="${readline_library} -lhistory", AC_MSG_ERROR([*** readline history support not installed ***]), ${readline_extra_libs})
-   AC_SUBST(ECA_S_READLINE_INCLUDES)
- else
-   AC_CONFIG_SUBDIRS(readline-4.0)
-@@ -865,6 +904,9 @@
- AC_CHECK_FUNCS(sched_getparam)
- AC_CHECK_FUNCS(sched_getscheduler)
- AC_CHECK_FUNCS(sched_setscheduler)
-+AC_CHECK_FUNCS(pthread_self)
-+AC_CHECK_FUNCS(pthread_getschedparam)
-+AC_CHECK_FUNCS(pthread_setschedparam)
- AC_CHECK_FUNCS(sigprocmask)
- AC_CHECK_FUNCS(sigwait)
- 
-@@ -943,8 +985,12 @@
- echo "Following packages are now configured:"
- echo "ecasound: 		yes (ecasound,libecasound,libecasoundc)"
- echo "ecatools: 		yes"
--if test x$compile_pyecasound = xyes ; then
--	echo "pyecasound: 		yes"
-+if test x$pyecasound_support != xnone ; then
-+	if test x$pyecasound_support = xc ; then
-+		echo "pyecasound: 		yes (as Python C extension module)"
-+	else
-+		echo "pyecasound: 		yes (as native Python module)"
-+	fi
- else
- 	echo "pyecasound: 		no"
- fi
-@@ -1011,7 +1057,7 @@
- echo "-----------------------------------------------------------------"
- echo "Following directories are used:"
- echo "Directory prefix:    "$ECA_S_PREFIX
--if test x$compile_pyecasound = xyes ; then
-+if test x$pyecasound_support != xnone ; then
- 	echo "Python include dir:	"$ECA_S_PYTHON_INCLUDES
- 	echo "Python module dir:	"$ECA_S_PYTHON_MODULES
- fi
diff --git a/audio/ecasound/files/patch-pyecasound::Makefile.am b/audio/ecasound/files/patch-pyecasound::Makefile.am
deleted file mode 100644
index 1eea024577d4..000000000000
--- a/audio/ecasound/files/patch-pyecasound::Makefile.am
+++ /dev/null
@@ -1,65 +0,0 @@
-===================================================================
-RCS file: /home/cvspsrv/cvsroot/sound/ecasound/pyecasound/Makefile.am,v
-retrieving revision 1.28
-retrieving revision 1.29
-diff -u -r1.28 -r1.29
---- pyecasound/Makefile.am	2003/04/02 20:13:52	1.28
-+++ pyecasound/Makefile.am	2003/05/30 01:50:40	1.29
-@@ -11,7 +11,7 @@
- ecasoundc_libs 			= -L$(top_builddir)/libecasoundc/.libs -lecasoundc
- endif
- 
--if ECA_AM_HAVE_PYTHON
-+if ECA_AM_PYECASOUND_INSTALL
- pyecasound_install_list1 = 	$(srcdir)/eci.py \
- 				$(srcdir)/pyeca.py \
- 				$(srcdir)/ecacontrol.py
-@@ -19,7 +19,7 @@
- 				$(DESTDIR)$(ECA_S_PYTHON_DLMODULES)/pyeca.py \
- 				$(DESTDIR)$(ECA_S_PYTHON_DLMODULES)/ecacontrol.py
- endif
--if ECA_AM_COMPILE_PYECASOUND
-+if ECA_AM_PYECASOUND_CEXT
- pyecasound_install_list2 = 	pyecasound.so
- pyecasound_uninstall_list2 =   	$(DESTDIR)$(ECA_S_PYTHON_DLMODULES)/pyecasound.so
- endif
-@@ -39,14 +39,14 @@
- # source files
- # ----------------------------------------------------------------------
- 
--if ECA_AM_COMPILE_PYECASOUND
-+if ECA_AM_PYECASOUND_CEXT
- noinst_LTLIBRARIES 		= libpyecasound.la
- endif
- 
- libpyecasound_la_SOURCES	= pyecasound.c
- libpyecasound_la_LDFLAGS 	= -avoid-version -export-dynamic
- 
--if ECA_AM_COMPILE_PYECASOUND
-+if ECA_AM_PYECASOUND_CEXT
- all: pyecasound.so
- 
- pyecasound.so: pyecasound.lo
-@@ -57,11 +57,11 @@
- # hooks
- # ----------------------------------------------------------------------
- 
--if ECA_AM_COMPILE_PYECASOUND
-+if ECA_AM_PYECASOUND_CEXT
- CLEANFILES=pyecasound.so
- endif
- 
--if ECA_AM_HAVE_PYTHON
-+if ECA_AM_PYECASOUND_INSTALL
- install-exec-hook: $(pyecasound_install_list1) $(pyecasound_install_list2)
- 	$(INSTALL) -d $(DESTDIR)$(ECA_S_PYTHON_DLMODULES)
- 	$(INSTALL) $(pyecasound_install_list1) $(pyecasound_install_list2) $(DESTDIR)$(ECA_S_PYTHON_DLMODULES)
-@@ -69,7 +69,7 @@
- install-exec-hook:
- endif
- 
--if ECA_AM_HAVE_PYTHON
-+if ECA_AM_PYECASOUND_INSTALL
- uninstall-local:
- 	rm -f $(pyecasound_uninstall_list1) $(pyecasound_uninstall_list2)
- 	rmdir --ignore-fail-on-non-empty $(DESTDIR)$(ECA_S_PYTHON_DLMODULES)
diff --git a/audio/ecasound/pkg-plist b/audio/ecasound/pkg-plist
index 334b2705f425..896de7ef5fa9 100644
--- a/audio/ecasound/pkg-plist
+++ b/audio/ecasound/pkg-plist
@@ -37,6 +37,7 @@ include/libecasound/audiofx_rcfilter.h
 include/libecasound/audiofx_reverb.h
 include/libecasound/audiofx_timebased.h
 include/libecasound/audiogate.h
+include/libecasound/audioio-aac.h
 include/libecasound/audioio-buffered.h
 include/libecasound/audioio-cdr.h
 include/libecasound/audioio-cdr_impl.h
@@ -46,6 +47,7 @@ include/libecasound/audioio-db-server.h
 include/libecasound/audioio-db-server_impl.h
 include/libecasound/audioio-device.h
 include/libecasound/audioio-ewf.h
+include/libecasound/audioio-flac.h
 include/libecasound/audioio-forked-stream.h
 include/libecasound/audioio-loop.h
 include/libecasound/audioio-manager.h
@@ -117,6 +119,7 @@ include/libecasound/midi-cc.h
 include/libecasound/midi-client.h
 include/libecasound/midi-parser.h
 include/libecasound/midi-server.h
+include/libecasound/midiio-aseq.h
 include/libecasound/midiio-raw.h
 include/libecasound/midiio.h
 include/libecasound/osc-gen-file.h
@@ -126,6 +129,7 @@ include/libecasound/oscillator.h
 include/libecasound/preset.h
 include/libecasound/preset_impl.h
 include/libecasound/resource-file.h
+include/libecasound/sample-ops_impl.h
 include/libecasound/sample-specs.h
 include/libecasound/samplebuffer.h
 include/libecasound/samplebuffer_functions.h
@@ -136,16 +140,13 @@ include/libecasound/two-stage-linear-envelope.h
 include/libecasoundc/eca-control-interface.h
 include/libecasoundc/ecasoundc.h
 lib/libecasound.a
-lib/libecasound.la
 lib/libecasoundc.a
-lib/libecasoundc.la
 lib/libkvutils.a
-lib/libkvutils.la
-share/ecasound/ecasound.el
-share/ecasound/ecasoundrc
-share/ecasound/effect_presets
-share/ecasound/generic_oscillators
-@dirrm share/ecasound
+%%DATADIR%%/ecasound.el
+%%DATADIR%%/ecasoundrc
+%%DATADIR%%/effect_presets
+%%DATADIR%%/generic_oscillators
+@dirrm %%DATADIR%%
 @dirrm include/libecasoundc
 @dirrm include/libecasound
 @dirrm include/kvutils