Update to 2.2.2

PR:		50580
Submitted by:	maintainer

4 files changed, 37 insertions, 44 deletions

diff --git a/audio/ecasound/files/extra-patch-configure.in-optimizations b/audio/ecasound/files/extra-patch-configure.in-optimizations
index 292be49..33c2076 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 5131c96..0000000
--- 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 0000000..6df405b
--- /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 7f27fe8..0000000
--- 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"