- Update to version 0.12.1

PR:		59583
Submitted by:	Ports Fury

11 files changed, 141 insertions, 161 deletions

diff --git a/net/linphone/Makefile b/net/linphone/Makefile
index 9bfe403808c9..9bf0502e6143 100644
--- a/net/linphone/Makefile
+++ b/net/linphone/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	linphone
-PORTVERSION=	0.12.0
+PORTVERSION=	0.12.1
 PORTEPOCH=	1
 CATEGORIES=	net
 MASTER_SITES=	http://simon.morlat.free.fr/download/%SUBDIR%/
@@ -26,6 +26,7 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
 		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
 CONFIGURE_ARGS=	--enable-platform-gnome-2 --disable-ipv6
+INSTALLS_SHLIB=	yes
 
 MAN1=		linphone.1 linphonec.1 sipomatic.1
 
diff --git a/net/linphone/distinfo b/net/linphone/distinfo
index ba3c9413efbe..518fe1dc752c 100644
--- a/net/linphone/distinfo
+++ b/net/linphone/distinfo
@@ -1 +1 @@
-MD5 (linphone-0.12.0.tar.gz) = 79abbdcbec4c59cdd28a2722fe333b6e
+MD5 (linphone-0.12.1.tar.gz) = 62e94ca8e3a95297175ee0c3c6de13b1
diff --git a/net/linphone/files/patch-Makefile.in b/net/linphone/files/patch-Makefile.in
index f6b1b035eafa..1431371048bc 100644
--- a/net/linphone/files/patch-Makefile.in
+++ b/net/linphone/files/patch-Makefile.in
@@ -1,15 +1,15 @@
 
 $FreeBSD$
 
---- Makefile.in.orig	Wed Aug 20 17:43:49 2003
-+++ Makefile.in	Sat Aug 23 01:36:29 2003
-@@ -158,8 +158,8 @@
+--- Makefile.in.orig	Thu Nov 20 19:41:33 2003
++++ Makefile.in	Fri Nov 21 11:04:35 2003
+@@ -156,8 +156,8 @@
  
  @BUILD_TRUESPEECH_TRUE@WIN32ACM_DIR = win32acm
  
--SUBDIRS = pixmaps ffmpeg po macros debian ipkg oRTP gsmlib lpc10-1.5 \
+-SUBDIRS = support pixmaps ffmpeg po macros debian ipkg oRTP gsmlib lpc10-1.5 \
 -                speex $(WIN32ACM_DIR) mediastreamer \
-+SUBDIRS = pixmaps ffmpeg po macros debian ipkg oRTP lpc10-1.5 \
++SUBDIRS = support pixmaps ffmpeg po macros debian ipkg oRTP lpc10-1.5 \
 +                $(WIN32ACM_DIR) mediastreamer \
  		media_api osipua coreapi console gnome share developer-docs
  
diff --git a/net/linphone/files/patch-configure b/net/linphone/files/patch-configure
index df73b24e7d53..c9d5cb8c243e 100644
--- a/net/linphone/files/patch-configure
+++ b/net/linphone/files/patch-configure
@@ -1,15 +1,15 @@
---- configure.orig	Mon Oct 20 13:00:16 2003
-+++ configure	Mon Oct 20 13:01:22 2003
-@@ -462,7 +462,7 @@
+--- configure.orig	Thu Nov 20 19:41:45 2003
++++ configure	Fri Nov 21 11:02:43 2003
+@@ -463,7 +463,7 @@
  # include <unistd.h>
  #endif"
  
 -ac_subdirs_all="$ac_subdirs_all ffmpeg speex oRTP osipua"
 +ac_subdirs_all="$ac_subdirs_all ffmpeg oRTP osipua"
- ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE INSIDE_GNOME_COMMON_TRUE INSIDE_GNOME_COMMON_FALSE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE CPP EGREP INTLTOOL_DESKTOP_RULE INTLTOOL_DIRECTORY_RULE INTLTOOL_KEYS_RULE INTLTOOL_PROP_RULE INTLTOOL_OAF_RULE INTLTOOL_PONG_RULE INTLTOOL_SERVER_RULE INTLTOOL_SHEET_RULE INTLTOOL_SOUNDLIST_RULE INTLTOOL_UI_RULE INTLTOOL_XML_RULE INTLTOOL_CAVES_RULE INTLTOOL_SCHEMAS_RULE INTLTOOL_THEME_RULE INTLTOOL_EXTRACT INTLTOOL_MERGE INTLTOOL_UPDATE INTLTOOL_PERL build build_cpu build_vendor build_os host host_cpu host_vendor host_os LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CXX CXXFLAGS ac_ct_CXX CXXDEPMODE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL GETTEXT_PACKAGE USE_NLS MSGFMT GMSGFMT XGETTEXT CATALOGS CATOBJEXT DATADIRNAME GMOFILES INSTOBJEXT INTLLIBS PO_IN_DATADIR_TRUE PO_IN_DATADIR_FALSE POFILES POSUB MKINSTALLDIRS PKG_CONFIG PLATFORM_GNOME_2_TRUE PLATFORM_GNOME_2_FALSE GNOME_INTERFACE_VERSION WARN_CFLAGS LIBGNOMEUI_CFLAGS LIBGNOMEUI_LIBS LIBGNOME_CFLAGS LIBGNOME_LIBS GNOME_APPLETS_CFLAGS GNOME_APPLETS_LIBS BUILD_MINIMALGLIB_TRUE BUILD_MINIMALGLIB_FALSE GLIB_CFLAGS GLIB_LIBS GLIB_GENMARSHAL GOBJECT_QUERY GLIB_MKENUMS PTHREAD_LDFLAGS GSMLIB_CFLAGS osip_prefix IPV6_CFLAGS TRUESPEECH_CFLAGS BUILD_TRUESPEECH_TRUE BUILD_TRUESPEECH_FALSE NASM AVCODEC_LIBS GDK_CFLAGS GDK_LIBS BUILD_MEDIASTREAMER_TRUE BUILD_MEDIASTREAMER_FALSE HAVE_XINELIB_TRUE HAVE_XINELIB_FALSE HAVE_SMPEG_TRUE HAVE_SMPEG_FALSE BUILD_FFMPEG_TRUE BUILD_FFMPEG_FALSE BUILD_GDK_VO_TRUE BUILD_GDK_VO_FALSE BUILD_V4L_TRUE BUILD_V4L_FALSE BUILD_MEDIA_API_TRUE BUILD_MEDIA_API_FALSE BUILD_GNOME_TRUE BUILD_GNOME_FALSE BUILD_GNOME_APPLET_TRUE BUILD_GNOME_APPLET_FALSE ALSA_LIBS subdirs HTML_DIR GTKDOC HAVE_GTK_DOC_TRUE HAVE_GTK_DOC_FALSE HAVE_GTK_DOC ENABLE_GTK_DOC_TRUE ENABLE_GTK_DOC_FALSE LINPHONE_CFLAGS LINPHONE_LIBS LIBOBJS LTLIBOBJS'
+ ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE INSIDE_GNOME_COMMON_TRUE INSIDE_GNOME_COMMON_FALSE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE CPP EGREP INTLTOOL_DESKTOP_RULE INTLTOOL_DIRECTORY_RULE INTLTOOL_KEYS_RULE INTLTOOL_PROP_RULE INTLTOOL_OAF_RULE INTLTOOL_PONG_RULE INTLTOOL_SERVER_RULE INTLTOOL_SHEET_RULE INTLTOOL_SOUNDLIST_RULE INTLTOOL_UI_RULE INTLTOOL_XAM_RULE INTLTOOL_XML_RULE INTLTOOL_CAVES_RULE INTLTOOL_SCHEMAS_RULE INTLTOOL_THEME_RULE INTLTOOL_EXTRACT INTLTOOL_MERGE INTLTOOL_UPDATE INTLTOOL_PERL build build_cpu build_vendor build_os host host_cpu host_vendor host_os LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CXX CXXFLAGS ac_ct_CXX CXXDEPMODE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL GETTEXT_PACKAGE USE_NLS MSGFMT GMSGFMT XGETTEXT CATALOGS CATOBJEXT DATADIRNAME GMOFILES INSTOBJEXT INTLLIBS PO_IN_DATADIR_TRUE PO_IN_DATADIR_FALSE POFILES POSUB MKINSTALLDIRS PKG_CONFIG GLIB_CFLAGS GLIB_LIBS GLIB_GENMARSHAL GOBJECT_QUERY GLIB_MKENUMS LIBGNOMEUI_CFLAGS LIBGNOMEUI_LIBS LIBGNOME_CFLAGS LIBGNOME_LIBS GNOME_APPLETS_CFLAGS GNOME_APPLETS_LIBS PTHREAD_LDFLAGS GSMLIB_CFLAGS osip_prefix IPV6_CFLAGS TRUESPEECH_CFLAGS BUILD_TRUESPEECH_TRUE BUILD_TRUESPEECH_FALSE NASM AVCODEC_LIBS GDK_CFLAGS GDK_LIBS BUILD_MEDIASTREAMER_TRUE BUILD_MEDIASTREAMER_FALSE HAVE_XINELIB_TRUE HAVE_XINELIB_FALSE HAVE_SMPEG_TRUE HAVE_SMPEG_FALSE BUILD_FFMPEG_TRUE BUILD_FFMPEG_FALSE BUILD_GDK_VO_TRUE BUILD_GDK_VO_FALSE BUILD_V4L_TRUE BUILD_V4L_FALSE BUILD_MEDIA_API_TRUE BUILD_MEDIA_API_FALSE BUILD_UGLIB_TRUE BUILD_UGLIB_FALSE BUILD_GNOME_TRUE BUILD_GNOME_FALSE BUILD_GNOME_APPLET_TRUE BUILD_GNOME_APPLET_FALSE ALSA_LIBS subdirs HTML_DIR GTKDOC HAVE_GTK_DOC_TRUE HAVE_GTK_DOC_FALSE HAVE_GTK_DOC ENABLE_GTK_DOC_TRUE ENABLE_GTK_DOC_FALSE LINPHONE_CFLAGS LINPHONE_LIBS LIBOBJS LTLIBOBJS'
  ac_subst_files=''
  
-@@ -21818,19 +21818,19 @@
+@@ -22300,19 +22300,19 @@
  
  
  cat >>confdefs.h <<_ACEOF
@@ -32,7 +32,7 @@
  _ACEOF
  
  
-@@ -22869,7 +22869,7 @@
+@@ -23669,7 +23669,7 @@
  
  
  
diff --git a/net/linphone/files/patch-coreapi::linphonecore.c b/net/linphone/files/patch-coreapi::linphonecore.c
new file mode 100644
index 000000000000..0e758bdd463a
--- /dev/null
+++ b/net/linphone/files/patch-coreapi::linphonecore.c
@@ -0,0 +1,10 @@
+--- coreapi/linphonecore.c.orig	Fri Nov  7 00:27:42 2003
++++ coreapi/linphonecore.c	Fri Nov 21 11:59:25 2003
+@@ -33,6 +33,7 @@
+ #include <sys/socket.h>
+ #include <netinet/in.h>
+ #include <arpa/inet.h>
++#include <netdb.h>  
+ 
+ #ifdef INET6  
+ #include <netdb.h>  
diff --git a/net/linphone/files/patch-gnome::callbacks.c b/net/linphone/files/patch-gnome::callbacks.c
new file mode 100644
index 000000000000..ad3af985d852
--- /dev/null
+++ b/net/linphone/files/patch-gnome::callbacks.c
@@ -0,0 +1,11 @@
+--- gnome/callbacks.c.orig	Fri Nov  7 21:08:34 2003
++++ gnome/callbacks.c	Fri Nov 21 12:57:20 2003
+@@ -82,7 +82,7 @@
+ on_user_manual1_activate               (GtkMenuItem     *menuitem,
+                                         gpointer         user_data)
+ {
+-	gnome_help_display("manual/index.html",NULL,NULL);
++	gnome_help_display("index.html",NULL,NULL);
+ }
+ 
+ 
diff --git a/net/linphone/files/patch-mediastreamer::Makefile.in b/net/linphone/files/patch-mediastreamer::Makefile.in
index 8a383c1cf0d3..bab51371dd00 100644
--- a/net/linphone/files/patch-mediastreamer::Makefile.in
+++ b/net/linphone/files/patch-mediastreamer::Makefile.in
@@ -1,26 +1,18 @@
 
 $FreeBSD$
 
---- mediastreamer/Makefile.in.orig	Wed Aug 20 17:45:14 2003
-+++ mediastreamer/Makefile.in	Sat Aug 23 01:37:49 2003
-@@ -224,14 +224,14 @@
-                                                         $(TRUESPEECH_SOURCES)
+--- mediastreamer/Makefile.in.orig	Thu Nov 20 19:41:39 2003
++++ mediastreamer/Makefile.in	Fri Nov 21 10:59:28 2003
+@@ -222,7 +222,7 @@
  
  
--@BUILD_MINIMALGLIB_TRUE@libmediastreamer_la_LIBADD = ../gsmlib/libgsm.la \
-+@BUILD_MINIMALGLIB_TRUE@libmediastreamer_la_LIBADD = -lgsm \
- @BUILD_MINIMALGLIB_TRUE@							../lpc10-1.5/liblpc10.la \
- @BUILD_MINIMALGLIB_TRUE@							../oRTP/src/libortp.la \
- @BUILD_MINIMALGLIB_TRUE@							$(ALSA_LIBS) \
- @BUILD_MINIMALGLIB_TRUE@							$(TRUESPEECH_LIBADD)
- 
- @BUILD_MINIMALGLIB_FALSE@libmediastreamer_la_LIBADD = $(GLIB_LIBS) \
--@BUILD_MINIMALGLIB_FALSE@							../gsmlib/libgsm.la \
-+@BUILD_MINIMALGLIB_FALSE@							-lgsm \
- @BUILD_MINIMALGLIB_FALSE@							../lpc10-1.5/liblpc10.la \
- @BUILD_MINIMALGLIB_FALSE@							../oRTP/src/libortp.la \
- @BUILD_MINIMALGLIB_FALSE@							$(ALSA_LIBS) \
-@@ -261,7 +261,7 @@
+ libmediastreamer_la_LIBADD = $(GLIB_LIBS) \
+-							../gsmlib/libgsm.la \
++							-lgsm \
+ 							../lpc10-1.5/liblpc10.la \
+ 							../oRTP/src/libortp.la \
+ 							$(ALSA_LIBS) \
+@@ -252,7 +252,7 @@
  
  #the speex encoder and decoder 
  libmsspeex_la_SOURCES = msspeexenc.c msspeexenc.h msspeexdec.c msspeexdec.h
@@ -29,46 +21,35 @@ $FreeBSD$
  
  #the v4l plugin 
  libmsv4l_la_SOURCES = msv4l.c msv4l.h
-@@ -349,12 +349,8 @@
+@@ -335,12 +335,8 @@
  						-I$(top_srcdir)/mediastreamer \
  						-I$(top_srcdir)/oRTP/src \
  						-I$(top_srcdir)/oRTP \
 -						-I$(top_srcdir)/gsmlib   \
  						-I$(top_srcdir)/lpc10-1.5    \
-                         -I$(top_srcdir)/ffmpeg/libavcodec \
+             -I$(top_srcdir)/ffmpeg/libavcodec \
 -						-I/usr/X11R6/include/X11 \
 -						-I/usr/include/SDL \
 -						-I$(top_srcdir)/speex/libspeex \
  						$(TRUESPEECH_INCLUDES)
  
  subdir = mediastreamer
-@@ -365,21 +361,21 @@
+@@ -351,12 +347,12 @@
  
  libmediastreamer_la_LDFLAGS =
- @BUILD_MINIMALGLIB_FALSE@@BUILD_TRUESPEECH_TRUE@libmediastreamer_la_DEPENDENCIES = \
--@BUILD_MINIMALGLIB_FALSE@@BUILD_TRUESPEECH_TRUE@	../gsmlib/libgsm.la \
-+@BUILD_MINIMALGLIB_FALSE@@BUILD_TRUESPEECH_TRUE@	-lgsm \
- @BUILD_MINIMALGLIB_FALSE@@BUILD_TRUESPEECH_TRUE@	../lpc10-1.5/liblpc10.la \
- @BUILD_MINIMALGLIB_FALSE@@BUILD_TRUESPEECH_TRUE@	../oRTP/src/libortp.la \
- @BUILD_MINIMALGLIB_FALSE@@BUILD_TRUESPEECH_TRUE@	../win32acm/libwin32acm.a
- @BUILD_MINIMALGLIB_FALSE@@BUILD_TRUESPEECH_FALSE@libmediastreamer_la_DEPENDENCIES = \
--@BUILD_MINIMALGLIB_FALSE@@BUILD_TRUESPEECH_FALSE@	../gsmlib/libgsm.la \
-+@BUILD_MINIMALGLIB_FALSE@@BUILD_TRUESPEECH_FALSE@	-lgsm \
- @BUILD_MINIMALGLIB_FALSE@@BUILD_TRUESPEECH_FALSE@	../lpc10-1.5/liblpc10.la \
- @BUILD_MINIMALGLIB_FALSE@@BUILD_TRUESPEECH_FALSE@	../oRTP/src/libortp.la
- @BUILD_MINIMALGLIB_TRUE@@BUILD_TRUESPEECH_TRUE@libmediastreamer_la_DEPENDENCIES = \
--@BUILD_MINIMALGLIB_TRUE@@BUILD_TRUESPEECH_TRUE@	../gsmlib/libgsm.la \
-+@BUILD_MINIMALGLIB_TRUE@@BUILD_TRUESPEECH_TRUE@	-lgsm \
- @BUILD_MINIMALGLIB_TRUE@@BUILD_TRUESPEECH_TRUE@	../lpc10-1.5/liblpc10.la \
- @BUILD_MINIMALGLIB_TRUE@@BUILD_TRUESPEECH_TRUE@	../oRTP/src/libortp.la \
- @BUILD_MINIMALGLIB_TRUE@@BUILD_TRUESPEECH_TRUE@	../win32acm/libwin32acm.a
- @BUILD_MINIMALGLIB_TRUE@@BUILD_TRUESPEECH_FALSE@libmediastreamer_la_DEPENDENCIES = \
--@BUILD_MINIMALGLIB_TRUE@@BUILD_TRUESPEECH_FALSE@	../gsmlib/libgsm.la \
-+@BUILD_MINIMALGLIB_TRUE@@BUILD_TRUESPEECH_FALSE@	-lgsm \
- @BUILD_MINIMALGLIB_TRUE@@BUILD_TRUESPEECH_FALSE@	../lpc10-1.5/liblpc10.la \
- @BUILD_MINIMALGLIB_TRUE@@BUILD_TRUESPEECH_FALSE@	../oRTP/src/libortp.la
+ @BUILD_TRUESPEECH_TRUE@libmediastreamer_la_DEPENDENCIES = \
+-@BUILD_TRUESPEECH_TRUE@	../gsmlib/libgsm.la \
++@BUILD_TRUESPEECH_TRUE@	-lgsm \
+ @BUILD_TRUESPEECH_TRUE@	../lpc10-1.5/liblpc10.la \
+ @BUILD_TRUESPEECH_TRUE@	../oRTP/src/libortp.la \
+ @BUILD_TRUESPEECH_TRUE@	../win32acm/libwin32acm.a
+ @BUILD_TRUESPEECH_FALSE@libmediastreamer_la_DEPENDENCIES = \
+-@BUILD_TRUESPEECH_FALSE@	../gsmlib/libgsm.la \
++@BUILD_TRUESPEECH_FALSE@	-lgsm \
+ @BUILD_TRUESPEECH_FALSE@	../lpc10-1.5/liblpc10.la \
+ @BUILD_TRUESPEECH_FALSE@	../oRTP/src/libortp.la
  @BUILD_TRUESPEECH_TRUE@am__objects_1 = mstruespeechencoder.lo \
-@@ -410,7 +406,7 @@
+@@ -386,7 +382,7 @@
  libmssmpeg_la_OBJECTS = $(am_libmssmpeg_la_OBJECTS)
  libmsspeex_la_LDFLAGS =
  libmsspeex_la_DEPENDENCIES = libmediastreamer.la \
diff --git a/net/linphone/files/patch-oRTP::configure b/net/linphone/files/patch-oRTP::configure
index da85f68a52cb..328fe8ff9f07 100644
--- a/net/linphone/files/patch-oRTP::configure
+++ b/net/linphone/files/patch-oRTP::configure
@@ -1,14 +1,11 @@
-
-$FreeBSD$
-
---- oRTP/configure.orig	Wed Aug 13 01:22:52 2003
-+++ oRTP/configure	Sat Aug 23 00:17:21 2003
-@@ -18804,8 +18804,6 @@
+--- oRTP/configure.orig	Thu Nov 20 19:42:24 2003
++++ oRTP/configure	Fri Nov 21 11:14:07 2003
+@@ -19430,8 +19430,6 @@
  			CFLAGS="$CFLAGS +DA2.0W +DS2.0"
  		fi
  	fi
 -else
--	CFLAGS="-O2 -g"
+-	CFLAGS="-O2 -g -Wall"
  fi
  
  build_scheduler=yes
diff --git a/net/linphone/files/patch-oRTP::ltmain.sh b/net/linphone/files/patch-oRTP::ltmain.sh
new file mode 100644
index 000000000000..b2ed1cfb3dd6
--- /dev/null
+++ b/net/linphone/files/patch-oRTP::ltmain.sh
@@ -0,0 +1,15 @@
+--- oRTP/ltmain.sh.orig	Thu Nov 20 19:42:06 2003
++++ oRTP/ltmain.sh	Fri Nov 21 13:13:05 2003
+@@ -5478,10 +5478,12 @@
+ 	fi
+ 
+ 	# Install the pseudo-library for information purposes.
++	if /usr/bin/false; then
+ 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+ 	instname="$dir/$name"i
+ 	$show "$install_prog $instname $destdir/$name"
+ 	$run eval "$install_prog $instname $destdir/$name" || exit $?
++	fi
+ 
+ 	# Maybe install the static library, too.
+ 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/net/linphone/files/patch-osipua::src::osipua.c b/net/linphone/files/patch-osipua::src::osipua.c
index 8d9e0b969023..0ebdee4d5cd1 100644
--- a/net/linphone/files/patch-osipua::src::osipua.c
+++ b/net/linphone/files/patch-osipua::src::osipua.c
@@ -1,5 +1,5 @@
---- osipua/src/osipua.c.orig	Sat Aug 16 02:30:51 2003
-+++ osipua/src/osipua.c	Thu Oct 23 12:56:06 2003
+--- osipua/src/osipua.c.orig	Mon Oct 20 17:55:05 2003
++++ osipua/src/osipua.c	Fri Nov 21 11:52:31 2003
 @@ -591,8 +591,7 @@
  			if (ipaddr != NULL)
  			{
@@ -10,12 +10,3 @@
  				{
  				   	 ret_ua=ua;       /* ip addresses match */
  				}
-@@ -600,7 +599,7 @@
- 			else ret_ua=ua;	/* we accept uncheckable host names... */
- 			ret_ua=ua;
- #else
--			if (ip4addr!=NULL)
-+			if (ipaddr!=NULL)
- 			{
- 				osip_trace(OSIP_INFO1,("osip_ua_find 1: %s <> %s \n",ua->ua_ip4addr,ipaddr));
- 				if ((strcasecmp(ua->ua_ip4addr,ipaddr)==0) || (strcasecmp("127.0.0.1",ipaddr)==0))
diff --git a/net/linphone/pkg-plist b/net/linphone/pkg-plist
index 9c4704eb1182..7215d172cdfc 100644
--- a/net/linphone/pkg-plist
+++ b/net/linphone/pkg-plist
@@ -1,8 +1,6 @@
 bin/linphone
 bin/linphonec
-bin/osipua_tester
 bin/sipomatic
-bin/test_sdphandler
 include/linphone/config.h
 include/linphone/linphonecore.h
 include/linphone/sndcard.h
@@ -10,6 +8,7 @@ include/ortp/ortp-config.h
 include/ortp/ortp.h
 include/ortp/payloadtype.h
 include/ortp/port_fct.h
+include/ortp/rtcp.h
 include/ortp/rtp.h
 include/ortp/rtpmod.h
 include/ortp/rtpport.h
@@ -66,6 +65,7 @@ share/doc/mediastreamer/msfilterimplementations.html
 share/doc/mediastreamer/userapi.html
 share/doc/ortp/book1.html
 share/doc/ortp/index.sgml
+share/doc/ortp/ortp-library-management-functions.html
 share/doc/ortp/ortp-multiplexing-sessions-(in-a-one-thread-design).html
 share/doc/ortp/ortp-rtp-payloads-and-profiles.html
 share/doc/ortp/ortp-rtpsession-api.html
@@ -84,108 +84,82 @@ share/doc/osipua/osipua.html
 share/doc/osipua/registrationctxt.html
 share/gnome/apps/Internet/linphone.desktop
 share/gnome/gnome-2.0/ui/GNOME_LinphoneApplet.xml
-share/gnome/help/linphone/C/manual/CVS/Entries
-share/gnome/help/linphone/C/manual/CVS/Repository
-share/gnome/help/linphone/C/manual/CVS/Root
-share/gnome/help/linphone/C/manual/docbook.css
-share/gnome/help/linphone/C/manual/index.html
-share/gnome/help/linphone/C/manual/params.html
-share/gnome/help/linphone/C/manual/stylesheet-images/CVS/Entries
-share/gnome/help/linphone/C/manual/stylesheet-images/CVS/Repository
-share/gnome/help/linphone/C/manual/stylesheet-images/CVS/Root
-share/gnome/help/linphone/C/manual/t1.html
-share/gnome/help/linphone/C/manual/x118.html
-share/gnome/help/linphone/C/manual/x121.html
-share/gnome/help/linphone/C/manual/x137.html
-share/gnome/help/linphone/C/manual/x143.html
-share/gnome/help/linphone/C/manual/x167.html
-share/gnome/help/linphone/C/manual/x172.html
-share/gnome/help/linphone/C/manual/x188.html
-share/gnome/help/linphone/C/manual/x26.html
-share/gnome/help/linphone/C/manual/x36.html
-share/gnome/help/linphone/fr/manual/CVS/Entries
-share/gnome/help/linphone/fr/manual/CVS/Repository
-share/gnome/help/linphone/fr/manual/CVS/Root
-share/gnome/help/linphone/fr/manual/docbook.css
-share/gnome/help/linphone/fr/manual/params.html
-share/gnome/help/linphone/fr/manual/registering.html
-share/gnome/help/linphone/fr/manual/stylesheet-images/CVS/Entries
-share/gnome/help/linphone/fr/manual/stylesheet-images/CVS/Repository
-share/gnome/help/linphone/fr/manual/stylesheet-images/CVS/Root
-share/gnome/help/linphone/fr/manual/t1.html
-share/gnome/help/linphone/fr/manual/x116.html
-share/gnome/help/linphone/fr/manual/x134.html
-share/gnome/help/linphone/fr/manual/x140.html
-share/gnome/help/linphone/fr/manual/x164.html
-share/gnome/help/linphone/fr/manual/x170.html
-share/gnome/help/linphone/fr/manual/x188.html
-share/gnome/help/linphone/fr/manual/x24.html
-share/gnome/help/linphone/fr/manual/x34.html
-share/gnome/help/linphone/it/manual/CVS/Entries
-share/gnome/help/linphone/it/manual/CVS/Repository
-share/gnome/help/linphone/it/manual/CVS/Root
-share/gnome/help/linphone/it/manual/docbook.css
-share/gnome/help/linphone/it/manual/params.html
-share/gnome/help/linphone/it/manual/registering.html
-share/gnome/help/linphone/it/manual/stylesheet-images/CVS/Entries
-share/gnome/help/linphone/it/manual/stylesheet-images/CVS/Repository
-share/gnome/help/linphone/it/manual/stylesheet-images/CVS/Root
-share/gnome/help/linphone/it/manual/t1.html
-share/gnome/help/linphone/it/manual/x116.html
-share/gnome/help/linphone/it/manual/x134.html
-share/gnome/help/linphone/it/manual/x140.html
-share/gnome/help/linphone/it/manual/x164.html
-share/gnome/help/linphone/it/manual/x170.html
-share/gnome/help/linphone/it/manual/x189.html
-share/gnome/help/linphone/it/manual/x24.html
-share/gnome/help/linphone/it/manual/x34.html
-share/gnome/help/linphone/ja/manual/CVS/Entries
-share/gnome/help/linphone/ja/manual/CVS/Repository
-share/gnome/help/linphone/ja/manual/CVS/Root
-share/gnome/help/linphone/ja/manual/params.html
-share/gnome/help/linphone/ja/manual/t1.html
-share/gnome/help/linphone/ja/manual/x112.html
-share/gnome/help/linphone/ja/manual/x115.html
-share/gnome/help/linphone/ja/manual/x131.html
-share/gnome/help/linphone/ja/manual/x137.html
-share/gnome/help/linphone/ja/manual/x161.html
-share/gnome/help/linphone/ja/manual/x166.html
-share/gnome/help/linphone/ja/manual/x182.html
-share/gnome/help/linphone/ja/manual/x25.html
-share/gnome/help/linphone/ja/manual/x35.html
+share/gnome/help/linphone/C/docbook.css
+share/gnome/help/linphone/C/index.html
+share/gnome/help/linphone/C/params.html
+share/gnome/help/linphone/C/t1.html
+share/gnome/help/linphone/C/x118.html
+share/gnome/help/linphone/C/x121.html
+share/gnome/help/linphone/C/x137.html
+share/gnome/help/linphone/C/x143.html
+share/gnome/help/linphone/C/x167.html
+share/gnome/help/linphone/C/x172.html
+share/gnome/help/linphone/C/x188.html
+share/gnome/help/linphone/C/x26.html
+share/gnome/help/linphone/C/x36.html
+share/gnome/help/linphone/fr/docbook.css
+share/gnome/help/linphone/fr/params.html
+share/gnome/help/linphone/fr/registering.html
+share/gnome/help/linphone/fr/t1.html
+share/gnome/help/linphone/fr/x116.html
+share/gnome/help/linphone/fr/x134.html
+share/gnome/help/linphone/fr/x140.html
+share/gnome/help/linphone/fr/x164.html
+share/gnome/help/linphone/fr/x170.html
+share/gnome/help/linphone/fr/x188.html
+share/gnome/help/linphone/fr/x24.html
+share/gnome/help/linphone/fr/x34.html
+share/gnome/help/linphone/it/docbook.css
+share/gnome/help/linphone/it/params.html
+share/gnome/help/linphone/it/registering.html
+share/gnome/help/linphone/it/t1.html
+share/gnome/help/linphone/it/x116.html
+share/gnome/help/linphone/it/x134.html
+share/gnome/help/linphone/it/x140.html
+share/gnome/help/linphone/it/x164.html
+share/gnome/help/linphone/it/x170.html
+share/gnome/help/linphone/it/x189.html
+share/gnome/help/linphone/it/x24.html
+share/gnome/help/linphone/it/x34.html
+share/gnome/help/linphone/ja/params.html
+share/gnome/help/linphone/ja/t1.html
+share/gnome/help/linphone/ja/x112.html
+share/gnome/help/linphone/ja/x115.html
+share/gnome/help/linphone/ja/x131.html
+share/gnome/help/linphone/ja/x137.html
+share/gnome/help/linphone/ja/x161.html
+share/gnome/help/linphone/ja/x166.html
+share/gnome/help/linphone/ja/x182.html
+share/gnome/help/linphone/ja/x25.html
+share/gnome/help/linphone/ja/x35.html
 share/gnome/linphonec/linphonec
 share/gnome/pixmaps/linphone/linphone.png
 share/gnome/pixmaps/linphone/linphone2.png
 share/gnome/pixmaps/linphone/linphone2.xpm
 share/gnome/sounds/linphone/hello16000.wav
 share/gnome/sounds/linphone/hello8000.wav
-share/gnome/sounds/linphone/ring.wav
 share/gnome/sounds/linphone/ringback.wav
+share/gnome/sounds/linphone/rings/bigben.wav
+share/gnome/sounds/linphone/rings/oldphone.wav
+share/gnome/sounds/linphone/rings/orig.wav
+share/gnome/sounds/linphone/rings/rock.wav
+share/gnome/sounds/linphone/rings/sweet.wav
+share/gnome/sounds/linphone/rings/synth.wav
+share/gnome/sounds/linphone/rings/tapping.wav
+share/gnome/sounds/linphone/rings/toy.wav
 share/locale/de/LC_MESSAGES/linphone.mo
 share/locale/es/LC_MESSAGES/linphone.mo
 share/locale/fr/LC_MESSAGES/linphone.mo
 share/locale/it/LC_MESSAGES/linphone.mo
 share/locale/ja/LC_MESSAGES/linphone.mo
+share/locale/pl/LC_MESSAGES/linphone.mo
+@dirrm share/gnome/sounds/linphone/rings
 @dirrm share/gnome/sounds/linphone
 @dirrm share/gnome/pixmaps/linphone
 @dirrm share/gnome/linphonec
-@dirrm share/gnome/help/linphone/ja/manual/CVS
-@dirrm share/gnome/help/linphone/ja/manual
 @dirrm share/gnome/help/linphone/ja
-@dirrm share/gnome/help/linphone/it/manual/stylesheet-images/CVS
-@dirrm share/gnome/help/linphone/it/manual/stylesheet-images
-@dirrm share/gnome/help/linphone/it/manual/CVS
-@dirrm share/gnome/help/linphone/it/manual
 @dirrm share/gnome/help/linphone/it
-@dirrm share/gnome/help/linphone/fr/manual/stylesheet-images/CVS
-@dirrm share/gnome/help/linphone/fr/manual/stylesheet-images
-@dirrm share/gnome/help/linphone/fr/manual/CVS
-@dirrm share/gnome/help/linphone/fr/manual
 @dirrm share/gnome/help/linphone/fr
-@dirrm share/gnome/help/linphone/C/manual/stylesheet-images/CVS
-@dirrm share/gnome/help/linphone/C/manual/stylesheet-images
-@dirrm share/gnome/help/linphone/C/manual/CVS
-@dirrm share/gnome/help/linphone/C/manual
 @dirrm share/gnome/help/linphone/C
 @dirrm share/gnome/help/linphone
 @dirrm share/doc/osipua