7 files changed, 180 insertions, 200 deletions

diff --git a/audio/ecasound/Makefile b/audio/ecasound/Makefile
index 05253d25c2ac..4a0f1d1c2152 100644
--- a/audio/ecasound/Makefile
+++ b/audio/ecasound/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	ecasound
-PORTVERSION=	2.0.4
+PORTVERSION=	2.2.2
 CATEGORIES=	audio
 MASTER_SITES=	http://ecasound.seul.org/download/
 
-MAINTAINER=	anarcat@anarcat.dyndns.org
+MAINTAINER=	anarcat@anarcat.ath.cx
 COMMENT=	Multitrack audio processing software
 
 USE_GMAKE=	yes
@@ -57,7 +57,8 @@ EXTRA_PATCHES+=	${FILESDIR}/extra-patch-configure.in-optimizations
 .endif
 
 MAN1=		ecasound-iam.1 ecasound.1 ecatools.1 ecaconvert.1 \
-		ecafixdc.1 ecanormalize.1 ecaplay.1 ecasignalview.1
+		ecafixdc.1 ecalength.1 ecamonitor.1 ecanormalize.1 \
+		ecaplay.1 ecasignalview.1
 MAN5=		ecasoundrc.5
 
 pre-everything::
@@ -74,19 +75,6 @@ post-patch:
 	@${PERL} -pi -e 's!-O2 -ffast-math!!' ${WRKSRC}/kvutils/Makefile.am
 .endif
 
-post-install:
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/ecasound
-	${MKDIR} ${PREFIX}/share/doc/ecasound/programmers_guide
-	${MKDIR} ${PREFIX}/share/doc/ecasound/users_guide
-	${INSTALL_MAN} ${WRKSRC}/Documentation/*.html ${WRKSRC}/Documentation/*.txt \
-		${PREFIX}/share/doc/ecasound
-	${INSTALL_MAN} ${WRKSRC}/Documentation/programmers_guide/*.html \
-		${PREFIX}/share/doc/ecasound/programmers_guide
-	${INSTALL_MAN} ${WRKSRC}/Documentation/users_guide/*.html \
-		${PREFIX}/share/doc/ecasound/users_guide
-.endif
-
 #	strip ${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
diff --git a/audio/ecasound/distinfo b/audio/ecasound/distinfo
index 850998091fd6..eee925020000 100644
--- a/audio/ecasound/distinfo
+++ b/audio/ecasound/distinfo
@@ -1 +1 @@
-MD5 (ecasound-2.0.4.tar.gz) = 73dfe024c541cea1a432510151fefbc8
+MD5 (ecasound-2.2.2.tar.gz) = f40a2ea2cabf8b0cbd3663d522f74918
diff --git a/audio/ecasound/files/extra-patch-configure.in-optimizations b/audio/ecasound/files/extra-patch-configure.in-optimizations
index 292be49ecfc7..33c2076e9178 100644
--- a/audio/ecasound/files/extra-patch-configure.in-optimizations
+++ b/audio/ecasound/files/extra-patch-configure.in-optimizations
@@ -1,20 +1,12 @@
---- configure.in.orig	Tue Dec  4 12:42:12 2001
-+++ configure.in	Tue Dec  4 12:42:51 2001
-@@ -74,7 +74,7 @@
+--- 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 ---
- dnl Set CXXFLAGS.
- dnl ---
--CXXFLAGS="-O2 -D_REENTRANT -DNDEBUG -ffast-math -fstrict-aliasing -funroll-loops"
-+CXXFLAGS="-D_REENTRANT -DNDEBUG"
- dnl CXXFLAGS="-O2 -D_REENTRANT -fomit-frame-pointer -finline-functions -ffast-math -funroll-loops -Wall -Wstrict-prototypes -pedantic -fstrict-aliasing"
- 
- dnl ------------------------------------------------------------------
-@@ -84,7 +84,7 @@
- include_debug=yes)
- AM_CONDITIONAL(INCLUDE_DEBUG, test x$include_debug = xyes)
- if test x$include_debug = xyes; then
--CXXFLAGS="-D_REENTRANT -g -Wall -Wstrict-prototypes -ffast-math"
-+CXXFLAGS="-D_REENTRANT -g -Wall -Wstrict-prototypes"
- dnl CXXFLAGS="-D_REENTRANT -DENABLE_DBC -g -Wall -Wstrict-prototypes -ffast-math"
- dnl LDFLAGS="-pg -pedantic -funroll-loops"
- fi                                     
+ 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 5131c96767ca..000000000000
--- a/audio/ecasound/files/patch-configure.in
+++ /dev/null
@@ -1,14 +0,0 @@
---- configure.in.orig	Thu Nov 21 21:39:56 2002
-+++ configure.in	Thu Nov 21 21:40:12 2002
-@@ -374,9 +374,9 @@
- AC_LANG_CPLUSPLUS
- AC_HEADER_TIME
- AC_CHECK_HEADERS(fcntl.h dlfcn.h sys/ioctl.h sys/time.h sys/resource.h sys/stat.h sys/wait.h signal.h sys/types.h sys/mman.h errno.h sched.h unistd.h inttypes.h asm/atomic.h ladspa.h)
--AC_CHECK_HEADER(map.h,nostlmap=0,nostlmap=1)
-+AC_CHECK_HEADER(map,nostlmap=0,nostlmap=1)
- if test "x$nostlmap" = "x1" ; then
--	AC_MSG_ERROR([C++ header files not found! Searched for 'map.h' (STL).])
-+	AC_MSG_ERROR([C++ header files not found! Searched for 'map' (STL).])
- fi
- 
- dnl ------------------------------------------------------------------
diff --git a/audio/ecasound/files/patch-ecasound::eca-curses.cpp b/audio/ecasound/files/patch-ecasound::eca-curses.cpp
new file mode 100644
index 000000000000..6df405bec8ad
--- /dev/null
+++ b/audio/ecasound/files/patch-ecasound::eca-curses.cpp
@@ -0,0 +1,26 @@
+--- ecasound/eca-curses.cpp.orig	Thu Apr  3 19:52:32 2003
++++ ecasound/eca-curses.cpp	Thu Apr  3 19:54:32 2003
+@@ -114,11 +114,7 @@
+   rl_readline_name = "ecasound";
+ 
+   /* we want to attempt completion first */
+-#if RL_READLINE_VERSION >= 0x0402
+   rl_attempted_completion_function = (rl_completion_func_t*)ecasound_completion;
+-#else
+-  rl_attempted_completion_function = (CPPFunction *)ecasound_completion;
+-#endif
+ }
+ 
+ /* **************************************************************** */
+@@ -149,11 +145,7 @@
+   /* complete only the first command, otherwise complete files in 
+    * the current directory */
+   if (start == 0) {
+-#if RL_READLINE_VERSION >= 0x0402
+     matches = rl_completion_matches (text, (rl_compentry_func_t *)ecasound_command_generator);
+-#else
+-    matches = completion_matches (text, (CPFunction *)ecasound_command_generator);
+-#endif
+   }
+   return (matches);
+ }
diff --git a/audio/ecasound/files/patch-libecasound:audioio-wave.h b/audio/ecasound/files/patch-libecasound:audioio-wave.h
deleted file mode 100644
index 7f27fe826099..000000000000
--- a/audio/ecasound/files/patch-libecasound:audioio-wave.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- libecasound/audioio-wave.h.orig	Sun Sep 23 10:50:32 2001
-+++ libecasound/audioio-wave.h	Sat Nov 24 09:22:36 2001
-@@ -3,7 +3,7 @@
- 
- #include <string>
- #include <iostream>
--#include <stdint.h>
-+/* #include <stdint.h> */
- #include <sys/types.h>
- 
- #include "audioio-types.h"
diff --git a/audio/ecasound/pkg-plist b/audio/ecasound/pkg-plist
index 72e8b695d42b..334b2705f425 100644
--- a/audio/ecasound/pkg-plist
+++ b/audio/ecasound/pkg-plist
@@ -1,152 +1,151 @@
 bin/ecaconvert
 bin/ecafixdc
+bin/ecalength
+bin/ecamonitor
 bin/ecanormalize
 bin/ecaplay
 bin/ecasignalview
 bin/ecasound
-bin/ecasound-config
-bin/ecasoundc-config
-include/ecasound/audio-stamp.h
-include/ecasound/audiofx.h
-include/ecasound/audiofx_amplitude.h
-include/ecasound/audiofx_analysis.h
-include/ecasound/audiofx_compressor.h
-include/ecasound/audiofx_envelope_modulation.h
-include/ecasound/audiofx_filter.h
-include/ecasound/audiofx_ladspa.h
-include/ecasound/audiofx_misc.h
-include/ecasound/audiofx_mixing.h
-include/ecasound/audiofx_rcfilter.h
-include/ecasound/audiofx_reverb.h
-include/ecasound/audiofx_timebased.h
-include/ecasound/audiogate.h
-include/ecasound/audioio-buffered-proxy.h
-include/ecasound/audioio-cdr.h
-include/ecasound/audioio-cdr_impl.h
-include/ecasound/audioio-ewf.h
-include/ecasound/audioio-forked-stream.h
-include/ecasound/audioio-loop.h
-include/ecasound/audioio-mikmod.h
-include/ecasound/audioio-mp3.h
-include/ecasound/audioio-mp3_impl.h
-include/ecasound/audioio-null.h
-include/ecasound/audioio-ogg.h
-include/ecasound/audioio-oss.h
-include/ecasound/audioio-oss_impl.h
-include/ecasound/audioio-plugin.h
-include/ecasound/audioio-proxy-buffer.h
-include/ecasound/audioio-proxy-server.h
-include/ecasound/audioio-raw.h
-include/ecasound/audioio-rtnull.h
-include/ecasound/audioio-timidity.h
-include/ecasound/audioio-types.h
-include/ecasound/audioio-wave.h
-include/ecasound/audioio.h
-include/ecasound/ctrl-source.h
-include/ecasound/dynamic-object.h
-include/ecasound/dynamic-parameters.h
-include/ecasound/eca-audio-format.h
-include/ecasound/eca-audio-objects.h
-include/ecasound/eca-audio-position.h
-include/ecasound/eca-audio-time.h
-include/ecasound/eca-chain.h
-include/ecasound/eca-chainop.h
-include/ecasound/eca-chainsetup-position.h
-include/ecasound/eca-chainsetup.h
-include/ecasound/eca-comhelp.h
-include/ecasound/eca-control-base.h
-include/ecasound/eca-control-dump.h
-include/ecasound/eca-control-interface.h
-include/ecasound/eca-control-objects.h
-include/ecasound/eca-control.h
-include/ecasound/eca-debug.h
-include/ecasound/eca-error.h
-include/ecasound/eca-fileio-mmap.h
-include/ecasound/eca-fileio-stream.h
-include/ecasound/eca-fileio.h
-include/ecasound/eca-iamode-parser.h
-include/ecasound/eca-main.h
-include/ecasound/eca-object-factory.h
-include/ecasound/eca-object-map.h
-include/ecasound/eca-object.h
-include/ecasound/eca-operator.h
-include/ecasound/eca-preset-map.h
-include/ecasound/eca-resources.h
-include/ecasound/eca-session.h
-include/ecasound/eca-static-object-maps.h
-include/ecasound/eca-version.h
-include/ecasound/ecasoundc.h
-include/ecasound/file-preset.h
-include/ecasound/finite-envelope.h
-include/ecasound/generic-controller.h
-include/ecasound/generic-linear-envelope.h
-include/ecasound/global-preset.h
-include/ecasound/layer.h
-include/ecasound/linear-envelope.h
-include/ecasound/midi-cc.h
-include/ecasound/midi-client.h
-include/ecasound/midi-parser.h
-include/ecasound/midi-server.h
-include/ecasound/midiio-raw.h
-include/ecasound/midiio.h
-include/ecasound/osc-gen-file.h
-include/ecasound/osc-gen.h
-include/ecasound/osc-sine.h
-include/ecasound/oscillator.h
-include/ecasound/plugin-paths.h
-include/ecasound/preset.h
-include/ecasound/resource-file.h
-include/ecasound/sample-specs.h
-include/ecasound/samplebuffer.h
-include/ecasound/samplebuffer_functions.h
-include/ecasound/samplebuffer_impl.h
-include/ecasound/samplebuffer_iterators.h
-include/ecasound/stamp-ctrl.h
-include/ecasound/two-stage-linear-envelope.h
-include/kvutils/com_line.h
-include/kvutils/definition_by_contract.h
+bin/libecasound-config
+bin/libecasoundc-config
+include/kvutils/kvu_com_line.h
+include/kvutils/kvu_dbc.h
+include/kvutils/kvu_definition_by_contract.h
+include/kvutils/kvu_fd_io.h
+include/kvutils/kvu_inttypes.h
+include/kvutils/kvu_locks.h
+include/kvutils/kvu_message_item.h
 include/kvutils/kvu_numtostr.h
-include/kvutils/kvutils.h
-include/kvutils/locks.h
-include/kvutils/message_item.h
-include/kvutils/object_queue.h
-include/kvutils/procedure_timer.h
-include/kvutils/temporary_file_directory.h
-include/kvutils/value_queue.h
-lib/ecasound-plugins/libaudioio_af.so
-lib/ecasound-plugins/libaudioio_alsa.so
-lib/ecasound-plugins/libaudioio_alsa2.so
-lib/ecasound-plugins/libaudioio_alsa2_plugin.so
-lib/ecasound-plugins/libaudioio_alsa3.so
-lib/ecasound-plugins/libaudioio_alsa3_pcm.so
-lib/ecasound-plugins/libaudioio_alsalb.so
-lib/ecasound-plugins/libaudioio_arts.so
+include/kvutils/kvu_object_queue.h
+include/kvutils/kvu_procedure_timer.h
+include/kvutils/kvu_rtcaps.h
+include/kvutils/kvu_temporary_file_directory.h
+include/kvutils/kvu_threads.h
+include/kvutils/kvu_utils.h
+include/kvutils/kvu_value_queue.h
+include/libecasound/audio-stamp.h
+include/libecasound/audiofx.h
+include/libecasound/audiofx_amplitude.h
+include/libecasound/audiofx_analysis.h
+include/libecasound/audiofx_compressor.h
+include/libecasound/audiofx_envelope_modulation.h
+include/libecasound/audiofx_filter.h
+include/libecasound/audiofx_ladspa.h
+include/libecasound/audiofx_misc.h
+include/libecasound/audiofx_mixing.h
+include/libecasound/audiofx_rcfilter.h
+include/libecasound/audiofx_reverb.h
+include/libecasound/audiofx_timebased.h
+include/libecasound/audiogate.h
+include/libecasound/audioio-buffered.h
+include/libecasound/audioio-cdr.h
+include/libecasound/audioio-cdr_impl.h
+include/libecasound/audioio-db-buffer.h
+include/libecasound/audioio-db-client.h
+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-forked-stream.h
+include/libecasound/audioio-loop.h
+include/libecasound/audioio-manager.h
+include/libecasound/audioio-mikmod.h
+include/libecasound/audioio-mp3.h
+include/libecasound/audioio-mp3_impl.h
+include/libecasound/audioio-null.h
+include/libecasound/audioio-ogg.h
+include/libecasound/audioio-oss.h
+include/libecasound/audioio-oss_impl.h
+include/libecasound/audioio-plugin.h
+include/libecasound/audioio-proxy.h
+include/libecasound/audioio-raw.h
+include/libecasound/audioio-resample.h
+include/libecasound/audioio-reverse.h
+include/libecasound/audioio-rtnull.h
+include/libecasound/audioio-timidity.h
+include/libecasound/audioio-typeselect.h
+include/libecasound/audioio-wave.h
+include/libecasound/audioio.h
+include/libecasound/ctrl-source.h
+include/libecasound/dynamic-object.h
+include/libecasound/dynamic-parameters.h
+include/libecasound/eca-audio-format.h
+include/libecasound/eca-audio-position.h
+include/libecasound/eca-audio-time.h
+include/libecasound/eca-chain.h
+include/libecasound/eca-chainop.h
+include/libecasound/eca-chainsetup-bufparams.h
+include/libecasound/eca-chainsetup-parser.h
+include/libecasound/eca-chainsetup-position.h
+include/libecasound/eca-chainsetup.h
+include/libecasound/eca-chainsetup_impl.h
+include/libecasound/eca-control-base.h
+include/libecasound/eca-control-dump.h
+include/libecasound/eca-control-objects.h
+include/libecasound/eca-control.h
+include/libecasound/eca-engine-driver.h
+include/libecasound/eca-engine.h
+include/libecasound/eca-engine_impl.h
+include/libecasound/eca-error.h
+include/libecasound/eca-fileio-mmap.h
+include/libecasound/eca-fileio-stream.h
+include/libecasound/eca-fileio.h
+include/libecasound/eca-iamode-parser.h
+include/libecasound/eca-iamode-parser_impl.h
+include/libecasound/eca-logger-default.h
+include/libecasound/eca-logger-interface.h
+include/libecasound/eca-logger-wellformed.h
+include/libecasound/eca-logger.h
+include/libecasound/eca-object-factory.h
+include/libecasound/eca-object-map.h
+include/libecasound/eca-object.h
+include/libecasound/eca-operator.h
+include/libecasound/eca-preset-map.h
+include/libecasound/eca-resources.h
+include/libecasound/eca-sample-conversion.h
+include/libecasound/eca-samplerate-aware.h
+include/libecasound/eca-session.h
+include/libecasound/eca-static-object-maps.h
+include/libecasound/eca-version.h
+include/libecasound/file-preset.h
+include/libecasound/generic-controller.h
+include/libecasound/generic-linear-envelope.h
+include/libecasound/global-preset.h
+include/libecasound/layer.h
+include/libecasound/linear-envelope.h
+include/libecasound/midi-cc.h
+include/libecasound/midi-client.h
+include/libecasound/midi-parser.h
+include/libecasound/midi-server.h
+include/libecasound/midiio-raw.h
+include/libecasound/midiio.h
+include/libecasound/osc-gen-file.h
+include/libecasound/osc-gen.h
+include/libecasound/osc-sine.h
+include/libecasound/oscillator.h
+include/libecasound/preset.h
+include/libecasound/preset_impl.h
+include/libecasound/resource-file.h
+include/libecasound/sample-specs.h
+include/libecasound/samplebuffer.h
+include/libecasound/samplebuffer_functions.h
+include/libecasound/samplebuffer_impl.h
+include/libecasound/samplebuffer_iterators.h
+include/libecasound/stamp-ctrl.h
+include/libecasound/two-stage-linear-envelope.h
+include/libecasoundc/eca-control-interface.h
+include/libecasoundc/ecasoundc.h
 lib/libecasound.a
-lib/libecasound.so
-lib/libecasound.so.7
+lib/libecasound.la
 lib/libecasoundc.a
-lib/libecasoundc.so
-lib/libecasoundc.so.1
+lib/libecasoundc.la
 lib/libkvutils.a
-lib/libkvutils.so
-lib/libkvutils.so.2
+lib/libkvutils.la
+share/ecasound/ecasound.el
+share/ecasound/ecasoundrc
 share/ecasound/effect_presets
 share/ecasound/generic_oscillators
-%%PORTDOCS%%share/doc/ecasound/ecasound-iam_manpage.html
-%%PORTDOCS%%share/doc/ecasound/ecasound_manpage.html
-%%PORTDOCS%%share/doc/ecasound/ecasoundrc_manpage.html
-%%PORTDOCS%%share/doc/ecasound/ecatools_manpage.html
-%%PORTDOCS%%share/doc/ecasound/edi-list.txt
-%%PORTDOCS%%share/doc/ecasound/examples.html
-%%PORTDOCS%%share/doc/ecasound/index.html
-%%PORTDOCS%%share/doc/ecasound/manpages.html
-%%PORTDOCS%%share/doc/ecasound/programmers_guide/eci_doc.html
-%%PORTDOCS%%share/doc/ecasound/programmers_guide/programmers_guide.html
-%%PORTDOCS%%share/doc/ecasound/users_guide/users_guide.html
-%%PORTDOCS%%@dirrm share/doc/ecasound/programmers_guide
-%%PORTDOCS%%@dirrm share/doc/ecasound/users_guide
-%%PORTDOCS%%@dirrm share/doc/ecasound/
-@dirrm include/ecasound
-@dirrm include/kvutils
-@dirrm lib/ecasound-plugins
 @dirrm share/ecasound
+@dirrm include/libecasoundc
+@dirrm include/libecasound
+@dirrm include/kvutils