23 files changed, 249 insertions, 244 deletions

diff --git a/net/linphone-base/Makefile b/net/linphone-base/Makefile
index 413a7aafaf51..a86f41ae4370 100644
--- a/net/linphone-base/Makefile
+++ b/net/linphone-base/Makefile
@@ -5,59 +5,91 @@
 # $FreeBSD$
 #
 
-PORTNAME=	${LINPHONE_PORTNAME}
-PORTVERSION=	${LINPHONE_PORTVERSION}
-PORTREVISION=	${LINPHONE_PORTREVISION}
-PORTREVISION=	${LINPHONE_PORTREVISION}
-PORTEPOCH=	${LINPHONE_PORTEPOCH}
-CATEGORIES=	net
-MASTER_SITES=	${LINPHONE_MASTER_SITES}
-PKGNAMESUFFIX=	-base
+PORTNAME=	linphone
+PORTVERSION=	1.6.0
+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
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A web phone that supports SIP protocol
 
-BROKEN=		broken by latest update to libosip2
-DEPRECATED=	${BROKEN}
-EXPIRATION_DATE=2007-01-01
-
-LIB_DEPENDS=	gsm.1:${PORTSDIR}/audio/gsm \
-		jack.0:${PORTSDIR}/audio/jack \
+LIB_DEPENDS=	jack.0:${PORTSDIR}/audio/jack \
 		samplerate.1:${PORTSDIR}/audio/libsamplerate \
 		speex.1:${PORTSDIR}/audio/speex \
 		osip2.3:${PORTSDIR}/net/libosip2
 
 USE_GNOME=	glib20 gnomehack gnometarget intlhack pkgconfig
-USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool:15
-LIBTOOLFILES=	configure oRTP/configure
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
-CONFIGURE_ARGS=	--disable-ipv6 --disable-gtk-doc --enable-gnome_ui=no \
-		--disable-ewarning --without-ilbc --disable-strict \
-		--with-speex=${LOCALBASE} --with-osip=${LOCALBASE} \
-		--with-html-dir=${DOCSDIR}
+LIBTOOLFILES=	configure mediastreamer2/configure oRTP/configure
+CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
+		PKG_CONFIG="${LOCALBASE}/bin/pkg-config"
+CONFIGURE_ARGS=	--disable-ipv6 --disable-gtk-doc --disable-ewarning \
+		--without-ilbc --disable-strict --disable-video \
+		--with-osip=${LOCALBASE}
+MAKE_ENV=	SUBDIRS="${SUBDIRS}"
 USE_LDCONFIG=	yes
 
-MAN1=		linphonec.1 sipomatic.1
-
 CFLAGS+=	-DPACKAGE_LOCALE_DIR='\"${PREFIX}/share/locale\"' \
-		-DPACKAGE_DATA_DIR='\"${PREFIX}/share\"' \
-		-DPACKAGE_SOUND_DIR='\"${DATADIR}/sounds\"'
+		-DPACKAGE_DATA_DIR='\"${PREFIX}/${DATA_PATH}\"' \
+		-DPACKAGE_SOUND_DIR='\"${DATADIR}/sounds\"' \
+		-DHAVE_STRUCT_TIMEVAL
 CPPFLAGS=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
 LDFLAGS=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
-.include "Makefile.common"
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 600000
 LIB_DEPENDS+=	readline.[5-9]:${PORTSDIR}/devel/readline
 .endif
 
+.if defined(WITHOUT_NLS)
+CONFIGURE_ARGS+=	--disable-nls
+PLIST_SUB+=	NLS="@comment "
+.else
+USE_GETTEXT=	yes
+PLIST_SUB+=	NLS=""
+LDFLAGS+=	-lintl
+.endif
+
+.if defined(LINPHONE_GUI)
+LIB_DEPENDS+=	linphone.7:${PORTSDIR}/net/linphone-base
+DESCR=		${PKGDIR}/pkg-descr.gui
+PLIST=		${PKGDIR}/pkg-plist.gui
+USE_GNOME+=	gnomepanel gnomeprefix
+MAN1=		linphone.1
+DATA_PATH=	share/gnome
+SUBDIRS=	pixmaps gnome
+.else
+PKGNAMESUFFIX=	-base
+CONFIGURE_ARGS+=	--enable-gnome_ui=no
+MAN1=		linphonec.1 sipomatic.1
+DATA_PATH=	share
+SUBDIRS=	po oRTP gsmlib mediastreamer2 media_api exosip coreapi console
+.endif
+
+post-extract:
+	@${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 '/^SUBDIRS =/s|docs||g' ${WRKSRC}/oRTP/Makefile.in
 
 post-install:
+.if defined(LINPHONE_GUI)
+	${INSTALL_MAN} ${WRKSRC}/share/C/linphone.1 ${MANPREFIX}/man/man1
+	${INSTALL_DATA} ${WRKSRC}/share/linphone.desktop \
+		${PREFIX}/share/gnome/applications
+.else
 	${INSTALL_MAN} ${WRKSRC}/share/C/linphonec.1 ${MANPREFIX}/man/man1
 	${INSTALL_MAN} ${WRKSRC}/share/C/sipomatic.1 ${MANPREFIX}/man/man1
 	${INSTALL_DATA} ${WRKSRC}/share/linphone.pc ${PREFIX}/libdata/pkgconfig
@@ -65,5 +97,6 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/share/*.wav ${DATADIR}/sounds
 	@${MKDIR} ${DATADIR}/sounds/rings
 	${INSTALL_DATA} ${WRKSRC}/share/rings/*.wav ${DATADIR}/sounds/rings
+.endif
 
 .include <bsd.port.post.mk>
diff --git a/net/linphone-base/Makefile.common b/net/linphone-base/Makefile.common
deleted file mode 100644
index 2b7c2a7fc832..000000000000
--- a/net/linphone-base/Makefile.common
+++ /dev/null
@@ -1,12 +0,0 @@
-#
-# $FreeBSD$
-#
-
-LINPHONE_PORTNAME=	linphone
-LINPHONE_PORTVERSION=	1.3.5
-LINPHONE_PORTREVISION=	1
-LINPHONE_PORTEPOCH=	1
-LINPHONE_MASTER_SITES=	http://simon.morlat.free.fr/download/stable/source/
-
-PATCHDIR=	${.CURDIR}/../../net/linphone-base/files
-MD5_FILE=	${.CURDIR}/../../net/linphone-base/distinfo
diff --git a/net/linphone-base/distinfo b/net/linphone-base/distinfo
index 248ffec5d4ff..8784660c502a 100644
--- a/net/linphone-base/distinfo
+++ b/net/linphone-base/distinfo
@@ -1,3 +1,6 @@
-MD5 (linphone-1.3.5.tar.gz) = 522b08a22c5e1de281676cddd3f2bcf6
-SHA256 (linphone-1.3.5.tar.gz) = b1036fde820c928b877a7065a8e396a7aaf262df125da96c6f6b56f02097a1f3
-SIZE (linphone-1.3.5.tar.gz) = 7411961
+MD5 (linphone-1.6.0.tar.gz) = fb345125e23c787df0818ff7caad5515
+SHA256 (linphone-1.6.0.tar.gz) = ba1c32207fd62d374c9397a81fb1247da93edb859e30d0d855dc65e5457f690b
+SIZE (linphone-1.6.0.tar.gz) = 7720841
+MD5 (libosip2-2.2.2.tar.gz) = 40ee3ec89030f0d6dfdb2cf6100e6685
+SHA256 (libosip2-2.2.2.tar.gz) = 4e13febd65a2f8f18cb55151cd10f5f0888bf1e7dc2a4c0d54f39f170255de1c
+SIZE (libosip2-2.2.2.tar.gz) = 664050
diff --git a/net/linphone-base/files/patch-Makefile.in b/net/linphone-base/files/patch-Makefile.in
deleted file mode 100644
index 4bd60b8d785c..000000000000
--- a/net/linphone-base/files/patch-Makefile.in
+++ /dev/null
@@ -1,16 +0,0 @@
---- Makefile.in.orig	Tue Apr  4 17:18:50 2006
-+++ Makefile.in	Wed Apr  5 12:43:31 2006
-@@ -289,9 +289,11 @@
- 
- # let make re-run automake upon need
- ACLOCAL_AMFLAGS = -I m4
--SUBDIRS = m4 support pixmaps po ipkg oRTP gsmlib lpc10-1.5 \
-+ifndef SUBDIRS
-+SUBDIRS = m4 support po ipkg oRTP lpc10-1.5 \
-                 $(WIN32ACM_DIR) mediastreamer mediastreamer2\
--		media_api exosip coreapi console gnome share developer-docs
-+		media_api exosip coreapi console gnome developer-docs
-+endif
- 
- EXTRA_DIST = linphone2.glade BUGS linphone.kdevprj \
- 				intltool-extract.in	\
diff --git a/net/linphone-base/files/patch-configure b/net/linphone-base/files/patch-configure
index 1e56a72a2c1e..394bb877a114 100644
--- a/net/linphone-base/files/patch-configure
+++ b/net/linphone-base/files/patch-configure
@@ -1,26 +1,50 @@
---- configure.orig	Sat Apr  1 01:54:31 2006
-+++ configure	Sat Apr  1 01:54:31 2006
-@@ -23542,23 +23542,6 @@
+--- configure.orig	Fri Nov 10 05:54:17 2006
++++ configure	Thu Dec 28 00:35:46 2006
+@@ -24896,27 +24896,6 @@
+ 	prefix=${ac_default_prefix}
  fi
  
- 
+-DATADIRNAME=share
+-
 -cat >>confdefs.h <<_ACEOF
--#define PACKAGE_LOCALE_DIR "${realprefix}/${DATADIRNAME}/locale"
+-#define PACKAGE_LOCALE_DIR "${prefix}/${DATADIRNAME}/locale"
 -_ACEOF
 -
 -
 -
 -cat >>confdefs.h <<_ACEOF
--#define PACKAGE_DATA_DIR "${realprefix}/${DATADIRNAME}"
+-#define PACKAGE_DATA_DIR "${prefix}/${DATADIRNAME}"
 -_ACEOF
 -
 -
 -
 -cat >>confdefs.h <<_ACEOF
--#define PACKAGE_SOUND_DIR "${realprefix}/${DATADIRNAME}/sounds/linphone"
+-#define PACKAGE_SOUND_DIR "${prefix}/${DATADIRNAME}/sounds/linphone"
 -_ACEOF
 -
 -
- found_sound=no
+-
+-
+ for ac_func in getifaddrs
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+@@ -25210,9 +25189,8 @@
+ 
+ CPPFLAGS=$CPPFLAGS_save
+ 
+-LDFLAGS_save=$LDFLAGS
+-LDFLAGS=$OSIP_LIBS
+-LIBS_save=$LIBS
++LIBS_save=$LDFLAGS
++LIBS=$OSIP_LIBS
+ 
+ { echo "$as_me:$LINENO: checking for osip_message_init in -losipparser2" >&5
+ echo $ECHO_N "checking for osip_message_init in -losipparser2... $ECHO_C" >&6; }
+@@ -25304,7 +25282,6 @@
+    { (exit 1); exit 1; }; }
+ fi
  
+-LDFLAGS=$LDFLAGS_save
+ LIBS=$LIBS_save
  
+ OSIP_LIBS="$OSIP_LIBS -losipparser2 -losip2"
diff --git a/net/linphone-base/files/patch-coreapi::enum.c b/net/linphone-base/files/patch-coreapi::enum.c
deleted file mode 100644
index 268a81731e88..000000000000
--- a/net/linphone-base/files/patch-coreapi::enum.c
+++ /dev/null
@@ -1,16 +0,0 @@
-
-$FreeBSD$
-
---- coreapi/enum.c.orig	Sat Mar  6 01:21:40 2004
-+++ coreapi/enum.c	Thu Apr 15 03:46:41 2004
-@@ -21,7 +21,10 @@
- 
- #include "enum.h"
- 
-+#include <sys/types.h>
-+#include <sys/socket.h>
- #include <netinet/in.h>
-+#include <arpa/inet.h>
- #include <arpa/nameser.h>
- #include <resolv.h>
- #include <errno.h>
diff --git a/net/linphone-base/files/patch-coreapi::linphonecore.c b/net/linphone-base/files/patch-coreapi::linphonecore.c
index 1d02c1922193..2b96bf3df5dd 100644
--- a/net/linphone-base/files/patch-coreapi::linphonecore.c
+++ b/net/linphone-base/files/patch-coreapi::linphonecore.c
@@ -1,12 +1,13 @@
---- coreapi/linphonecore.c.orig	Sat Mar 11 00:19:17 2006
-+++ coreapi/linphonecore.c	Sat Apr  1 00:57:53 2006
-@@ -36,9 +36,7 @@
- #include <arpa/inet.h>
- #include <time.h>
+--- coreapi/linphonecore.c.orig	Fri Sep  8 18:16:44 2006
++++ coreapi/linphonecore.c	Tue Sep 12 22:33:19 2006
+@@ -29,10 +29,8 @@
+ #include "exevents.h"
+ 
  
 -#ifdef INET6  
+ #ifndef WIN32
  #include <netdb.h>  
 -#endif
+ #endif
  
  #include "enum.h"
- 
diff --git a/net/linphone-base/files/patch-coreapi::misc.c b/net/linphone-base/files/patch-coreapi::misc.c
deleted file mode 100644
index 499b6f2aa060..000000000000
--- a/net/linphone-base/files/patch-coreapi::misc.c
+++ /dev/null
@@ -1,23 +0,0 @@
-
-$FreeBSD$
-
---- coreapi/misc.c.orig	Sat Aug  9 00:10:47 2003
-+++ coreapi/misc.c	Sat Aug 23 00:08:50 2003
-@@ -93,7 +93,7 @@
- 	pid_t pid;
- 	
- 	/* try to kill all artsd*/
--	command=g_strdup_printf("ps -u %s |grep artsd",getenv("LOGNAME"));
-+	command=g_strdup_printf("ps -c %s |grep artsd",getenv("LOGNAME"));
- 	out=popen(command,"r");
- 	if (out!=NULL)
- 	{
-@@ -123,7 +123,7 @@
- 	g_free(command);
- 	
- 	/* do the same with esd*/
--	command=g_strdup_printf("ps -u %s |grep esd",getenv("LOGNAME"));
-+	command=g_strdup_printf("ps -c %s |grep esd",getenv("LOGNAME"));
- 	out=popen(command,"r");
- 	if (out!=NULL)
- 	{
diff --git a/net/linphone-base/files/patch-exosip__Makefile.in b/net/linphone-base/files/patch-exosip__Makefile.in
new file mode 100644
index 000000000000..5f95ca4401de
--- /dev/null
+++ b/net/linphone-base/files/patch-exosip__Makefile.in
@@ -0,0 +1,20 @@
+--- exosip/Makefile.in.bak	Tue Jan 23 19:20:22 2007
++++ exosip/Makefile.in	Sun Feb 25 12:21:39 2007
+@@ -54,7 +54,7 @@
+ LTLIBRARIES = $(noinst_LTLIBRARIES)
+ am__DEPENDENCIES_1 =
+ libeXosip_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+-am_libeXosip_la_OBJECTS = eXosip.lo jrequest.lo jresponse.lo \
++am_libeXosip_la_OBJECTS = osip_negotiation.lo eXosip.lo jrequest.lo jresponse.lo \
+ 	jcallback.lo jdialog.lo udp.lo jcall.lo jreg.lo jfreinds.lo \
+ 	jidentity.lo eXutils.lo jnotify.lo jsubscribers.lo \
+ 	jsubscribe.lo jevents.lo sdp_offans.lo misc.lo jpipe.lo \
+@@ -263,7 +263,7 @@
+ target_alias = @target_alias@
+ noinst_LTLIBRARIES = libeXosip.la
+ AM_CFLAGS = $(EXOSIP_CFLAGS)
+-libeXosip_la_SOURCES = eXosip.c  \
++libeXosip_la_SOURCES = osip_negotiation.c eXosip.c  \
+ jrequest.c jresponse.c    jcallback.c  jdialog.c   udp.c  \
+ jcall.c jreg.c jfreinds.c jidentity.c  eXutils.c          \
+ jnotify.c      jsubscribers.c          jsubscribe.c    jevents.c \
diff --git a/net/linphone-base/files/patch-exosip__jauth.c b/net/linphone-base/files/patch-exosip__jauth.c
new file mode 100644
index 000000000000..2a3f0ce3154a
--- /dev/null
+++ b/net/linphone-base/files/patch-exosip__jauth.c
@@ -0,0 +1,18 @@
+--- exosip/jauth.c.orig	Mon Oct  2 21:19:14 2006
++++ exosip/jauth.c	Sun Feb 25 12:38:55 2007
+@@ -285,12 +285,12 @@
+     char * pszQop = NULL;
+     char * pszURI = osip_strdup_without_quote(rquri);
+ 
+-    szNonceCount = osip_strdup("00000000");
+-    sprintf(szNonceCount, "%08d", nc++);
+-
+     HASHHEX HA1;
+     HASHHEX HA2 = "";
+     HASHHEX Response;
++
++    szNonceCount = osip_strdup("00000000");
++    sprintf(szNonceCount, "%08d", nc++);
+ 
+     pszPass=passwd;
+ 
diff --git a/net/linphone-base/files/patch-gnome::Makefile.in b/net/linphone-base/files/patch-gnome::Makefile.in
index 3f896acc57c9..c9bf78daeb20 100644
--- a/net/linphone-base/files/patch-gnome::Makefile.in
+++ b/net/linphone-base/files/patch-gnome::Makefile.in
@@ -1,6 +1,6 @@
---- gnome/Makefile.in.orig	Sat Mar  4 01:55:42 2006
-+++ gnome/Makefile.in	Sat Mar 11 01:04:15 2006
-@@ -70,8 +70,7 @@
+--- gnome/Makefile.in.orig	Tue Jan 23 19:20:23 2007
++++ gnome/Makefile.in	Sun Feb 25 15:31:13 2007
+@@ -73,8 +73,7 @@
  linphone_OBJECTS = $(am_linphone_OBJECTS)
  am__DEPENDENCIES_1 =
  @BUILD_GNOME_TRUE@linphone_DEPENDENCIES = $(am__DEPENDENCIES_1) \
@@ -10,7 +10,7 @@
  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 \
-@@ -91,8 +90,7 @@
+@@ -94,8 +93,7 @@
  @BUILD_GNOME_APPLET_TRUE@	linphone_applet-applet.$(OBJEXT)
  linphone_applet_OBJECTS = $(am_linphone_applet_OBJECTS)
  @BUILD_GNOME_APPLET_TRUE@linphone_applet_DEPENDENCIES =  \
@@ -20,21 +20,21 @@
  DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
  depcomp = $(SHELL) $(top_srcdir)/depcomp
  am__depfiles_maybe = depfiles
-@@ -363,7 +361,7 @@
+@@ -332,7 +330,7 @@
  
  @BUILD_GNOME_TRUE@linphone_LDADD = $(LIBGNOMEUI_LIBS) $(INTLLIBS) \
  @BUILD_GNOME_TRUE@				$(LIBGNOME_LIBS) \
--@BUILD_GNOME_TRUE@				$(top_builddir)/coreapi/liblinphone.la 							
+-@BUILD_GNOME_TRUE@				$(top_builddir)/coreapi/liblinphone.la
 +@BUILD_GNOME_TRUE@				-llinphone
  
  AM_CFLAGS = $(STRICT_OPTIONS) $(LIBGNOMEUI_CFLAGS) $(LIBGNOME_CFLAGS) $(GNOME_APPLETS_CFLAGS) $(IPV6_CFLAGS)	
  @BUILD_GNOME_APPLET_TRUE@gnome_appletdir = $(libexecdir)
-@@ -374,7 +372,7 @@
+@@ -343,7 +341,7 @@
  @BUILD_GNOME_APPLET_TRUE@linphone_applet_CFLAGS = $(AM_CFLAGS) -DLINPHONE_APPLET
  @BUILD_GNOME_APPLET_TRUE@linphone_applet_LDADD = \
  @BUILD_GNOME_APPLET_TRUE@				$(GNOME_APPLETS_LIBS) \
 -@BUILD_GNOME_APPLET_TRUE@				$(top_builddir)/coreapi/liblinphone.la
 +@BUILD_GNOME_APPLET_TRUE@				-llinphone
  
- 
- #uidir		= $(datadir)/gnome-2.0/ui
+ @BUILD_GNOME_APPLET_TRUE@serverdir = $(libdir)/bonobo/servers
+ @BUILD_GNOME_APPLET_TRUE@server_in_files = GNOME_LinphoneApplet.server.in
diff --git a/net/linphone-base/files/patch-lpc10-1.5::lpcini.c b/net/linphone-base/files/patch-lpc10-1.5::lpcini.c
deleted file mode 100644
index 4398a7075055..000000000000
--- a/net/linphone-base/files/patch-lpc10-1.5::lpcini.c
+++ /dev/null
@@ -1,17 +0,0 @@
-
-$FreeBSD$
-
---- lpc10-1.5/lpcini.c	2002/12/30 08:26:21	1.1
-+++ lpc10-1.5/lpcini.c	2002/12/30 08:28:01
-@@ -32,9 +32,9 @@
- 	-lf2c -lm   (in that order)
- */
- 
--#include "f2c.h"
-+#include <stdlib.h>
- 
--#include <malloc.h>
-+#include "f2c.h"
- 
- /* Common Block Declarations */
- 
diff --git a/net/linphone-base/files/patch-media_api::Makefile.in b/net/linphone-base/files/patch-media_api::Makefile.in
deleted file mode 100644
index 2cc794e5b04b..000000000000
--- a/net/linphone-base/files/patch-media_api::Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
-
-$FreeBSD$
-
---- media_api/Makefile.in.orig	Wed Aug 20 17:46:39 2003
-+++ media_api/Makefile.in	Sat Aug 23 01:38:46 2003
-@@ -176,7 +176,6 @@
- 
- INCLUDES = -I$(top_srcdir)/mediastreamer \
- 		-I$(top_srcdir)/speex \
--		-I$(top_srcdir)/gsmlib \
- 		-I$(top_srcdir)/oRTP \
- 		-I$(top_srcdir)/oRTP/src \
- 		-I$(top_srcdir)/lpc10-1.5 \
diff --git a/net/linphone-base/files/patch-mediastreamer2::Makefile.in b/net/linphone-base/files/patch-mediastreamer2::Makefile.in
deleted file mode 100644
index 4a92796a9685..000000000000
--- a/net/linphone-base/files/patch-mediastreamer2::Makefile.in
+++ /dev/null
@@ -1,25 +0,0 @@
---- mediastreamer2/Makefile.in.orig	Sat Apr  1 00:58:16 2006
-+++ mediastreamer2/Makefile.in	Sat Apr  1 00:59:37 2006
-@@ -64,7 +64,7 @@
- libmediastreamer2_la_DEPENDENCIES =  \
- 	$(top_builddir)/oRTP/src/libortp.la $(am__DEPENDENCIES_1) \
- 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
--	$(top_builddir)/gsmlib/libgsm.la $(am__DEPENDENCIES_2)
-+	$(am__DEPENDENCIES_2)
- am__libmediastreamer2_la_SOURCES_DIST = mscommon.c mscommon.h \
- 	allfilters.h msfilter.c msfilter.h msvideo.h msqueue.c \
- 	msqueue.h msticker.c msticker.h alaw.c g711common.h ulaw.c \
-@@ -360,11 +360,10 @@
- 				$(ALSA_LIBS) \
- 				$(ARTS_LIBS) \
- 				$(SPEEX_LIBS) \
--				$(top_builddir)/gsmlib/libgsm.la \
--				-lrt\
-+				-lgsm\
- $(am__append_6)
- libquickstream_la_LIBADD = libmediastreamer2.la
--INCLUDES = -I$(top_srcdir)/oRTP/include -I$(top_srcdir)/gsmlib
-+INCLUDES = -I$(top_srcdir)/oRTP/include
- ORTP_CFLAGS = `cat $(top_builddir)/oRTP/ortp.defs`
- AM_CFLAGS = $(ORTP_CFLAGS) $(SPEEX_CFLAGS) $(STRICT_OPTIONS)
- all: $(BUILT_SOURCES)
diff --git a/net/linphone-base/files/patch-mediastreamer2__src__ice.c b/net/linphone-base/files/patch-mediastreamer2__src__ice.c
new file mode 100644
index 000000000000..e0a9cea3666c
--- /dev/null
+++ b/net/linphone-base/files/patch-mediastreamer2__src__ice.c
@@ -0,0 +1,10 @@
+--- 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 @@
+ */
+ 
+ #if !defined(WIN32) && !defined(_WIN32_WCE)

++#include <sys/types.h>
+ #include <sys/socket.h>
+ #include <netdb.h>
+ #endif
diff --git a/net/linphone-base/files/patch-mediastreamer2__oss.c b/net/linphone-base/files/patch-mediastreamer2__src__oss.c
index ee224e058009..93a948751b0a 100644
--- a/net/linphone-base/files/patch-mediastreamer2__oss.c
+++ b/net/linphone-base/files/patch-mediastreamer2__src__oss.c
@@ -1,5 +1,5 @@
---- mediastreamer2/oss.c.orig	Fri Mar 24 18:30:55 2006
-+++ mediastreamer2/oss.c	Sat Apr  1 01:00:49 2006
+--- mediastreamer2/src/oss.c.orig	Thu Nov  9 19:45:26 2006
++++ mediastreamer2/src/oss.c	Wed Dec 27 23:57:46 2006
 @@ -30,7 +30,10 @@
  #include <sys/time.h>
  #include <sys/ioctl.h>
diff --git a/net/linphone-base/files/patch-mediastreamer::Makefile.in b/net/linphone-base/files/patch-mediastreamer::Makefile.in
deleted file mode 100644
index fb3d0f846d89..000000000000
--- a/net/linphone-base/files/patch-mediastreamer::Makefile.in
+++ /dev/null
@@ -1,20 +0,0 @@
---- mediastreamer/Makefile.in.orig	Tue Mar 22 00:53:39 2005
-+++ mediastreamer/Makefile.in	Wed Mar 23 17:52:23 2005
-@@ -66,7 +66,7 @@
- @BUILD_UGLIB_TRUE@	$(top_builddir)/support/libuglib.la
- @BUILD_TRUESPEECH_TRUE@am__DEPENDENCIES_3 = ../win32acm/libwin32acm.a
- libmediastreamer_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
--	../gsmlib/libgsm.la ../lpc10-1.5/liblpc10.la \
-+	../lpc10-1.5/liblpc10.la \
- 	../oRTP/src/libortp.la $(am__DEPENDENCIES_1) \
- 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) \
- 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_3) \
-@@ -493,7 +493,7 @@
- 							$(VIDEO_SOURCES)
- 
- libmediastreamer_la_LIBADD = $(GLIB_LIBS) \
--							../gsmlib/libgsm.la \
-+							-lgsm \
- 							../lpc10-1.5/liblpc10.la \
- 							../oRTP/src/libortp.la \
- 							$(JACK_LIBS)\
diff --git a/net/linphone-base/files/patch-mediastreamer::msfifo.c b/net/linphone-base/files/patch-mediastreamer::msfifo.c
deleted file mode 100644
index f30f63710642..000000000000
--- a/net/linphone-base/files/patch-mediastreamer::msfifo.c
+++ /dev/null
@@ -1,15 +0,0 @@
-
-$FreeBSD$
-
---- mediastreamer/msfifo.c	2002/12/30 08:33:16	1.1
-+++ mediastreamer/msfifo.c	2002/12/30 08:33:36
-@@ -23,6 +23,9 @@
- #include "msutils.h"
- #include "msfifo.h"
- 
-+#ifndef ENODATA
-+#define ENODATA  61
-+#endif
- 
- MSFifo * ms_fifo_new(MSBuffer *buf, gint r_gran, gint w_gran, gint r_offset, gint w_offset)
- {
diff --git a/net/linphone-base/files/patch-oRTP__src__stun_udp.c b/net/linphone-base/files/patch-oRTP__src__stun_udp.c
new file mode 100644
index 000000000000..8591a5e4b146
--- /dev/null
+++ b/net/linphone-base/files/patch-oRTP__src__stun_udp.c
@@ -0,0 +1,14 @@
+--- oRTP/src/stun_udp.c.orig	Fri Sep 22 16:19:58 2006
++++ oRTP/src/stun_udp.c	Sun Feb 25 03:36:37 2007
+@@ -71,10 +71,10 @@
+ #include <string.h>
+ #include <stdio.h>
+ #if !defined(WIN32) && !defined(_WIN32_WCE)
++#include <sys/types.h> 
+ #include <sys/ioctl.h>
+ #include <sys/socket.h>
+ #include <sys/time.h>
+-#include <sys/types.h> 
+ #include <arpa/inet.h>
+ #include <fcntl.h>
+ #include <netdb.h>
diff --git a/net/linphone-base/pkg-descr b/net/linphone-base/pkg-descr
index 7a4d7fab5cf0..de850441eac4 100644
--- a/net/linphone-base/pkg-descr
+++ b/net/linphone-base/pkg-descr
@@ -2,4 +2,6 @@ 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.
 
-WWW: http://www.linphone.org
+This package includes libraries, headers and cosole frontend.
+
+WWW: http://www.linphone.org/
diff --git a/net/linphone-base/pkg-descr.gui b/net/linphone-base/pkg-descr.gui
new file mode 100644
index 000000000000..7f27da8a73e1
--- /dev/null
+++ b/net/linphone-base/pkg-descr.gui
@@ -0,0 +1,7 @@
+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
index 593d04486124..8f667b1b5035 100644
--- a/net/linphone-base/pkg-plist
+++ b/net/linphone-base/pkg-plist
@@ -1,13 +1,25 @@
 bin/linphonec
 bin/sipomatic
 include/linphone/config.h
-include/linphone/glist.h
-include/linphone/gshell.h
-include/linphone/gspawn.h
 include/linphone/linphonecore.h
 include/linphone/lpconfig.h
-include/linphone/sndcard.h
-include/linphone/uglib.h
+include/mediastreamer2/allfilters.h
+include/mediastreamer2/dtmfgen.h
+include/mediastreamer2/ice.h
+include/mediastreamer2/mediastream.h
+include/mediastreamer2/mscommon.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/msticker.h
+include/mediastreamer2/msv4l.h
+include/mediastreamer2/msvideo.h
+include/mediastreamer2/msvideoout.h
+include/mediastreamer2/waveheader.h
+include/ortp/event.h
 include/ortp/ortp.h
 include/ortp/payloadtype.h
 include/ortp/port.h
@@ -17,16 +29,27 @@ include/ortp/rtpsession.h
 include/ortp/rtpsignaltable.h
 include/ortp/sessionset.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.4
+lib/liblinphone.so.7
+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.4
+lib/libortp.so.5
+lib/libquickstream.a
+lib/libquickstream.la
+lib/libquickstream.so
+lib/libquickstream.so.0
 libdata/pkgconfig/linphone.pc
+libdata/pkgconfig/mediastreamer.pc
 libdata/pkgconfig/ortp.pc
 libexec/mediastream
 %%DATADIR%%/sounds/hello16000.wav
@@ -40,33 +63,23 @@ libexec/mediastream
 %%DATADIR%%/sounds/rings/synth.wav
 %%DATADIR%%/sounds/rings/tapping.wav
 %%DATADIR%%/sounds/rings/toy.wav
-%%DOCSDIR%%/mediastreamer/book1.html
-%%DOCSDIR%%/mediastreamer/coreapi.html
-%%DOCSDIR%%/mediastreamer/index.sgml
-%%DOCSDIR%%/mediastreamer/mediastreamer-filters.html
-%%DOCSDIR%%/mediastreamer/mediastreamer-msringplayer.html
-%%DOCSDIR%%/mediastreamer/mediastreamer-mssync.html
-%%DOCSDIR%%/mediastreamer/mediastreamer-running-processing-chains.html
-%%DOCSDIR%%/mediastreamer/msfilterimplementations.html
-%%DOCSDIR%%/mediastreamer/userapi.html
-share/locale/cs/LC_MESSAGES/linphone.mo
-share/locale/de/LC_MESSAGES/linphone.mo
-share/locale/es/LC_MESSAGES/linphone.mo
-share/locale/fr/LC_MESSAGES/linphone.mo
-share/locale/it/LC_MESSAGES/linphone.mo
-share/locale/ja/LC_MESSAGES/linphone.mo
-share/locale/nl/LC_MESSAGES/linphone.mo
-share/locale/pl/LC_MESSAGES/linphone.mo
-share/locale/pt_BR/LC_MESSAGES/linphone.mo
-share/locale/sv/LC_MESSAGES/linphone.mo
-@dirrmtry share/locale/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
-@dirrm %%DOCSDIR%%/mediastreamer
-@dirrm %%DOCSDIR%%
+%%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/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
+%%NLS%%@dirrmtry share/locale/pl/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/pl
+%%NLS%%@dirrmtry share/locale/cs/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/cs
 @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
new file mode 100644
index 000000000000..869f471afa4d
--- /dev/null
+++ b/net/linphone-base/pkg-plist.gui
@@ -0,0 +1,17 @@
+bin/linphone
+libdata/bonobo/servers/GNOME_LinphoneApplet.server
+libexec/linphone_applet
+share/gnome/applications/linphone.desktop
+share/gnome/gnome-2.0/ui/GNOME_LinphoneApplet.xml
+share/gnome/pixmaps/linphone/linphone.png
+share/gnome/pixmaps/linphone/linphone2.png
+share/gnome/pixmaps/linphone/linphone2.xpm
+share/gnome/pixmaps/linphone/sip-away.png
+share/gnome/pixmaps/linphone/sip-bifm.png
+share/gnome/pixmaps/linphone/sip-busy.png
+share/gnome/pixmaps/linphone/sip-closed.png
+share/gnome/pixmaps/linphone/sip-online.png
+share/gnome/pixmaps/linphone/sip-otl.png
+share/gnome/pixmaps/linphone/sip-otp.png
+share/gnome/pixmaps/linphone/sip-wfa.png
+@dirrm share/gnome/pixmaps/linphone