- Update to 2.1.1

PR:		121089
Submitted by:	Ports Fury

7 files changed, 81 insertions, 89 deletions

diff --git a/net/linphone-base/Makefile b/net/linphone-base/Makefile
index f5652ecc3053..c80da0c894ba 100644
--- a/net/linphone-base/Makefile
+++ b/net/linphone-base/Makefile
@@ -6,42 +6,31 @@
 #
 
 PORTNAME=	linphone
-PORTVERSION=	1.7.1
-PORTREVISION=	2
+PORTVERSION=	2.1.1
 PORTEPOCH=	1
 CATEGORIES?=	net
-MASTER_SITES=	${MASTER_SITE_SAVANNAH:S/$/:linphone/} \
-		${MASTER_SITE_GNU:S/$/:libosip2/}
-MASTER_SITE_SUBDIR=	${PORTNAME}/stable/sources/:linphone \
-			osip/:libosip2
-DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}:linphone \
-		libosip2-2.2.2${EXTRACT_SUFX}:libosip2
+MASTER_SITES=	SAVANNAH/${PORTNAME}/stable/sources
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A web phone that supports SIP protocol
 
-LIB_DEPENDS=	jack.0:${PORTSDIR}/audio/jack \
-		samplerate.1:${PORTSDIR}/audio/libsamplerate \
-		portaudio.0:${PORTSDIR}/audio/portaudio \
+LIB_DEPENDS=	gsm.1:${PORTSDIR}/audio/gsm \
 		speex.1:${PORTSDIR}/audio/speex \
-		osip2.3:${PORTSDIR}/net/libosip2 \
-		ortp.5:${PORTSDIR}/net/ortp
+		eXosip2.6:${PORTSDIR}/net/libexosip2
+
+CONFLICTS=	ortp-[0-9]*
 
 USE_GNOME=	glib20 gnomehack gnometarget intlhack pkgconfig
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool:15
-LIBTOOLFILES=	configure mediastreamer2/configure
+LIBTOOLFILES=	configure oRTP/configure mediastreamer2/configure
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--disable-ipv6 --disable-manual --disable-ewarning \
-		--disable-strict --disable-video --enable-external-ortp \
-		--with-osip=${LOCALBASE}
+		--disable-strict --disable-video --disable-external-ortp \
+		--with-osip=${LOCALBASE} --with-gsm=${LOCALBASE}
 MAKE_ENV=	SUBDIRS="${SUBDIRS}"
 USE_LDCONFIG=	yes
 
-CFLAGS+=	-DPACKAGE_LOCALE_DIR='\"${PREFIX}/share/locale\"' \
-		-DPACKAGE_DATA_DIR='\"${PREFIX}/share\"' \
-		-DPACKAGE_SOUND_DIR='\"${DATADIR}/sounds\"' \
-		-DHAVE_STRUCT_TIMEVAL
 CPPFLAGS=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
 LDFLAGS=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
@@ -60,7 +49,8 @@ PLIST_SUB+=	NLS=""
 .endif
 
 .if defined(LINPHONE_GUI)
-LIB_DEPENDS+=	linphone.8:${PORTSDIR}/net/linphone-base
+BUILD_DEPENDS+=	linphone-base>=2.1.1:${PORTSDIR}/net/linphone-base
+RUN_DEPENDS+=	linphone-base>=2.1.1:${PORTSDIR}/net/linphone-base
 DESCR=		${PKGDIR}/pkg-descr.gui
 PLIST=		${PKGDIR}/pkg-plist.gui
 USE_GNOME+=	gnomepanel gnomeprefix
@@ -70,20 +60,20 @@ SUBDIRS=	pixmaps gtk
 PKGNAMESUFFIX=	-base
 CONFIGURE_ARGS+=	--enable-gtk_ui=no
 MAN1=		linphonec.1 sipomatic.1
-SUBDIRS=	po gsmlib mediastreamer2 media_api exosip coreapi console
+SUBDIRS=	po oRTP mediastreamer2 media_api coreapi console
 .endif
 
 post-extract:
 	@${CP} -f ${FILESDIR}/GNOME_LinphoneApplet.xml ${WRKSRC}/gtk
-	@${LN} -sf ${WRKDIR}/libosip2-2.2.2/src/osip2/osip_negotiation.c \
-		${WRKSRC}/exosip
-	@${LN} -sf ${WRKDIR}/libosip2-2.2.2/include/osip2 \
-		${WRKSRC}/exosip
 
 post-patch:
 	@${REINPLACE_CMD} -e '/^SUBDIRS =/s| =| ?=|g' ${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e '/^imgdir =/s|(datadir)|(pkgdatadir)|g' \
 		${WRKSRC}/mediastreamer2/src/Makefile.in
+.for file in configure src/gsm.c
+	@${REINPLACE_CMD} -e 's|gsm/gsm\.h|gsm.h|g' \
+		${WRKSRC}/mediastreamer2/${file}
+.endfor 
 
 post-install:
 .if defined(LINPHONE_GUI)
diff --git a/net/linphone-base/distinfo b/net/linphone-base/distinfo
index 7fb84ab7cc19..368b9291b7d1 100644
--- a/net/linphone-base/distinfo
+++ b/net/linphone-base/distinfo
@@ -1,6 +1,3 @@
-MD5 (linphone-1.7.1.tar.gz) = 6fe246d072fad2f4a9533317ab7e9060
-SHA256 (linphone-1.7.1.tar.gz) = 3a3c606e2313f9871f07e41dfbeb87f6edb404f7927f7737fc22ab1a59a59e48
-SIZE (linphone-1.7.1.tar.gz) = 7537415
-MD5 (libosip2-2.2.2.tar.gz) = 40ee3ec89030f0d6dfdb2cf6100e6685
-SHA256 (libosip2-2.2.2.tar.gz) = 4e13febd65a2f8f18cb55151cd10f5f0888bf1e7dc2a4c0d54f39f170255de1c
-SIZE (libosip2-2.2.2.tar.gz) = 664050
+MD5 (linphone-2.1.1.tar.gz) = 130fb6048f84ee89f7c1a8a010ff1add
+SHA256 (linphone-2.1.1.tar.gz) = ae69a6fb606046bccb5bfa20726bbc054ebe25abd1865f004e6205542523184e
+SIZE (linphone-2.1.1.tar.gz) = 7662602
diff --git a/net/linphone-base/files/patch-configure b/net/linphone-base/files/patch-configure
index 30f1a49da2f5..45ad7e2e17b5 100644
--- a/net/linphone-base/files/patch-configure
+++ b/net/linphone-base/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	Tue Apr 24 13:11:35 2007
-+++ configure	Tue Apr 24 13:14:01 2007
-@@ -23874,7 +23874,7 @@
+--- configure.orig	Fri Nov 30 20:36:38 2007
++++ configure	Sun Dec  2 14:43:57 2007
+@@ -24138,7 +24138,7 @@
  echo "GTK interface compilation is disabled."
  fi
  
@@ -9,31 +9,3 @@
  
  pkg_failed=no
  { echo "$as_me:$LINENO: checking for GNOME_APPLETS" >&5
-@@ -24072,27 +24072,6 @@
- if test "x${prefix}" = "xNONE"; then
- 	prefix=${ac_default_prefix}
- fi
--
--DATADIRNAME=share
--
--cat >>confdefs.h <<_ACEOF
--#define PACKAGE_LOCALE_DIR "${prefix}/${DATADIRNAME}/locale"
--_ACEOF
--
--
--
--cat >>confdefs.h <<_ACEOF
--#define PACKAGE_DATA_DIR "${prefix}/${DATADIRNAME}"
--_ACEOF
--
--
--
--cat >>confdefs.h <<_ACEOF
--#define PACKAGE_SOUND_DIR "${prefix}/${DATADIRNAME}/sounds/linphone"
--_ACEOF
--
--
--
- 
- for ac_func in getifaddrs
- do
diff --git a/net/linphone-base/files/patch-coreapi::linphonecore.c b/net/linphone-base/files/patch-coreapi::linphonecore.c
index da6e4fbf3610..2262f2a72ea5 100644
--- a/net/linphone-base/files/patch-coreapi::linphonecore.c
+++ b/net/linphone-base/files/patch-coreapi::linphonecore.c
@@ -1,5 +1,5 @@
---- coreapi/linphonecore.c.orig	Thu Apr  5 00:19:40 2007
-+++ coreapi/linphonecore.c	Fri Apr 13 01:43:09 2007
+--- coreapi/linphonecore.c.orig	2008-02-12 20:18:04.000000000 +0900
++++ coreapi/linphonecore.c	2008-02-14 02:54:42.000000000 +0900
 @@ -29,11 +29,9 @@
  #include "exevents.h"
  
@@ -10,5 +10,14 @@
  #endif
 -#endif
  
- 
- static const char *liblinphone_version=LIBLINPHONE_VERSION;
+ #ifdef WIN32
+ #define HAVE_EXOSIP_GET_VERSION 1
+@@ -318,7 +316,7 @@
+ 	const char **devices;
+ 	int ndev;
+ 	int i;
+-#ifndef WIN32
++#ifdef __linux
+ 	/*alsadev let the user use custom alsa device within linphone*/
+ 	devid=lp_config_get_string(lc->config,"sound","alsadev",NULL);
+ 	if (devid){
diff --git a/net/linphone-base/files/patch-gtk__Makefile.in b/net/linphone-base/files/patch-gtk__Makefile.in
index f736802bf0e2..76da8c0c7e2e 100644
--- a/net/linphone-base/files/patch-gtk__Makefile.in
+++ b/net/linphone-base/files/patch-gtk__Makefile.in
@@ -1,13 +1,15 @@
---- gtk/Makefile.in.orig	Tue Apr 10 05:06:20 2007
-+++ gtk/Makefile.in	Fri Apr 13 03:49:05 2007
-@@ -73,7 +73,6 @@
+--- gtk/Makefile.in.orig	Wed Nov 21 19:04:35 2007
++++ gtk/Makefile.in	Wed Nov 21 19:06:10 2007
+@@ -73,8 +73,7 @@
+ linphone_OBJECTS = $(am_linphone_OBJECTS)
  am__DEPENDENCIES_1 =
  @BUILD_GTK_TRUE@linphone_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- @BUILD_GTK_TRUE@	$(am__DEPENDENCIES_1) \
--@BUILD_GTK_TRUE@	$(top_builddir)/coreapi/liblinphone.la \
- @BUILD_GTK_TRUE@	$(am__DEPENDENCIES_1)
+-@BUILD_GTK_TRUE@	$(am__DEPENDENCIES_1) \
+-@BUILD_GTK_TRUE@	$(top_builddir)/coreapi/liblinphone.la
++@BUILD_GTK_TRUE@	$(am__DEPENDENCIES_1)
  am__linphone_applet_SOURCES_DIST = linphone.c linphone.h gui_utils.c \
  	gui_utils.h support.c support.h interface.c interface.h \
+ 	callbacks.c callbacks.h presence.c presence.h propertybox.c \
 @@ -95,7 +94,6 @@
  linphone_applet_OBJECTS = $(am_linphone_applet_OBJECTS)
  @BUILD_GNOME_APPLET_TRUE@linphone_applet_DEPENDENCIES =  \
@@ -20,12 +22,12 @@
  @BUILD_GTK_TRUE@	$(linphone_common_sources)
  
  @BUILD_GTK_TRUE@linphone_LDADD = $(LIBGTK_LIBS) $(INTLLIBS) \
--@BUILD_GTK_TRUE@				$(top_builddir)/coreapi/liblinphone.la \
-+@BUILD_GTK_TRUE@				-llinphone \
- @BUILD_GTK_TRUE@				$(OSIP_LIBS)
+-@BUILD_GTK_TRUE@				$(top_builddir)/coreapi/liblinphone.la
++@BUILD_GTK_TRUE@				-llinphone
  
- AM_CFLAGS = $(STRICT_OPTIONS) $(LIBGTK_CFLAGS) $(IPV6_CFLAGS)	
-@@ -347,7 +345,7 @@
+ AM_CFLAGS = $(STRICT_OPTIONS) $(LIBGTK_CFLAGS) $(IPV6_CFLAGS) \
+ 		$(ORTP_CFLAGS) $(OSIP_CFLAGS)
+@@ -348,7 +346,7 @@
  @BUILD_GNOME_APPLET_TRUE@linphone_applet_CFLAGS = $(AM_CFLAGS) $(GNOME_APPLETS_CFLAGS) -DLINPHONE_APPLET
  @BUILD_GNOME_APPLET_TRUE@linphone_applet_LDADD = \
  @BUILD_GNOME_APPLET_TRUE@				$(GNOME_APPLETS_LIBS) \
diff --git a/net/linphone-base/files/patch-mediastreamer2__src__ice.c b/net/linphone-base/files/patch-mediastreamer2__src__ice.c
index e0a9cea3666c..c2532e91fc37 100644
--- a/net/linphone-base/files/patch-mediastreamer2__src__ice.c
+++ b/net/linphone-base/files/patch-mediastreamer2__src__ice.c
@@ -1,10 +1,12 @@
---- mediastreamer2/src/ice.c.orig	Fri Jan  5 06:42:59 2007
-+++ mediastreamer2/src/ice.c	Sun Feb 25 03:37:44 2007
-@@ -18,6 +18,7 @@
+--- 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)

-+#include <sys/types.h>
+ #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/pkg-plist b/net/linphone-base/pkg-plist
index c70da23afe9a..8fd1e7c04ed7 100644
--- a/net/linphone-base/pkg-plist
+++ b/net/linphone-base/pkg-plist
@@ -14,25 +14,43 @@ include/mediastreamer2/msfilter.h
 include/mediastreamer2/msqueue.h
 include/mediastreamer2/msrtp.h
 include/mediastreamer2/mssndcard.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/rfc3984.h
 include/mediastreamer2/waveheader.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.8
+lib/liblinphone.so.3
 lib/libmediastreamer.a
 lib/libmediastreamer.la
 lib/libmediastreamer.so
 lib/libmediastreamer.so.0
-lib/libquickstream.a
-lib/libquickstream.la
-lib/libquickstream.so
-lib/libquickstream.so.0
+lib/libortp.a
+lib/libortp.la
+lib/libortp.so
+lib/libortp.so.7
 libdata/pkgconfig/linphone.pc
 libdata/pkgconfig/mediastreamer.pc
+libdata/pkgconfig/ortp.pc
 libexec/mediastream
 %%DATADIR%%/sounds/hello16000.wav
 %%DATADIR%%/sounds/hello8000.wav
@@ -45,21 +63,23 @@ libexec/mediastream
 %%DATADIR%%/sounds/rings/synth.wav
 %%DATADIR%%/sounds/rings/tapping.wav
 %%DATADIR%%/sounds/rings/toy.wav
-share/mediastreamer/images/nowebcamCIF.jpg
 %%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/sv/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