ports/130442: Update port: net/linphone to 3.0.0
KATO Tsuguru
tkato432 at yahoo.com
Mon Jan 12 18:30:12 UTC 2009
>Number: 130442
>Category: ports
>Synopsis: Update port: net/linphone to 3.0.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: Mon Jan 12 18:30:06 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: FreeBSD 7.1-RELEASE-p1 i386
>Organization:
>Environment:
>Description:
- Update net/libexosip to 3.2.0
- Update net/linphone-base to version 3.0.0
[net/linphone-base]
New file:
files/patch-gtk-glade__Makefile.in
Remove file:
files/GNOME_LinphoneApplet.xml
files/patch-config.h.in
files/patch-configure
files/patch-gtk__Makefile.in
files/patch-mediastreamer2__src__oss.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_libexosip2.diff
# net_linphone-base.diff
#
echo x - net_libexosip2.diff
sed 's/^X//' >net_libexosip2.diff << '1b292d0d1b73542529c51ee00020e468'
Xdiff -urN /usr/ports/net/libexosip2/Makefile net/libexosip2/Makefile
X--- /usr/ports/net/libexosip2/Makefile 2008-04-01 14:08:33.000000000 +0900
X+++ net/libexosip2/Makefile 2008-11-16 01:51:26.000000000 +0900
X@@ -6,10 +6,9 @@
X #
X
X PORTNAME= libeXosip2
X-PORTVERSION= 3.1.0
X+PORTVERSION= 3.2.0
X CATEGORIES= net
X-MASTER_SITES= ${MASTER_SITE_SAVANNAH}
X-MASTER_SITE_SUBDIR= exosip
X+MASTER_SITES= SAVANNAH/exosip
X
X MAINTAINER= bd_subzero at yahoo.com
X COMMENT= GPL library that extends the capability of the oSIP library
Xdiff -urN /usr/ports/net/libexosip2/distinfo net/libexosip2/distinfo
X--- /usr/ports/net/libexosip2/distinfo 2008-04-01 14:08:34.000000000 +0900
X+++ net/libexosip2/distinfo 2008-11-16 01:58:23.000000000 +0900
X@@ -1,3 +1,3 @@
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
X+MD5 (libeXosip2-3.2.0.tar.gz) = 2186453c58b3da4e302d1456fffa02bf
X+SHA256 (libeXosip2-3.2.0.tar.gz) = 0eedfc9e79244c37b35477c686e9e9f94193e68a8b4fb15c58dade254d5ac452
X+SIZE (libeXosip2-3.2.0.tar.gz) = 502201
1b292d0d1b73542529c51ee00020e468
echo x - net_linphone-base.diff
sed 's/^X//' >net_linphone-base.diff << 'a9e957ed89c7b0dd011d93d8f55de3a0'
Xdiff -urN /usr/ports/net/linphone-base/Makefile net/linphone-base/Makefile
X--- /usr/ports/net/linphone-base/Makefile 2009-01-07 04:43:37.000000000 +0900
X+++ net/linphone-base/Makefile 2009-01-07 04:44:56.000000000 +0900
X@@ -6,8 +6,7 @@
X #
X
X PORTNAME= linphone
X-PORTVERSION= 2.1.1
X-PORTREVISION= 1
X+PORTVERSION= 3.0.0
X PORTEPOCH= 1
X CATEGORIES?= net
X MASTER_SITES= SAVANNAH/${PORTNAME}/stable/sources
X@@ -46,24 +45,23 @@
X .endif
X
X .if defined(LINPHONE_GUI)
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+BUILD_DEPENDS+= linphone-base>=3.0.0:${PORTSDIR}/net/linphone-base
X+RUN_DEPENDS+= linphone-base>=3.0.0:${PORTSDIR}/net/linphone-base
X DESCR= ${PKGDIR}/pkg-descr.gui
X PLIST= ${PKGDIR}/pkg-plist.gui
X-USE_GNOME+= gnomepanel gnomeprefix
X+USE_GNOME+= libglade2
X MAN1= linphone.1
X-SUBDIRS= pixmaps gtk
X+SUBDIRS= pixmaps gtk-glade
X .else
X PKGNAMESUFFIX= -base
X CONFIGURE_ARGS+= --enable-gtk_ui=no
X MAN1= linphonec.1 sipomatic.1
X-SUBDIRS= po oRTP mediastreamer2 media_api coreapi console
X+SUBDIRS= po oRTP mediastreamer2 coreapi console
X .endif
X
X-post-extract:
X- @${CP} -f ${FILESDIR}/GNOME_LinphoneApplet.xml ${WRKSRC}/gtk
X-
X post-patch:
X+ @${REINPLACE_CMD} -e 's|sounds/linphone|linphone/sounds|g' \
X+ ${WRKSRC}/configure
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@@ -74,11 +72,10 @@
X
X post-install:
X .if defined(LINPHONE_GUI)
X+ @${LN} -sf linphone-3 ${PREFIX}/bin/linphone
X ${INSTALL_MAN} ${WRKSRC}/share/C/linphone.1 ${MANPREFIX}/man/man1
X ${INSTALL_DATA} ${WRKSRC}/share/linphone.desktop \
X ${PREFIX}/share/applications
X- ${INSTALL_DATA} ${WRKSRC}/share/linphone_applet.desktop \
X- ${PREFIX}/share/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
Xdiff -urN /usr/ports/net/linphone-base/distinfo net/linphone-base/distinfo
X--- /usr/ports/net/linphone-base/distinfo 2008-04-01 14:08:35.000000000 +0900
X+++ net/linphone-base/distinfo 2008-10-14 16:51:43.000000000 +0900
X@@ -1,3 +1,3 @@
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
X+MD5 (linphone-3.0.0.tar.gz) = 8c883bb267da5d2b6c7c2a5c52641a35
X+SHA256 (linphone-3.0.0.tar.gz) = 68657f5efe147bd00ec1375daf3fe13ae1c81f906bf9d81ab4fad8f0ef1fabec
X+SIZE (linphone-3.0.0.tar.gz) = 7577336
Xdiff -urN /usr/ports/net/linphone-base/files/GNOME_LinphoneApplet.xml net/linphone-base/files/GNOME_LinphoneApplet.xml
X--- /usr/ports/net/linphone-base/files/GNOME_LinphoneApplet.xml 2007-04-28 21:50:11.000000000 +0900
X+++ net/linphone-base/files/GNOME_LinphoneApplet.xml 1970-01-01 09:00:00.000000000 +0900
X@@ -1,7 +0,0 @@
X-<Root>
X- <popups>
X- <popup name="button3">
X- <menuitem name="About" verb="About" _label="_About..." pixtype="stock" pixname="gnome-stock-about"/>
X- </popup>
X- </popups>
X-</Root>
Xdiff -urN /usr/ports/net/linphone-base/files/patch-config.h.in net/linphone-base/files/patch-config.h.in
X--- /usr/ports/net/linphone-base/files/patch-config.h.in 2007-10-25 13:50:44.000000000 +0900
X+++ net/linphone-base/files/patch-config.h.in 1970-01-01 09:00:00.000000000 +0900
X@@ -1,14 +0,0 @@
X-
X-$FreeBSD: ports/net/linphone-base/files/patch-config.h.in,v 1.5 2007/10/24 23:36:20 marcus Exp $
X-
X---- config.h.in 2003/02/27 23:47:19 1.1
X-+++ config.h.in 2003/02/27 23:47:35
X-@@ -122,8 +122,5 @@
X- first (like Motorola and SPARC, unlike Intel and VAX). */
X- #undef WORDS_BIGENDIAN
X-
X--/* Defined if we are compiling for FreeBSD */
X--#undef __FreeBSD__
X--
X- /* Defined if we are compiling for linux */
X- #undef __LINUX__
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 2008-04-01 14:08:35.000000000 +0900
X+++ net/linphone-base/files/patch-configure 1970-01-01 09:00:00.000000000 +0900
X@@ -1,11 +0,0 @@
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--if test "gtk_ui" = "true" ; then
X-+if test "$gtk_ui" = "true" ; then
X-
X- pkg_failed=no
X- { echo "$as_me:$LINENO: checking for GNOME_APPLETS" >&5
Xdiff -urN /usr/ports/net/linphone-base/files/patch-gtk-glade__Makefile.in net/linphone-base/files/patch-gtk-glade__Makefile.in
X--- /usr/ports/net/linphone-base/files/patch-gtk-glade__Makefile.in 1970-01-01 09:00:00.000000000 +0900
X+++ net/linphone-base/files/patch-gtk-glade__Makefile.in 2009-01-12 21:23:15.000000000 +0900
X@@ -0,0 +1,41 @@
X+--- gtk-glade/Makefile.in.orig 2008-10-10 21:54:08.000000000 +0900
X++++ gtk-glade/Makefile.in 2008-10-20 05:14:41.000000000 +0900
X+@@ -67,9 +67,6 @@
X+ linphone_3_OBJECTS = $(am_linphone_3_OBJECTS)
X+ am__DEPENDENCIES_1 =
X+ @BUILD_GLADE_UI_TRUE at linphone_3_DEPENDENCIES = \
X+- at BUILD_GLADE_UI_TRUE@ $(top_builddir)/oRTP/src/libortp.la \
X+- at BUILD_GLADE_UI_TRUE@ $(top_builddir)/mediastreamer2/src/libmediastreamer.la \
X+- at BUILD_GLADE_UI_TRUE@ $(top_builddir)/coreapi/liblinphone.la \
X+ @BUILD_GLADE_UI_TRUE@ $(am__DEPENDENCIES_1) \
X+ @BUILD_GLADE_UI_TRUE@ $(am__DEPENDENCIES_1) \
X+ @BUILD_GLADE_UI_TRUE@ $(am__DEPENDENCIES_1)
X+@@ -310,9 +307,9 @@
X+ @BUILD_GLADE_UI_TRUE@ logging.c \
X+ @BUILD_GLADE_UI_TRUE@ linphone.h
X+
X+- at BUILD_GLADE_UI_TRUE@linphone_3_LDADD = $(top_builddir)/oRTP/src/libortp.la \
X+- at BUILD_GLADE_UI_TRUE@ $(top_builddir)/mediastreamer2/src/libmediastreamer.la \
X+- at BUILD_GLADE_UI_TRUE@ $(top_builddir)/coreapi/liblinphone.la \
X++ at BUILD_GLADE_UI_TRUE@linphone_3_LDADD = `$(PKG_CONFIG) --libs ortp` \
X++ at BUILD_GLADE_UI_TRUE@ `$(PKG_CONFIG) --libs mediastreamer` \
X++ at BUILD_GLADE_UI_TRUE@ `$(PKG_CONFIG) --libs linphone` \
X+ @BUILD_GLADE_UI_TRUE@ $(LIBGTK_LIBS) $(INTLLIBS) \
X+ @BUILD_GLADE_UI_TRUE@ $(LIBGLADE_LIBS)
X+
X+@@ -324,10 +321,12 @@
X+
X+ #gtk-linphone.ui: gtk-linphone.glade
X+ # gtk-builder-convert gtk-linphone.glade $@
X+-AM_CFLAGS = -I$(top_srcdir)/coreapi/ \
X+- -I$(top_srcdir)/mediastreamer2/include/ \
X++AM_CFLAGS = \
X++ `$(PKG_CONFIG) --cflags ortp` \
X++ `$(PKG_CONFIG) --cflags mediastreamer` \
X++ `$(PKG_CONFIG) --cflags linphone` \
X+ $(LIBGLADE_CFLAGS) $(STRICT_OPTIONS) $(LIBGTK_CFLAGS) $(IPV6_CFLAGS) \
X+- $(ORTP_CFLAGS) $(OSIP_CFLAGS)
X++ $(OSIP_CFLAGS)
X+
X+ all: all-am
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 2008-04-01 14:08:36.000000000 +0900
X+++ net/linphone-base/files/patch-gtk__Makefile.in 1970-01-01 09:00:00.000000000 +0900
X@@ -1,38 +0,0 @@
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-- 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- @BUILD_GNOME_APPLET_TRUE@ $(am__DEPENDENCIES_1) \
X-- at BUILD_GNOME_APPLET_TRUE@ $(top_builddir)/coreapi/liblinphone.la \
X- @BUILD_GNOME_APPLET_TRUE@ $(am__DEPENDENCIES_1)
X- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
X- depcomp = $(SHELL) $(top_srcdir)/depcomp
X-@@ -335,7 +333,7 @@
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-
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) \
X-- at BUILD_GNOME_APPLET_TRUE@ $(top_builddir)/coreapi/liblinphone.la \
X-+ at BUILD_GNOME_APPLET_TRUE@ -llinphone \
X- @BUILD_GNOME_APPLET_TRUE@ $(OSIP_LIBS)
X-
X- @BUILD_GNOME_APPLET_TRUE at serverdir = $(libdir)/bonobo/servers
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 2007-03-22 20:46:17.000000000 +0900
X+++ net/linphone-base/files/patch-mediastreamer2__src__oss.c 1970-01-01 09:00:00.000000000 +0900
X@@ -1,13 +0,0 @@
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/pkg-plist net/linphone-base/pkg-plist
X--- /usr/ports/net/linphone-base/pkg-plist 2008-04-01 14:08:36.000000000 +0900
X+++ net/linphone-base/pkg-plist 2008-10-19 21:21:57.000000000 +0900
X@@ -20,8 +20,10 @@
X include/mediastreamer2/msvideo.h
X include/mediastreamer2/msvideoout.h
X include/mediastreamer2/msvolume.h
X+include/mediastreamer2/mswebcam.h
X include/mediastreamer2/rfc3984.h
X include/mediastreamer2/waveheader.h
X+include/ortp/b64.h
X include/ortp/event.h
X include/ortp/ortp.h
X include/ortp/payloadtype.h
X@@ -47,7 +49,7 @@
X lib/libortp.a
X lib/libortp.la
X lib/libortp.so
X-lib/libortp.so.7
X+lib/libortp.so.8
X libdata/pkgconfig/linphone.pc
X libdata/pkgconfig/mediastreamer.pc
X libdata/pkgconfig/ortp.pc
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 2007-10-25 13:50:44.000000000 +0900
X+++ net/linphone-base/pkg-plist.gui 2008-10-19 22:04:53.000000000 +0900
X@@ -1,9 +1,20 @@
X bin/linphone
X-libdata/bonobo/servers/GNOME_LinphoneApplet.server
X-libexec/linphone_applet
X+bin/linphone-3
X share/applications/linphone.desktop
X-share/applications/linphone_applet.desktop
X-share/gnome-2.0/ui/GNOME_LinphoneApplet.xml
X+%%DATADIR%%/about.glade
X+%%DATADIR%%/call_logs.glade
X+%%DATADIR%%/chatroom.glade
X+%%DATADIR%%/contact.glade
X+%%DATADIR%%/gtk-linphone.glade
X+%%DATADIR%%/incoming_call.glade
X+%%DATADIR%%/linphone.png
X+%%DATADIR%%/linphone2.png
X+%%DATADIR%%/log.glade
X+%%DATADIR%%/main.glade
X+%%DATADIR%%/parameters.glade
X+%%DATADIR%%/password.glade
X+%%DATADIR%%/sip_account.glade
X+%%DATADIR%%/stock_people.png
X share/pixmaps/linphone/linphone.png
X share/pixmaps/linphone/linphone2.png
X share/pixmaps/linphone/linphone2.xpm
X@@ -16,3 +27,5 @@
X share/pixmaps/linphone/sip-otp.png
X share/pixmaps/linphone/sip-wfa.png
X @dirrm share/pixmaps/linphone
X+ at dirrmtry %%DATADIR%%
X+ at dirrmtry share/applications
a9e957ed89c7b0dd011d93d8f55de3a0
exit
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list