18 files changed, 193 insertions, 227 deletions

diff --git a/net/linphone-base/Makefile b/net/linphone-base/Makefile
index 805daf38c4f8..a51dc1b72601 100644
--- a/net/linphone-base/Makefile
+++ b/net/linphone-base/Makefile
@@ -6,22 +6,24 @@
 #
 
 PORTNAME=	linphone
-PORTVERSION=	0.9.1
+PORTVERSION=	0.10.0
 CATEGORIES=	net
 MASTER_SITES=	http://savannah.gnu.org/download/linphone/${PORTVERSION}/sources/
 
 MAINTAINER=	sobomax@FreeBSD.org
 
-LIB_DEPENDS=	osip.0:${PORTSDIR}/net/libosip
+LIB_DEPENDS=	osip.0:${PORTSDIR}/net/libosip \
+		panel-applet-2.0:${PORTSDIR}/x11/gnomepanel
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
+LIBTOOLFILES=	configure oRTP/configure speex/configure osipua/configure
 USE_GNOMENG=	yes
-USE_GNOME=	gnomehack gnomeprefix libpanel
+USE_GNOME=	gnomehack gnomeprefix
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
-MAN1=		speexdec.1 speexenc.1
+MAN1=		speexdec.1 speexenc.1 linphone.1 linphonec.1 sipomatic.1
 
 .include <bsd.port.mk>
diff --git a/net/linphone-base/distinfo b/net/linphone-base/distinfo
index 48dc2cb06076..dac97a589e1c 100644
--- a/net/linphone-base/distinfo
+++ b/net/linphone-base/distinfo
@@ -1 +1 @@
-MD5 (linphone-0.9.1.tar.gz) = 0c8e94039b5c6b772672f533c54816fe
+MD5 (linphone-0.10.0.tar.gz) = 22744906226f92ee6b279373c634fb22
diff --git a/net/linphone-base/files/patch-config.h.in b/net/linphone-base/files/patch-config.h.in
new file mode 100644
index 000000000000..464bc65832ff
--- /dev/null
+++ b/net/linphone-base/files/patch-config.h.in
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- config.h.in	2003/02/27 23:47:19	1.1
++++ config.h.in	2003/02/27 23:47:35
+@@ -122,8 +122,5 @@
+    first (like Motorola and SPARC, unlike Intel and VAX). */
+ #undef WORDS_BIGENDIAN
+ 
+-/* Defined if we are compiling for FreeBSD */
+-#undef __FreeBSD__
+-
+ /* Defined if we are compiling for linux */
+ #undef __LINUX__
diff --git a/net/linphone-base/files/patch-configure b/net/linphone-base/files/patch-configure
index 9d91ad9f0b33..b7617cedf427 100644
--- a/net/linphone-base/files/patch-configure
+++ b/net/linphone-base/files/patch-configure
@@ -1,9 +1,9 @@
 
 $FreeBSD$
 
---- configure	2002/12/16 19:20:25	1.1
-+++ configure	2002/12/16 19:21:24
-@@ -7572,6 +7572,7 @@
+--- configure.orig	Mon Jan 27 13:16:04 2003
++++ configure	Fri Feb 28 01:08:49 2003
+@@ -8786,6 +8786,7 @@
  
  # This can be used to rebuild libtool when needed
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
@@ -11,21 +11,3 @@ $FreeBSD$
  
  # Always use our own libtool.
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -14026,7 +14027,7 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lc  $LIBS"
-+#LIBS="-lc  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
- #include "confdefs.h"
-@@ -14074,7 +14075,7 @@
- #define HAVE_LIBC 1
- _ACEOF
- 
--  LIBS="-lc $LIBS"
-+#  LIBS="-lc $LIBS"
- 
- fi
- 
diff --git a/net/linphone-base/files/patch-console::Makefile.in b/net/linphone-base/files/patch-console::Makefile.in
index 9d5b095c3ab5..1a0933bc372c 100644
--- a/net/linphone-base/files/patch-console::Makefile.in
+++ b/net/linphone-base/files/patch-console::Makefile.in
@@ -1,13 +1,13 @@
 
 $FreeBSD$
 
---- console/Makefile.in	2002/12/30 09:08:53	1.1
-+++ console/Makefile.in	2002/12/30 09:10:07
-@@ -166,7 +166,8 @@
+--- console/Makefile.in.orig	Fri Feb 28 01:10:38 2003
++++ console/Makefile.in	Fri Feb 28 01:12:45 2003
+@@ -165,7 +165,8 @@
  				$(top_srcdir)/osipua/src/libosipua.la \
  				$(top_srcdir)/mediastreamer/audiostream.o \
  				$(top_srcdir)/mediastreamer/libmediastreamer.la \
--				$(top_srcdir)/mediastreamer/libmsspeex.la
+-				$(top_srcdir)/mediastreamer/libmsspeex.la 
 +				$(top_srcdir)/mediastreamer/.libs/libmsspeex.so \
 +				$(top_srcdir)/speex/libspeex/libspeex.la
  
diff --git a/net/linphone-base/files/patch-coreapi::Makefile.in b/net/linphone-base/files/patch-coreapi::Makefile.in
new file mode 100644
index 000000000000..0561a3d876ce
--- /dev/null
+++ b/net/linphone-base/files/patch-coreapi::Makefile.in
@@ -0,0 +1,29 @@
+
+$FreeBSD$
+
+--- coreapi/Makefile.in	2003/02/28 01:08:22	1.1
++++ coreapi/Makefile.in	2003/02/28 01:08:45
+@@ -171,9 +171,6 @@
+ 	gnome-config.c gnome-config.h 
+ 
+ 
+-libcoreapignome_a_LIBADD = $(top_srcdir)/mediastreamer/audiostream.o 
+-libcoreapi_a_LIBADD = $(top_srcdir)/mediastreamer/audiostream.o 
+-
+ DEFS = @DEFS@ @SOUNDDEFS@	-DENABLE_TRACE
+ 
+ CFLAGS = @CFLAGS@ $(GLIB_CFLAGS) -DG_LOG_DOMAIN=\"LinphoneCore\"
+@@ -184,13 +181,10 @@
+ LIBRARIES = $(noinst_LIBRARIES)
+ 
+ libcoreapi_a_AR = $(AR) cru
+-libcoreapi_a_DEPENDENCIES = $(top_srcdir)/mediastreamer/audiostream.o
+ am_libcoreapi_a_OBJECTS = linphonecore.$(OBJEXT) osipuacb.$(OBJEXT) \
+ 	misc.$(OBJEXT) gnome-config.$(OBJEXT)
+ libcoreapi_a_OBJECTS = $(am_libcoreapi_a_OBJECTS)
+ libcoreapignome_a_AR = $(AR) cru
+-libcoreapignome_a_DEPENDENCIES = \
+-	$(top_srcdir)/mediastreamer/audiostream.o
+ am_libcoreapignome_a_OBJECTS = linphonecore.$(OBJEXT) osipuacb.$(OBJEXT) \
+ 	misc.$(OBJEXT)
+ libcoreapignome_a_OBJECTS = $(am_libcoreapignome_a_OBJECTS)
diff --git a/net/linphone-base/files/patch-gnome::LinphoneMain.c b/net/linphone-base/files/patch-gnome::LinphoneMain.c
deleted file mode 100644
index 03745f2ac804..000000000000
--- a/net/linphone-base/files/patch-gnome::LinphoneMain.c
+++ /dev/null
@@ -1,60 +0,0 @@
-
-$FreeBSD$
-
---- gnome/LinphoneMain.c	2002/12/30 10:30:37	1.1
-+++ gnome/LinphoneMain.c	2002/12/30 11:27:59
-@@ -676,27 +676,49 @@
- 	int sock,err,if_count,i,j=0,lo=0;
- 	struct ifconf netconf;
- 	char buffer[32*MAX_IF];
-+	struct ifreq *ifr;
- 	
- 	netconf.ifc_len=32*MAX_IF;
- 	netconf.ifc_buf=buffer;
- 	sock=socket(PF_INET, SOCK_DGRAM,0);
- 	err=ioctl(sock,SIOCGIFCONF,&netconf);
--	if (err<0) printf("Error in ioctl: %i.\n",errno);
--	close(sock);
-+	if (err<0) {
-+		printf("Error in ioctl: %i.\n",errno);
-+		close(sock);
-+		return (-1);
-+	}
- 	
--	if_count=netconf.ifc_len/32;
-+	if_count=netconf.ifc_len/sizeof(struct ifreq);
- 	printf("Found %i interfaces.\n",if_count);
- 	for (i=0;i<if_count;i++)
- 	{
--		if (strcmp(netconf.ifc_req[i].ifr_name,"lo")==0) lo=1;
-+		ifr = &netconf.ifc_req[i];
-+		err = ioctl(sock, SIOCGIFFLAGS, ifr);
-+		if (err < 0) {
-+			if (errno != ENXIO)
-+				printf("Error in ioctl: %i.\n",errno);
-+			continue;
-+		}
-+		if ((ifr->ifr_flags & (IFF_UP || IFF_RUNNING)) == 0)
-+			continue;
-+		err = ioctl(sock, SIOCGIFADDR, ifr);
-+		if (err < 0) {
-+                        printf("Error in ioctl: %i.\n",errno);
-+                        continue;
-+                }
-+			
-+		if (strncmp(netconf.ifc_req[i].ifr_name,"lo",2)==0) lo=1;
-+		if (netconf.ifc_req[i].ifr_name[0] == '\0')
-+			continue;
- 
- 		strncpy(lpm->net_conf.if_names[j],netconf.ifc_req[i].ifr_name,20);
- 		strncpy(lpm->net_conf.if_addr[j],inet_ntoa(((struct sockaddr_in*)(&netconf.ifc_req[i].ifr_addr))->sin_addr),20);
- 		j++;
- 	
- 	}
-+	close(sock);
- 	if (lo==0) return(-1);
--	return(if_count);
-+	return(j);
- }
- 
- static char lock_name[80];
diff --git a/net/linphone-base/files/patch-gnome::Makefile.in b/net/linphone-base/files/patch-gnome::Makefile.in
index 6f630edef7be..d0883e6a3b8d 100644
--- a/net/linphone-base/files/patch-gnome::Makefile.in
+++ b/net/linphone-base/files/patch-gnome::Makefile.in
@@ -1,21 +1,45 @@
 
 $FreeBSD$
 
---- gnome/Makefile.in	2002/12/30 08:51:17	1.1
-+++ gnome/Makefile.in	2002/12/30 08:59:06
-@@ -167,12 +167,13 @@
- @BUILD_GNOME_TRUE@	propertybox.c propertybox.h
+--- gnome/Makefile.in.orig	Fri Feb 28 02:49:43 2003
++++ gnome/Makefile.in	Fri Feb 28 03:01:56 2003
+@@ -173,8 +173,10 @@
+ @BUILD_GNOME_TRUE@				$(LIBGNOME_LIBS) \
+ @BUILD_GNOME_TRUE@				$(top_srcdir)/coreapi/libcoreapignome.a \
+ @BUILD_GNOME_TRUE@				$(top_srcdir)/osipua/src/libosipua.la \
++@BUILD_GNOME_TRUE@				$(top_srcdir)/mediastreamer/audiostream.o \
+ @BUILD_GNOME_TRUE@				$(top_srcdir)/mediastreamer/libmediastreamer.la \
+-@BUILD_GNOME_TRUE@				$(top_srcdir)/mediastreamer/libmsspeex.la 							
++@BUILD_GNOME_TRUE@				$(top_srcdir)/mediastreamer/.libs/libmsspeex.so \
++@BUILD_GNOME_TRUE@				$(top_srcdir)/speex/libspeex/libspeex.la
  
  
--@BUILD_GNOME_TRUE@linphone_LDADD = $(GNOME_LIBDIR) $(GNOMEUI_LIBS) $(INTLLIBS) @SOUNDLIB@ -lgthread -lpthread -lpanel_applet -lgnorba \
-+@BUILD_GNOME_TRUE@linphone_LDADD = $(GNOME_LIBDIR) $(GNOMEUI_LIBS) $(INTLLIBS) @SOUNDLIB@ `gnome-config --libs applets` \
- @BUILD_GNOME_TRUE@								$(top_srcdir)/mediastreamer/audiostream.o \
- @BUILD_GNOME_TRUE@								$(top_srcdir)/osipua/src/libosipua.la \
- @BUILD_GNOME_TRUE@								$(top_srcdir)/oRTP/src/libortp.la  \
- @BUILD_GNOME_TRUE@								$(top_srcdir)/mediastreamer/libmediastreamer.la \
--@BUILD_GNOME_TRUE@								$(top_srcdir)/mediastreamer/libmsspeex.la 
-+@BUILD_GNOME_TRUE@								$(top_srcdir)/mediastreamer/.libs/libmsspeex.so \
-+@BUILD_GNOME_TRUE@								$(top_srcdir)/speex/libspeex/libspeex.la
+ CFLAGS = @CFLAGS@ $(LIBGNOMEUI_CFLAGS) $(LIBGNOME_CFLAGS) $(GNOME_APPLETS_CFLAGS)		
+@@ -199,8 +201,10 @@
+ @BUILD_GNOME_APPLET_TRUE@				$(GNOME_APPLETS_LIBS) \
+ @BUILD_GNOME_APPLET_TRUE@				$(top_srcdir)/coreapi/libcoreapignome.a \
+ @BUILD_GNOME_APPLET_TRUE@				$(top_srcdir)/osipua/src/libosipua.la \
++@BUILD_GNOME_APPLET_TRUE@				$(top_srcdir)/mediastreamer/audiostream.o \
+ @BUILD_GNOME_APPLET_TRUE@				$(top_srcdir)/mediastreamer/libmediastreamer.la \
+-@BUILD_GNOME_APPLET_TRUE@				$(top_srcdir)/mediastreamer/libmsspeex.la 
++@BUILD_GNOME_APPLET_TRUE@				$(top_srcdir)/mediastreamer/.libs/libmsspeex.so \
++@BUILD_GNOME_APPLET_TRUE@				$(top_srcdir)/speex/libspeex/libspeex.la
  
  
- DEFS = @DEFS@ @SOUNDDEFS@	-DENABLE_TRACE		
+ 
+@@ -237,6 +241,7 @@
+ @BUILD_GNOME_TRUE@linphone_DEPENDENCIES = \
+ @BUILD_GNOME_TRUE@	$(top_srcdir)/coreapi/libcoreapignome.a \
+ @BUILD_GNOME_TRUE@	$(top_srcdir)/osipua/src/libosipua.la \
++@BUILD_GNOME_TRUE@	$(top_srcdir)/mediastreamer/audiostream.o \
+ @BUILD_GNOME_TRUE@	$(top_srcdir)/mediastreamer/libmediastreamer.la \
+ @BUILD_GNOME_TRUE@	$(top_srcdir)/mediastreamer/libmsspeex.la
+ @BUILD_GNOME_FALSE@linphone_DEPENDENCIES =
+@@ -255,6 +260,7 @@
+ @BUILD_GNOME_APPLET_TRUE@linphone_applet_DEPENDENCIES = \
+ @BUILD_GNOME_APPLET_TRUE@	$(top_srcdir)/coreapi/libcoreapignome.a \
+ @BUILD_GNOME_APPLET_TRUE@	$(top_srcdir)/osipua/src/libosipua.la \
++@BUILD_GNOME_APPLET_TRUE@	$(top_srcdir)/mediastreamer/audiostream.o \
+ @BUILD_GNOME_APPLET_TRUE@	$(top_srcdir)/mediastreamer/libmediastreamer.la \
+ @BUILD_GNOME_APPLET_TRUE@	$(top_srcdir)/mediastreamer/libmsspeex.la
+ @BUILD_GNOME_APPLET_FALSE@linphone_applet_DEPENDENCIES =
diff --git a/net/linphone-base/files/patch-mediastreamer::Makefile.in b/net/linphone-base/files/patch-mediastreamer::Makefile.in
index 79aae34a52f9..40badea3acd6 100644
--- a/net/linphone-base/files/patch-mediastreamer::Makefile.in
+++ b/net/linphone-base/files/patch-mediastreamer::Makefile.in
@@ -1,8 +1,8 @@
 
 $FreeBSD$
 
---- mediastreamer/Makefile.in	2002/12/30 08:36:10	1.1
-+++ mediastreamer/Makefile.in	2002/12/30 08:43:27
+--- mediastreamer/Makefile.in.orig	Fri Feb 28 01:20:45 2003
++++ mediastreamer/Makefile.in	Fri Feb 28 01:20:45 2003
 @@ -163,7 +163,7 @@
  @BUILD_V4L_TRUE@V4L_PLUGIN_TEST = test_v4l
  
@@ -12,16 +12,7 @@ $FreeBSD$
  
  
  libmediastreamer_la_SOURCES = msfilter.c msfilter.h msutils.h\
-@@ -239,7 +239,7 @@
- 
- 
- mstest_SOURCES = test.c
--mstest_LDADD = libmediastreamer.la -lglib -lpthread -lgthread
-+mstest_LDADD = libmediastreamer.la @GLIB_LIBS@
- 
- #test program to test MSRingPlayer object
- ring_test_SOURCES = ring_test.c
-@@ -291,7 +291,7 @@
+@@ -296,7 +296,7 @@
  
  #the mediastream program that runs a processing that will be used in linphone
  mediastream_SOURCES = mediastream.c audiostream.c mediastream.h
diff --git a/net/linphone-base/files/patch-oRTP::configure b/net/linphone-base/files/patch-oRTP::configure
new file mode 100644
index 000000000000..23804098f77c
--- /dev/null
+++ b/net/linphone-base/files/patch-oRTP::configure
@@ -0,0 +1,13 @@
+
+$FreeBSD$
+
+--- oRTP/configure	2003/02/27 23:48:28	1.1
++++ oRTP/configure	2003/02/27 23:49:02
+@@ -7793,6 +7793,7 @@
+ 
+ # This can be used to rebuild libtool when needed
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++$ac_aux_dir/ltconfig $LIBTOOL_DEPS
+ 
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/net/linphone-base/files/patch-oRTP::src::Makefile.in b/net/linphone-base/files/patch-oRTP::src::Makefile.in
index b2e02153b9b6..6e6e4301a508 100644
--- a/net/linphone-base/files/patch-oRTP::src::Makefile.in
+++ b/net/linphone-base/files/patch-oRTP::src::Makefile.in
@@ -1,14 +1,14 @@
 
 $FreeBSD$
 
---- oRTP/src/Makefile.in	2002/12/30 08:17:27	1.1
-+++ oRTP/src/Makefile.in	2002/12/30 08:24:15
-@@ -93,7 +93,7 @@
+--- oRTP/src/Makefile.in.orig	Fri Feb 28 01:21:43 2003
++++ oRTP/src/Makefile.in	Fri Feb 28 01:22:12 2003
+@@ -97,7 +97,7 @@
  
- EXTRA_DIST = master system LOAD
+ EXTRA_DIST = master system LOAD export.c export.h
  
 -DEFS = @DEFS@ $(PTHREAD_CFLAGS) -DG_LOG_DOMAIN=\"oRTP\"
 +DEFS = @DEFS@ $(PTHREAD_CFLAGS) -DG_LOG_DOMAIN=\"oRTP\" -DBUILD_SCHEDULER
+ CFLAGS = -I$(top_srcdir) $(GLIB_CFLAGS)
+ LDFLAGS = $(PTHREAD_LDFLAGS)
  
- @HPUXKERNEL_TRUE@KERNEL_BITS = $$(getconf KERNEL_BITS)
- @HPUXKERNEL_TRUE@SYSTEM = $$(/usr/bin/uname -s)
diff --git a/net/linphone-base/files/patch-osipua::configure b/net/linphone-base/files/patch-osipua::configure
new file mode 100644
index 000000000000..d9bfcae45b6f
--- /dev/null
+++ b/net/linphone-base/files/patch-osipua::configure
@@ -0,0 +1,13 @@
+
+$FreeBSD$
+
+--- osipua/configure	2003/02/27 23:48:28	1.1
++++ osipua/configure	2003/02/27 23:49:11
+@@ -8652,6 +8652,7 @@
+ 
+ # This can be used to rebuild libtool when needed
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++$ac_aux_dir/ltconfig $LIBTOOL_DEPS
+ 
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/net/linphone-base/files/patch-osipua::src::Makefile.in b/net/linphone-base/files/patch-osipua::src::Makefile.in
deleted file mode 100644
index ce96bf9fec49..000000000000
--- a/net/linphone-base/files/patch-osipua::src::Makefile.in
+++ /dev/null
@@ -1,36 +0,0 @@
-
-$FreeBSD$
-
---- osipua/src/Makefile.in	2002/12/30 08:45:50	1.1
-+++ osipua/src/Makefile.in	2002/12/30 08:49:29
-@@ -91,7 +91,7 @@
- SIP_MLEAK_FLAGS = @SIP_MLEAK_FLAGS@
- SOCKET_LIB = @SOCKET_LIB@
- STRIP = @STRIP@
--THREAD_LIB = @THREAD_LIB@
-+THREAD_LIB = -pthread
- VERSION = @VERSION@
- am__include = @am__include@
- am__quote = @am__quote@
-@@ -126,7 +126,7 @@
- 
- 
- libosipua_la_LDFLAGS = -version-info $(LIBOSIPUA_SO_VERSION) \
-- @POSIX4_LIB@ @THREAD_LIB@ @NSL_LIB@ @SOCKET_LIB@
-+ @POSIX4_LIB@ -pthread @NSL_LIB@ @SOCKET_LIB@
- 
- 
- libosipua_la_LIBADD = @OSIP_LIBS@
-@@ -137,10 +137,10 @@
- 
- bin_PROGRAMS = osipua_tester test_sdphandler
- osipua_tester_SOURCES = osipua_tester.c  osipua_tester.h
--osipua_tester_LDADD = libosipua.la
-+osipua_tester_LDADD = libosipua.la -pthread
- 
- test_sdphandler_SOURCES = test_sdphandler.c
--test_sdphandler_LDADD = libosipua.la
-+test_sdphandler_LDADD = libosipua.la -pthread
- subdir = src
- mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/osipua-config.h
diff --git a/net/linphone-base/files/patch-osipua::src::osipmanager.c b/net/linphone-base/files/patch-osipua::src::osipmanager.c
deleted file mode 100644
index 79da20b2fdf9..000000000000
--- a/net/linphone-base/files/patch-osipua::src::osipmanager.c
+++ /dev/null
@@ -1,15 +0,0 @@
-
-$FreeBSD$
-
---- osipua/src/osipmanager.c	2002/12/30 08:44:18	1.1
-+++ osipua/src/osipmanager.c	2002/12/30 08:44:31
-@@ -18,8 +18,8 @@
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
- 
--#include <sys/socket.h>
- #include <sys/types.h>
-+#include <sys/socket.h>
- #include <netinet/in.h>
- #include <errno.h>
- #include "osipua.h"
diff --git a/net/linphone-base/files/patch-osipua::src::udp.c b/net/linphone-base/files/patch-osipua::src::udp.c
deleted file mode 100644
index 082a99884bb5..000000000000
--- a/net/linphone-base/files/patch-osipua::src::udp.c
+++ /dev/null
@@ -1,15 +0,0 @@
-
-$FreeBSD$
-
---- osipua/src/udp.c	2002/12/30 08:44:53	1.1
-+++ osipua/src/udp.c	2002/12/30 08:45:01
-@@ -19,8 +19,8 @@
- */
- 
- 
--#include <sys/socket.h>
- #include <sys/types.h>
-+#include <sys/socket.h>
- #include <netinet/in.h>
- #include <arpa/inet.h>
- #include <unistd.h>
diff --git a/net/linphone-base/files/patch-share::Makefile.in b/net/linphone-base/files/patch-share::Makefile.in
deleted file mode 100644
index 6973647366bc..000000000000
--- a/net/linphone-base/files/patch-share::Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- share/Makefile.in	2002/12/30 09:26:56	1.1
-+++ share/Makefile.in	2002/12/30 09:27:28
-@@ -158,7 +158,7 @@
- #linphone_sys2dir=$(prefix)/etc/CORBA/servers
- 
- #linphone_sys2_DATA=linphone.gnorba
--linphone_appletdir = $(prefix)/share/applets/Network
-+linphone_appletdir = $(prefix)/share/gnome/applets/Network
- 
- linphone_applet_DATA = linphone_applet.desktop
- 
diff --git a/net/linphone-base/files/patch-speex::configure b/net/linphone-base/files/patch-speex::configure
new file mode 100644
index 000000000000..9fa7eb31cd72
--- /dev/null
+++ b/net/linphone-base/files/patch-speex::configure
@@ -0,0 +1,13 @@
+
+$FreeBSD$
+
+--- speex/configure	2003/02/27 23:48:28	1.1
++++ speex/configure	2003/02/27 23:49:06
+@@ -7764,6 +7764,7 @@
+ 
+ # This can be used to rebuild libtool when needed
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++$ac_aux_dir/ltconfig $LIBTOOL_DEPS
+ 
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/net/linphone-base/pkg-plist b/net/linphone-base/pkg-plist
index 43c37b8dcad1..bbcb13fe3597 100644
--- a/net/linphone-base/pkg-plist
+++ b/net/linphone-base/pkg-plist
@@ -5,12 +5,10 @@ bin/sipomatic
 bin/speexdec
 bin/speexenc
 bin/test_sdphandler
-bin/testenc
-bin/testenc_wb
-etc/CORBA/servers/linphone.gnorba
 include/ortp/ortp-config.h
 include/ortp/ortp.h
 include/ortp/payloadtype.h
+include/ortp/port_fct.h
 include/ortp/rtp.h
 include/ortp/rtpmod.h
 include/ortp/rtpport.h
@@ -25,6 +23,7 @@ include/osipua/bodycontext.h
 include/osipua/bodyhandler.h
 include/osipua/osipdialog.h
 include/osipua/osipmanager.h
+include/osipua/osipua-config.h
 include/osipua/osipua.h
 include/osipua/regctxt.h
 include/osipua/resolver.h
@@ -35,6 +34,7 @@ include/speex.h
 include/speex_bits.h
 include/speex_callbacks.h
 include/speex_header.h
+include/speex_stereo.h
 lib/libmediastreamer.a
 lib/libmediastreamer.so
 lib/libmediastreamer.so.0
@@ -42,16 +42,19 @@ lib/libmsspeex.a
 lib/libmsspeex.so
 lib/libmsspeex.so.0
 lib/libortp.a
-lib/libortp.la
 lib/libortp.so
 lib/libortp.so.0
+lib/libosipalloc.a
+lib/libosipalloc.so
+lib/libosipalloc.so.0
 lib/libosipua.a
-lib/libosipua.la
 lib/libosipua.so
-lib/libosipua.so.1
+lib/libosipua.so.2
+lib/libspeex-0.99.so
 lib/libspeex.a
-lib/libspeex.la
-share/doc/manual.pdf
+lib/libspeex.so
+libdata/bonobo/servers/GNOME_LinphoneApplet.server
+libexec/linphone_applet
 share/doc/mediastreamer/book1.html
 share/doc/mediastreamer/coreapi.html
 share/doc/mediastreamer/index.sgml
@@ -79,38 +82,44 @@ share/doc/osipua/osipua-osipua-private-api.html
 share/doc/osipua/osipua-osipua-public-api.html
 share/doc/osipua/osipua.html
 share/doc/osipua/registrationctxt.html
+share/doc/speex/manual.pdf
 share/gnome/apps/Internet/linphone.desktop
-share/gnome/applets/Network/linphone_applet.desktop
+share/gnome/gnome-2.0/ui/GNOME_LinphoneApplet.xml
 share/gnome/help/linphone/C/manual/CVS/Entries
 share/gnome/help/linphone/C/manual/CVS/Repository
 share/gnome/help/linphone/C/manual/CVS/Root
 share/gnome/help/linphone/C/manual/docbook.css
 share/gnome/help/linphone/C/manual/index.html
 share/gnome/help/linphone/C/manual/params.html
-share/gnome/help/linphone/C/manual/stylesheet-images/CVS/Entries
-share/gnome/help/linphone/C/manual/stylesheet-images/CVS/Repository
-share/gnome/help/linphone/C/manual/stylesheet-images/CVS/Root
 share/gnome/help/linphone/C/manual/t1.html
+share/gnome/help/linphone/C/manual/x112.html
+share/gnome/help/linphone/C/manual/x115.html
 share/gnome/help/linphone/C/manual/x118.html
 share/gnome/help/linphone/C/manual/x121.html
+share/gnome/help/linphone/C/manual/x130.html
+share/gnome/help/linphone/C/manual/x136.html
 share/gnome/help/linphone/C/manual/x137.html
 share/gnome/help/linphone/C/manual/x143.html
+share/gnome/help/linphone/C/manual/x160.html
+share/gnome/help/linphone/C/manual/x165.html
 share/gnome/help/linphone/C/manual/x167.html
 share/gnome/help/linphone/C/manual/x172.html
+share/gnome/help/linphone/C/manual/x185.html
 share/gnome/help/linphone/C/manual/x188.html
 share/gnome/help/linphone/C/manual/x26.html
+share/gnome/help/linphone/C/manual/x34.html
 share/gnome/help/linphone/C/manual/x36.html
+share/gnome/help/linphone/C/manual/x72.html
 share/gnome/help/linphone/fr/manual/CVS/Entries
 share/gnome/help/linphone/fr/manual/CVS/Repository
 share/gnome/help/linphone/fr/manual/CVS/Root
 share/gnome/help/linphone/fr/manual/docbook.css
+share/gnome/help/linphone/fr/manual/index.html
 share/gnome/help/linphone/fr/manual/params.html
 share/gnome/help/linphone/fr/manual/registering.html
-share/gnome/help/linphone/fr/manual/stylesheet-images/CVS/Entries
-share/gnome/help/linphone/fr/manual/stylesheet-images/CVS/Repository
-share/gnome/help/linphone/fr/manual/stylesheet-images/CVS/Root
 share/gnome/help/linphone/fr/manual/t1.html
 share/gnome/help/linphone/fr/manual/x116.html
+share/gnome/help/linphone/fr/manual/x119.html
 share/gnome/help/linphone/fr/manual/x134.html
 share/gnome/help/linphone/fr/manual/x140.html
 share/gnome/help/linphone/fr/manual/x164.html
@@ -118,17 +127,17 @@ share/gnome/help/linphone/fr/manual/x170.html
 share/gnome/help/linphone/fr/manual/x188.html
 share/gnome/help/linphone/fr/manual/x24.html
 share/gnome/help/linphone/fr/manual/x34.html
+share/gnome/help/linphone/fr/manual/x72.html
 share/gnome/help/linphone/it/manual/CVS/Entries
 share/gnome/help/linphone/it/manual/CVS/Repository
 share/gnome/help/linphone/it/manual/CVS/Root
 share/gnome/help/linphone/it/manual/docbook.css
+share/gnome/help/linphone/it/manual/index.html
 share/gnome/help/linphone/it/manual/params.html
 share/gnome/help/linphone/it/manual/registering.html
-share/gnome/help/linphone/it/manual/stylesheet-images/CVS/Entries
-share/gnome/help/linphone/it/manual/stylesheet-images/CVS/Repository
-share/gnome/help/linphone/it/manual/stylesheet-images/CVS/Root
 share/gnome/help/linphone/it/manual/t1.html
 share/gnome/help/linphone/it/manual/x116.html
+share/gnome/help/linphone/it/manual/x119.html
 share/gnome/help/linphone/it/manual/x134.html
 share/gnome/help/linphone/it/manual/x140.html
 share/gnome/help/linphone/it/manual/x164.html
@@ -136,7 +145,22 @@ share/gnome/help/linphone/it/manual/x170.html
 share/gnome/help/linphone/it/manual/x189.html
 share/gnome/help/linphone/it/manual/x24.html
 share/gnome/help/linphone/it/manual/x34.html
-share/gnome/linphonec
+share/gnome/help/linphone/it/manual/x72.html
+share/gnome/help/linphone/ja/manual/CVS/Entries
+share/gnome/help/linphone/ja/manual/CVS/Repository
+share/gnome/help/linphone/ja/manual/CVS/Root
+share/gnome/help/linphone/ja/manual/params.html
+share/gnome/help/linphone/ja/manual/t1.html
+share/gnome/help/linphone/ja/manual/x112.html
+share/gnome/help/linphone/ja/manual/x115.html
+share/gnome/help/linphone/ja/manual/x131.html
+share/gnome/help/linphone/ja/manual/x137.html
+share/gnome/help/linphone/ja/manual/x161.html
+share/gnome/help/linphone/ja/manual/x166.html
+share/gnome/help/linphone/ja/manual/x182.html
+share/gnome/help/linphone/ja/manual/x25.html
+share/gnome/help/linphone/ja/manual/x35.html
+share/gnome/linphonec/linphonec
 share/gnome/pixmaps/linphone/linphone.png
 share/gnome/pixmaps/linphone/linphone2.png
 share/gnome/pixmaps/linphone/linphone2.xpm
@@ -146,23 +170,24 @@ share/gnome/sounds/linphone/ringback.raw
 share/locale/de/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
 @dirrm share/gnome/sounds/linphone
-@dirrm share/gnome/help/linphone/it/manual/stylesheet-images/CVS
-@dirrm share/gnome/help/linphone/it/manual/stylesheet-images
+@dirrm share/gnome/pixmaps/linphone
+@dirrm share/gnome/linphonec
+@dirrm share/gnome/help/linphone/ja/manual/CVS
+@dirrm share/gnome/help/linphone/ja/manual
+@dirrm share/gnome/help/linphone/ja
 @dirrm share/gnome/help/linphone/it/manual/CVS
 @dirrm share/gnome/help/linphone/it/manual
 @dirrm share/gnome/help/linphone/it
-@dirrm share/gnome/help/linphone/fr/manual/stylesheet-images/CVS
-@dirrm share/gnome/help/linphone/fr/manual/stylesheet-images
 @dirrm share/gnome/help/linphone/fr/manual/CVS
 @dirrm share/gnome/help/linphone/fr/manual
 @dirrm share/gnome/help/linphone/fr
-@dirrm share/gnome/help/linphone/C/manual/stylesheet-images/CVS
-@dirrm share/gnome/help/linphone/C/manual/stylesheet-images
 @dirrm share/gnome/help/linphone/C/manual/CVS
 @dirrm share/gnome/help/linphone/C/manual
 @dirrm share/gnome/help/linphone/C
 @dirrm share/gnome/help/linphone
+@dirrm share/doc/speex
 @dirrm share/doc/osipua
 @dirrm share/doc/ortp
 @dirrm share/doc/mediastreamer