Update the Linphone stack and drop maintainership.

Linphone uses Qt5 now instead of GTK2.

audio/bcg729:
- switch to cmake, required by net/mediastreamer
- download distfile instead of using gitlab
- fix license: source code allows later GPL version

audio/msbcg729: deleted, net/mediastreamer contains a G.729 codec now
audio/msilbc: deleted, superseded by multimedia/mswebrtc
deskutils/belcard: version 1.0.2
multimedia/bcmatroska2: version 0.23
multimedia/msopenh264: version 1.2.1
multimedia/mswebrtc: version 1.1.1
multimedia/msx264: deleted, superseded by msopenh264
net/bctoolbox: version 0.6.0
net/belle-sip: version 1.6.3
net/liblinphone: version 3.12.0
net/linphone: version 4.1.1 + upstream Qt 5.11 patches
net/mediastreamer: version 2.16.1 + upstream libsrtp2 patch
net/ortp: version 1.0.2 + bump dependent port devel/libosmo-abis
security/bzrtp: version 1.0.6
textproc/belr: version 0.1.3

16 files changed, 122 insertions, 47 deletions

diff --git a/multimedia/Makefile b/multimedia/Makefile
index 36c2473025ab..a2c9341e73cc 100644
--- a/multimedia/Makefile
+++ b/multimedia/Makefile
@@ -26,6 +26,7 @@
     SUBDIR += avidemux-qt4
     SUBDIR += avinfo
     SUBDIR += baka-mplayer
+    SUBDIR += bcmatroska2
     SUBDIR += bino
     SUBDIR += bitstream
     SUBDIR += blind
@@ -283,7 +284,7 @@
     SUBDIR += mpv
     SUBDIR += msdl
     SUBDIR += msopenh264
-    SUBDIR += msx264
+    SUBDIR += mswebrtc
     SUBDIR += mxflib
     SUBDIR += mythtv
     SUBDIR += mythtv-frontend
diff --git a/multimedia/bcmatroska2/Makefile b/multimedia/bcmatroska2/Makefile
new file mode 100644
index 000000000000..eee40b87ee84
--- /dev/null
+++ b/multimedia/bcmatroska2/Makefile
@@ -0,0 +1,16 @@
+# $FreeBSD$
+
+PORTNAME=	bcmatroska2
+PORTVERSION=	0.23
+CATEGORIES=	multimedia
+MASTER_SITES=	https://www.linphone.org/releases/sources/bcmatroska2/
+
+MAINTAINER=	ports@FreeBSD.org
+COMMENT=	Belledonne Communications Matroska media container support
+
+USES=		cmake:outsource
+USE_LDCONFIG=	yes
+
+CMAKE_ARGS=	-DENABLE_STATIC=NO
+
+.include <bsd.port.mk>
diff --git a/multimedia/bcmatroska2/distinfo b/multimedia/bcmatroska2/distinfo
new file mode 100644
index 000000000000..1591e626483d
--- /dev/null
+++ b/multimedia/bcmatroska2/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1529855371
+SHA256 (bcmatroska2-0.23.tar.gz) = 2540e2d39785004060688218df2d33ddefc2561f6cf1fcdd4d2840e8c8a41ba8
+SIZE (bcmatroska2-0.23.tar.gz) = 959058
diff --git a/multimedia/bcmatroska2/files/patch-corec-corec-helpers-file-file_libc.c b/multimedia/bcmatroska2/files/patch-corec-corec-helpers-file-file_libc.c
new file mode 100644
index 000000000000..8b2c85260201
--- /dev/null
+++ b/multimedia/bcmatroska2/files/patch-corec-corec-helpers-file-file_libc.c
@@ -0,0 +1,11 @@
+--- corec/corec/helpers/file/file_libc.c.orig	2017-07-20 13:52:29 UTC
++++ corec/corec/helpers/file/file_libc.c
+@@ -40,7 +40,7 @@
+ #include <unistd.h>
+ #include <dirent.h>
+ #include <errno.h>
+-#if defined(TARGET_OSX)
++#if defined(TARGET_OSX) || defined(__FreeBSD__)
+ #include <sys/mount.h>
+ #elif defined(TARGET_QNX)
+ #include <sys/statvfs.h>
diff --git a/multimedia/bcmatroska2/pkg-descr b/multimedia/bcmatroska2/pkg-descr
new file mode 100644
index 000000000000..5d52f78c70b6
--- /dev/null
+++ b/multimedia/bcmatroska2/pkg-descr
@@ -0,0 +1,3 @@
+This library provides support for Matroska, a media container format.
+
+WWW: https://www.linphone.org/
diff --git a/multimedia/bcmatroska2/pkg-plist b/multimedia/bcmatroska2/pkg-plist
new file mode 100644
index 000000000000..621a87a1b307
--- /dev/null
+++ b/multimedia/bcmatroska2/pkg-plist
@@ -0,0 +1,43 @@
+include/corec/array/array.h
+include/corec/banned.h
+include/corec/confhelper.h
+include/corec/config.h
+include/corec/corec.h
+include/corec/err.h
+include/corec/helper.h
+include/corec/helpers/charconvert/charconvert.h
+include/corec/helpers/date/date.h
+include/corec/helpers/file/file.h
+include/corec/helpers/file/streams.h
+include/corec/helpers/md5/md5.h
+include/corec/helpers/parser/buffer.h
+include/corec/helpers/parser/dataheap.h
+include/corec/helpers/parser/hotkey.h
+include/corec/helpers/parser/nodelookup.h
+include/corec/helpers/parser/parser.h
+include/corec/helpers/parser/strtab.h
+include/corec/helpers/parser/strtypes.h
+include/corec/helpers/parser/urlpart.h
+include/corec/helpers/system/ccsystem.h
+include/corec/memalloc.h
+include/corec/memheap.h
+include/corec/multithread/multithread.h
+include/corec/node/node.h
+include/corec/node/node_internal.h
+include/corec/node/nodebase.h
+include/corec/node/nodetools.h
+include/corec/node/nodetree.h
+include/corec/portab.h
+include/corec/str/str.h
+include/ebml/ebml.h
+include/ebml/ebml_internal.h
+include/matroska/matroska.h
+include/matroska/matroska_internal.h
+include/matroska/matroska_sem.h
+lib/libbcmatroska2.so
+lib/libbcmatroska2.so.0
+lib/libbcmatroska2.so.0.0.0
+%%DATADIR%%/cmake/BcMatroska2Config.cmake
+%%DATADIR%%/cmake/BcMatroska2ConfigVersion.cmake
+%%DATADIR%%/cmake/BcMatroska2Targets-%%CMAKE_BUILD_TYPE%%.cmake
+%%DATADIR%%/cmake/BcMatroska2Targets.cmake
diff --git a/multimedia/msopenh264/Makefile b/multimedia/msopenh264/Makefile
index 766dc8e1630a..fc37670a2e4c 100644
--- a/multimedia/msopenh264/Makefile
+++ b/multimedia/msopenh264/Makefile
@@ -1,20 +1,23 @@
 # $FreeBSD$
 
 PORTNAME=	msopenh264
-PORTVERSION=	1.1.2
-PORTREVISION=	2
+PORTVERSION=	1.2.1
 CATEGORIES=	multimedia net
-MASTER_SITES=	SAVANNAH/linphone/plugins/sources/
+MASTER_SITES=	https://www.linphone.org/releases/sources/plugins/msopenh264/
 
-MAINTAINER=	tijl@FreeBSD.org
-COMMENT=	Mediastreamer plugin for H264 encoding/decoding
+MAINTAINER=	ports@FreeBSD.org
+COMMENT=	Mediastreamer plugin with H.264 codec
+
+LICENSE=	GPLv2+
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libmediastreamer_base.so:net/mediastreamer \
-		libopenh264.so:multimedia/openh264
+		libopenh264.so:multimedia/openh264 \
+		libortp.so:net/ortp
+
+USES=		cmake:outsource
 
-USES=		libtool pkgconfig
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--disable-strict
-INSTALL_TARGET=	install-strip
+CMAKE_ARGS=	-DENABLE_STATIC=NO
+PLIST_FILES=	lib/mediastreamer/plugins/libmsopenh264.so
 
 .include <bsd.port.mk>
diff --git a/multimedia/msopenh264/distinfo b/multimedia/msopenh264/distinfo
index 2ec90aba377a..293e468388c3 100644
--- a/multimedia/msopenh264/distinfo
+++ b/multimedia/msopenh264/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1476614735
-SHA256 (msopenh264-1.1.2.tar.gz) = 57e9d82540624afc42149fad8b2c52afddc996b418e61b9f6f7954749d59f8f3
-SIZE (msopenh264-1.1.2.tar.gz) = 373065
+TIMESTAMP = 1539620002
+SHA256 (msopenh264-1.2.1.tar.gz) = a8622752fcc8a3cbbcfb3ffa2fe0f8419aceebb8d5dc2bca03a68852bf7abd65
+SIZE (msopenh264-1.2.1.tar.gz) = 29665
diff --git a/multimedia/msopenh264/pkg-descr b/multimedia/msopenh264/pkg-descr
index 8ad878f8a6e0..636a20d8eb3f 100644
--- a/multimedia/msopenh264/pkg-descr
+++ b/multimedia/msopenh264/pkg-descr
@@ -1,3 +1,3 @@
-H264 encoder and decoder plugin for Mediastreamer based on OpenH264 codec.
+H.264 codec for Mediastreamer based on OpenH264.
 
 WWW: https://www.linphone.org/technical-corner/mediastreamer2.html
diff --git a/multimedia/msopenh264/pkg-plist b/multimedia/msopenh264/pkg-plist
deleted file mode 100644
index 524afa419d75..000000000000
--- a/multimedia/msopenh264/pkg-plist
+++ /dev/null
@@ -1,3 +0,0 @@
-lib/mediastreamer/plugins/libmsopenh264.so
-lib/mediastreamer/plugins/libmsopenh264.so.0
-lib/mediastreamer/plugins/libmsopenh264.so.0.0.0
diff --git a/multimedia/mswebrtc/Makefile b/multimedia/mswebrtc/Makefile
new file mode 100644
index 000000000000..e93d049253ac
--- /dev/null
+++ b/multimedia/mswebrtc/Makefile
@@ -0,0 +1,23 @@
+# $FreeBSD$
+
+PORTNAME=	mswebrtc
+PORTVERSION=	1.1.1
+CATEGORIES=	multimedia net
+MASTER_SITES=	https://www.linphone.org/releases/sources/plugins/mswebrtc/
+
+MAINTAINER=	ports@FreeBSD.org
+COMMENT=	Mediastreamer plugin with WebRTC codecs
+
+LICENSE=	GPLv2+
+LICENSE_FILE=	${WRKSRC}/COPYING
+
+LIB_DEPENDS=	libbctoolbox.so:net/bctoolbox \
+		libmediastreamer_base.so:net/mediastreamer \
+		libortp.so:net/ortp
+
+USES=		cmake:outsource
+
+CMAKE_ARGS=	-DENABLE_STATIC=NO
+PLIST_FILES=	lib/mediastreamer/plugins/libmswebrtc.so
+
+.include <bsd.port.mk>
diff --git a/multimedia/mswebrtc/distinfo b/multimedia/mswebrtc/distinfo
new file mode 100644
index 000000000000..1125cfe06161
--- /dev/null
+++ b/multimedia/mswebrtc/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1539620822
+SHA256 (mswebrtc-1.1.1.tar.gz) = 19d7836aec6db16c9ccb65d168eb2b87ab039c04af13632b861afa9a284442f2
+SIZE (mswebrtc-1.1.1.tar.gz) = 2360979
diff --git a/multimedia/msx264/pkg-descr b/multimedia/mswebrtc/pkg-descr
index 59164264358d..48622daf2767 100644
--- a/multimedia/msx264/pkg-descr
+++ b/multimedia/mswebrtc/pkg-descr
@@ -1,3 +1,3 @@
-H264 encoder plugin for Mediastreamer based on libx264.
+WebRTC codecs for Mediastreamer (iSAC, AEC, iLBC).
 
 WWW: https://www.linphone.org/technical-corner/mediastreamer2.html
diff --git a/multimedia/msx264/Makefile b/multimedia/msx264/Makefile
deleted file mode 100644
index dbc608132ac5..000000000000
--- a/multimedia/msx264/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-# $FreeBSD$
-
-PORTNAME=	msx264
-PORTVERSION=	1.5.2
-PORTREVISION=	5
-CATEGORIES=	multimedia net
-MASTER_SITES=	SAVANNAH/linphone/plugins/sources/
-
-MAINTAINER=	tijl@FreeBSD.org
-COMMENT=	Mediastreamer plugin for H264 encoding
-
-LICENSE=	GPLv2
-LICENSE_FILE=	${WRKSRC}/COPYING
-
-LIB_DEPENDS=	libmediastreamer_base.so:net/mediastreamer \
-		libx264.so:multimedia/libx264
-
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--disable-strict
-INSTALL_TARGET=	install-strip
-USES=		libtool pkgconfig
-
-.include <bsd.port.mk>
diff --git a/multimedia/msx264/distinfo b/multimedia/msx264/distinfo
deleted file mode 100644
index 5d9b2bbdf00a..000000000000
--- a/multimedia/msx264/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (msx264-1.5.2.tar.gz) = e82e5142b479f331d09dfe858857d6311ccd149ff8f6c5c63b03151fb7b5a88a
-SIZE (msx264-1.5.2.tar.gz) = 359877
diff --git a/multimedia/msx264/pkg-plist b/multimedia/msx264/pkg-plist
deleted file mode 100644
index 5f410948abd9..000000000000
--- a/multimedia/msx264/pkg-plist
+++ /dev/null
@@ -1,3 +0,0 @@
-lib/mediastreamer/plugins/libmsx264.so
-lib/mediastreamer/plugins/libmsx264.so.0
-lib/mediastreamer/plugins/libmsx264.so.0.0.0