ports/85534: Update port: net/linphone to 1.1.0
KATO Tsuguru
tkato432 at yahoo.com
Wed Aug 31 17:10:20 UTC 2005
>Number: 85534
>Category: ports
>Synopsis: Update port: net/linphone to 1.1.0
>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: Wed Aug 31 17:10:13 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: FreeBSD 4.11-RELEASE-p11 i386
>Organization:
>Environment:
>Description:
- Update to version 1.1.0
[net/linphone-base]
New file:
files/patch-gnome-callbacks.c
Remove file:
files/patch-console::commands.c
files/patch-coreapi::lpconfig.c
files/patch-coreapi::proxy.c
files/patch-gnome::linphone.c
files/patch-oRTP::Makefile.in
files/patch-oRTP::configure
files/patch-oRTP::src::rtpsession.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_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 Tue Apr 5 13:35:08 2005
X+++ net/linphone-base/Makefile Wed Aug 31 22:23:30 2005
X@@ -7,7 +7,6 @@
X
X PORTNAME= ${LINPHONE_PORTNAME}
X PORTVERSION= ${LINPHONE_PORTVERSION}
X-PORTREVISION= 1
X PORTREVISION= ${LINPHONE_PORTREVISION}
X PORTEPOCH= ${LINPHONE_PORTEPOCH}
X CATEGORIES= net
X@@ -24,12 +23,14 @@
X osip2.3:${PORTSDIR}/net/libosip2
X
X USE_GNOME= glib20 gnomehack gnometarget intlhack pkgconfig
X+USE_REINPLACE= yes
X USE_GMAKE= yes
X USE_LIBTOOL_VER= 15
X LIBTOOLFILES= configure oRTP/configure
X CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
X LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
X CONFIGURE_ARGS= --disable-ipv6 --disable-gtk-doc --enable-gnome_ui=no \
X+ --disable-ewarning --without-ilbc \
X --with-speex=${LOCALBASE} --with-osip=${LOCALBASE} \
X --with-html-dir=${DOCSDIR}
X INSTALLS_SHLIB= yes
X@@ -42,6 +43,9 @@
X
X .include "Makefile.common"
X .include <bsd.port.pre.mk>
X+
X+post-patch:
X+ @${REINPLACE_CMD} -e '/^SUBDIRS =/s|docs||g' ${WRKSRC}/oRTP/Makefile.in
X
X post-install:
X ${INSTALL_MAN} ${WRKSRC}/share/C/linphonec.1 ${MANPREFIX}/man/man1
Xdiff -urN /usr/ports/net/linphone-base/Makefile.common net/linphone-base/Makefile.common
X--- /usr/ports/net/linphone-base/Makefile.common Tue Apr 5 13:35:08 2005
X+++ net/linphone-base/Makefile.common Thu Aug 25 19:54:16 2005
X@@ -3,7 +3,7 @@
X #
X
X LINPHONE_PORTNAME= linphone
X-LINPHONE_PORTVERSION= 1.0.1
X+LINPHONE_PORTVERSION= 1.1.0
X LINPHONE_PORTREVISION= 0
X LINPHONE_PORTEPOCH= 1
X LINPHONE_MASTER_SITES= http://simon.morlat.free.fr/download/stable/source/
Xdiff -urN /usr/ports/net/linphone-base/distinfo net/linphone-base/distinfo
X--- /usr/ports/net/linphone-base/distinfo Tue Apr 5 13:35:08 2005
X+++ net/linphone-base/distinfo Thu Aug 25 22:43:13 2005
X@@ -1,2 +1,2 @@
X-MD5 (linphone-1.0.1.tar.gz) = d65f977dd6512b7725fcb2e2c9713e65
X-SIZE (linphone-1.0.1.tar.gz) = 7315742
X+MD5 (linphone-1.1.0.tar.gz) = 9f164b41c76ef1caca164909dea199a1
X+SIZE (linphone-1.1.0.tar.gz) = 7334577
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 Thu May 13 02:59:00 2004
X+++ net/linphone-base/files/patch-configure Thu Aug 25 23:31:34 2005
X@@ -1,9 +1,22 @@
X---- configure.orig Thu Apr 1 05:40:47 2004
X-+++ configure Thu Apr 15 03:28:18 2004
X-@@ -22220,23 +22220,6 @@
X- fi
X+--- configure.orig Thu Aug 25 07:37:04 2005
X++++ configure Thu Aug 25 23:31:24 2005
X+@@ -23818,10 +23818,6 @@
X+ ;;
X+ esac
X+
X+-if test "$GCC" = "yes" ; then
X+- STRICT_OPTIONS="-Wall -Werror"
X+-fi
X+-
X
X
X+ # Check whether --with-realprefix or --without-realprefix was given.
X+@@ -23930,23 +23926,6 @@
X+ if test "x${realprefix}" = "xnone"; then
X+ realprefix=${prefix}
X+ fi
X+-
X+-
X -cat >>confdefs.h <<_ACEOF
X -#define PACKAGE_LOCALE_DIR "${realprefix}/${DATADIRNAME}/locale"
X -_ACEOF
X@@ -19,8 +32,6 @@
X -cat >>confdefs.h <<_ACEOF
X -#define PACKAGE_SOUND_DIR "${realprefix}/${DATADIRNAME}/sounds/linphone"
X -_ACEOF
X--
X--
X- found_sound=no
X
X
X+ found_sound=no
Xdiff -urN /usr/ports/net/linphone-base/files/patch-console::commands.c net/linphone-base/files/patch-console::commands.c
X--- /usr/ports/net/linphone-base/files/patch-console::commands.c Tue Apr 5 06:42:06 2005
X+++ net/linphone-base/files/patch-console::commands.c Thu Jan 1 09:00:00 1970
X@@ -1,14 +0,0 @@
X---- console/commands.c.orig Tue Mar 8 03:31:49 2005
X-+++ console/commands.c Wed Mar 23 17:46:13 2005
X-@@ -112,9 +112,9 @@
X-
X- void linphonec_proxy_list(LinphoneCore *lc){
X- GList *proxies;
X-- int n;
X-+ int def, n;
X- proxies=linphone_core_get_proxy_config_list(lc);
X-- int def=linphone_core_get_default_proxy(lc,NULL);
X-+ def=linphone_core_get_default_proxy(lc,NULL);
X- for(n=0;proxies!=NULL;proxies=g_list_next(proxies),n++){
X- if (n==def)
X- printf("****** Proxy %i - this is the default one - *******\n",n);
Xdiff -urN /usr/ports/net/linphone-base/files/patch-coreapi::lpconfig.c net/linphone-base/files/patch-coreapi::lpconfig.c
X--- /usr/ports/net/linphone-base/files/patch-coreapi::lpconfig.c Tue Apr 5 06:42:06 2005
X+++ net/linphone-base/files/patch-coreapi::lpconfig.c Thu Jan 1 09:00:00 1970
X@@ -1,13 +0,0 @@
X---- coreapi/lpconfig.c.orig Fri Mar 11 21:53:12 2005
X-+++ coreapi/lpconfig.c Wed Mar 23 17:44:35 2005
X-@@ -266,8 +266,9 @@
X- }
X-
X- int lp_config_sync(LpConfig *lpconfig){
X-+ FILE *file;
X- if (lpconfig->filename==NULL) return;
X-- FILE *file=fopen(lpconfig->filename,"w");
X-+ file=fopen(lpconfig->filename,"w");
X- if (file==NULL){
X- g_warning("Could not write %s !",lpconfig->filename);
X- return -1;
Xdiff -urN /usr/ports/net/linphone-base/files/patch-coreapi::proxy.c net/linphone-base/files/patch-coreapi::proxy.c
X--- /usr/ports/net/linphone-base/files/patch-coreapi::proxy.c Tue Apr 5 06:42:06 2005
X+++ net/linphone-base/files/patch-coreapi::proxy.c Thu Jan 1 09:00:00 1970
X@@ -1,12 +0,0 @@
X---- coreapi/proxy.c.orig Fri Mar 11 01:54:25 2005
X-+++ coreapi/proxy.c Wed Mar 23 17:43:30 2005
X-@@ -59,8 +59,8 @@
X-
X- gint linphone_proxy_config_set_server_addr(LinphoneProxyConfig *obj, const gchar *server_addr){
X- int err;
X-- if (server_addr==NULL || strlen(server_addr)==0) return -1;
X- osip_from_t *url;
X-+ if (server_addr==NULL || strlen(server_addr)==0) return -1;
X- osip_from_init(&url);
X- err=osip_from_parse(url,server_addr);
X- if (err<0){
Xdiff -urN /usr/ports/net/linphone-base/files/patch-gnome-callbacks.c net/linphone-base/files/patch-gnome-callbacks.c
X--- /usr/ports/net/linphone-base/files/patch-gnome-callbacks.c Thu Jan 1 09:00:00 1970
X+++ net/linphone-base/files/patch-gnome-callbacks.c Thu Aug 25 23:45:00 2005
X@@ -0,0 +1,14 @@
X+--- gnome/callbacks.c.orig Sat Jul 9 22:32:24 2005
X++++ gnome/callbacks.c Thu Aug 25 23:44:43 2005
X+@@ -595,9 +595,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-gnome::linphone.c net/linphone-base/files/patch-gnome::linphone.c
X--- /usr/ports/net/linphone-base/files/patch-gnome::linphone.c Tue Apr 5 06:42:06 2005
X+++ net/linphone-base/files/patch-gnome::linphone.c Thu Jan 1 09:00:00 1970
X@@ -1,15 +0,0 @@
X---- gnome/linphone.c.orig Fri Mar 11 00:38:56 2005
X-+++ gnome/linphone.c Wed Mar 23 19:33:00 2005
X-@@ -255,9 +255,10 @@
X- LinphoneCore *lc=get_core();
X- GList *elem=linphone_core_get_proxy_config_list(lc);
X- LinphoneProxyConfig *cfg=NULL;
X-- linphone_core_get_default_proxy(lc,&cfg);
X- GtkWidget *combo;
X-- GtkWidget *hbox=lookup_widget(window,"proxy_hbox");
X-+ GtkWidget *hbox;
X-+ linphone_core_get_default_proxy(lc,&cfg);
X-+ hbox=lookup_widget(window,"proxy_hbox");
X- if (elem==NULL){
X- gtk_widget_hide(hbox);
X- return;
Xdiff -urN /usr/ports/net/linphone-base/files/patch-oRTP::Makefile.in net/linphone-base/files/patch-oRTP::Makefile.in
X--- /usr/ports/net/linphone-base/files/patch-oRTP::Makefile.in Tue Apr 5 06:42:06 2005
X+++ net/linphone-base/files/patch-oRTP::Makefile.in Thu Jan 1 09:00:00 1970
X@@ -1,11 +0,0 @@
X---- oRTP/Makefile.in.orig Tue Mar 22 00:53:54 2005
X-+++ oRTP/Makefile.in Wed Mar 23 18:51:57 2005
X-@@ -209,7 +209,7 @@
X- #config.h.in and acconfig.h to avoid a bug in automake that prevent them to be included in the
X- #dist...
X- EXTRA_DIST = oRTP.prj ortp-config.h.in TODO pkg.list
X--SUBDIRS = src docs build include
X-+SUBDIRS = src build include
X- @WITH_EPM_TRUE at PKG_NAME = $(PACKAGE)-$(VERSION)-$(RELEASE)
X- all: ortp-config.h
X- $(MAKE) $(AM_MAKEFLAGS) all-recursive
Xdiff -urN /usr/ports/net/linphone-base/files/patch-oRTP::configure net/linphone-base/files/patch-oRTP::configure
X--- /usr/ports/net/linphone-base/files/patch-oRTP::configure Tue Apr 5 13:35:11 2005
X+++ net/linphone-base/files/patch-oRTP::configure Thu Jan 1 09:00:00 1970
X@@ -1,13 +0,0 @@
X---- oRTP/configure.orig Wed Mar 23 13:35:19 2005
X-+++ oRTP/configure Wed Mar 23 13:41:11 2005
X-@@ -20712,10 +20712,6 @@
X- posixtimer_interval=20000
X- fi
X-
X--if test "$GCC" = "yes" ; then
X-- CFLAGS="$CFLAGS -Werror"
X--fi
X--
X-
X- cat >>confdefs.h <<_ACEOF
X- #define POSIXTIMER_INTERVAL $posixtimer_interval
Xdiff -urN /usr/ports/net/linphone-base/files/patch-oRTP::src::rtpsession.c net/linphone-base/files/patch-oRTP::src::rtpsession.c
X--- /usr/ports/net/linphone-base/files/patch-oRTP::src::rtpsession.c Tue Apr 5 06:42:06 2005
X+++ net/linphone-base/files/patch-oRTP::src::rtpsession.c Thu Jan 1 09:00:00 1970
X@@ -1,71 +0,0 @@
X---- oRTP/src/rtpsession.c.orig Thu Mar 10 01:34:59 2005
X-+++ oRTP/src/rtpsession.c Wed Mar 23 15:27:20 2005
X-@@ -377,16 +377,22 @@
X- close_socket (session->rtp.socket);
X- continue;
X- }
X--#ifndef __hpux
X-+#if !defined(__hpux) && !defined(__FreeBSD__)
X- switch (res->ai_family)
X- {
X- case AF_INET:
X- if (IN_MULTICAST(ntohl(((struct sockaddr_in *) res->ai_addr)->sin_addr.s_addr)))
X- {
X-+#if !defined(__FreeBSD__)
X- struct ip_mreqn mreq;
X-+#else
X-+ struct ip_mreq mreq;
X-+#endif
X- mreq.imr_multiaddr.s_addr = ((struct sockaddr_in *) res->ai_addr)->sin_addr.s_addr;
X- mreq.imr_address.s_addr = INADDR_ANY;
X-+#if !defined(__FreeBSD__)
X- mreq.imr_ifindex = 0;
X-+#endif
X- err = setsockopt(session->rtp.socket, IPPROTO_IP, IP_ADD_MEMBERSHIP, &mreq, sizeof(mreq));
X- if (err < 0)
X- {
X-@@ -454,16 +460,22 @@
X- close_socket (session->rtcp.socket);
X- continue;
X- }
X--#ifndef __hpux
X-+#if !defined(__hpux) && !defined(__FreeBSD__)
X- switch (res->ai_family)
X- {
X- case AF_INET:
X- if (IN_MULTICAST(ntohl(((struct sockaddr_in *) res->ai_addr)->sin_addr.s_addr)))
X- {
X-+#if !defined(__FreeBSD__)
X- struct ip_mreqn mreq;
X-+#else
X-+ struct ip_mreq mreq;
X-+#endif
X- mreq.imr_multiaddr.s_addr = ((struct sockaddr_in *) res->ai_addr)->sin_addr.s_addr;
X- mreq.imr_address.s_addr = INADDR_ANY;
X-+#if !defined(__FreeBSD__)
X- mreq.imr_ifindex = 0;
X-+#endif
X- err = setsockopt(session->rtcp.socket, IPPROTO_IP, IP_ADD_MEMBERSHIP, &mreq, sizeof(mreq));
X- if (err < 0)
X- {
X-@@ -555,13 +567,19 @@
X- close_socket (session->rtcp.socket);
X- return -1;
X- }
X--#ifndef __hpux
X-+#if !defined(__hpux) && !defined(__FreeBSD__)
X- if (IN_MULTICAST(ntohl(session->rtp.loc_addr.sin_addr.s_addr)))
X- {
X-+#if !defined(__FreeBSD__)
X- struct ip_mreqn mreq;
X-+#else
X-+ struct ip_mreq mreq;
X-+#endif
X- mreq.imr_multiaddr.s_addr = session->rtp.loc_addr.sin_addr.s_addr;
X- mreq.imr_address.s_addr = INADDR_ANY;
X-+#if !defined(__FreeBSD__)
X- mreq.imr_ifindex = 0;
X-+#endif
X- err = setsockopt(session->rtp.socket, IPPROTO_IP, IP_ADD_MEMBERSHIP, &mreq, sizeof(mreq));
X- if (err == 0)
X- err = setsockopt(session->rtcp.socket, IPPROTO_IP, IP_ADD_MEMBERSHIP, &mreq, sizeof(mreq));
Xdiff -urN /usr/ports/net/linphone-base/pkg-plist net/linphone-base/pkg-plist
X--- /usr/ports/net/linphone-base/pkg-plist Tue Apr 5 13:35:11 2005
X+++ net/linphone-base/pkg-plist Thu Aug 25 23:39:59 2005
X@@ -20,20 +20,12 @@
X include/ortp/telephonyevents.h
X lib/liblinphone.a
X lib/liblinphone.so
X-lib/liblinphone.so.1
X+lib/liblinphone.so.2
X lib/libortp.a
X lib/libortp.so
X lib/libortp.so.7
X libdata/pkgconfig/linphone.pc
X-share/doc/linphone/mediastreamer/book1.html
X-share/doc/linphone/mediastreamer/coreapi.html
X-share/doc/linphone/mediastreamer/mediastreamer-filters.html
X-share/doc/linphone/mediastreamer/mediastreamer-msringplayer.html
X-share/doc/linphone/mediastreamer/mediastreamer-mssync.html
X-share/doc/linphone/mediastreamer/mediastreamer-running-processing-chains.html
X-share/doc/linphone/mediastreamer/msfilterimplementations.html
X-share/doc/linphone/mediastreamer/userapi.html
X-share/doc/linphone/mediastreamer/index.sgml
X+libdata/pkgconfig/ortp.pc
X %%DATADIR%%/sounds/hello16000.wav
X %%DATADIR%%/sounds/hello8000.wav
X %%DATADIR%%/sounds/ringback.wav
X@@ -53,8 +45,6 @@
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- at dirrm share/doc/linphone/mediastreamer
X- at dirrm share/doc/linphone
X @dirrm %%DATADIR%%/sounds/rings
X @dirrm %%DATADIR%%/sounds
X @dirrm %%DATADIR%%
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 Tue Apr 5 13:35:08 2005
X+++ net/linphone/Makefile Thu Aug 25 23:42:16 2005
X@@ -7,7 +7,6 @@
X
X PORTNAME= ${LINPHONE_PORTNAME}
X PORTVERSION= ${LINPHONE_PORTVERSION}
X-PORTREVISION= 2
X PORTREVISION= ${LINPHONE_PORTREVISION}
X PORTEPOCH= ${LINPHONE_PORTEPOCH}
X CATEGORIES= net gnome
X@@ -16,7 +15,7 @@
X MAINTAINER= ports at FreeBSD.org
X COMMENT= A web phone that supports SIP protocol
X
X-LIB_DEPENDS= linphone.1:${PORTSDIR}/net/linphone-base
X+LIB_DEPENDS= linphone.2:${PORTSDIR}/net/linphone-base
X
X USE_X_PREFIX= yes
X USE_GNOME= gnomehack gnomeprefix gnomepanel
END-of-net_linphone.diff
exit
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list