5 files changed, 38 insertions, 29 deletions

diff --git a/net/yate/files/patch-Makefile.in b/net/yate/files/patch-Makefile.in
index 0a0c449059bc..f77dd9d6e717 100644
--- a/net/yate/files/patch-Makefile.in
+++ b/net/yate/files/patch-Makefile.in
@@ -1,15 +1,15 @@
---- ./Makefile.in.orig	2011-03-18 22:46:29.000000000 +0300
-+++ ./Makefile.in	2011-04-13 15:25:28.000000000 +0400
+--- ./Makefile.in.orig	2012-02-10 19:22:46.000000000 +0400
++++ ./Makefile.in	2012-02-29 19:31:18.000000000 +0400
 @@ -20,7 +20,7 @@
  MKDEPS := ./config.status
  PROGS:= yate
  YLIB := libyate.so.@PACKAGE_VERSION@
 -SLIBS:= $(YLIB) libyate.so \
-+SLIBS:= $(YLIB) libyate.so libyate.so.3 \
++SLIBS:= $(YLIB) libyate.so libyate.so.4 \
+ 	libyatescript.so.@PACKAGE_VERSION@ libyatescript.so \
  	libyatesig.so.@PACKAGE_VERSION@ libyatesig.so \
  	libyatemgcp.so.@PACKAGE_VERSION@ libyatemgcp.so \
- 	libyatejabber.so.@PACKAGE_VERSION@ libyatejabber.so
-@@ -47,7 +47,7 @@
+@@ -48,7 +48,7 @@
  libdir = @libdir@
  incdir = @includedir@/yate
  mandir = @mandir@
@@ -18,7 +18,7 @@
  vardir = @localstatedir@/lib/yate
  moddir = @libdir@/yate
  shrdir = $(datadir)/yate
-@@ -221,7 +221,7 @@
+@@ -222,7 +222,7 @@
  	    install -m 0644 @srcdir@/docs/man/$$i "$(DESTDIR)$(mandir)/man8/" ; \
  	done
  	@mkdir -p "$(DESTDIR)$(libdir)/pkgconfig/" && \
@@ -27,7 +27,7 @@
  	@mkdir -p "$(DESTDIR)$(incdir)/" && \
  	for i in $(INCS) ; do \
  	    install -m 0644 @srcdir@/$$i "$(DESTDIR)$(incdir)/" ; \
-@@ -249,7 +249,7 @@
+@@ -250,7 +250,7 @@
  	@-for i in $(PROGS) yate-config ; do \
  	    rm "$(DESTDIR)$(bindir)/$$i" ; \
  	done
@@ -36,11 +36,11 @@
  	    rmdir $(DESTDIR)$(libdir)/pkgconfig
  	@-for i in $(INCS) $(GENS) ; do \
  	    rm "$(DESTDIR)$(incdir)/$$i" ; \
-@@ -324,6 +324,7 @@
+@@ -325,6 +325,7 @@
  
  libyate.so: $(YLIB)
  	ln -sf $^ $@
-+	ln -sf $^ $@\.3
++	ln -sf $^ $@\.4
  
  .PHONY: library
  library $(YLIB): yatepaths.h
diff --git a/net/yate/files/patch-conf.d__Makefile.in b/net/yate/files/patch-conf.d__Makefile.in
index 5a37e087e2d0..d0e6dffa4651 100644
--- a/net/yate/files/patch-conf.d__Makefile.in
+++ b/net/yate/files/patch-conf.d__Makefile.in
@@ -1,5 +1,5 @@
 --- ./conf.d/Makefile.in.orig	2009-09-19 17:55:58.000000000 +0400
-+++ ./conf.d/Makefile.in	2011-04-13 15:25:28.000000000 +0400
++++ ./conf.d/Makefile.in	2012-02-29 19:31:18.000000000 +0400
 @@ -20,14 +20,14 @@
  	lst="`ls -1 @srcdir@/*.conf @srcdir@/*.sample @srcdir@/*.default 2>/dev/null | sed 's/\.sample//g; s/\.default//g; s/[^ ]*\*\.[^ ]*//g' | sort | uniq`" ; \
  	for s in $$lst; do \
diff --git a/net/yate/files/patch-configure.in b/net/yate/files/patch-configure.in
index 8ac624824440..5ab401e841d9 100644
--- a/net/yate/files/patch-configure.in
+++ b/net/yate/files/patch-configure.in
@@ -1,6 +1,6 @@
---- ./configure.in.orig	2011-04-12 18:04:04.000000000 +0400
-+++ ./configure.in	2012-01-17 00:54:49.000000000 +0400
-@@ -476,7 +476,7 @@
+--- ./configure.in.orig	2012-02-17 20:32:21.000000000 +0400
++++ ./configure.in	2012-02-29 19:31:18.000000000 +0400
+@@ -561,7 +561,7 @@
  AC_SUBST(MYSQL_VER)
  
  HAVE_ZAP=no
@@ -9,25 +9,25 @@
  AC_ARG_ENABLE(dahdi,AC_HELP_STRING([--enable-dahdi],[Enable Dahdi driver (default: yes)]),want_dahdi=$enableval,want_dahdi=yes)
  if [[ "x$want_dahdi" = "xyes" ]]; then
  AC_MSG_CHECKING([for Dahdi generic headers])
-@@ -494,7 +494,7 @@
- #include <zaptel/zaptel.h>
- ],[],
+@@ -580,7 +580,7 @@
+ #include <sys/ioctl.h>
+ ],[ioctl(0,ZT_GETVERSION,(void*)0)],
  HAVE_ZAP="yes"
 -ZAP_FLAGS="-DNEW_ZAPTEL_LOCATION -DHAVE_ZAP"
 +ZAP_FLAGS="-DNEW_ZAPTEL_LOCATION -DHAVE_ZAP -I/usr/local/include"
  )
  AC_MSG_RESULT([$HAVE_ZAP])
  if [[ "x$HAVE_ZAP" = "xno" ]]; then
-@@ -503,7 +503,7 @@
- #include <linux/zaptel.h>
- ],[],
+@@ -590,7 +590,7 @@
+ #include <sys/ioctl.h>
+ ],[ioctl(0,ZT_GETVERSION,(void*)0)],
  HAVE_ZAP="yes"
 -ZAP_FLAGS="-DHAVE_ZAP"
 +ZAP_FLAGS="-DHAVE_ZAP -I/usr/local/include"
  )
  AC_MSG_RESULT([$HAVE_ZAP])
  fi
-@@ -731,7 +731,7 @@
+@@ -818,7 +818,7 @@
  )
  CFLAGS="$SAVE_CFLAGS"
  if [[ "x$HAVE_SPEEX" = "xyes" ]]; then
@@ -36,7 +36,7 @@
  fi
  fi
  AC_MSG_RESULT([$HAVE_SPEEX])
-@@ -911,7 +911,7 @@
+@@ -999,7 +999,7 @@
  PWLIB_INC="-I$ac_cv_use_pwlib/include" # Base dir, ok for ptlib
  if [[ "$vpw" '<' "02.00.00" ]]; then
      # Pwlib-1.xm no ptlib (2.x) install into ptlib
@@ -45,7 +45,7 @@
      if [[ "$vpw" '<' "01.06.00" ]]; then
          # Very old pwlib needs more includes.
          PWLIB_INC="$PWLIB_INC/unix/ptlib $PWLIB_INC/unix $PWLIB_INC"
-@@ -1036,7 +1036,7 @@
+@@ -1132,7 +1132,7 @@
      AC_MSG_CHECKING([for OpenSSL in $ac_cv_use_openssl])
      verssl=no
      if [[ -f "$ac_cv_use_openssl/include/openssl/opensslconf.h" ]]; then
diff --git a/net/yate/files/patch-modules__Makefile.in b/net/yate/files/patch-modules__Makefile.in
index c0426ce58813..dac68bc59a32 100644
--- a/net/yate/files/patch-modules__Makefile.in
+++ b/net/yate/files/patch-modules__Makefile.in
@@ -1,5 +1,5 @@
---- ./modules/Makefile.in.orig	2011-03-03 17:48:39.000000000 +0300
-+++ ./modules/Makefile.in	2012-01-17 00:53:04.000000000 +0400
+--- ./modules/Makefile.in.orig	2012-02-17 20:19:40.000000000 +0400
++++ ./modules/Makefile.in	2012-02-29 19:51:09.000000000 +0400
 @@ -32,7 +32,7 @@
  ZLIB_LIB := @ZLIB_LIB@
  SED := sed
@@ -9,8 +9,17 @@
  CFLAGS := @CFLAGS@ @MODULE_CFLAGS@ @INLINE_FLAGS@
  CPPFLAGS := @CFLAGS@ @MODULE_CPPFLAGS@ @INLINE_FLAGS@
  LDFLAGS:= @LDFLAGS@
-@@ -316,7 +316,7 @@
- server/mgcpgw.yate: LOCALLIBS = -lyatemgcp
+@@ -81,7 +81,7 @@
+ 	callgen.yate analyzer.yate rmanager.yate msgsniff.yate
+ 
+ LIBS :=
+-DIRS := client server jabber qt4 sip
++DIRS := client server jabber qt4 sip sig
+ 
+ ifneq ($(HAVE_PGSQL),no)
+ PROGS := $(PROGS) server/pgsqldb.yate
+@@ -330,7 +330,7 @@
+ server/mgcpgw.yate: LOCALLIBS = -lyatemgcp -L../libs/ysdp -lyatesdp
  
  server/lksctp.yate: LOCALFLAGS = @SCTP_FLAGS@
 -server/lksctp.yate: LOCALLIBS = -lsctp
diff --git a/net/yate/files/patch-modules__h323chan.cpp b/net/yate/files/patch-modules__h323chan.cpp
index 6f91c4c3f7bd..d5f81bb63cc1 100644
--- a/net/yate/files/patch-modules__h323chan.cpp
+++ b/net/yate/files/patch-modules__h323chan.cpp
@@ -1,6 +1,6 @@
---- ./modules/h323chan.cpp.orig	2011-03-31 14:30:48.000000000 +0400
-+++ ./modules/h323chan.cpp	2011-04-13 15:25:28.000000000 +0400
-@@ -646,7 +646,7 @@
+--- ./modules/h323chan.cpp.orig	2011-11-03 21:57:19.000000000 +0400
++++ ./modules/h323chan.cpp	2012-02-29 19:31:18.000000000 +0400
+@@ -725,7 +725,7 @@
  static void ListRegisteredCaps(int level)
  {
      PFactory<H323Capability>::KeyList_T list = PFactory<H323Capability>::GetKeyList();