ports/121089: Update port: net/linphone to 2.1.1

KATO Tsuguru tkato432 at yahoo.com
Mon Feb 25 17:10:03 UTC 2008


>Number:         121089
>Category:       ports
>Synopsis:       Update port: net/linphone to 2.1.1
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Feb 25 17:10:03 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        FreeBSD 6.3-RELEASE-p1 i386
>Organization:
>Environment:
>Description:
- Update net/libosip to version 3.1.0
- Update net/libexosip2 to version 3.1.0
- Update net/linphone-base to version 2.1.1

[net/linphone-base]
Remove file:
files/patch-exosip__Makefile.in
files/patch-exosip__jauth.c
files/patch-gtk__callbacks.c

>How-To-Repeat:
>Fix:

# 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_libosip.diff
#	net_libexosip2.diff
#	net_linphone-base.diff
#
echo x - net_libosip.diff
sed 's/^X//' >net_libosip.diff << 'END-of-net_libosip.diff'
Xdiff -urN /usr/ports/net/libosip/Makefile net/libosip/Makefile
X--- /usr/ports/net/libosip/Makefile	2007-03-06 03:14:44.000000000 +0900
X+++ net/libosip/Makefile	2008-02-19 02:23:10.000000000 +0900
X@@ -7,11 +7,9 @@
X #
X 
X PORTNAME=	libosip
X-PORTVERSION=	3.0.1
X+PORTVERSION=	3.1.0
X CATEGORIES=	net
X-MASTER_SITES=	${MASTER_SITE_GNU} \
X-		http://www.antisip.com/download/
X-MASTER_SITE_SUBDIR=	osip
X+MASTER_SITES=	GNU/osip
X DISTNAME=	${PORTNAME}2-${PORTVERSION}
X 
X MAINTAINER=	ports at FreeBSD.org
X@@ -19,12 +17,9 @@
X 
X CONFLICTS=	libosip2-2*
X 
X-WRKSRC=	${WRKDIR}/${PORTNAME}2-${PORTVERSION}
X-
X USE_GNOME=	gnomehack gnometarget pkgconfig
X-GNU_CONFIGURE=	yes
X-CONFIGURE_ARGS=	--disable-debug --disable-trace
X USE_AUTOTOOLS=	libtool:15
X+CONFIGURE_ARGS=	--disable-debug --disable-trace
X USE_LDCONFIG=	yes
X 
X post-patch:
Xdiff -urN /usr/ports/net/libosip/distinfo net/libosip/distinfo
X--- /usr/ports/net/libosip/distinfo	2006-12-11 13:47:01.000000000 +0900
X+++ net/libosip/distinfo	2008-02-19 02:40:47.000000000 +0900
X@@ -1,3 +1,3 @@
X-MD5 (libosip2-3.0.1.tar.gz) = 417833bb363ffd7c762ff17c931651df
X-SHA256 (libosip2-3.0.1.tar.gz) = dd09cefb80f327260c21a45a7b22f29f48c8d2d3f1f1c535fa5eed62f123bed9
X-SIZE (libosip2-3.0.1.tar.gz) = 652385
X+MD5 (libosip2-3.1.0.tar.gz) = 7eb305608256ac2a7a27b66ce52627c8
X+SHA256 (libosip2-3.1.0.tar.gz) = 245911a9a48bbe868c4518faf86191f6568fb99d9967d368164a17a83671e8fb
X+SIZE (libosip2-3.1.0.tar.gz) = 655700
Xdiff -urN /usr/ports/net/libosip/pkg-plist net/libosip/pkg-plist
X--- /usr/ports/net/libosip/pkg-plist	2006-12-11 13:47:01.000000000 +0900
X+++ net/libosip/pkg-plist	2008-02-19 02:45:09.000000000 +0900
X@@ -44,11 +44,11 @@
X lib/libosip2.a
X lib/libosip2.la
X lib/libosip2.so
X-lib/libosip2.so.4
X+lib/libosip2.so.5
X lib/libosipparser2.a
X lib/libosipparser2.la
X lib/libosipparser2.so
X-lib/libosipparser2.so.4
X+lib/libosipparser2.so.5
X libdata/pkgconfig/libosip2.pc
X @dirrm include/osipparser2/headers
X @dirrm include/osipparser2
END-of-net_libosip.diff
echo x - net_libexosip2.diff
sed 's/^X//' >net_libexosip2.diff << 'END-of-net_libexosip2.diff'
Xdiff -urN /usr/ports/net/libexosip2/Makefile net/libexosip2/Makefile
X--- /usr/ports/net/libexosip2/Makefile	2006-12-11 13:47:00.000000000 +0900
X+++ net/libexosip2/Makefile	2008-02-19 02:25:01.000000000 +0900
X@@ -6,7 +6,7 @@
X #
X 
X PORTNAME=	libeXosip2
X-PORTVERSION=	3.0.1
X+PORTVERSION=	3.1.0
X CATEGORIES=	net
X MASTER_SITES=	${MASTER_SITE_SAVANNAH}
X MASTER_SITE_SUBDIR=	exosip
X@@ -22,4 +22,7 @@
X 
X CFLAGS+=	-I${LOCALBASE}/include -L${LOCALBASE}/lib
X 
X+post-patch:
X+	@${REINPLACE_CMD} -e '/HAVE_OPENSSL/d' ${WRKSRC}/config.h.in
X+
X .include <bsd.port.mk>
Xdiff -urN /usr/ports/net/libexosip2/distinfo net/libexosip2/distinfo
X--- /usr/ports/net/libexosip2/distinfo	2006-12-11 13:47:00.000000000 +0900
X+++ net/libexosip2/distinfo	2008-02-19 02:26:26.000000000 +0900
X@@ -1,3 +1,3 @@
X-MD5 (libeXosip2-3.0.1.tar.gz) = bd52d81c83306c5ba260939537d69577
X-SHA256 (libeXosip2-3.0.1.tar.gz) = 04e2256773c16c57174a4a2492514a4002a5753507e3d319c2469d0ae80d348d
X-SIZE (libeXosip2-3.0.1.tar.gz) = 450738
X+MD5 (libeXosip2-3.1.0.tar.gz) = ed6005a146501a5f9308e28108ae7bca
X+SHA256 (libeXosip2-3.1.0.tar.gz) = eed72871201e2c1deae3d7c0b618bf16f306d91fc7ebcb53956ab7468663514f
X+SIZE (libeXosip2-3.1.0.tar.gz) = 489973
END-of-net_libexosip2.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	2007-10-25 13:50:44.000000000 +0900
X+++ net/linphone-base/Makefile	2008-02-14 03:03:06.000000000 +0900
X@@ -6,42 +6,31 @@
X #
X 
X PORTNAME=	linphone
X-PORTVERSION=	1.7.1
X-PORTREVISION=	2
X+PORTVERSION=	2.1.1
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/sources/:linphone \
X-			osip/:libosip2
X-DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}:linphone \
X-		libosip2-2.2.2${EXTRACT_SUFX}:libosip2
X+MASTER_SITES=	SAVANNAH/${PORTNAME}/stable/sources
X 
X MAINTAINER=	ports at FreeBSD.org
X COMMENT=	A web phone that supports SIP protocol
X 
X-LIB_DEPENDS=	jack.0:${PORTSDIR}/audio/jack \
X-		samplerate.1:${PORTSDIR}/audio/libsamplerate \
X-		portaudio.0:${PORTSDIR}/audio/portaudio \
X+LIB_DEPENDS=	gsm.1:${PORTSDIR}/audio/gsm \
X 		speex.1:${PORTSDIR}/audio/speex \
X-		osip2.3:${PORTSDIR}/net/libosip2 \
X-		ortp.5:${PORTSDIR}/net/ortp
X+		eXosip2.6:${PORTSDIR}/net/libexosip2
X+
X+CONFLICTS=	ortp-[0-9]*
X 
X USE_GNOME=	glib20 gnomehack gnometarget intlhack pkgconfig
X USE_GMAKE=	yes
X USE_AUTOTOOLS=	libtool:15
X-LIBTOOLFILES=	configure mediastreamer2/configure
X+LIBTOOLFILES=	configure oRTP/configure mediastreamer2/configure
X CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
X CONFIGURE_ARGS=	--disable-ipv6 --disable-manual --disable-ewarning \
X-		--disable-strict --disable-video --enable-external-ortp \
X-		--with-osip=${LOCALBASE}
X+		--disable-strict --disable-video --disable-external-ortp \
X+		--with-osip=${LOCALBASE} --with-gsm=${LOCALBASE}
X MAKE_ENV=	SUBDIRS="${SUBDIRS}"
X USE_LDCONFIG=	yes
X 
X-CFLAGS+=	-DPACKAGE_LOCALE_DIR='\"${PREFIX}/share/locale\"' \
X-		-DPACKAGE_DATA_DIR='\"${PREFIX}/share\"' \
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@@ -60,7 +49,8 @@
X .endif
X 
X .if defined(LINPHONE_GUI)
X-LIB_DEPENDS+=	linphone.8:${PORTSDIR}/net/linphone-base
X+BUILD_DEPENDS+=	linphone-base>=2.1.1:${PORTSDIR}/net/linphone-base
X+RUN_DEPENDS+=	linphone-base>=2.1.1:${PORTSDIR}/net/linphone-base
X DESCR=		${PKGDIR}/pkg-descr.gui
X PLIST=		${PKGDIR}/pkg-plist.gui
X USE_GNOME+=	gnomepanel gnomeprefix
X@@ -70,20 +60,20 @@
X PKGNAMESUFFIX=	-base
X CONFIGURE_ARGS+=	--enable-gtk_ui=no
X MAN1=		linphonec.1 sipomatic.1
X-SUBDIRS=	po gsmlib mediastreamer2 media_api exosip coreapi console
X+SUBDIRS=	po oRTP mediastreamer2 media_api coreapi console
X .endif
X 
X post-extract:
X 	@${CP} -f ${FILESDIR}/GNOME_LinphoneApplet.xml ${WRKSRC}/gtk
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 '/^imgdir =/s|(datadir)|(pkgdatadir)|g' \
X 		${WRKSRC}/mediastreamer2/src/Makefile.in
X+.for file in configure src/gsm.c
X+	@${REINPLACE_CMD} -e 's|gsm/gsm\.h|gsm.h|g' \
X+		${WRKSRC}/mediastreamer2/${file}
X+.endfor 
X 
X post-install:
X .if defined(LINPHONE_GUI)
Xdiff -urN /usr/ports/net/linphone-base/distinfo net/linphone-base/distinfo
X--- /usr/ports/net/linphone-base/distinfo	2007-04-29 13:47:25.000000000 +0900
X+++ net/linphone-base/distinfo	2008-02-19 03:03:39.000000000 +0900
X@@ -1,6 +1,3 @@
X-MD5 (linphone-1.7.1.tar.gz) = 6fe246d072fad2f4a9533317ab7e9060
X-SHA256 (linphone-1.7.1.tar.gz) = 3a3c606e2313f9871f07e41dfbeb87f6edb404f7927f7737fc22ab1a59a59e48
X-SIZE (linphone-1.7.1.tar.gz) = 7537415
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
X+MD5 (linphone-2.1.1.tar.gz) = 130fb6048f84ee89f7c1a8a010ff1add
X+SHA256 (linphone-2.1.1.tar.gz) = ae69a6fb606046bccb5bfa20726bbc054ebe25abd1865f004e6205542523184e
X+SIZE (linphone-2.1.1.tar.gz) = 7662602
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	2007-04-29 13:47:25.000000000 +0900
X+++ net/linphone-base/files/patch-configure	2007-12-02 14:44:08.000000000 +0900
X@@ -1,6 +1,6 @@
X---- configure.orig	Tue Apr 24 13:11:35 2007
X-+++ configure	Tue Apr 24 13:14:01 2007
X-@@ -23874,7 +23874,7 @@
X+--- configure.orig	Fri Nov 30 20:36:38 2007
X++++ configure	Sun Dec  2 14:43:57 2007
X+@@ -24138,7 +24138,7 @@
X  echo "GTK interface compilation is disabled."
X  fi
X  
X@@ -9,31 +9,3 @@
X  
X  pkg_failed=no
X  { echo "$as_me:$LINENO: checking for GNOME_APPLETS" >&5
X-@@ -24072,27 +24072,6 @@
X- if test "x${prefix}" = "xNONE"; then
X- 	prefix=${ac_default_prefix}
X- fi
X--
X--DATADIRNAME=share
X--
X--cat >>confdefs.h <<_ACEOF
X--#define PACKAGE_LOCALE_DIR "${prefix}/${DATADIRNAME}/locale"
X--_ACEOF
X--
X--
X--
X--cat >>confdefs.h <<_ACEOF
X--#define PACKAGE_DATA_DIR "${prefix}/${DATADIRNAME}"
X--_ACEOF
X--
X--
X--
X--cat >>confdefs.h <<_ACEOF
X--#define PACKAGE_SOUND_DIR "${prefix}/${DATADIRNAME}/sounds/linphone"
X--_ACEOF
X--
X--
X--
X- 
X- for ac_func in getifaddrs
X- do
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	2007-04-29 13:47:25.000000000 +0900
X+++ net/linphone-base/files/patch-coreapi::linphonecore.c	2008-02-14 02:54:58.000000000 +0900
X@@ -1,5 +1,5 @@
X---- coreapi/linphonecore.c.orig	Thu Apr  5 00:19:40 2007
X-+++ coreapi/linphonecore.c	Fri Apr 13 01:43:09 2007
X+--- coreapi/linphonecore.c.orig	2008-02-12 20:18:04.000000000 +0900
X++++ coreapi/linphonecore.c	2008-02-14 02:54:42.000000000 +0900
X @@ -29,11 +29,9 @@
X  #include "exevents.h"
X  
X@@ -10,5 +10,14 @@
X  #endif
X -#endif
X  
X- 
X- static const char *liblinphone_version=LIBLINPHONE_VERSION;
X+ #ifdef WIN32
X+ #define HAVE_EXOSIP_GET_VERSION 1
X+@@ -318,7 +316,7 @@
X+ 	const char **devices;
X+ 	int ndev;
X+ 	int i;
X+-#ifndef WIN32
X++#ifdef __linux
X+ 	/*alsadev let the user use custom alsa device within linphone*/
X+ 	devid=lp_config_get_string(lc->config,"sound","alsadev",NULL);
X+ 	if (devid){
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	2007-03-22 20:46:17.000000000 +0900
X+++ net/linphone-base/files/patch-exosip__Makefile.in	1970-01-01 09:00:00.000000000 +0900
X@@ -1,20 +0,0 @@
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	2007-03-22 20:46:17.000000000 +0900
X+++ net/linphone-base/files/patch-exosip__jauth.c	1970-01-01 09:00:00.000000000 +0900
X@@ -1,18 +0,0 @@
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-gtk__Makefile.in net/linphone-base/files/patch-gtk__Makefile.in
X--- /usr/ports/net/linphone-base/files/patch-gtk__Makefile.in	2007-04-18 04:21:27.000000000 +0900
X+++ net/linphone-base/files/patch-gtk__Makefile.in	2008-02-19 03:29:09.000000000 +0900
X@@ -1,13 +1,15 @@
X---- gtk/Makefile.in.orig	Tue Apr 10 05:06:20 2007
X-+++ gtk/Makefile.in	Fri Apr 13 03:49:05 2007
X-@@ -73,7 +73,6 @@
X+--- gtk/Makefile.in.orig	Wed Nov 21 19:04:35 2007
X++++ gtk/Makefile.in	Wed Nov 21 19:06:10 2007
X+@@ -73,8 +73,7 @@
X+ linphone_OBJECTS = $(am_linphone_OBJECTS)
X  am__DEPENDENCIES_1 =
X  @BUILD_GTK_TRUE at linphone_DEPENDENCIES = $(am__DEPENDENCIES_1) \
X- @BUILD_GTK_TRUE@	$(am__DEPENDENCIES_1) \
X-- at BUILD_GTK_TRUE@	$(top_builddir)/coreapi/liblinphone.la \
X- @BUILD_GTK_TRUE@	$(am__DEPENDENCIES_1)
X+- at BUILD_GTK_TRUE@	$(am__DEPENDENCIES_1) \
X+- at BUILD_GTK_TRUE@	$(top_builddir)/coreapi/liblinphone.la
X++ at BUILD_GTK_TRUE@	$(am__DEPENDENCIES_1)
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 @@ -95,7 +94,6 @@
X  linphone_applet_OBJECTS = $(am_linphone_applet_OBJECTS)
X  @BUILD_GNOME_APPLET_TRUE at linphone_applet_DEPENDENCIES =  \
X@@ -20,12 +22,12 @@
X  @BUILD_GTK_TRUE@	$(linphone_common_sources)
X  
X  @BUILD_GTK_TRUE at linphone_LDADD = $(LIBGTK_LIBS) $(INTLLIBS) \
X-- at BUILD_GTK_TRUE@				$(top_builddir)/coreapi/liblinphone.la \
X-+ at BUILD_GTK_TRUE@				-llinphone \
X- @BUILD_GTK_TRUE@				$(OSIP_LIBS)
X+- at BUILD_GTK_TRUE@				$(top_builddir)/coreapi/liblinphone.la
X++ at BUILD_GTK_TRUE@				-llinphone
X  
X- AM_CFLAGS = $(STRICT_OPTIONS) $(LIBGTK_CFLAGS) $(IPV6_CFLAGS)	
X-@@ -347,7 +345,7 @@
X+ AM_CFLAGS = $(STRICT_OPTIONS) $(LIBGTK_CFLAGS) $(IPV6_CFLAGS) \
X+ 		$(ORTP_CFLAGS) $(OSIP_CFLAGS)
X+@@ -348,7 +346,7 @@
X  @BUILD_GNOME_APPLET_TRUE at linphone_applet_CFLAGS = $(AM_CFLAGS) $(GNOME_APPLETS_CFLAGS) -DLINPHONE_APPLET
X  @BUILD_GNOME_APPLET_TRUE at linphone_applet_LDADD = \
X  @BUILD_GNOME_APPLET_TRUE@				$(GNOME_APPLETS_LIBS) \
Xdiff -urN /usr/ports/net/linphone-base/files/patch-gtk__callbacks.c net/linphone-base/files/patch-gtk__callbacks.c
X--- /usr/ports/net/linphone-base/files/patch-gtk__callbacks.c	2007-04-18 04:21:27.000000000 +0900
X+++ net/linphone-base/files/patch-gtk__callbacks.c	1970-01-01 09:00:00.000000000 +0900
X@@ -1,14 +0,0 @@
X---- gtk/callbacks.c.orig	Wed Feb  7 18:11:10 2007
X-+++ gtk/callbacks.c	Fri Apr 13 03:42:46 2007
X-@@ -626,9 +626,10 @@
X-                                         gpointer         user_data)
X- {
X- 	gchar *sipurl;
X-+	GtkWidget *gcr;
X- 	
X- 	sipurl=gtk_editable_get_chars(GTK_EDITABLE(get_main_window()->addressentry),0,-1);
X--	GtkWidget *gcr=chatroom_new(sipurl,NULL);
X-+	gcr=chatroom_new(sipurl,NULL);
X- 	if (gcr!=NULL) gtk_widget_show(gcr);
X- 	g_free(sipurl);
X- }
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	2007-03-22 20:46:17.000000000 +0900
X+++ net/linphone-base/files/patch-mediastreamer2__src__ice.c	2007-11-21 19:07:46.000000000 +0900
X@@ -1,10 +1,12 @@
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+--- mediastreamer2/src/ice.c.orig	Fri Oct 19 05:05:10 2007
X++++ mediastreamer2/src/ice.c	Wed Nov 21 19:07:33 2007
X+@@ -18,9 +18,7 @@
X  */
X  
X- #if !defined(WIN32) && !defined(_WIN32_WCE)
X-+#include <sys/types.h>
X+ #if !defined(WIN32) && !defined(_WIN32_WCE)
X+-#ifdef __APPLE__
X+ #include <sys/types.h>
X+-#endif
X  #include <sys/socket.h>
X  #include <netdb.h>
X  #endif
Xdiff -urN /usr/ports/net/linphone-base/pkg-plist net/linphone-base/pkg-plist
X--- /usr/ports/net/linphone-base/pkg-plist	2007-05-20 13:55:09.000000000 +0900
X+++ net/linphone-base/pkg-plist	2008-02-19 03:22:58.000000000 +0900
X@@ -14,25 +14,43 @@
X include/mediastreamer2/msqueue.h
X include/mediastreamer2/msrtp.h
X include/mediastreamer2/mssndcard.h
X+include/mediastreamer2/mstee.h
X include/mediastreamer2/msticker.h
X include/mediastreamer2/msv4l.h
X include/mediastreamer2/msvideo.h
X include/mediastreamer2/msvideoout.h
X+include/mediastreamer2/msvolume.h
X+include/mediastreamer2/rfc3984.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+include/ortp/rtcp.h
X+include/ortp/rtp.h
X+include/ortp/rtpsession.h
X+include/ortp/rtpsignaltable.h
X+include/ortp/sessionset.h
X+include/ortp/srtp.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.8
X+lib/liblinphone.so.3
X lib/libmediastreamer.a
X lib/libmediastreamer.la
X lib/libmediastreamer.so
X lib/libmediastreamer.so.0
X-lib/libquickstream.a
X-lib/libquickstream.la
X-lib/libquickstream.so
X-lib/libquickstream.so.0
X+lib/libortp.a
X+lib/libortp.la
X+lib/libortp.so
X+lib/libortp.so.7
X libdata/pkgconfig/linphone.pc
X libdata/pkgconfig/mediastreamer.pc
X+libdata/pkgconfig/ortp.pc
X libexec/mediastream
X %%DATADIR%%/sounds/hello16000.wav
X %%DATADIR%%/sounds/hello8000.wav
X@@ -45,17 +63,18 @@
X %%DATADIR%%/sounds/rings/synth.wav
X %%DATADIR%%/sounds/rings/tapping.wav
X %%DATADIR%%/sounds/rings/toy.wav
X-share/mediastreamer/images/nowebcamCIF.jpg
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/hu/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+share/mediastreamer/images/nowebcamCIF.jpg
X @dirrm share/mediastreamer/images
X @dirrm share/mediastreamer
X @dirrm %%DATADIR%%/sounds/rings
END-of-net_linphone-base.diff
exit

>Release-Note:
>Audit-Trail:
>Unformatted:



More information about the freebsd-ports-bugs mailing list