Update the Linphone stack.

Linphone 3.9.0
Ortp 0.25.0 + bump PORTREVISION on dependent ports (devel/libosmo-abis)
Libbzrtp 1.0.3
Belle-sip (fix files/patch-src-belle_sip_headers_impl.c)
Mediastreamer 2.12.0
MS plugins (msbcg729 1.0.1, msilbc 2.1.2, msopenh264 1.1.1, msx264 1.5.2)

14 files changed, 172 insertions, 81 deletions

diff --git a/net/belle-sip/Makefile b/net/belle-sip/Makefile
index ff07d5d6f753..eb105bed141d 100644
--- a/net/belle-sip/Makefile
+++ b/net/belle-sip/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	belle-sip
 PORTVERSION=	1.4.2
+PORTREVISION=	1
 CATEGORIES=	net java
 MASTER_SITES=	SAVANNAH/linphone/${PORTNAME}/ \
 		http://www.antlr3.org/download/:source2
diff --git a/net/belle-sip/files/patch-src-belle_sip_headers_impl.c b/net/belle-sip/files/patch-src-belle_sip_headers_impl.c
index 9a3f2fae30c2..18f5bc71a699 100644
--- a/net/belle-sip/files/patch-src-belle_sip_headers_impl.c
+++ b/net/belle-sip/files/patch-src-belle_sip_headers_impl.c
@@ -1,22 +1,26 @@
 --- src/belle_sip_headers_impl.c.orig	2015-10-19 11:43:47 UTC
 +++ src/belle_sip_headers_impl.c
-@@ -1670,8 +1670,6 @@ BELLESIP_EXPORT time_t belle_sip_header_
+@@ -1668,11 +1668,6 @@ BELLESIP_EXPORT time_t belle_sip_header_
+ 	char tmp2[16] ={0};
+ 	int i,j;
  	time_t seconds;
- #ifdef BELLE_SIP_WINDOWS_UNIVERSAL
- 	long adjust_timezone;
+-#ifdef BELLE_SIP_WINDOWS_UNIVERSAL
+-	long adjust_timezone;
 -#else
 -	time_t adjust_timezone;
- #endif
+-#endif
  
  
-@@ -1695,25 +1693,11 @@ BELLESIP_EXPORT time_t belle_sip_header_
+ 	/* time headers are in GMT as spec says */
+@@ -1694,26 +1689,12 @@ BELLESIP_EXPORT time_t belle_sip_header_
+ 	return (time_t)-1;
  success:
  	ret.tm_isdst=0;
- 
+-
 -#if TARGET_IPHONE_SIMULATOR
 -	/* 'timezone' is buggy on iOS simulator, use the timegm() function to convert to UTC timestamp
 -	   and discard the adjust timezone value */
--	seconds = timegm(&ret);
+ 	seconds = timegm(&ret);
 -	adjust_timezone = 0;
 -#else
 -	seconds = mktime(&ret);
diff --git a/net/linphone/Makefile b/net/linphone/Makefile
index 0e159a6968cc..9cf9897d4235 100644
--- a/net/linphone/Makefile
+++ b/net/linphone/Makefile
@@ -1,10 +1,10 @@
 # $FreeBSD$
 
 PORTNAME=	linphone
-PORTVERSION=	3.8.5
+PORTVERSION=	3.9.0
 PORTEPOCH=	1
 CATEGORIES=	net
-MASTER_SITES=	SAVANNAH/linphone/3.8.x/sources
+MASTER_SITES=	SAVANNAH/linphone/3.9.x/sources
 
 MAINTAINER=	tijl@FreeBSD.org
 COMMENT=	SIP client supporting voice/video calls and text messaging
@@ -18,8 +18,9 @@ LIB_DEPENDS=	libbellesip.so:${PORTSDIR}/net/belle-sip \
 CONFLICTS_INSTALL=	linphone-base-[0-9]*
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--disable-deplibs-link --disable-silent-rules \
-		--disable-speex --disable-strict --disable-tutorials \
+CONFIGURE_ARGS=	--disable-deplibs-link --disable-documentation \
+		--disable-silent-rules --disable-speex --disable-strict \
+		--disable-tutorials \
 		--enable-external-mediastreamer --enable-external-ortp \
 		--enable-lime --with-polarssl=${LOCALBASE} \
 		--with-readline=${LOCALBASE}
diff --git a/net/linphone/distinfo b/net/linphone/distinfo
index d44b5c7b0dab..097b46314073 100644
--- a/net/linphone/distinfo
+++ b/net/linphone/distinfo
@@ -1,2 +1,2 @@
-SHA256 (linphone-3.8.5.tar.gz) = 5dd1ffeb8b5a6858e38018b340d108b587b0dd0e356ab14b83369839f9a27981
-SIZE (linphone-3.8.5.tar.gz) = 15376036
+SHA256 (linphone-3.9.0.tar.gz) = bcdf975b339de90906b0c27917ae6eb471733356690e6b7cd8ba36d8f96363e2
+SIZE (linphone-3.9.0.tar.gz) = 13424982
diff --git a/net/linphone/files/patch-configure b/net/linphone/files/patch-configure
index a92ea8b43140..e69f7cd86bcc 100644
--- a/net/linphone/files/patch-configure
+++ b/net/linphone/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	2015-04-02 09:04:58 UTC
+--- configure.orig	2015-11-02 13:54:22 UTC
 +++ configure
-@@ -20382,12 +20382,6 @@ $as_echo "#define HAVE_NOTIFY1 1" >>conf
+@@ -20432,12 +20432,6 @@ $as_echo "#define HAVE_NOTIFY1 1" >>conf
  	fi
  fi
  
@@ -13,12 +13,37 @@
  case "$host_cpu" in
  	*arm*)
  
-@@ -22149,7 +22143,7 @@ fi
+@@ -22107,14 +22101,14 @@ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sqlite3_sqlite3_open" >&5
+ $as_echo "$ac_cv_lib_sqlite3_sqlite3_open" >&6; }
+ if test "x$ac_cv_lib_sqlite3_sqlite3_open" = xyes; then :
+-  SQLITE3_LIBS+=" -lsqlite3 "; found_sqlite=yes
++  SQLITE3_LIBS="$SQLITE3_LIBS -lsqlite3 "; found_sqlite=yes
+ else
+   foo=bar
+ fi
  
  	fi
  	if test "$found_sqlite" = "yes"; then
--		SQLITE3_CFLAGS+="-DMSG_STORAGE_ENABLED"
+-		SQLITE3_CFLAGS+=" -DMSG_STORAGE_ENABLED"
 +		SQLITE3_CFLAGS="$SQLITE3_CFLAGS -DMSG_STORAGE_ENABLED"
  		if test "$build_macos" = "yes" -o "$ios_found" = "yes"; then
  			SQLITE3_LIBS+=" -liconv"
  		fi
+@@ -22262,14 +22256,14 @@ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sqlite3_sqlite3_open" >&5
+ $as_echo "$ac_cv_lib_sqlite3_sqlite3_open" >&6; }
+ if test "x$ac_cv_lib_sqlite3_sqlite3_open" = xyes; then :
+-  SQLITE3_LIBS+=" -lsqlite3 "; found_sqlite=yes
++  SQLITE3_LIBS="$SQLITE3_LIBS -lsqlite3 "; found_sqlite=yes
+ else
+   foo=bar
+ fi
+ 
+         fi
+         if test "$found_sqlite" = "yes"; then
+-                SQLITE3_CFLAGS+=" -DCALL_LOGS_STORAGE_ENABLED"
++                SQLITE3_CFLAGS="$SQLITE3_CFLAGS -DCALL_LOGS_STORAGE_ENABLED"
+                 if test "$build_macos" = "yes" -o "$ios_found" = "yes"; then
+                         SQLITE3_LIBS+=" -liconv"
+                 fi
diff --git a/net/linphone/files/patch-coreapi__presence.c b/net/linphone/files/patch-coreapi__presence.c
index e685d5bb6028..fd464865ee75 100644
--- a/net/linphone/files/patch-coreapi__presence.c
+++ b/net/linphone/files/patch-coreapi__presence.c
@@ -1,6 +1,18 @@
---- coreapi/presence.c.orig	2015-04-02 09:04:01 UTC
+--- coreapi/presence.c.orig	2015-10-23 09:10:07 UTC
 +++ coreapi/presence.c
-@@ -164,12 +164,12 @@ static time_t parse_timestamp(const char
+@@ -157,11 +157,6 @@ static void presence_activity_delete(Lin
+ static time_t parse_timestamp(const char *timestamp) {
+ 	struct tm ret;
+ 	time_t seconds;
+-#ifdef LINPHONE_WINDOWS_UNIVERSAL
+-	long adjust_timezone;
+-#else
+-	time_t adjust_timezone;
+-#endif
+ 
+ 	memset(&ret, 0, sizeof(ret));
+ 	sscanf(timestamp, "%d-%d-%dT%d:%d:%d",
+@@ -169,17 +164,12 @@ static time_t parse_timestamp(const char
  	ret.tm_mon--;
  	ret.tm_year -= 1900;
  	ret.tm_isdst = 0;
@@ -11,7 +23,12 @@
 +		ms_error("timegm() failed: %s", strerror(errno));
  		return (time_t)-1;
  	}
--	return seconds - timezone;
+-#ifdef LINPHONE_WINDOWS_UNIVERSAL
+-	_get_timezone(&adjust_timezone);
+-#else
+-	adjust_timezone = timezone;
+-#endif
+-	return seconds - (time_t)adjust_timezone;
 +	return seconds;
  }
  
diff --git a/net/linphone/files/patch-gtk-status_icon.c b/net/linphone/files/patch-gtk-status_icon.c
deleted file mode 100644
index 1001135bee30..000000000000
--- a/net/linphone/files/patch-gtk-status_icon.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- gtk/status_icon.c.orig	2015-05-13 14:47:31 UTC
-+++ gtk/status_icon.c
-@@ -195,7 +194,7 @@ static LinphoneStatusIcon *_linphone_sta
- }
- 
- static void _linphone_status_icon_free(LinphoneStatusIcon *obj) {
--	if(obj->desc->uninit) obj->desc->uninit(obj->data);
-+	if(obj->desc->uninit) obj->desc->uninit(obj);
- 	if(obj->params) linphone_status_icon_params_unref(obj->params);
- 	g_free(obj);
- }
diff --git a/net/linphone/pkg-plist b/net/linphone/pkg-plist
index 14da64f2d649..4de63c5a8830 100644
--- a/net/linphone/pkg-plist
+++ b/net/linphone/pkg-plist
@@ -11,6 +11,7 @@ include/linphone/call_log.h
 include/linphone/call_params.h
 include/linphone/content.h
 include/linphone/event.h
+include/linphone/linphone_proxy_config.h
 include/linphone/linphone_tunnel.h
 include/linphone/linphonecore.h
 include/linphone/linphonecore_utils.h
@@ -22,8 +23,8 @@ include/linphone/sipsetup.h
 include/linphone/xml2lpc.h
 include/linphone/xmlrpc.h
 lib/liblinphone.so
-lib/liblinphone.so.7
-lib/liblinphone.so.7.0.0
+lib/liblinphone.so.8
+lib/liblinphone.so.8.0.0
 libdata/pkgconfig/linphone.pc
 man/cs/man1/linphone.1.gz
 man/cs/man1/linphonec.1.gz
@@ -35,24 +36,109 @@ man/man1/sipomatic.1.gz
 share/appdata/linphone.appdata.xml
 share/applications/audio-assistant.desktop
 share/applications/linphone.desktop
+share/icons/hicolor/48x48/actions/linphone-add-call.png
+share/icons/hicolor/48x48/actions/linphone-call-transfer.png
+share/icons/hicolor/48x48/actions/linphone-chat-send.png
+share/icons/hicolor/48x48/actions/linphone-conference-start.png
+share/icons/hicolor/48x48/actions/linphone-contact-add.png
+share/icons/hicolor/48x48/actions/linphone-delete.png
+share/icons/hicolor/48x48/actions/linphone-edit.png
+share/icons/hicolor/48x48/actions/linphone-history.png
+share/icons/hicolor/48x48/actions/linphone-hold-off.png
+share/icons/hicolor/48x48/actions/linphone-hold-on.png
+share/icons/hicolor/48x48/actions/linphone-record.png
+share/icons/hicolor/48x48/actions/linphone-start-call.png
+share/icons/hicolor/48x48/actions/linphone-start-call2.png
+share/icons/hicolor/48x48/actions/linphone-start-chat.png
+share/icons/hicolor/48x48/actions/linphone-stop-call.png
 share/icons/hicolor/48x48/apps/linphone.png
+share/icons/hicolor/48x48/status/linphone-call-status-incoming.png
+share/icons/hicolor/48x48/status/linphone-call-status-missed.png
+share/icons/hicolor/48x48/status/linphone-call-status-outgoing.png
+share/icons/hicolor/48x48/status/linphone-camera-disabled.png
+share/icons/hicolor/48x48/status/linphone-camera-enabled.png
+share/icons/hicolor/48x48/status/linphone-chat-new-message-and-writing.png
+share/icons/hicolor/48x48/status/linphone-chat-new-message.png
+share/icons/hicolor/48x48/status/linphone-chat-nothing.png
+share/icons/hicolor/48x48/status/linphone-chat-writing.png
+share/icons/hicolor/48x48/status/linphone-failed.png
+share/icons/hicolor/48x48/status/linphone-inprogress.png
+share/icons/hicolor/48x48/status/linphone-media-pause.png
+share/icons/hicolor/48x48/status/linphone-media-play.png
+share/icons/hicolor/48x48/status/linphone-micro-enabled.png
+share/icons/hicolor/48x48/status/linphone-micro-muted.png
+share/icons/hicolor/48x48/status/linphone-ok.png
+share/icons/hicolor/48x48/status/linphone-security-ok.png
+share/icons/hicolor/48x48/status/linphone-security-pending.png
+share/icons/hicolor/48x48/status/linphone-speaker-enabled.png
+share/icons/hicolor/48x48/status/linphone-speaker-muted.png
+share/icons/hicolor/48x48/status/linphone-status-away.png
+share/icons/hicolor/48x48/status/linphone-status-donotdisturb.png
+share/icons/hicolor/48x48/status/linphone-status-offline.png
+share/icons/hicolor/48x48/status/linphone-status-online.png
+share/icons/hicolor/48x48/status/linphone-warning.png
+share/icons/hicolor/scalable/actions/linphone-add-call.svg
+share/icons/hicolor/scalable/actions/linphone-call-transfer.svg
+share/icons/hicolor/scalable/actions/linphone-chat-send.svg
+share/icons/hicolor/scalable/actions/linphone-conference-start.svg
+share/icons/hicolor/scalable/actions/linphone-contact-add.svg
+share/icons/hicolor/scalable/actions/linphone-delete.svg
+share/icons/hicolor/scalable/actions/linphone-edit.svg
+share/icons/hicolor/scalable/actions/linphone-history.svg
+share/icons/hicolor/scalable/actions/linphone-hold-off.svg
+share/icons/hicolor/scalable/actions/linphone-hold-on.svg
+share/icons/hicolor/scalable/actions/linphone-record.svg
+share/icons/hicolor/scalable/actions/linphone-start-call.svg
+share/icons/hicolor/scalable/actions/linphone-start-call2.svg
+share/icons/hicolor/scalable/actions/linphone-start-chat.svg
+share/icons/hicolor/scalable/status/linphone-call-status-incoming.svg
+share/icons/hicolor/scalable/status/linphone-call-status-missed.svg
+share/icons/hicolor/scalable/status/linphone-call-status-outgoing.svg
+share/icons/hicolor/scalable/status/linphone-camera-disabled.svg
+share/icons/hicolor/scalable/status/linphone-camera-enabled.svg
+share/icons/hicolor/scalable/status/linphone-chat-new-message-and-writing.svg
+share/icons/hicolor/scalable/status/linphone-chat-new-message.svg
+share/icons/hicolor/scalable/status/linphone-chat-nothing.svg
+share/icons/hicolor/scalable/status/linphone-chat-writing.svg
+share/icons/hicolor/scalable/status/linphone-failed.svg
+share/icons/hicolor/scalable/status/linphone-inprogress.svg
+share/icons/hicolor/scalable/status/linphone-media-pause.svg
+share/icons/hicolor/scalable/status/linphone-media-play.svg
+share/icons/hicolor/scalable/status/linphone-micro-enabled.svg
+share/icons/hicolor/scalable/status/linphone-micro-muted.svg
+share/icons/hicolor/scalable/status/linphone-ok.svg
+share/icons/hicolor/scalable/status/linphone-security-ok.svg
+share/icons/hicolor/scalable/status/linphone-security-pending.svg
+share/icons/hicolor/scalable/status/linphone-speaker-enabled.svg
+share/icons/hicolor/scalable/status/linphone-speaker-muted.svg
+share/icons/hicolor/scalable/status/linphone-status-away.svg
+share/icons/hicolor/scalable/status/linphone-status-donotdisturb.svg
+share/icons/hicolor/scalable/status/linphone-status-offline.svg
+share/icons/hicolor/scalable/status/linphone-status-online.svg
+share/icons/hicolor/scalable/status/linphone-warning.svg
 %%DATADIR%%/COPYING
 %%DATADIR%%/about.ui
 %%DATADIR%%/audio_assistant.ui
 %%DATADIR%%/buddylookup.ui
 %%DATADIR%%/call_logs.ui
 %%DATADIR%%/call_statistics.ui
+%%DATADIR%%/callee_frame.ui
+%%DATADIR%%/chatroom_frame.ui
+%%DATADIR%%/conf_frame.ui
 %%DATADIR%%/config-uri.ui
 %%DATADIR%%/contact.ui
 %%DATADIR%%/dscp_settings.ui
+%%DATADIR%%/in_call_frame.ui
 %%DATADIR%%/keypad.ui
 %%DATADIR%%/ldap.ui
 %%DATADIR%%/log.ui
+%%DATADIR%%/login_frame.ui
 %%DATADIR%%/main.ui
 %%DATADIR%%/parameters.ui
 %%DATADIR%%/password.ui
 %%DATADIR%%/provisioning-fetch.ui
 %%DATADIR%%/rootca.pem
+%%DATADIR%%/setup_wizard.ui
 %%DATADIR%%/sip_account.ui
 %%DATADIR%%/stock_people.png
 %%DATADIR%%/tunnel_config.ui
@@ -66,6 +152,7 @@ share/icons/hicolor/48x48/apps/linphone.png
 %%NLS%%share/locale/hu/LC_MESSAGES/linphone.mo
 %%NLS%%share/locale/it/LC_MESSAGES/linphone.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/linphone.mo
+%%NLS%%share/locale/lt/LC_MESSAGES/linphone.mo
 %%NLS%%share/locale/nb_NO/LC_MESSAGES/linphone.mo
 %%NLS%%share/locale/nl/LC_MESSAGES/linphone.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/linphone.mo
@@ -76,41 +163,8 @@ share/icons/hicolor/48x48/apps/linphone.png
 %%NLS%%share/locale/tr/LC_MESSAGES/linphone.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/linphone.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/linphone.mo
-share/pixmaps/linphone/active_chat.png
-share/pixmaps/linphone/addcall-green.png
-share/pixmaps/linphone/call.png
-share/pixmaps/linphone/call_status_incoming.png
-share/pixmaps/linphone/call_status_outgoing.png
-share/pixmaps/linphone/chat.png
-share/pixmaps/linphone/chat_message_delivered.png
-share/pixmaps/linphone/chat_message_inprogress.png
-share/pixmaps/linphone/chat_message_not_delivered.png
-share/pixmaps/linphone/composing_active_chat.png
-share/pixmaps/linphone/composing_chat.png
-share/pixmaps/linphone/contact-orange.png
-share/pixmaps/linphone/contact_starred.png
-share/pixmaps/linphone/contact_unstarred.png
-share/pixmaps/linphone/dialer-orange.png
-share/pixmaps/linphone/dialer.png
-share/pixmaps/linphone/history-orange.png
-share/pixmaps/linphone/hold_off.png
-share/pixmaps/linphone/hold_on.png
 share/pixmaps/linphone/linphone-banner.png
 share/pixmaps/linphone/linphone.icns
-share/pixmaps/linphone/linphone.png
-share/pixmaps/linphone/mic_active.png
-share/pixmaps/linphone/mic_muted.png
-share/pixmaps/linphone/notok.png
-share/pixmaps/linphone/ok.png
-share/pixmaps/linphone/speaker.png
-share/pixmaps/linphone/startcall-green.png
-share/pixmaps/linphone/startcall-small.png
-share/pixmaps/linphone/status-green.png
-share/pixmaps/linphone/status-offline.png
-share/pixmaps/linphone/status-orange.png
-share/pixmaps/linphone/status-red.png
-share/pixmaps/linphone/stopcall-red.png
-share/pixmaps/linphone/stopcall-small.png
 share/sounds/linphone/hello16000.wav
 share/sounds/linphone/hello8000.wav
 share/sounds/linphone/incoming_chat.wav
diff --git a/net/mediastreamer/Makefile b/net/mediastreamer/Makefile
index 67dc95ea2ae8..200bd46df22c 100644
--- a/net/mediastreamer/Makefile
+++ b/net/mediastreamer/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	mediastreamer
-PORTVERSION=	2.11.2
-PORTREVISION=	3
+PORTVERSION=	2.12.0
 CATEGORIES=	net
 MASTER_SITES=	SAVANNAH/linphone/mediastreamer
 
@@ -21,8 +20,8 @@ LIB_DEPENDS=	libortp.so:${PORTSDIR}/net/ortp \
 CONFLICTS_INSTALL=	linphone-base-[0-9]*
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--disable-alsa --disable-matroska --disable-pulseaudio \
-		--disable-silent-rules --disable-strict \
+CONFIGURE_ARGS=	--disable-alsa --disable-documentation --disable-matroska \
+		--disable-pulseaudio --disable-silent-rules --disable-strict \
 		--with-gsm=${LOCALBASE} --with-srtp=${LOCALBASE} \
 		--with-polarssl=${LOCALBASE} xxd_found=yes
 CPPFLAGS+=	-I${LOCALBASE}/include -DHAVE_ARC4RANDOM
diff --git a/net/mediastreamer/distinfo b/net/mediastreamer/distinfo
index 0586f727da9c..d1b443b2362e 100644
--- a/net/mediastreamer/distinfo
+++ b/net/mediastreamer/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mediastreamer-2.11.2.tar.gz) = 8c09b0646c8ba0354b3e1d807811e70110d6f3a893fd19f4ef91864f3357cfbc
-SIZE (mediastreamer-2.11.2.tar.gz) = 6356644
+SHA256 (mediastreamer-2.12.0.tar.gz) = 3e0f497705b00862a42361591c3e588a3c5df5b4be22238da8cb46ae1ed76b5f
+SIZE (mediastreamer-2.12.0.tar.gz) = 6384689
diff --git a/net/mediastreamer/pkg-plist b/net/mediastreamer/pkg-plist
index 6f471465bd99..88a3d2080f62 100644
--- a/net/mediastreamer/pkg-plist
+++ b/net/mediastreamer/pkg-plist
@@ -40,6 +40,7 @@ include/mediastreamer2/msv4l.h
 include/mediastreamer2/msvaddtx.h
 include/mediastreamer2/msvideo.h
 include/mediastreamer2/msvideoout.h
+include/mediastreamer2/msvideopresets.h
 include/mediastreamer2/msvolume.h
 include/mediastreamer2/mswebcam.h
 include/mediastreamer2/qualityindicator.h
@@ -51,11 +52,11 @@ include/mediastreamer2/videostarter.h
 include/mediastreamer2/x11_helper.h
 include/mediastreamer2/zrtp.h
 lib/libmediastreamer_base.so
-lib/libmediastreamer_base.so.4
-lib/libmediastreamer_base.so.4.0.0
+lib/libmediastreamer_base.so.6
+lib/libmediastreamer_base.so.6.0.0
 lib/libmediastreamer_voip.so
-lib/libmediastreamer_voip.so.4
-lib/libmediastreamer_voip.so.4.0.0
+lib/libmediastreamer_voip.so.6
+lib/libmediastreamer_voip.so.6.0.0
 libdata/pkgconfig/mediastreamer.pc
 share/images/nowebcamCIF.jpg
 %%NLS%%share/locale/cs/LC_MESSAGES/mediastreamer.mo
diff --git a/net/ortp/Makefile b/net/ortp/Makefile
index a5498d7fbaf7..98d8d1612970 100644
--- a/net/ortp/Makefile
+++ b/net/ortp/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	ortp
-PORTVERSION=	0.24.2
+PORTVERSION=	0.25.0
 CATEGORIES=	net
 MASTER_SITES=	SAVANNAH/linphone/ortp/sources
 
diff --git a/net/ortp/distinfo b/net/ortp/distinfo
index 622716dcb2a4..71942708220a 100644
--- a/net/ortp/distinfo
+++ b/net/ortp/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ortp-0.24.2.tar.gz) = cb37c76985b3703157f0ed06d900d662b903ad3c5b772e2d1ea36478ad8a6616
-SIZE (ortp-0.24.2.tar.gz) = 560529
+SHA256 (ortp-0.25.0.tar.gz) = 0deb826b79b1fd329f7638821d5439dc343bc55bb122daa6c90d19116cfe8d9a
+SIZE (ortp-0.25.0.tar.gz) = 565836
diff --git a/net/ortp/pkg-plist b/net/ortp/pkg-plist
index 90ffd7bb47ec..0352fde09973 100644
--- a/net/ortp/pkg-plist
+++ b/net/ortp/pkg-plist
@@ -13,6 +13,6 @@ include/ortp/sessionset.h
 include/ortp/str_utils.h
 include/ortp/telephonyevents.h
 lib/libortp.so
-lib/libortp.so.9
-lib/libortp.so.9.0.0
+lib/libortp.so.10
+lib/libortp.so.10.0.0
 libdata/pkgconfig/ortp.pc