aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--MOVED2
-rw-r--r--UPDATING12
-rw-r--r--audio/msilbc/Makefile6
-rw-r--r--net-im/kopete-kde4/Makefile6
-rw-r--r--net-im/libjingle/Makefile13
-rw-r--r--net/Makefile2
-rw-r--r--net/linphone-base/Makefile97
-rw-r--r--net/linphone-base/distinfo2
-rw-r--r--net/linphone-base/files/patch-coreapi_linphonecore.c14
-rw-r--r--net/linphone-base/files/patch-gtk-glade_Makefile.in41
-rw-r--r--net/linphone-base/files/patch-mediastreamer2_src_dsptools.c13
-rw-r--r--net/linphone-base/files/patch-mediastreamer2_src_ice.c12
-rw-r--r--net/linphone-base/files/patch-oRTP-src_stun.c11
-rw-r--r--net/linphone-base/pkg-descr7
-rw-r--r--net/linphone-base/pkg-descr.gui7
-rw-r--r--net/linphone-base/pkg-plist97
-rw-r--r--net/linphone-base/pkg-plist.gui37
-rw-r--r--net/linphone/Makefile61
-rw-r--r--net/linphone/distinfo2
-rw-r--r--net/linphone/files/patch-configure24
-rw-r--r--net/linphone/files/patch-coreapi__presence.c11
-rw-r--r--net/linphone/pkg-descr11
-rw-r--r--net/linphone/pkg-plist121
-rw-r--r--net/mediastreamer/Makefile2
-rw-r--r--net/ortp/Makefile2
25 files changed, 262 insertions, 351 deletions
diff --git a/MOVED b/MOVED
index aca83d045a37..2fbcf83b9c83 100644
--- a/MOVED
+++ b/MOVED
@@ -6253,4 +6253,4 @@ editors/nxml||2014-07-13|Needs recently removed emacs21 or emacs22
graphics/py-stl|graphics/py-stltools|2014-07-13|Upstream project has been renamed
audio/muine||2014-07-13|Has expired: Fails to build/run since August 2013
x11-themes/kde4-windeco-nitrogen||2014-07-14|Has expired: Merged with the Oxygen windeco included with KDE4
-net/linphone||2014-07-14|Removed temporarily
+net/linphone-base||2014-07-14|Split into separate components
diff --git a/UPDATING b/UPDATING
index 892ed605e33d..3aeeb3141511 100644
--- a/UPDATING
+++ b/UPDATING
@@ -5,6 +5,18 @@ they are unavoidable.
You should get into the habit of checking this file for changes each time
you update your ports collection, before attempting any port upgrades.
+20140714:
+ AFFECTS: users of net/linphone-base
+ AUTHOR: tijl@FreeBSD.org
+
+ Linphone has been updated to version 3.7.0 and the linphone-base port
+ has been split into separate components. You must first delete the
+ linphone-base package before you can update ports that depend on it.
+
+ pkg del -f linphone-base
+ or
+ pkg_delete -f linphone-base\*
+
20140713:
AFFECTS: users of mail/postfix-current
AUTHOR: sahil@FreeBSD.org
diff --git a/audio/msilbc/Makefile b/audio/msilbc/Makefile
index 558625356ba4..21cd46a7bff4 100644
--- a/audio/msilbc/Makefile
+++ b/audio/msilbc/Makefile
@@ -2,15 +2,15 @@
PORTNAME= msilbc
PORTVERSION= 2.0.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= audio net
MASTER_SITES= SAVANNAH/linphone/plugins/sources/
MAINTAINER= makc@FreeBSD.org
COMMENT= Mediastreamer plugin for the iLBC audio codec
-LIB_DEPENDS= libortp.so:${PORTSDIR}/net/linphone-base \
- libmediastreamer.so:${PORTSDIR}/net/linphone-base \
+LIB_DEPENDS= libortp.so:${PORTSDIR}/net/ortp \
+ libmediastreamer_base.so:${PORTSDIR}/net/mediastreamer \
libilbc.so:${PORTSDIR}/net/ilbc
USES= libtool pkgconfig
diff --git a/net-im/kopete-kde4/Makefile b/net-im/kopete-kde4/Makefile
index 1856a08816dc..e315748abcac 100644
--- a/net-im/kopete-kde4/Makefile
+++ b/net-im/kopete-kde4/Makefile
@@ -2,7 +2,7 @@
PORTNAME= kopete
PORTVERSION= ${KDE4_VERSION}
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net-im kde
MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
DIST_SUBDIR= KDE/${PORTVERSION}
@@ -14,8 +14,8 @@ LIB_DEPENDS= libidn.so:${PORTSDIR}/dns/libidn \
libqca.so:${PORTSDIR}/devel/qca \
libotr.so.5:${PORTSDIR}/security/libotr \
libgadu.so:${PORTSDIR}/polish/libgadu \
- libortp.so:${PORTSDIR}/net/linphone-base \
- libmediastreamer.so:${PORTSDIR}/net/linphone-base \
+ libortp.so:${PORTSDIR}/net/ortp \
+ libmediastreamer_base.so:${PORTSDIR}/net/mediastreamer \
libspeex.so:${PORTSDIR}/audio/speex \
libexpat.so:${PORTSDIR}/textproc/expat2 \
libmeanwhile.so:${PORTSDIR}/net-im/meanwhile \
diff --git a/net-im/libjingle/Makefile b/net-im/libjingle/Makefile
index 75080fd6a104..b5645ba4eb56 100644
--- a/net-im/libjingle/Makefile
+++ b/net-im/libjingle/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libjingle
PORTVERSION= 0.4.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net-im
MASTER_SITES= SF
@@ -13,14 +13,17 @@ COMMENT= Google Talk's implementation of Jingle and Jingle-Audio
LICENSE= BSD
LICENSE_FILE= ${WRKSRC}/COPYING
-LIB_DEPENDS= speex:${PORTSDIR}/audio/speex \
- ilbc:${PORTSDIR}/net/ilbc \
- ortp:${PORTSDIR}/net/linphone-base \
- expat:${PORTSDIR}/textproc/expat2
+LIB_DEPENDS= libspeex.so:${PORTSDIR}/audio/speex \
+ libilbc.so:${PORTSDIR}/net/ilbc \
+ libortp.so:${PORTSDIR}/net/ortp \
+ libexpat.so:${PORTSDIR}/textproc/expat2
CONFLICTS= krb4-[0-9]* krb5-[0-9]* heimdal-[0-9]* srp-[0-9]* \
clusterit-[0-9]* pcp-[0-9]* synce-librapi2-[0-9]*
+DEPRECATED= Upstream defunct and broken with clang
+EXPIRATION_DATE=2014-08-31
+
USES= pkgconfig dos2unix gmake
DOS2UNIX_FILES= README
USE_GNOME= glib20
diff --git a/net/Makefile b/net/Makefile
index abeedad29a76..2ba8ac57420d 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -346,7 +346,7 @@
SUBDIR += linc
SUBDIR += linc-reference
SUBDIR += linknx
- SUBDIR += linphone-base
+ SUBDIR += linphone
SUBDIR += linux-f10-nss_ldap
SUBDIR += linux-f10-openldap
SUBDIR += linuxigd
diff --git a/net/linphone-base/Makefile b/net/linphone-base/Makefile
deleted file mode 100644
index d304867b5c09..000000000000
--- a/net/linphone-base/Makefile
+++ /dev/null
@@ -1,97 +0,0 @@
-# Created by: Maxim Sobolev <sobomax@FreeBSD.org>
-# $FreeBSD$
-
-PORTNAME= linphone
-PORTVERSION= 3.2.1
-PORTREVISION?= 3
-PORTEPOCH= 1
-CATEGORIES?= net
-MASTER_SITES= SAVANNAH/${PORTNAME}/3.2.x/sources
-
-MAINTAINER= ports@FreeBSD.org
-COMMENT= Web phone that supports SIP protocol
-
-LIB_DEPENDS= libgsm.so:${PORTSDIR}/audio/gsm \
- libspeex.so:${PORTSDIR}/audio/speex \
- libeXosip2.so:${PORTSDIR}/net/libexosip2-legacy
-
-CONFLICTS= ortp-[0-9]*
-
-USE_GNOME= glib20 intlhack
-USES= gmake pathfix pkgconfig readline:port
-USE_AUTOTOOLS= libtool
-LIBTOOLFILES= configure oRTP/configure mediastreamer2/configure
-CONFIGURE_ARGS= --disable-ipv6 --disable-manual --disable-ewarning \
- --disable-strict --disable-video --disable-external-ortp \
- --with-osip=${LOCALBASE} --with-gsm=${LOCALBASE} \
- --with-readline=${LOCALBASE}
-CONFIGURE_ENV+= ac_cv_lib_readline_readline=yes
-MAKE_ENV= SUBDIRS="${SUBDIRS}"
-USE_LDCONFIG= yes
-
-CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
-
-OPTIONS_DEFINE= NLS
-OPTIONS_SUB= yes
-
-NLS_CONFIGURE_ENABLE= nls
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MNLS}
-USES+= gettext
-.endif
-
-.if defined(LINPHONE_GUI)
-BUILD_DEPENDS+= linphone-base>=${PORTVERSION}:${PORTSDIR}/net/linphone-base
-RUN_DEPENDS+= linphone-base>=${PORTVERSION}:${PORTSDIR}/net/linphone-base
-DESCR= ${PKGDIR}/pkg-descr.gui
-PLIST= ${PKGDIR}/pkg-plist.gui
-USE_GNOME+= libglade2
-SUBDIRS= pixmaps gtk-glade
-.else
-PKGNAMESUFFIX= -base
-CONFIGURE_ARGS+= --enable-gtk_ui=no
-SUBDIRS= po oRTP mediastreamer2 coreapi console
-.endif
-
-.if ${ARCH} == "powerpc"
-BROKEN= Does not compile on powerpc
-.endif
-
-post-patch:
- @${REINPLACE_CMD} -e 's|sounds/linphone|linphone/sounds|g' \
- ${WRKSRC}/configure
- @${REINPLACE_CMD} -e '/^SUBDIRS =/s| =| ?=|g' ${WRKSRC}/Makefile.in
- @${REINPLACE_CMD} -e '/^imgdir =/s|(datadir)|(pkgdatadir)|g' \
- ${WRKSRC}/mediastreamer2/src/Makefile.in
- @${REINPLACE_CMD} -e 's|gsm/gsm\.h|gsm.h|g ; \
- s| -O2 -g ||g' ${WRKSRC}/mediastreamer2/configure
- @${REINPLACE_CMD} -e 's|gsm/gsm\.h|gsm.h|g' \
- ${WRKSRC}/mediastreamer2/src/gsm.c
-
-post-install:
-.if defined(LINPHONE_GUI)
- cd ${STAGEDIR}${PREFIX}/bin && \
- ${LN} -sf linphone-3 linphone
- ${INSTALL_MAN} ${WRKSRC}/share/C/linphone.1 \
- ${STAGEDIR}${MANPREFIX}/man/man1
- ${INSTALL_DATA} ${WRKSRC}/share/linphone.desktop \
- ${STAGEDIR}${PREFIX}/share/applications
-.else
- @${MKDIR} ${STAGEDIR}${DATADIR}/sounds/rings
- ${INSTALL_MAN} \
- ${WRKSRC}/share/C/linphonec.1 \
- ${WRKSRC}/share/C/linphonecsh.1 \
- ${WRKSRC}/share/C/sipomatic.1 \
- ${STAGEDIR}${MANPREFIX}/man/man1
- ${INSTALL_DATA} ${WRKSRC}/share/linphone.pc \
- ${STAGEDIR}${PREFIX}/libdata/pkgconfig
- ${INSTALL_DATA} ${WRKSRC}/share/*.wav \
- ${STAGEDIR}${DATADIR}/sounds
- ${INSTALL_DATA} ${WRKSRC}/share/rings/*.wav \
- ${STAGEDIR}${DATADIR}/sounds/rings
-.endif
-
-.include <bsd.port.mk>
diff --git a/net/linphone-base/distinfo b/net/linphone-base/distinfo
deleted file mode 100644
index 78dd107004bc..000000000000
--- a/net/linphone-base/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (linphone-3.2.1.tar.gz) = b34bf066e07895b4d7b51a4a64e2a7524ab1cb755c996ef208293228c7bc4e69
-SIZE (linphone-3.2.1.tar.gz) = 7906185
diff --git a/net/linphone-base/files/patch-coreapi_linphonecore.c b/net/linphone-base/files/patch-coreapi_linphonecore.c
deleted file mode 100644
index a14aa6d58328..000000000000
--- a/net/linphone-base/files/patch-coreapi_linphonecore.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- coreapi/linphonecore.c.orig 2009-09-19 13:56:58.000000000 -0300
-+++ coreapi/linphonecore.c 2009-09-19 13:58:01.000000000 -0300
-@@ -31,11 +31,9 @@
- #include "exevents.h"
-
-
--#ifdef INET6
- #ifndef WIN32
- #include <netdb.h>
- #endif
--#endif
-
- #ifdef WIN32
- #define HAVE_EXOSIP_GET_VERSION 1
diff --git a/net/linphone-base/files/patch-gtk-glade_Makefile.in b/net/linphone-base/files/patch-gtk-glade_Makefile.in
deleted file mode 100644
index e8182602f871..000000000000
--- a/net/linphone-base/files/patch-gtk-glade_Makefile.in
+++ /dev/null
@@ -1,41 +0,0 @@
---- gtk-glade/Makefile.in.orig 2009-09-18 20:07:22.000000000 -0300
-+++ gtk-glade/Makefile.in 2009-09-18 20:38:19.000000000 -0300
-@@ -77,9 +77,6 @@
- @BUILD_GLADE_UI_TRUE@@BUILD_WIN32_TRUE@am__DEPENDENCIES_2 = \
- @BUILD_GLADE_UI_TRUE@@BUILD_WIN32_TRUE@ linphone.res
- @BUILD_GLADE_UI_TRUE@linphone_3_DEPENDENCIES = \
--@BUILD_GLADE_UI_TRUE@ $(top_builddir)/oRTP/src/libortp.la \
--@BUILD_GLADE_UI_TRUE@ $(top_builddir)/mediastreamer2/src/libmediastreamer.la \
--@BUILD_GLADE_UI_TRUE@ $(top_builddir)/coreapi/liblinphone.la \
- @BUILD_GLADE_UI_TRUE@ $(am__DEPENDENCIES_1) \
- @BUILD_GLADE_UI_TRUE@ $(am__DEPENDENCIES_1) \
- @BUILD_GLADE_UI_TRUE@ $(am__DEPENDENCIES_1) \
-@@ -335,9 +332,9 @@
- @BUILD_GLADE_UI_TRUE@ linphone.h
-
- @BUILD_GLADE_UI_TRUE@linphone_3_LDADD = \
--@BUILD_GLADE_UI_TRUE@ $(top_builddir)/oRTP/src/libortp.la \
--@BUILD_GLADE_UI_TRUE@ $(top_builddir)/mediastreamer2/src/libmediastreamer.la \
--@BUILD_GLADE_UI_TRUE@ $(top_builddir)/coreapi/liblinphone.la \
-+@BUILD_GLADE_UI_TRUE@ `$(PKG_CONFIG) --libs ortp` \
-+@BUILD_GLADE_UI_TRUE@ `$(PKG_CONFIG) --libs mediastreamer` \
-+@BUILD_GLADE_UI_TRUE@ `$(PKG_CONFIG) --libs linphone` \
- @BUILD_GLADE_UI_TRUE@ $(LIBGTK_LIBS) $(INTLLIBS) \
- @BUILD_GLADE_UI_TRUE@ $(LIBGLADE_LIBS) $(am__append_1)
- @BUILD_GLADE_UI_TRUE@@BUILD_WIN32_FALSE@linphone_3_LDFLAGS = -export-dynamic
-@@ -349,10 +346,12 @@
-
- #gtk-linphone.ui: gtk-linphone.glade
- # gtk-builder-convert gtk-linphone.glade $@
--AM_CFLAGS = -DIN_LINPHONE -I$(top_srcdir)/coreapi/ \
-- -I$(top_srcdir)/mediastreamer2/include/ \
-+AM_CFLAGS = -DIN_LINPHONE \
-+ `$(PKG_CONFIG) --cflags ortp` \
-+ `$(PKG_CONFIG) --cflags mediastreamer` \
-+ `$(PKG_CONFIG) --cflags linphone` \
- $(LIBGLADE_CFLAGS) $(STRICT_OPTIONS) $(LIBGTK_CFLAGS) $(IPV6_CFLAGS) \
-- $(ORTP_CFLAGS) $(OSIP_CFLAGS)
-+ $(OSIP_CFLAGS)
-
- CLEANFILES = version_date.h
- all: $(BUILT_SOURCES)
diff --git a/net/linphone-base/files/patch-mediastreamer2_src_dsptools.c b/net/linphone-base/files/patch-mediastreamer2_src_dsptools.c
deleted file mode 100644
index 971aaefeb424..000000000000
--- a/net/linphone-base/files/patch-mediastreamer2_src_dsptools.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- mediastreamer2/src/dsptools.c.orig 2009-09-19 14:00:35.000000000 -0300
-+++ mediastreamer2/src/dsptools.c 2009-09-19 14:01:21.000000000 -0300
-@@ -56,10 +56,6 @@
-
- #ifdef HAVE_ALLOCA_H
- #include <alloca.h>
--#else
--#if !defined(__APPLE__)
--#include <malloc.h>
--#endif
- #endif
-
- #define ALLOC(var,size,type) var = alloca(sizeof(type)*(size))
diff --git a/net/linphone-base/files/patch-mediastreamer2_src_ice.c b/net/linphone-base/files/patch-mediastreamer2_src_ice.c
deleted file mode 100644
index c2532e91fc37..000000000000
--- a/net/linphone-base/files/patch-mediastreamer2_src_ice.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- mediastreamer2/src/ice.c.orig 2007-10-18 22:05:10.000000000 +0200
-+++ mediastreamer2/src/ice.c 2008-03-31 10:12:57.000000000 +0200
-@@ -18,9 +18,7 @@
- */
-
- #if !defined(WIN32) && !defined(_WIN32_WCE)
--#ifdef __APPLE__
- #include <sys/types.h>
--#endif
- #include <sys/socket.h>
- #include <netdb.h>
- #endif
diff --git a/net/linphone-base/files/patch-oRTP-src_stun.c b/net/linphone-base/files/patch-oRTP-src_stun.c
deleted file mode 100644
index 68ce7543775c..000000000000
--- a/net/linphone-base/files/patch-oRTP-src_stun.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- oRTP/src/stun.c.orig 2008-06-24 14:21:05.000000000 +0000
-+++ oRTP/src/stun.c 2008-06-24 14:21:47.000000000 +0000
-@@ -770,7 +770,7 @@
- asm("rdtsc" : "=A" (tick));
- #elif defined (__SUNPRO_CC) && defined( __sparc__ )
- tick = gethrtime();
--#elif defined(__MACH__)
-+#elif defined(__MACH__) || defined(__sparc64__)
- {
- int fd=open("/dev/random",O_RDONLY);
- read(fd,&tick,sizeof(tick));
diff --git a/net/linphone-base/pkg-descr b/net/linphone-base/pkg-descr
deleted file mode 100644
index 7a7127bc4a73..000000000000
--- a/net/linphone-base/pkg-descr
+++ /dev/null
@@ -1,7 +0,0 @@
-Linphone is a web phone: it let you phone to your friends anywhere in the
-whole world, freely, simply by using the internet. The cost of the phone call
-is the cost that you spend connected to the internet.
-
-This package includes libraries, headers and console frontend.
-
-WWW: http://www.linphone.org/
diff --git a/net/linphone-base/pkg-descr.gui b/net/linphone-base/pkg-descr.gui
deleted file mode 100644
index 7f27da8a73e1..000000000000
--- a/net/linphone-base/pkg-descr.gui
+++ /dev/null
@@ -1,7 +0,0 @@
-Linphone is a web phone: it let you phone to your friends anywhere in the
-whole world, freely, simply by using the internet. The cost of the phone call
-is the cost that you spend connected to the internet.
-
-This package includes graphical frontend and panel applet for Gnome.
-
-WWW: http://www.linphone.org/
diff --git a/net/linphone-base/pkg-plist b/net/linphone-base/pkg-plist
deleted file mode 100644
index c0c33d24b316..000000000000
--- a/net/linphone-base/pkg-plist
+++ /dev/null
@@ -1,97 +0,0 @@
-bin/linphonec
-bin/linphonecsh
-bin/sipomatic
-include/linphone/config.h
-include/linphone/linphonecore.h
-include/linphone/lpconfig.h
-include/linphone/sipsetup.h
-include/mediastreamer2/allfilters.h
-include/mediastreamer2/dtmfgen.h
-include/mediastreamer2/dsptools.h
-include/mediastreamer2/ice.h
-include/mediastreamer2/mediastream.h
-include/mediastreamer2/mscommon.h
-include/mediastreamer2/msequalizer.h
-include/mediastreamer2/msfileplayer.h
-include/mediastreamer2/msfilerec.h
-include/mediastreamer2/msfilter.h
-include/mediastreamer2/msqueue.h
-include/mediastreamer2/msrtp.h
-include/mediastreamer2/mssndcard.h
-include/mediastreamer2/msspeexec.h
-include/mediastreamer2/mstee.h
-include/mediastreamer2/msticker.h
-include/mediastreamer2/msv4l.h
-include/mediastreamer2/msvideo.h
-include/mediastreamer2/msvideoout.h
-include/mediastreamer2/msvolume.h
-include/mediastreamer2/mswebcam.h
-include/mediastreamer2/rfc3984.h
-include/mediastreamer2/waveheader.h
-include/ortp/b64.h
-include/ortp/event.h
-include/ortp/ortp.h
-include/ortp/payloadtype.h
-include/ortp/port.h
-include/ortp/rtcp.h
-include/ortp/rtp.h
-include/ortp/rtpsession.h
-include/ortp/rtpsignaltable.h
-include/ortp/sessionset.h
-include/ortp/srtp.h
-include/ortp/str_utils.h
-include/ortp/stun.h
-include/ortp/stun_udp.h
-include/ortp/telephonyevents.h
-lib/liblinphone.a
-lib/liblinphone.la
-lib/liblinphone.so
-lib/liblinphone.so.5
-lib/libmediastreamer.a
-lib/libmediastreamer.la
-lib/libmediastreamer.so
-lib/libmediastreamer.so.0
-lib/libortp.a
-lib/libortp.la
-lib/libortp.so
-lib/libortp.so.8
-libdata/pkgconfig/linphone.pc
-libdata/pkgconfig/mediastreamer.pc
-libdata/pkgconfig/ortp.pc
-libexec/mediastream
-man/man1/linphonec.1.gz
-man/man1/linphonecsh.1.gz
-man/man1/sipomatic.1.gz
-%%DATADIR%%/sounds/hello16000.wav
-%%DATADIR%%/sounds/hello8000.wav
-%%DATADIR%%/sounds/ringback.wav
-%%DATADIR%%/sounds/rings/bigben.wav
-%%DATADIR%%/sounds/rings/oldphone.wav
-%%DATADIR%%/sounds/rings/orig.wav
-%%DATADIR%%/sounds/rings/rock.wav
-%%DATADIR%%/sounds/rings/sweet.wav
-%%DATADIR%%/sounds/rings/synth.wav
-%%DATADIR%%/sounds/rings/tapping.wav
-%%DATADIR%%/sounds/rings/toy.wav
-%%NLS%%share/locale/cs/LC_MESSAGES/linphone.mo
-%%NLS%%share/locale/de/LC_MESSAGES/linphone.mo
-%%NLS%%share/locale/es/LC_MESSAGES/linphone.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/linphone.mo
-%%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/nl/LC_MESSAGES/linphone.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/linphone.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/linphone.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/linphone.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/linphone.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/linphone.mo
-share/mediastreamer/images/nowebcamCIF.jpg
-@dirrm share/mediastreamer/images
-@dirrm share/mediastreamer
-@dirrm %%DATADIR%%/sounds/rings
-@dirrm %%DATADIR%%/sounds
-@dirrm %%DATADIR%%
-@dirrm include/ortp
-@dirrm include/mediastreamer2
-@dirrm include/linphone
diff --git a/net/linphone-base/pkg-plist.gui b/net/linphone-base/pkg-plist.gui
deleted file mode 100644
index 67110982ad42..000000000000
--- a/net/linphone-base/pkg-plist.gui
+++ /dev/null
@@ -1,37 +0,0 @@
-bin/linphone
-bin/linphone-3
-man/man1/libphone.1.gz
-share/applications/linphone.desktop
-%%DATADIR%%/COPYING
-%%DATADIR%%/about.glade
-%%DATADIR%%/buddylookup.glade
-%%DATADIR%%/call_logs.glade
-%%DATADIR%%/chatroom.glade
-%%DATADIR%%/contact.glade
-%%DATADIR%%/incoming_call.glade
-%%DATADIR%%/linphone.png
-%%DATADIR%%/linphone2.png
-%%DATADIR%%/log.glade
-%%DATADIR%%/main.glade
-%%DATADIR%%/parameters.glade
-%%DATADIR%%/password.glade
-%%DATADIR%%/sip_account.glade
-%%DATADIR%%/stock_people.png
-%%DATADIR%%/waiting.glade
-share/pixmaps/linphone/green.png
-share/pixmaps/linphone/linphone.png
-share/pixmaps/linphone/linphone2.png
-share/pixmaps/linphone/linphone2.xpm
-share/pixmaps/linphone/mic_active.png
-share/pixmaps/linphone/mic_muted.png
-share/pixmaps/linphone/red.png
-share/pixmaps/linphone/sip-away.png
-share/pixmaps/linphone/sip-bifm.png
-share/pixmaps/linphone/sip-busy.png
-share/pixmaps/linphone/sip-closed.png
-share/pixmaps/linphone/sip-online.png
-share/pixmaps/linphone/sip-otl.png
-share/pixmaps/linphone/sip-otp.png
-share/pixmaps/linphone/sip-wfa.png
-@dirrm share/pixmaps/linphone
-@dirrmtry %%DATADIR%%
diff --git a/net/linphone/Makefile b/net/linphone/Makefile
new file mode 100644
index 000000000000..baef5ad9c026
--- /dev/null
+++ b/net/linphone/Makefile
@@ -0,0 +1,61 @@
+# $FreeBSD$
+
+PORTNAME= linphone
+PORTVERSION= 3.7.0
+PORTEPOCH= 1
+CATEGORIES= net
+MASTER_SITES= SAVANNAH/linphone/3.7.x/sources
+
+MAINTAINER= ports@FreeBSD.org
+COMMENT= SIP client supporting voice/video calls and text messaging
+
+LIB_DEPENDS= libbellesip.so:${PORTSDIR}/net/belle-sip \
+ libmediastreamer_base.so:${PORTSDIR}/net/mediastreamer \
+ libortp.so:${PORTSDIR}/net/ortp \
+ libsoup-2.4.so:${PORTSDIR}/devel/libsoup \
+ libsqlite3.so:${PORTSDIR}/databases/sqlite3
+
+CONFLICTS_INSTALL= linphone-base-[0-9]*
+
+GNU_CONFIGURE= yes
+CONFIGURE_ARGS= --disable-deplibs-link --disable-strict --disable-tutorials \
+ --enable-external-mediastreamer --enable-external-ortp \
+ --with-readline=${LOCALBASE}
+CPPFLAGS+= -I${LOCALBASE}/include
+LIBS+= -L${LOCALBASE}/lib
+INSTALL_TARGET= install-strip
+USES= gmake libtool pathfix pkgconfig readline:port
+USE_GNOME= gnomehier gtk20 intltool libxml2
+USE_LDCONFIG= yes
+
+OPTIONS_DEFINE= IPV6 NLS NOTIFY UPNP VIDEO
+OPTIONS_DEFAULT=NOTIFY UPNP VIDEO
+OPTIONS_SUB= yes
+
+IPV6_CONFIGURE_ENABLE= ipv6
+NLS_CONFIGURE_ENABLE= nls
+NLS_USES= gettext
+
+NOTIFY_CONFIGURE_ENABLE=notify
+NOTIFY_LIB_DEPENDS= libnotify.so:${PORTSDIR}/devel/libnotify
+
+UPNP_CONFIGURE_ENABLE= upnp
+UPNP_LIB_DEPENDS= libupnp.so:${PORTSDIR}/devel/upnp
+
+VIDEO_CONFIGURE_ENABLE= video
+
+.if defined(WITH_DEBUG) && !defined(WITHOUT_DEBUG)
+CONFIGURE_ARGS+=--enable-debug
+.endif
+
+post-patch:
+ @${REINPLACE_CMD} '/linphonec_LDADD =/s/=/= $$(MEDIASTREAMER_LIBS)/' \
+ ${WRKSRC}/console/Makefile.in
+ @${REINPLACE_CMD} '/linphone_LDADD =/s/=/= $$(MEDIASTREAMER_LIBS)/' \
+ ${WRKSRC}/gtk/Makefile.in
+.for l in C fr it ja
+ @${REINPLACE_CMD} '/^install-data-local:/,/^$$/d' \
+ ${WRKSRC}/share/$l/Makefile.in
+.endfor
+
+.include <bsd.port.mk>
diff --git a/net/linphone/distinfo b/net/linphone/distinfo
new file mode 100644
index 000000000000..e85094e3cded
--- /dev/null
+++ b/net/linphone/distinfo
@@ -0,0 +1,2 @@
+SHA256 (linphone-3.7.0.tar.gz) = ff792b1cfc132fc4a54ae6c861c99d4139ec6f4b8ff4092ea2ce1e19d44c151c
+SIZE (linphone-3.7.0.tar.gz) = 12090691
diff --git a/net/linphone/files/patch-configure b/net/linphone/files/patch-configure
new file mode 100644
index 000000000000..d97d2dd4c993
--- /dev/null
+++ b/net/linphone/files/patch-configure
@@ -0,0 +1,24 @@
+--- configure.orig
++++ configure
+@@ -19486,12 +19486,6 @@
+ ;;
+ esac
+
+-case "$host_os" in
+- *freebsd*)
+- LDFLAGS="$LDFLAGS -pthread"
+- ;;
+-esac
+-
+ case "$host_cpu" in
+ *arm*)
+
+@@ -20993,7 +20987,7 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+
+- SQLITE3_CFLAGS+="-DMSG_STORAGE_ENABLED"
++ SQLITE3_CFLAGS="$SQLITE3_CFLAGS -DMSG_STORAGE_ENABLED"
+
+
+ enable_msg_storage=true
diff --git a/net/linphone/files/patch-coreapi__presence.c b/net/linphone/files/patch-coreapi__presence.c
new file mode 100644
index 000000000000..95829fe4a610
--- /dev/null
+++ b/net/linphone/files/patch-coreapi__presence.c
@@ -0,0 +1,11 @@
+--- coreapi/presence.c.orig
++++ coreapi/presence.c
+@@ -167,7 +167,7 @@
+ ms_error("mktime() failed: %s", strerror(errno));
+ return (time_t)-1;
+ }
+- return seconds - timezone;
++ return seconds;
+ }
+
+ static char * timestamp_to_string(time_t timestamp) {
diff --git a/net/linphone/pkg-descr b/net/linphone/pkg-descr
new file mode 100644
index 000000000000..3a4719dcfa10
--- /dev/null
+++ b/net/linphone/pkg-descr
@@ -0,0 +1,11 @@
+Linphone is an internet phone or Voice Over IP phone (VoIP).
+
+* With linphone you can communicate freely with people over the internet,
+ with voice, video, and text instant messaging
+* Linphone makes use of the SIP protocol, an open standard for internet
+ telephony. You can use Linphone with any SIP VoIP operator, including
+ the free SIP audio/video service provided by www.linphone.org
+* Linphone is available for desktop computers: Linux, Windows, MacOSX, and
+ for mobile phones: Android, iPhone, Blackberry
+
+WWW: http://www.linphone.org/
diff --git a/net/linphone/pkg-plist b/net/linphone/pkg-plist
new file mode 100644
index 000000000000..1a5ba6dbcf89
--- /dev/null
+++ b/net/linphone/pkg-plist
@@ -0,0 +1,121 @@
+bin/linphone
+bin/linphonec
+bin/linphonecsh
+bin/lp-gen-wrappers
+bin/lpc2xml_test
+bin/xml2lpc_test
+include/linphone/event.h
+include/linphone/linphonecore.h
+include/linphone/linphonecore_utils.h
+include/linphone/linphonefriend.h
+include/linphone/linphonepresence.h
+include/linphone/lpc2xml.h
+include/linphone/lpconfig.h
+include/linphone/sipsetup.h
+include/linphone/xml2lpc.h
+lib/liblinphone.so
+lib/liblinphone.so.6
+lib/liblinphone.so.6.0.0
+libdata/pkgconfig/linphone.pc
+man/cs/man1/linphone.1.gz
+man/cs/man1/linphonec.1.gz
+man/cs/man1/sipomatic.1.gz
+man/man1/linphone.1.gz
+man/man1/linphonec.1.gz
+man/man1/linphonecsh.1.gz
+man/man1/sipomatic.1.gz
+share/applications/linphone.desktop
+%%DATADIR%%/COPYING
+%%DATADIR%%/about.ui
+%%DATADIR%%/buddylookup.ui
+%%DATADIR%%/call_logs.ui
+%%DATADIR%%/call_statistics.ui
+%%DATADIR%%/config-uri.ui
+%%DATADIR%%/contact.ui
+%%DATADIR%%/dscp_settings.ui
+%%DATADIR%%/keypad.ui
+%%DATADIR%%/ldap.ui
+%%DATADIR%%/log.ui
+%%DATADIR%%/main.ui
+%%DATADIR%%/parameters.ui
+%%DATADIR%%/password.ui
+%%DATADIR%%/provisioning-fetch.ui
+%%DATADIR%%/rootca.pem
+%%DATADIR%%/sip_account.ui
+%%DATADIR%%/stock_people.png
+%%DATADIR%%/tunnel_config.ui
+%%DATADIR%%/waiting.ui
+%%NLS%%share/locale/cs/LC_MESSAGES/linphone.mo
+%%NLS%%share/locale/de/LC_MESSAGES/linphone.mo
+%%NLS%%share/locale/es/LC_MESSAGES/linphone.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/linphone.mo
+%%NLS%%share/locale/he/LC_MESSAGES/linphone.mo
+%%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/nb_NO/LC_MESSAGES/linphone.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/linphone.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/linphone.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/linphone.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/linphone.mo
+%%NLS%%share/locale/sr/LC_MESSAGES/linphone.mo
+%%NLS%%share/locale/sv/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/ringback.wav
+share/sounds/linphone/rings/bigben.wav
+share/sounds/linphone/rings/oldphone-mono-30s.caf
+share/sounds/linphone/rings/oldphone-mono.wav
+share/sounds/linphone/rings/oldphone.wav
+share/sounds/linphone/rings/orig.wav
+share/sounds/linphone/rings/rock.wav
+share/sounds/linphone/rings/sweet.wav
+share/sounds/linphone/rings/synth.wav
+share/sounds/linphone/rings/tapping.wav
+share/sounds/linphone/rings/toy-mono.wav
+@dirrm include/linphone
+@dirrmtry man/cs/man1
+@dirrmtry man/cs
+@dirrm %%DATADIR%%
+@dirrmtry share/locale/nb_NO/LC_MESSAGES
+@dirrmtry share/locale/nb_NO
+@dirrm share/pixmaps/linphone
+@dirrm share/sounds/linphone/rings
+@dirrm share/sounds/linphone
diff --git a/net/mediastreamer/Makefile b/net/mediastreamer/Makefile
index 20f7eccc0c88..dfb6015d9206 100644
--- a/net/mediastreamer/Makefile
+++ b/net/mediastreamer/Makefile
@@ -15,6 +15,8 @@ LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libortp.so:${PORTSDIR}/net/ortp
+CONFLICTS_INSTALL= linphone-base-[0-9]*
+
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-alsa --disable-glx --disable-pulseaudio \
--disable-silent-rules --disable-strict \
diff --git a/net/ortp/Makefile b/net/ortp/Makefile
index 602de917eff2..56acc143acbb 100644
--- a/net/ortp/Makefile
+++ b/net/ortp/Makefile
@@ -12,6 +12,8 @@ COMMENT= Real-time Transport Protocol (RTP) library
LICENSE= LGPL21
LICENSE_FILE= ${WRKSRC}/COPYING
+CONFLICTS_INSTALL= linphone-base-[0-9]*
+
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-silent-rules --disable-strict
CPPFLAGS+= -DHAVE_DEV_RANDOM