# This is a shell archive.  Save it in a file, remove anything before
# this line, and then unpack it by entering "sh file".  Note, it may
# create directories; files and directories will be owned by you and
# have default permissions.
#
# This archive contains:
#
#	net_linphone-base.diff
#	net_linphone.diff
#
echo x - net_linphone-base.diff
sed 's/^X//' >net_linphone-base.diff << 'END-of-net_linphone-base.diff'
Xdiff -urN /usr/ports/net/linphone-base/Makefile net/linphone-base/Makefile
X--- /usr/ports/net/linphone-base/Makefile	Sat Feb 24 15:05:38 2007
X+++ net/linphone-base/Makefile	Fri Mar  2 22:46:02 2007
X@@ -5,59 +5,91 @@
X # $FreeBSD: ports/net/linphone-base/Makefile,v 1.39 2007/02/23 22:51:11 mezz Exp $
X #
X 
X-PORTNAME=	${LINPHONE_PORTNAME}
X-PORTVERSION=	${LINPHONE_PORTVERSION}
X-PORTREVISION=	${LINPHONE_PORTREVISION}
X-PORTREVISION=	${LINPHONE_PORTREVISION}
X-PORTEPOCH=	${LINPHONE_PORTEPOCH}
X-CATEGORIES=	net
X-MASTER_SITES=	${LINPHONE_MASTER_SITES}
X-PKGNAMESUFFIX=	-base
X+PORTNAME=	linphone
X+PORTVERSION=	1.6.0
X+PORTEPOCH=	1
X+CATEGORIES?=	net
X+MASTER_SITES=	${MASTER_SITE_SAVANNAH:S/$/:linphone/} \
X+		${MASTER_SITE_GNU:S/$/:libosip2/}
X+MASTER_SITE_SUBDIR=	${PORTNAME}/stable/:linphone \
X+			osip/:libosip2
X+DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}:linphone \
X+		libosip2-2.2.2${EXTRACT_SUFX}:libosip2
X 
X MAINTAINER=	ports@FreeBSD.org
X COMMENT=	A web phone that supports SIP protocol
X 
X-BROKEN=		broken by latest update to libosip2
X-DEPRECATED=	${BROKEN}
X-EXPIRATION_DATE=2007-01-01
X-
X-LIB_DEPENDS=	gsm.1:${PORTSDIR}/audio/gsm \
X-		jack.0:${PORTSDIR}/audio/jack \
X+LIB_DEPENDS=	jack.0:${PORTSDIR}/audio/jack \
X 		samplerate.1:${PORTSDIR}/audio/libsamplerate \
X 		speex.1:${PORTSDIR}/audio/speex \
X 		osip2.3:${PORTSDIR}/net/libosip2
X 
X USE_GNOME=	glib20 gnomehack gnometarget intlhack pkgconfig
X-USE_GETTEXT=	yes
X USE_GMAKE=	yes
X USE_AUTOTOOLS=	libtool:15
X-LIBTOOLFILES=	configure oRTP/configure
X-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
X-CONFIGURE_ARGS=	--disable-ipv6 --disable-gtk-doc --enable-gnome_ui=no \
X-		--disable-ewarning --without-ilbc --disable-strict \
X-		--with-speex=${LOCALBASE} --with-osip=${LOCALBASE} \
X-		--with-html-dir=${DOCSDIR}
X+LIBTOOLFILES=	configure mediastreamer2/configure oRTP/configure
X+CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
X+		PKG_CONFIG="${LOCALBASE}/bin/pkg-config"
X+CONFIGURE_ARGS=	--disable-ipv6 --disable-gtk-doc --disable-ewarning \
X+		--without-ilbc --disable-strict --disable-video \
X+		--with-osip=${LOCALBASE}
X+MAKE_ENV=	SUBDIRS="${SUBDIRS}"
X USE_LDCONFIG=	yes
X 
X-MAN1=		linphonec.1 sipomatic.1
X-
X CFLAGS+=	-DPACKAGE_LOCALE_DIR='\"${PREFIX}/share/locale\"' \
X-		-DPACKAGE_DATA_DIR='\"${PREFIX}/share\"' \
X-		-DPACKAGE_SOUND_DIR='\"${DATADIR}/sounds\"'
X+		-DPACKAGE_DATA_DIR='\"${PREFIX}/${DATA_PATH}\"' \
X+		-DPACKAGE_SOUND_DIR='\"${DATADIR}/sounds\"' \
X+		-DHAVE_STRUCT_TIMEVAL
X CPPFLAGS=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
X LDFLAGS=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
X 
X-.include "Makefile.common"
X .include <bsd.port.pre.mk>
X 
X .if ${OSVERSION} < 600000
X LIB_DEPENDS+=	readline.[5-9]:${PORTSDIR}/devel/readline
X .endif
X 
X+.if defined(WITHOUT_NLS)
X+CONFIGURE_ARGS+=	--disable-nls
X+PLIST_SUB+=	NLS="@comment "
X+.else
X+USE_GETTEXT=	yes
X+PLIST_SUB+=	NLS=""
X+LDFLAGS+=	-lintl
X+.endif
X+
X+.if defined(LINPHONE_GUI)
X+LIB_DEPENDS+=	linphone.7:${PORTSDIR}/net/linphone-base
X+DESCR=		${.CURDIR}/pkg-descr.gui
X+PLIST=		${.CURDIR}/pkg-plist.gui
X+USE_GNOME+=	gnomepanel gnomeprefix
X+MAN1=		linphone.1
X+DATA_PATH=	share/gnome
X+SUBDIRS=	pixmaps gnome
X+.else
X+PKGNAMESUFFIX=	-base
X+CONFIGURE_ARGS+=	--enable-gnome_ui=no
X+MAN1=		linphonec.1 sipomatic.1
X+DATA_PATH=	share
X+SUBDIRS=	po oRTP gsmlib mediastreamer2 media_api exosip coreapi console
X+.endif
X+
X+post-extract:
X+	@${LN} -sf ${WRKDIR}/libosip2-2.2.2/src/osip2/osip_negotiation.c \
X+		${WRKSRC}/exosip
X+	@${LN} -sf ${WRKDIR}/libosip2-2.2.2/include/osip2 \
X+		${WRKSRC}/exosip
X+
X post-patch:
X+	@${REINPLACE_CMD} -e '/^SUBDIRS =/s| =| ?=|g' ${WRKSRC}/Makefile.in
X 	@${REINPLACE_CMD} -e '/^SUBDIRS =/s|docs||g' ${WRKSRC}/oRTP/Makefile.in
X 
X post-install:
X+.if defined(LINPHONE_GUI)
X+	${INSTALL_MAN} ${WRKSRC}/share/C/linphone.1 ${MANPREFIX}/man/man1
X+	${INSTALL_DATA} ${WRKSRC}/share/linphone.desktop \
X+		${PREFIX}/share/gnome/applications
X+.else
X 	${INSTALL_MAN} ${WRKSRC}/share/C/linphonec.1 ${MANPREFIX}/man/man1
X 	${INSTALL_MAN} ${WRKSRC}/share/C/sipomatic.1 ${MANPREFIX}/man/man1
X 	${INSTALL_DATA} ${WRKSRC}/share/linphone.pc ${PREFIX}/libdata/pkgconfig
X@@ -65,5 +97,6 @@
X 	${INSTALL_DATA} ${WRKSRC}/share/*.wav ${DATADIR}/sounds
X 	@${MKDIR} ${DATADIR}/sounds/rings
X 	${INSTALL_DATA} ${WRKSRC}/share/rings/*.wav ${DATADIR}/sounds/rings
X+.endif
X 
X .include <bsd.port.post.mk>
Xdiff -urN /usr/ports/net/linphone-base/Makefile.common net/linphone-base/Makefile.common
X--- /usr/ports/net/linphone-base/Makefile.common	Sat Feb 24 15:05:38 2007
X+++ net/linphone-base/Makefile.common	Thu Jan  1 09:00:00 1970
X@@ -1,12 +0,0 @@
X-#
X-# $FreeBSD: ports/net/linphone-base/Makefile.common,v 1.8 2007/02/23 22:51:11 mezz Exp $
X-#
X-
X-LINPHONE_PORTNAME=	linphone
X-LINPHONE_PORTVERSION=	1.3.5
X-LINPHONE_PORTREVISION=	1
X-LINPHONE_PORTEPOCH=	1
X-LINPHONE_MASTER_SITES=	http://simon.morlat.free.fr/download/stable/source/
X-
X-PATCHDIR=	${.CURDIR}/../../net/linphone-base/files
X-MD5_FILE=	${.CURDIR}/../../net/linphone-base/distinfo
Xdiff -urN /usr/ports/net/linphone-base/distinfo net/linphone-base/distinfo
X--- /usr/ports/net/linphone-base/distinfo	Sat May 27 01:44:27 2006
X+++ net/linphone-base/distinfo	Sun Feb 25 22:26:28 2007
X@@ -1,3 +1,6 @@
X-MD5 (linphone-1.3.5.tar.gz) = 522b08a22c5e1de281676cddd3f2bcf6
X-SHA256 (linphone-1.3.5.tar.gz) = b1036fde820c928b877a7065a8e396a7aaf262df125da96c6f6b56f02097a1f3
X-SIZE (linphone-1.3.5.tar.gz) = 7411961
X+MD5 (linphone-1.6.0.tar.gz) = fb345125e23c787df0818ff7caad5515
X+SHA256 (linphone-1.6.0.tar.gz) = ba1c32207fd62d374c9397a81fb1247da93edb859e30d0d855dc65e5457f690b
X+SIZE (linphone-1.6.0.tar.gz) = 7720841
X+MD5 (libosip2-2.2.2.tar.gz) = 40ee3ec89030f0d6dfdb2cf6100e6685
X+SHA256 (libosip2-2.2.2.tar.gz) = 4e13febd65a2f8f18cb55151cd10f5f0888bf1e7dc2a4c0d54f39f170255de1c
X+SIZE (libosip2-2.2.2.tar.gz) = 664050
Xdiff -urN /usr/ports/net/linphone-base/files/patch-Makefile.in net/linphone-base/files/patch-Makefile.in
X--- /usr/ports/net/linphone-base/files/patch-Makefile.in	Sat May 27 01:44:27 2006
X+++ net/linphone-base/files/patch-Makefile.in	Thu Jan  1 09:00:00 1970
X@@ -1,16 +0,0 @@
X---- Makefile.in.orig	Tue Apr  4 17:18:50 2006
X-+++ Makefile.in	Wed Apr  5 12:43:31 2006
X-@@ -289,9 +289,11 @@
X- 
X- # let make re-run automake upon need
X- ACLOCAL_AMFLAGS = -I m4
X--SUBDIRS = m4 support pixmaps po ipkg oRTP gsmlib lpc10-1.5 \
X-+ifndef SUBDIRS
X-+SUBDIRS = m4 support po ipkg oRTP lpc10-1.5 \
X-                 $(WIN32ACM_DIR) mediastreamer mediastreamer2\
X--		media_api exosip coreapi console gnome share developer-docs
X-+		media_api exosip coreapi console gnome developer-docs
X-+endif
X- 
X- EXTRA_DIST = linphone2.glade BUGS linphone.kdevprj \
X- 				intltool-extract.in	\
Xdiff -urN /usr/ports/net/linphone-base/files/patch-configure net/linphone-base/files/patch-configure
X--- /usr/ports/net/linphone-base/files/patch-configure	Sat Feb 24 15:05:38 2007
X+++ net/linphone-base/files/patch-configure	Sun Feb 25 03:26:08 2007
X@@ -1,26 +1,50 @@
X---- configure.orig	Sat Apr  1 01:54:31 2006
X-+++ configure	Sat Apr  1 01:54:31 2006
X-@@ -23542,23 +23542,6 @@
X+--- configure.orig	Fri Nov 10 05:54:17 2006
X++++ configure	Thu Dec 28 00:35:46 2006
X+@@ -24896,27 +24896,6 @@
X+ 	prefix=${ac_default_prefix}
X  fi
X  
X- 
X+-DATADIRNAME=share
X+-
X -cat >>confdefs.h <<_ACEOF
X--#define PACKAGE_LOCALE_DIR "${realprefix}/${DATADIRNAME}/locale"
X+-#define PACKAGE_LOCALE_DIR "${prefix}/${DATADIRNAME}/locale"
X -_ACEOF
X -
X -
X -
X -cat >>confdefs.h <<_ACEOF
X--#define PACKAGE_DATA_DIR "${realprefix}/${DATADIRNAME}"
X+-#define PACKAGE_DATA_DIR "${prefix}/${DATADIRNAME}"
X -_ACEOF
X -
X -
X -
X -cat >>confdefs.h <<_ACEOF
X--#define PACKAGE_SOUND_DIR "${realprefix}/${DATADIRNAME}/sounds/linphone"
X+-#define PACKAGE_SOUND_DIR "${prefix}/${DATADIRNAME}/sounds/linphone"
X -_ACEOF
X -
X -
X- found_sound=no
X+-
X+-
X+ for ac_func in getifaddrs
X+ do
X+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
X+@@ -25210,9 +25189,8 @@
X+ 
X+ CPPFLAGS=$CPPFLAGS_save
X+ 
X+-LDFLAGS_save=$LDFLAGS
X+-LDFLAGS=$OSIP_LIBS
X+-LIBS_save=$LIBS
X++LIBS_save=$LDFLAGS
X++LIBS=$OSIP_LIBS
X+ 
X+ { echo "$as_me:$LINENO: checking for osip_message_init in -losipparser2" >&5
X+ echo $ECHO_N "checking for osip_message_init in -losipparser2... $ECHO_C" >&6; }
X+@@ -25304,7 +25282,6 @@
X+    { (exit 1); exit 1; }; }
X+ fi
X  
X+-LDFLAGS=$LDFLAGS_save
X+ LIBS=$LIBS_save
X  
X+ OSIP_LIBS="$OSIP_LIBS -losipparser2 -losip2"
Xdiff -urN /usr/ports/net/linphone-base/files/patch-coreapi::enum.c net/linphone-base/files/patch-coreapi::enum.c
X--- /usr/ports/net/linphone-base/files/patch-coreapi::enum.c	Wed May 12 23:06:31 2004
X+++ net/linphone-base/files/patch-coreapi::enum.c	Thu Jan  1 09:00:00 1970
X@@ -1,16 +0,0 @@
X-
X-$FreeBSD: ports/net/linphone-base/files/patch-coreapi::enum.c,v 1.1 2004/05/12 14:06:31 krion Exp $
X-
X---- coreapi/enum.c.orig	Sat Mar  6 01:21:40 2004
X-+++ coreapi/enum.c	Thu Apr 15 03:46:41 2004
X-@@ -21,7 +21,10 @@
X- 
X- #include "enum.h"
X- 
X-+#include <sys/types.h>
X-+#include <sys/socket.h>
X- #include <netinet/in.h>
X-+#include <arpa/inet.h>
X- #include <arpa/nameser.h>
X- #include <resolv.h>
X- #include <errno.h>
Xdiff -urN /usr/ports/net/linphone-base/files/patch-coreapi::linphonecore.c net/linphone-base/files/patch-coreapi::linphonecore.c
X--- /usr/ports/net/linphone-base/files/patch-coreapi::linphonecore.c	Sat May 27 01:44:28 2006
X+++ net/linphone-base/files/patch-coreapi::linphonecore.c	Sun Feb 25 03:26:08 2007
X@@ -1,12 +1,13 @@
X---- coreapi/linphonecore.c.orig	Sat Mar 11 00:19:17 2006
X-+++ coreapi/linphonecore.c	Sat Apr  1 00:57:53 2006
X-@@ -36,9 +36,7 @@
X- #include <arpa/inet.h>
X- #include <time.h>
X+--- coreapi/linphonecore.c.orig	Fri Sep  8 18:16:44 2006
X++++ coreapi/linphonecore.c	Tue Sep 12 22:33:19 2006
X+@@ -29,10 +29,8 @@
X+ #include "exevents.h"
X+ 
X  
X -#ifdef INET6  
X+ #ifndef WIN32
X  #include <netdb.h>  
X -#endif
X+ #endif
X  
X  #include "enum.h"
X- 
Xdiff -urN /usr/ports/net/linphone-base/files/patch-coreapi::misc.c net/linphone-base/files/patch-coreapi::misc.c
X--- /usr/ports/net/linphone-base/files/patch-coreapi::misc.c	Thu Oct 23 12:29:23 2003
X+++ net/linphone-base/files/patch-coreapi::misc.c	Thu Jan  1 09:00:00 1970
X@@ -1,23 +0,0 @@
X-
X-$FreeBSD: ports/net/linphone-base/files/patch-coreapi::misc.c,v 1.6 2003/10/23 03:29:23 edwin Exp $
X-
X---- coreapi/misc.c.orig	Sat Aug  9 00:10:47 2003
X-+++ coreapi/misc.c	Sat Aug 23 00:08:50 2003
X-@@ -93,7 +93,7 @@
X- 	pid_t pid;
X- 	
X- 	/* try to kill all artsd*/
X--	command=g_strdup_printf("ps -u %s |grep artsd",getenv("LOGNAME"));
X-+	command=g_strdup_printf("ps -c %s |grep artsd",getenv("LOGNAME"));
X- 	out=popen(command,"r");
X- 	if (out!=NULL)
X- 	{
X-@@ -123,7 +123,7 @@
X- 	g_free(command);
X- 	
X- 	/* do the same with esd*/
X--	command=g_strdup_printf("ps -u %s |grep esd",getenv("LOGNAME"));
X-+	command=g_strdup_printf("ps -c %s |grep esd",getenv("LOGNAME"));
X- 	out=popen(command,"r");
X- 	if (out!=NULL)
X- 	{
Xdiff -urN /usr/ports/net/linphone-base/files/patch-exosip__Makefile.in net/linphone-base/files/patch-exosip__Makefile.in
X--- /usr/ports/net/linphone-base/files/patch-exosip__Makefile.in	Thu Jan  1 09:00:00 1970
X+++ net/linphone-base/files/patch-exosip__Makefile.in	Sun Feb 25 12:21:50 2007
X@@ -0,0 +1,20 @@
X+--- exosip/Makefile.in.bak	Tue Jan 23 19:20:22 2007
X++++ exosip/Makefile.in	Sun Feb 25 12:21:39 2007
X+@@ -54,7 +54,7 @@
X+ LTLIBRARIES = $(noinst_LTLIBRARIES)
X+ am__DEPENDENCIES_1 =
X+ libeXosip_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
X+-am_libeXosip_la_OBJECTS = eXosip.lo jrequest.lo jresponse.lo \
X++am_libeXosip_la_OBJECTS = osip_negotiation.lo eXosip.lo jrequest.lo jresponse.lo \
X+ 	jcallback.lo jdialog.lo udp.lo jcall.lo jreg.lo jfreinds.lo \
X+ 	jidentity.lo eXutils.lo jnotify.lo jsubscribers.lo \
X+ 	jsubscribe.lo jevents.lo sdp_offans.lo misc.lo jpipe.lo \
X+@@ -263,7 +263,7 @@
X+ target_alias = @target_alias@
X+ noinst_LTLIBRARIES = libeXosip.la
X+ AM_CFLAGS = $(EXOSIP_CFLAGS)
X+-libeXosip_la_SOURCES = eXosip.c  \
X++libeXosip_la_SOURCES = osip_negotiation.c eXosip.c  \
X+ jrequest.c jresponse.c    jcallback.c  jdialog.c   udp.c  \
X+ jcall.c jreg.c jfreinds.c jidentity.c  eXutils.c          \
X+ jnotify.c      jsubscribers.c          jsubscribe.c    jevents.c \
Xdiff -urN /usr/ports/net/linphone-base/files/patch-exosip__jauth.c net/linphone-base/files/patch-exosip__jauth.c
X--- /usr/ports/net/linphone-base/files/patch-exosip__jauth.c	Thu Jan  1 09:00:00 1970
X+++ net/linphone-base/files/patch-exosip__jauth.c	Sun Feb 25 12:39:05 2007
X@@ -0,0 +1,18 @@
X+--- exosip/jauth.c.orig	Mon Oct  2 21:19:14 2006
X++++ exosip/jauth.c	Sun Feb 25 12:38:55 2007
X+@@ -285,12 +285,12 @@
X+     char * pszQop = NULL;
X+     char * pszURI = osip_strdup_without_quote(rquri);
X+ 
X+-    szNonceCount = osip_strdup("00000000");
X+-    sprintf(szNonceCount, "%08d", nc++);
X+-
X+     HASHHEX HA1;
X+     HASHHEX HA2 = "";
X+     HASHHEX Response;
X++
X++    szNonceCount = osip_strdup("00000000");
X++    sprintf(szNonceCount, "%08d", nc++);
X+ 
X+     pszPass=passwd;
X+ 
Xdiff -urN /usr/ports/net/linphone-base/files/patch-gnome::Makefile.in net/linphone-base/files/patch-gnome::Makefile.in
X--- /usr/ports/net/linphone-base/files/patch-gnome::Makefile.in	Sun Mar 19 15:55:02 2006
X+++ net/linphone-base/files/patch-gnome::Makefile.in	Sun Feb 25 15:31:31 2007
X@@ -1,6 +1,6 @@
X---- gnome/Makefile.in.orig	Sat Mar  4 01:55:42 2006
X-+++ gnome/Makefile.in	Sat Mar 11 01:04:15 2006
X-@@ -70,8 +70,7 @@
X+--- gnome/Makefile.in.orig	Tue Jan 23 19:20:23 2007
X++++ gnome/Makefile.in	Sun Feb 25 15:31:13 2007
X+@@ -73,8 +73,7 @@
X  linphone_OBJECTS = $(am_linphone_OBJECTS)
X  am__DEPENDENCIES_1 =
X  @BUILD_GNOME_TRUE@linphone_DEPENDENCIES = $(am__DEPENDENCIES_1) \
X@@ -10,7 +10,7 @@
X  am__linphone_applet_SOURCES_DIST = linphone.c linphone.h gui_utils.c \
X  	gui_utils.h support.c support.h interface.c interface.h \
X  	callbacks.c callbacks.h presence.c presence.h propertybox.c \
X-@@ -91,8 +90,7 @@
X+@@ -94,8 +93,7 @@
X  @BUILD_GNOME_APPLET_TRUE@	linphone_applet-applet.$(OBJEXT)
X  linphone_applet_OBJECTS = $(am_linphone_applet_OBJECTS)
X  @BUILD_GNOME_APPLET_TRUE@linphone_applet_DEPENDENCIES =  \
X@@ -20,21 +20,21 @@
X  DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
X  depcomp = $(SHELL) $(top_srcdir)/depcomp
X  am__depfiles_maybe = depfiles
X-@@ -363,7 +361,7 @@
X+@@ -332,7 +330,7 @@
X  
X  @BUILD_GNOME_TRUE@linphone_LDADD = $(LIBGNOMEUI_LIBS) $(INTLLIBS) \
X  @BUILD_GNOME_TRUE@				$(LIBGNOME_LIBS) \
X--@BUILD_GNOME_TRUE@				$(top_builddir)/coreapi/liblinphone.la 							
X+-@BUILD_GNOME_TRUE@				$(top_builddir)/coreapi/liblinphone.la
X +@BUILD_GNOME_TRUE@				-llinphone
X  
X  AM_CFLAGS = $(STRICT_OPTIONS) $(LIBGNOMEUI_CFLAGS) $(LIBGNOME_CFLAGS) $(GNOME_APPLETS_CFLAGS) $(IPV6_CFLAGS)	
X  @BUILD_GNOME_APPLET_TRUE@gnome_appletdir = $(libexecdir)
X-@@ -374,7 +372,7 @@
X+@@ -343,7 +341,7 @@
X  @BUILD_GNOME_APPLET_TRUE@linphone_applet_CFLAGS = $(AM_CFLAGS) -DLINPHONE_APPLET
X  @BUILD_GNOME_APPLET_TRUE@linphone_applet_LDADD = \
X  @BUILD_GNOME_APPLET_TRUE@				$(GNOME_APPLETS_LIBS) \
X -@BUILD_GNOME_APPLET_TRUE@				$(top_builddir)/coreapi/liblinphone.la
X +@BUILD_GNOME_APPLET_TRUE@				-llinphone
X  
X- 
X- #uidir		= $(datadir)/gnome-2.0/ui
X+ @BUILD_GNOME_APPLET_TRUE@serverdir = $(libdir)/bonobo/servers
X+ @BUILD_GNOME_APPLET_TRUE@server_in_files = GNOME_LinphoneApplet.server.in
Xdiff -urN /usr/ports/net/linphone-base/files/patch-lpc10-1.5::lpcini.c net/linphone-base/files/patch-lpc10-1.5::lpcini.c
X--- /usr/ports/net/linphone-base/files/patch-lpc10-1.5::lpcini.c	Thu Oct 23 12:29:23 2003
X+++ net/linphone-base/files/patch-lpc10-1.5::lpcini.c	Thu Jan  1 09:00:00 1970
X@@ -1,17 +0,0 @@
X-
X-$FreeBSD: ports/net/linphone-base/files/patch-lpc10-1.5::lpcini.c,v 1.4 2003/10/23 03:29:23 edwin Exp $
X-
X---- lpc10-1.5/lpcini.c	2002/12/30 08:26:21	1.1
X-+++ lpc10-1.5/lpcini.c	2002/12/30 08:28:01
X-@@ -32,9 +32,9 @@
X- 	-lf2c -lm   (in that order)
X- */
X- 
X--#include "f2c.h"
X-+#include <stdlib.h>
X- 
X--#include <malloc.h>
X-+#include "f2c.h"
X- 
X- /* Common Block Declarations */
X- 
Xdiff -urN /usr/ports/net/linphone-base/files/patch-media_api::Makefile.in net/linphone-base/files/patch-media_api::Makefile.in
X--- /usr/ports/net/linphone-base/files/patch-media_api::Makefile.in	Thu Oct 23 12:29:23 2003
X+++ net/linphone-base/files/patch-media_api::Makefile.in	Thu Jan  1 09:00:00 1970
X@@ -1,13 +0,0 @@
X-
X-$FreeBSD: ports/net/linphone-base/files/patch-media_api::Makefile.in,v 1.3 2003/10/23 03:29:23 edwin Exp $
X-
X---- media_api/Makefile.in.orig	Wed Aug 20 17:46:39 2003
X-+++ media_api/Makefile.in	Sat Aug 23 01:38:46 2003
X-@@ -176,7 +176,6 @@
X- 
X- INCLUDES = -I$(top_srcdir)/mediastreamer \
X- 		-I$(top_srcdir)/speex \
X--		-I$(top_srcdir)/gsmlib \
X- 		-I$(top_srcdir)/oRTP \
X- 		-I$(top_srcdir)/oRTP/src \
X- 		-I$(top_srcdir)/lpc10-1.5 \
Xdiff -urN /usr/ports/net/linphone-base/files/patch-mediastreamer2::Makefile.in net/linphone-base/files/patch-mediastreamer2::Makefile.in
X--- /usr/ports/net/linphone-base/files/patch-mediastreamer2::Makefile.in	Sat May 27 01:44:28 2006
X+++ net/linphone-base/files/patch-mediastreamer2::Makefile.in	Thu Jan  1 09:00:00 1970
X@@ -1,25 +0,0 @@
X---- mediastreamer2/Makefile.in.orig	Sat Apr  1 00:58:16 2006
X-+++ mediastreamer2/Makefile.in	Sat Apr  1 00:59:37 2006
X-@@ -64,7 +64,7 @@
X- libmediastreamer2_la_DEPENDENCIES =  \
X- 	$(top_builddir)/oRTP/src/libortp.la $(am__DEPENDENCIES_1) \
X- 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
X--	$(top_builddir)/gsmlib/libgsm.la $(am__DEPENDENCIES_2)
X-+	$(am__DEPENDENCIES_2)
X- am__libmediastreamer2_la_SOURCES_DIST = mscommon.c mscommon.h \
X- 	allfilters.h msfilter.c msfilter.h msvideo.h msqueue.c \
X- 	msqueue.h msticker.c msticker.h alaw.c g711common.h ulaw.c \
X-@@ -360,11 +360,10 @@
X- 				$(ALSA_LIBS) \
X- 				$(ARTS_LIBS) \
X- 				$(SPEEX_LIBS) \
X--				$(top_builddir)/gsmlib/libgsm.la \
X--				-lrt\
X-+				-lgsm\
X- $(am__append_6)
X- libquickstream_la_LIBADD = libmediastreamer2.la
X--INCLUDES = -I$(top_srcdir)/oRTP/include -I$(top_srcdir)/gsmlib
X-+INCLUDES = -I$(top_srcdir)/oRTP/include
X- ORTP_CFLAGS = `cat $(top_builddir)/oRTP/ortp.defs`
X- AM_CFLAGS = $(ORTP_CFLAGS) $(SPEEX_CFLAGS) $(STRICT_OPTIONS)
X- all: $(BUILT_SOURCES)
Xdiff -urN /usr/ports/net/linphone-base/files/patch-mediastreamer2__oss.c net/linphone-base/files/patch-mediastreamer2__oss.c
X--- /usr/ports/net/linphone-base/files/patch-mediastreamer2__oss.c	Fri May 26 19:23:19 2006
X+++ net/linphone-base/files/patch-mediastreamer2__oss.c	Thu Jan  1 09:00:00 1970
X@@ -1,13 +0,0 @@
X---- mediastreamer2/oss.c.orig	Fri Mar 24 18:30:55 2006
X-+++ mediastreamer2/oss.c	Sat Apr  1 01:00:49 2006
X-@@ -30,7 +30,10 @@
X- #include <sys/time.h>
X- #include <sys/ioctl.h>
X- #include <unistd.h>
X-+
X-+#ifdef HAVE_ALLOCA_H
X- #include <alloca.h>
X-+#endif
X- 
X- MSFilter *ms_oss_read_new(MSSndCard *card);
X- MSFilter *ms_oss_write_new(MSSndCard *card);
Xdiff -urN /usr/ports/net/linphone-base/files/patch-mediastreamer2__src__ice.c net/linphone-base/files/patch-mediastreamer2__src__ice.c
X--- /usr/ports/net/linphone-base/files/patch-mediastreamer2__src__ice.c	Thu Jan  1 09:00:00 1970
X+++ net/linphone-base/files/patch-mediastreamer2__src__ice.c	Sun Feb 25 03:37:57 2007
X@@ -0,0 +1,10 @@
X+--- mediastreamer2/src/ice.c.orig	Fri Jan  5 06:42:59 2007
X++++ mediastreamer2/src/ice.c	Sun Feb 25 03:37:44 2007
X+@@ -18,6 +18,7 @@
X+ */
X+ 
X+ #if !defined(WIN32) && !defined(_WIN32_WCE)
X++#include <sys/types.h>
X+ #include <sys/socket.h>
X+ #include <netdb.h>
X+ #endif
Xdiff -urN /usr/ports/net/linphone-base/files/patch-mediastreamer2__src__oss.c net/linphone-base/files/patch-mediastreamer2__src__oss.c
X--- /usr/ports/net/linphone-base/files/patch-mediastreamer2__src__oss.c	Thu Jan  1 09:00:00 1970
X+++ net/linphone-base/files/patch-mediastreamer2__src__oss.c	Sun Feb 25 03:26:08 2007
X@@ -0,0 +1,13 @@
X+--- mediastreamer2/src/oss.c.orig	Thu Nov  9 19:45:26 2006
X++++ mediastreamer2/src/oss.c	Wed Dec 27 23:57:46 2006
X+@@ -30,7 +30,10 @@
X+ #include <sys/time.h>
X+ #include <sys/ioctl.h>
X+ #include <unistd.h>
X++
X++#ifdef HAVE_ALLOCA_H
X+ #include <alloca.h>
X++#endif
X+ 
X+ MSFilter *ms_oss_read_new(MSSndCard *card);
X+ MSFilter *ms_oss_write_new(MSSndCard *card);
Xdiff -urN /usr/ports/net/linphone-base/files/patch-mediastreamer::Makefile.in net/linphone-base/files/patch-mediastreamer::Makefile.in
X--- /usr/ports/net/linphone-base/files/patch-mediastreamer::Makefile.in	Tue Apr  5 13:35:10 2005
X+++ net/linphone-base/files/patch-mediastreamer::Makefile.in	Thu Jan  1 09:00:00 1970
X@@ -1,20 +0,0 @@
X---- mediastreamer/Makefile.in.orig	Tue Mar 22 00:53:39 2005
X-+++ mediastreamer/Makefile.in	Wed Mar 23 17:52:23 2005
X-@@ -66,7 +66,7 @@
X- @BUILD_UGLIB_TRUE@	$(top_builddir)/support/libuglib.la
X- @BUILD_TRUESPEECH_TRUE@am__DEPENDENCIES_3 = ../win32acm/libwin32acm.a
X- libmediastreamer_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
X--	../gsmlib/libgsm.la ../lpc10-1.5/liblpc10.la \
X-+	../lpc10-1.5/liblpc10.la \
X- 	../oRTP/src/libortp.la $(am__DEPENDENCIES_1) \
X- 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) \
X- 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_3) \
X-@@ -493,7 +493,7 @@
X- 							$(VIDEO_SOURCES)
X- 
X- libmediastreamer_la_LIBADD = $(GLIB_LIBS) \
X--							../gsmlib/libgsm.la \
X-+							-lgsm \
X- 							../lpc10-1.5/liblpc10.la \
X- 							../oRTP/src/libortp.la \
X- 							$(JACK_LIBS)\
Xdiff -urN /usr/ports/net/linphone-base/files/patch-mediastreamer::msfifo.c net/linphone-base/files/patch-mediastreamer::msfifo.c
X--- /usr/ports/net/linphone-base/files/patch-mediastreamer::msfifo.c	Thu Oct 23 12:29:23 2003
X+++ net/linphone-base/files/patch-mediastreamer::msfifo.c	Thu Jan  1 09:00:00 1970
X@@ -1,15 +0,0 @@
X-
X-$FreeBSD: ports/net/linphone-base/files/patch-mediastreamer::msfifo.c,v 1.4 2003/10/23 03:29:23 edwin Exp $
X-
X---- mediastreamer/msfifo.c	2002/12/30 08:33:16	1.1
X-+++ mediastreamer/msfifo.c	2002/12/30 08:33:36
X-@@ -23,6 +23,9 @@
X- #include "msutils.h"
X- #include "msfifo.h"
X- 
X-+#ifndef ENODATA
X-+#define ENODATA  61
X-+#endif
X- 
X- MSFifo * ms_fifo_new(MSBuffer *buf, gint r_gran, gint w_gran, gint r_offset, gint w_offset)
X- {
Xdiff -urN /usr/ports/net/linphone-base/files/patch-oRTP__src__stun_udp.c net/linphone-base/files/patch-oRTP__src__stun_udp.c
X--- /usr/ports/net/linphone-base/files/patch-oRTP__src__stun_udp.c	Thu Jan  1 09:00:00 1970
X+++ net/linphone-base/files/patch-oRTP__src__stun_udp.c	Sun Feb 25 03:36:49 2007
X@@ -0,0 +1,14 @@
X+--- oRTP/src/stun_udp.c.orig	Fri Sep 22 16:19:58 2006
X++++ oRTP/src/stun_udp.c	Sun Feb 25 03:36:37 2007
X+@@ -71,10 +71,10 @@
X+ #include <string.h>
X+ #include <stdio.h>
X+ #if !defined(WIN32) && !defined(_WIN32_WCE)
X++#include <sys/types.h> 
X+ #include <sys/ioctl.h>
X+ #include <sys/socket.h>
X+ #include <sys/time.h>
X+-#include <sys/types.h> 
X+ #include <arpa/inet.h>
X+ #include <fcntl.h>
X+ #include <netdb.h>
Xdiff -urN /usr/ports/net/linphone-base/pkg-descr net/linphone-base/pkg-descr
X--- /usr/ports/net/linphone-base/pkg-descr	Mon Jan 20 06:01:50 2003
X+++ net/linphone-base/pkg-descr	Fri Mar  2 23:07:51 2007
X@@ -2,4 +2,6 @@
X whole world, freely, simply by using the internet. The cost of the phone call
X is the cost that you spend connected to the internet.
X 
X-WWW: http://www.linphone.org
X+This package includes libraries, headers and cosole frontend.
X+
X+WWW: http://www.linphone.org/
Xdiff -urN /usr/ports/net/linphone-base/pkg-descr.gui net/linphone-base/pkg-descr.gui
X--- /usr/ports/net/linphone-base/pkg-descr.gui	Thu Jan  1 09:00:00 1970
X+++ net/linphone-base/pkg-descr.gui	Fri Mar  2 23:08:27 2007
X@@ -0,0 +1,7 @@
X+Linphone is a web phone: it let you phone to your friends anywhere in the
X+whole world, freely, simply by using the internet. The cost of the phone call
X+is the cost that you spend connected to the internet.
X+
X+This package includes graphical frontend and panel applet for Gnome.
X+
X+WWW: http://www.linphone.org/
Xdiff -urN /usr/ports/net/linphone-base/pkg-plist net/linphone-base/pkg-plist
X--- /usr/ports/net/linphone-base/pkg-plist	Wed Aug 16 01:15:03 2006
X+++ net/linphone-base/pkg-plist	Sun Feb 25 20:19:13 2007
X@@ -1,13 +1,25 @@
X bin/linphonec
X bin/sipomatic
X include/linphone/config.h
X-include/linphone/glist.h
X-include/linphone/gshell.h
X-include/linphone/gspawn.h
X include/linphone/linphonecore.h
X include/linphone/lpconfig.h
X-include/linphone/sndcard.h
X-include/linphone/uglib.h
X+include/mediastreamer2/allfilters.h
X+include/mediastreamer2/dtmfgen.h
X+include/mediastreamer2/ice.h
X+include/mediastreamer2/mediastream.h
X+include/mediastreamer2/mscommon.h
X+include/mediastreamer2/msfileplayer.h
X+include/mediastreamer2/msfilerec.h
X+include/mediastreamer2/msfilter.h
X+include/mediastreamer2/msqueue.h
X+include/mediastreamer2/msrtp.h
X+include/mediastreamer2/mssndcard.h
X+include/mediastreamer2/msticker.h
X+include/mediastreamer2/msv4l.h
X+include/mediastreamer2/msvideo.h
X+include/mediastreamer2/msvideoout.h
X+include/mediastreamer2/waveheader.h
X+include/ortp/event.h
X include/ortp/ortp.h
X include/ortp/payloadtype.h
X include/ortp/port.h
X@@ -17,16 +29,27 @@
X include/ortp/rtpsignaltable.h
X include/ortp/sessionset.h
X include/ortp/str_utils.h
X+include/ortp/stun.h
X+include/ortp/stun_udp.h
X include/ortp/telephonyevents.h
X lib/liblinphone.a
X lib/liblinphone.la
X lib/liblinphone.so
X-lib/liblinphone.so.4
X+lib/liblinphone.so.7
X+lib/libmediastreamer.a
X+lib/libmediastreamer.la
X+lib/libmediastreamer.so
X+lib/libmediastreamer.so.0
X lib/libortp.a
X lib/libortp.la
X lib/libortp.so
X-lib/libortp.so.4
X+lib/libortp.so.5
X+lib/libquickstream.a
X+lib/libquickstream.la
X+lib/libquickstream.so
X+lib/libquickstream.so.0
X libdata/pkgconfig/linphone.pc
X+libdata/pkgconfig/mediastreamer.pc
X libdata/pkgconfig/ortp.pc
X libexec/mediastream
X %%DATADIR%%/sounds/hello16000.wav
X@@ -40,33 +63,23 @@
X %%DATADIR%%/sounds/rings/synth.wav
X %%DATADIR%%/sounds/rings/tapping.wav
X %%DATADIR%%/sounds/rings/toy.wav
X-%%DOCSDIR%%/mediastreamer/book1.html
X-%%DOCSDIR%%/mediastreamer/coreapi.html
X-%%DOCSDIR%%/mediastreamer/index.sgml
X-%%DOCSDIR%%/mediastreamer/mediastreamer-filters.html
X-%%DOCSDIR%%/mediastreamer/mediastreamer-msringplayer.html
X-%%DOCSDIR%%/mediastreamer/mediastreamer-mssync.html
X-%%DOCSDIR%%/mediastreamer/mediastreamer-running-processing-chains.html
X-%%DOCSDIR%%/mediastreamer/msfilterimplementations.html
X-%%DOCSDIR%%/mediastreamer/userapi.html
X-share/locale/cs/LC_MESSAGES/linphone.mo
X-share/locale/de/LC_MESSAGES/linphone.mo
X-share/locale/es/LC_MESSAGES/linphone.mo
X-share/locale/fr/LC_MESSAGES/linphone.mo
X-share/locale/it/LC_MESSAGES/linphone.mo
X-share/locale/ja/LC_MESSAGES/linphone.mo
X-share/locale/nl/LC_MESSAGES/linphone.mo
X-share/locale/pl/LC_MESSAGES/linphone.mo
X-share/locale/pt_BR/LC_MESSAGES/linphone.mo
X-share/locale/sv/LC_MESSAGES/linphone.mo
X-@dirrmtry share/locale/cs/LC_MESSAGES
X-@dirrmtry share/locale/cs
X-@dirrmtry share/locale/pl/LC_MESSAGES
X-@dirrmtry share/locale/pl
X-@dirrm %%DOCSDIR%%/mediastreamer
X-@dirrm %%DOCSDIR%%
X+%%NLS%%share/locale/cs/LC_MESSAGES/linphone.mo
X+%%NLS%%share/locale/de/LC_MESSAGES/linphone.mo
X+%%NLS%%share/locale/es/LC_MESSAGES/linphone.mo
X+%%NLS%%share/locale/fr/LC_MESSAGES/linphone.mo
X+%%NLS%%share/locale/it/LC_MESSAGES/linphone.mo
X+%%NLS%%share/locale/ja/LC_MESSAGES/linphone.mo
X+%%NLS%%share/locale/nl/LC_MESSAGES/linphone.mo
X+%%NLS%%share/locale/pl/LC_MESSAGES/linphone.mo
X+%%NLS%%share/locale/pt_BR/LC_MESSAGES/linphone.mo
X+%%NLS%%share/locale/sv/LC_MESSAGES/linphone.mo
X+%%NLS%%@dirrmtry share/locale/pl/LC_MESSAGES
X+%%NLS%%@dirrmtry share/locale/pl
X+%%NLS%%@dirrmtry share/locale/cs/LC_MESSAGES
X+%%NLS%%@dirrmtry share/locale/cs
X @dirrm %%DATADIR%%/sounds/rings
X @dirrm %%DATADIR%%/sounds
X @dirrm %%DATADIR%%
X @dirrm include/ortp
X+@dirrm include/mediastreamer2
X @dirrm include/linphone
Xdiff -urN /usr/ports/net/linphone-base/pkg-plist.gui net/linphone-base/pkg-plist.gui
X--- /usr/ports/net/linphone-base/pkg-plist.gui	Thu Jan  1 09:00:00 1970
X+++ net/linphone-base/pkg-plist.gui	Sun Feb 25 20:01:06 2007
X@@ -0,0 +1,17 @@
X+bin/linphone
X+libdata/bonobo/servers/GNOME_LinphoneApplet.server
X+libexec/linphone_applet
X+share/gnome/applications/linphone.desktop
X+share/gnome/gnome-2.0/ui/GNOME_LinphoneApplet.xml
X+share/gnome/pixmaps/linphone/linphone.png
X+share/gnome/pixmaps/linphone/linphone2.png
X+share/gnome/pixmaps/linphone/linphone2.xpm
X+share/gnome/pixmaps/linphone/sip-away.png
X+share/gnome/pixmaps/linphone/sip-bifm.png
X+share/gnome/pixmaps/linphone/sip-busy.png
X+share/gnome/pixmaps/linphone/sip-closed.png
X+share/gnome/pixmaps/linphone/sip-online.png
X+share/gnome/pixmaps/linphone/sip-otl.png
X+share/gnome/pixmaps/linphone/sip-otp.png
X+share/gnome/pixmaps/linphone/sip-wfa.png
X+@dirrm share/gnome/pixmaps/linphone
END-of-net_linphone-base.diff
echo x - net_linphone.diff
sed 's/^X//' >net_linphone.diff << 'END-of-net_linphone.diff'
Xdiff -urN /usr/ports/net/linphone/Makefile net/linphone/Makefile
X--- /usr/ports/net/linphone/Makefile	Sun Mar 19 15:55:01 2006
X+++ net/linphone/Makefile	Mon Feb 26 20:49:05 2007
X@@ -5,40 +5,9 @@
X # $FreeBSD: ports/net/linphone/Makefile,v 1.31 2006/03/18 20:53:17 pav Exp $
X #
X 
X-PORTNAME=	${LINPHONE_PORTNAME}
X-PORTVERSION=	${LINPHONE_PORTVERSION}
X-PORTREVISION=	${LINPHONE_PORTREVISION}
X-PORTEPOCH=	${LINPHONE_PORTEPOCH}
X CATEGORIES=	net gnome
X-MASTER_SITES=	${LINPHONE_MASTER_SITES}
X+LINPHONE_GUI=	yes
X 
X-MAINTAINER=	ports@FreeBSD.org
X-COMMENT=	A web phone that supports SIP protocol
X+MASTERDIR=	${.CURDIR}/../../net/linphone-base
X 
X-LIB_DEPENDS=	linphone.4:${PORTSDIR}/net/linphone-base
X-
X-USE_X_PREFIX=	yes
X-USE_GNOME=	gnomehack gnomeprefix gnomepanel
X-USE_GMAKE=	yes
X-GNU_CONFIGURE=	yes
X-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
X-		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
X-CONFIGURE_ARGS=	--disable-ipv6 --disable-gtk-doc \
X-		--with-speex=${LOCALBASE} --with-osip=${LOCALBASE}
X-MAKE_ENV=	SUBDIRS="pixmaps gnome"
X-
X-MAN1=		linphone.1
X-
X-CFLAGS+=	-DPACKAGE_LOCALE_DIR='\"${LOCALBASE}/share/locale\"' \
X-		-DPACKAGE_DATA_DIR='\"${PREFIX}/share/gnome\"' \
X-		-DPACKAGE_SOUND_DIR='\"${LOCALBASE}/share/linphone/sounds\"'
X-
X-.include "${.CURDIR}/../../net/linphone-base/Makefile.common"
X-.include <bsd.port.pre.mk>
X-
X-post-install:
X-	${INSTALL_MAN} ${WRKSRC}/share/C/linphone.1 ${MANPREFIX}/man/man1
X-	${INSTALL_DATA} ${WRKSRC}/share/linphone.desktop \
X-		${PREFIX}/share/gnome/applications
X-
X-.include <bsd.port.post.mk>
X+.include "${MASTERDIR}/Makefile"
Xdiff -urN /usr/ports/net/linphone/pkg-descr net/linphone/pkg-descr
X--- /usr/ports/net/linphone/pkg-descr	Mon Jan 20 06:01:50 2003
X+++ net/linphone/pkg-descr	Thu Jan  1 09:00:00 1970
X@@ -1,5 +0,0 @@
X-Linphone is a web phone: it let you phone to your friends anywhere in the
X-whole world, freely, simply by using the internet. The cost of the phone call
X-is the cost that you spend connected to the internet.
X-
X-WWW: http://www.linphone.org
Xdiff -urN /usr/ports/net/linphone/pkg-plist net/linphone/pkg-plist
X--- /usr/ports/net/linphone/pkg-plist	Tue Apr  5 13:35:08 2005
X+++ net/linphone/pkg-plist	Thu Jan  1 09:00:00 1970
X@@ -1,17 +0,0 @@
X-bin/linphone
X-libdata/bonobo/servers/GNOME_LinphoneApplet.server
X-libexec/linphone_applet
X-share/gnome/applications/linphone.desktop
X-share/gnome/gnome-2.0/ui/GNOME_LinphoneApplet.xml
X-share/gnome/pixmaps/linphone/linphone.png
X-share/gnome/pixmaps/linphone/linphone2.png
X-share/gnome/pixmaps/linphone/linphone2.xpm
X-share/gnome/pixmaps/linphone/sip-away.png
X-share/gnome/pixmaps/linphone/sip-bifm.png
X-share/gnome/pixmaps/linphone/sip-busy.png
X-share/gnome/pixmaps/linphone/sip-closed.png
X-share/gnome/pixmaps/linphone/sip-online.png
X-share/gnome/pixmaps/linphone/sip-otl.png
X-share/gnome/pixmaps/linphone/sip-otp.png
X-share/gnome/pixmaps/linphone/sip-wfa.png
X-@dirrm share/gnome/pixmaps/linphone
END-of-net_linphone.diff
exit