10 files changed, 82 insertions, 72 deletions

diff --git a/net/linphone-base/Makefile b/net/linphone-base/Makefile
index 2b81e12e29a4..80276fb0e05d 100644
--- a/net/linphone-base/Makefile
+++ b/net/linphone-base/Makefile
@@ -6,12 +6,12 @@
 #
 
 PORTNAME=	linphone
-PORTVERSION=	3.1.2
+PORTVERSION=	3.2.0
 PORTEPOCH=	1
 CATEGORIES?=	net
 MASTER_SITES=	SAVANNAH/${PORTNAME}/stable/sources
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	scjamorim@bsd.com.br
 COMMENT=	A web phone that supports SIP protocol
 
 LIB_DEPENDS=	gsm.1:${PORTSDIR}/audio/gsm \
@@ -45,8 +45,8 @@ PLIST_SUB+=	NLS=""
 .endif
 
 .if defined(LINPHONE_GUI)
-BUILD_DEPENDS+=	linphone-base>=3.1.2:${PORTSDIR}/net/linphone-base
-RUN_DEPENDS+=	linphone-base>=3.1.2:${PORTSDIR}/net/linphone-base
+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
diff --git a/net/linphone-base/distinfo b/net/linphone-base/distinfo
index f1b41a778f92..def027a3898e 100644
--- a/net/linphone-base/distinfo
+++ b/net/linphone-base/distinfo
@@ -1,3 +1,3 @@
-MD5 (linphone-3.1.2.tar.gz) = f0a6e48a2b3cf276f78f8499444be732
-SHA256 (linphone-3.1.2.tar.gz) = 2e676f2bc6aeed7753458079355fc64362c75b530913e9226cd4abd9257cbf17
-SIZE (linphone-3.1.2.tar.gz) = 7732132
+MD5 (linphone-3.2.0.tar.gz) = e5b99322b0de6e8ae4a22eb27fb56b77
+SHA256 (linphone-3.2.0.tar.gz) = f7b8db970e20898f5cefb8bb9a5133ebb3064d6d466301241e659d93e52e6cef
+SIZE (linphone-3.2.0.tar.gz) = 7880590
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 4052275f335a..000000000000
--- a/net/linphone-base/files/patch-coreapi::linphonecore.c
+++ /dev/null
@@ -1,23 +0,0 @@
---- coreapi/linphonecore.c.orig	2009-03-10 00:22:47.000000000 +0900
-+++ coreapi/linphonecore.c	2009-03-26 01:38:40.000000000 +0900
-@@ -29,11 +29,9 @@
- #include "exevents.h"
- 
- 
--#ifdef INET6  
- #ifndef WIN32
- #include <netdb.h>  
- #endif
--#endif
- 
- #ifdef WIN32
- #define HAVE_EXOSIP_GET_VERSION 1
-@@ -341,7 +339,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-coreapi_linphonecore.c b/net/linphone-base/files/patch-coreapi_linphonecore.c
new file mode 100644
index 000000000000..a14aa6d58328
--- /dev/null
+++ b/net/linphone-base/files/patch-coreapi_linphonecore.c
@@ -0,0 +1,14 @@
+--- 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
new file mode 100644
index 000000000000..e8182602f871
--- /dev/null
+++ b/net/linphone-base/files/patch-gtk-glade_Makefile.in
@@ -0,0 +1,41 @@
+--- 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-gtk-glade__Makefile.in b/net/linphone-base/files/patch-gtk-glade__Makefile.in
deleted file mode 100644
index 861c472c5847..000000000000
--- a/net/linphone-base/files/patch-gtk-glade__Makefile.in
+++ /dev/null
@@ -1,41 +0,0 @@
---- gtk-glade/Makefile.in.orig	2009-03-17 21:12:10.000000000 +0900
-+++ gtk-glade/Makefile.in	2009-03-17 21:17:21.000000000 +0900
-@@ -69,9 +69,6 @@
- linphone_3_OBJECTS = $(am_linphone_3_OBJECTS)
- am__DEPENDENCIES_1 =
- @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)
-@@ -315,9 +312,9 @@
- @BUILD_GLADE_UI_TRUE@			buddylookup.c \
- @BUILD_GLADE_UI_TRUE@			linphone.h
- 
--@BUILD_GLADE_UI_TRUE@linphone_3_LDADD = $(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@linphone_3_LDADD = `$(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)
- 
-@@ -329,10 +326,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) 
- 
- all: all-am
- 
diff --git a/net/linphone-base/files/patch-mediastreamer2_src_dsptools.c b/net/linphone-base/files/patch-mediastreamer2_src_dsptools.c
new file mode 100644
index 000000000000..971aaefeb424
--- /dev/null
+++ b/net/linphone-base/files/patch-mediastreamer2_src_dsptools.c
@@ -0,0 +1,13 @@
+--- 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
index c2532e91fc37..c2532e91fc37 100644
--- a/net/linphone-base/files/patch-mediastreamer2__src__ice.c
+++ b/net/linphone-base/files/patch-mediastreamer2_src_ice.c
diff --git a/net/linphone-base/pkg-plist b/net/linphone-base/pkg-plist
index ce20e4e38ede..569fd95ceb06 100644
--- a/net/linphone-base/pkg-plist
+++ b/net/linphone-base/pkg-plist
@@ -7,15 +7,18 @@ 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
@@ -43,7 +46,7 @@ include/ortp/telephonyevents.h
 lib/liblinphone.a
 lib/liblinphone.la
 lib/liblinphone.so
-lib/liblinphone.so.4
+lib/liblinphone.so.5
 lib/libmediastreamer.a
 lib/libmediastreamer.la
 lib/libmediastreamer.so
diff --git a/net/linphone-base/pkg-plist.gui b/net/linphone-base/pkg-plist.gui
index 4a0654f93ec5..6153db4df0e4 100644
--- a/net/linphone-base/pkg-plist.gui
+++ b/net/linphone-base/pkg-plist.gui
@@ -1,6 +1,7 @@
 bin/linphone
 bin/linphone-3
 share/applications/linphone.desktop
+%%DATADIR%%/COPYING
 %%DATADIR%%/about.glade
 %%DATADIR%%/buddylookup.glade
 %%DATADIR%%/call_logs.glade
@@ -16,9 +17,11 @@ share/applications/linphone.desktop
 %%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/red.png
 share/pixmaps/linphone/sip-away.png
 share/pixmaps/linphone/sip-bifm.png
 share/pixmaps/linphone/sip-busy.png