ports/66396: Update port: net/linphone to 0.12.2 (fix ports/61525)
KATO Tsuguru
tkato at prontomail.com
Sat May 8 14:40:22 UTC 2004
>Number: 66396
>Category: ports
>Synopsis: Update port: net/linphone to 0.12.2 (fix ports/61525)
>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: Sat May 08 07:40:14 PDT 2004
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: FreeBSD 4.9-RELEASE-p7 i386
>Organization:
>Environment:
>Description:
- Update to version 0.12.2
- Divide linphone port into two ports:
linphone-base (libraries and console frontends)
linphone (Gnome2 GUI frontends)
[net/linphone-base]
New file:
files/patch-coreapi::enum.c
Remove file:
files/patch-console::Makefile.in
files/patch-coreapi::Makefile.in
files/patch-oRTP::ltmain.sh
files/patch-osipua::ltmain.sh
files/patch-osipua::src::osipua.c
[net/linphone]
Remove file:
distinfo
files/patch-Makefile.in
files/patch-config.h.in
files/patch-configure
files/patch-console::Makefile.in
files/patch-coreapi::Makefile.in
files/patch-coreapi::linphonecore.c
files/patch-coreapi::misc.c
files/patch-gnome::Makefile.in
files/patch-gnome::callbacks.c
files/patch-lpc10-1.5::lpcini.c
files/patch-ltmain.sh
files/patch-media_api::Makefile.in
files/patch-mediastreamer::Makefile.in
files/patch-mediastreamer::msfifo.c
files/patch-oRTP::configure
files/patch-oRTP::ltmain.sh
files/patch-oRTP::src::port_fct.c
files/patch-oRTP::src::scheduler.h
files/patch-osipua::ltmain.sh
files/patch-osipua::src::osipua.c
files/patch-osipua::src::sdphandler.c
files/patch-osipua::src::utils.c
files/patch-share::Makefile.in
Following PRs should be superseded by this one:
[2004/01/18] ports/61525 Update port: net/linphone
>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/Makefile net/linphone-base/Makefile
X--- /usr/ports/net/linphone/Makefile Mon Apr 5 13:52:56 2004
X+++ net/linphone-base/Makefile Thu Apr 15 04:19:20 2004
X@@ -5,13 +5,13 @@
X # $FreeBSD: ports/net/linphone/Makefile,v 1.23 2004/04/05 03:30:10 marcus Exp $
X #
X
X-PORTNAME= linphone
X-PORTVERSION= 0.12.1
X-PORTREVISION= 2
X-PORTEPOCH= 1
X+PORTNAME= ${LINPHONE_PORTNAME}
X+PORTVERSION= ${LINPHONE_PORTVERSION}
X+PORTREVISION= ${LINPHONE_PORTREVISION}
X+PORTEPOCH= ${LINPHONE_PORTEPOCH}
X CATEGORIES= net
X-MASTER_SITES= http://simon.morlat.free.fr/download/%SUBDIR%/
X-MASTER_SITE_SUBDIR= ${PORTVERSION}/source
X+MASTER_SITES= ${LINPHONE_MASTER_SITES}
X+PKGNAMESUFFIX= -base
X
X MAINTAINER= ports at FreeBSD.org
X COMMENT= A web phone that supports SIP protocol
X@@ -20,28 +20,33 @@
X speex.2:${PORTSDIR}/audio/speex \
X osip.9:${PORTSDIR}/net/libosip
X
X-USE_GNOME= gnomehack gnometarget
X+USE_GNOME= glib20 gnomehack gnometarget intlhack pkgconfig
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
X+CONFIGURE_ARGS= --disable-ipv6 --enable-gnome_ui=no \
X+ --with-speex=${LOCALBASE} --with-html-dir=${DOCSDIR}
X INSTALLS_SHLIB= yes
X
X-MAN1= linphone.1 linphonec.1 sipomatic.1
X+MAN1= linphonec.1 sipomatic.1
X
X-.if defined(WITHOUT_X11)
X-CONFIGURE_ARGS+= --enable-gnome_ui=no --with-html-dir=${DOCSDIR}
X-PLIST_SUB+= GNOME="@comment " \
X- GNOME_PATH="" \
X- HTMLDOCSDIR="${DOCSDIR:S,^${PREFIX}/,,}"
X-.else
X-USE_X_PREFIX= yes
X-USE_GNOME+= gnomepanel gnomeprefix
X-DOCSDIR= ${GNOME_HTML_DIR}
X-PLIST_SUB+= GNOME="" \
X- GNOME_PATH="gnome/" \
X- HTMLDOCSDIR="${GNOME_HTML_DIR:S,^${PREFIX}/,,}"
X-.endif
X+CFLAGS+= -DPACKAGE_LOCALE_DIR='\"${PREFIX}/share/locale\"' \
X+ -DPACKAGE_DATA_DIR='\"${PREFIX}/share\"' \
X+ -DPACKAGE_SOUND_DIR='\"${DATADIR}/sounds\"'
X+
X+.include "Makefile.common"
X+.include <bsd.port.pre.mk>
X+
X+post-install:
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+ @${MKDIR} ${DATADIR}/sounds
X+ ${INSTALL_DATA} ${WRKSRC}/share/*.wav ${DATADIR}/sounds
X+ @${MKDIR} ${DATADIR}/sounds/rings
X+ ${INSTALL_DATA} ${WRKSRC}/share/rings/*.wav ${DATADIR}/sounds/rings
X+ @${MKDIR} ${PREFIX}/share/linphonec
X+ ${INSTALL_DATA} ${WRKSRC}/share/linphonec ${PREFIX}/share/linphonec
X
X-.include <bsd.port.mk>
X+.include <bsd.port.post.mk>
Xdiff -urN /usr/ports/net/linphone/Makefile.common net/linphone-base/Makefile.common
X--- /usr/ports/net/linphone/Makefile.common Thu Jan 1 09:00:00 1970
X+++ net/linphone-base/Makefile.common Thu Apr 15 02:58:25 2004
X@@ -0,0 +1,12 @@
X+#
X+# $FreeBSD$
X+#
X+
X+LINPHONE_PORTNAME= linphone
X+LINPHONE_PORTVERSION= 0.12.2
X+LINPHONE_PORTREVISION= 0
X+LINPHONE_PORTEPOCH= 1
X+LINPHONE_MASTER_SITES= http://simon.morlat.free.fr/download/${LINPHONE_PORTVERSION}/source/
X+
X+PATCHDIR= ${.CURDIR}/../../net/linphone-base/files
X+MD5_FILE= ${.CURDIR}/../../net/linphone-base/distinfo
Xdiff -urN /usr/ports/net/linphone/distinfo net/linphone-base/distinfo
X--- /usr/ports/net/linphone/distinfo Fri Jan 30 14:52:21 2004
X+++ net/linphone-base/distinfo Thu Apr 15 03:18:23 2004
X@@ -1,2 +1,2 @@
X-MD5 (linphone-0.12.1.tar.gz) = 62e94ca8e3a95297175ee0c3c6de13b1
X-SIZE (linphone-0.12.1.tar.gz) = 8296534
X+MD5 (linphone-0.12.2.tar.gz) = 86c01dbbcdb41786229f51ec0994ff67
X+SIZE (linphone-0.12.2.tar.gz) = 3044602
Xdiff -urN /usr/ports/net/linphone/files/patch-Makefile.in net/linphone-base/files/patch-Makefile.in
X--- /usr/ports/net/linphone/files/patch-Makefile.in Sun Nov 23 10:21:02 2003
X+++ net/linphone-base/files/patch-Makefile.in Thu Apr 15 04:00:54 2004
X@@ -1,16 +1,24 @@
X
X $FreeBSD: ports/net/linphone/files/patch-Makefile.in,v 1.4 2003/11/22 21:24:41 krion Exp $
X
X---- Makefile.in.orig Thu Nov 20 19:41:33 2003
X-+++ Makefile.in Fri Nov 21 11:04:35 2003
X-@@ -156,8 +156,8 @@
X+--- Makefile.in.orig Thu Apr 1 05:40:35 2004
X++++ Makefile.in Thu Apr 15 03:26:01 2004
X+@@ -156,13 +156,15 @@
X
X @BUILD_TRUESPEECH_TRUE at WIN32ACM_DIR = win32acm
X
X--SUBDIRS = support pixmaps ffmpeg po macros debian ipkg oRTP gsmlib lpc10-1.5 \
X-- speex $(WIN32ACM_DIR) mediastreamer \
X-+SUBDIRS = support pixmaps ffmpeg po macros debian ipkg oRTP lpc10-1.5 \
X-+ $(WIN32ACM_DIR) mediastreamer \
X- media_api osipua coreapi console gnome share developer-docs
X++ifndef SUBDIRS
X+ @BUILD_SPEEX_TRUE at SUBDIRS = support pixmaps ffmpeg po debian ipkg oRTP gsmlib lpc10-1.5 \
X+ @BUILD_SPEEX_TRUE@ $(WIN32ACM_DIR) speex mediastreamer \
X+ @BUILD_SPEEX_TRUE@ media_api osipua coreapi console gnome share developer-docs
X
X+- at BUILD_SPEEX_FALSE@SUBDIRS = support pixmaps ffmpeg po debian ipkg oRTP gsmlib lpc10-1.5 \
X+- at BUILD_SPEEX_FALSE@ $(WIN32ACM_DIR) speex mediastreamer \
X+- at BUILD_SPEEX_FALSE@ media_api osipua coreapi console gnome share developer-docs
X++ at BUILD_SPEEX_FALSE@SUBDIRS = support ffmpeg po debian ipkg oRTP lpc10-1.5 \
X++ at BUILD_SPEEX_FALSE@ $(WIN32ACM_DIR) mediastreamer \
X++ at BUILD_SPEEX_FALSE@ media_api osipua coreapi console gnome developer-docs
X++endif
X
X+
X+ EXTRA_DIST = linphone2.glade BUGS linphone.kdevprj \
Xdiff -urN /usr/ports/net/linphone/files/patch-configure net/linphone-base/files/patch-configure
X--- /usr/ports/net/linphone/files/patch-configure Sun Nov 23 10:21:02 2003
X+++ net/linphone-base/files/patch-configure Thu Apr 15 03:28:47 2004
X@@ -1,43 +1,26 @@
X---- configure.orig Thu Nov 20 19:41:45 2003
X-+++ configure Fri Nov 21 11:02:43 2003
X-@@ -463,7 +463,7 @@
X- # include <unistd.h>
X- #endif"
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
X--ac_subdirs_all="$ac_subdirs_all ffmpeg speex oRTP osipua"
X-+ac_subdirs_all="$ac_subdirs_all ffmpeg oRTP osipua"
X- ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE INSIDE_GNOME_COMMON_TRUE INSIDE_GNOME_COMMON_FALSE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE CPP EGREP INTLTOOL_DESKTOP_RULE INTLTOOL_DIRECTORY_RULE INTLTOOL_KEYS_RULE INTLTOOL_PROP_RULE INTLTOOL_OAF_RULE INTLTOOL_PONG_RULE INTLTOOL_SERVER_RULE INTLTOOL_SHEET_RULE INTLTOOL_SOUNDLIST_RULE INTLTOOL_UI_RULE INTLTOOL_XAM_RULE INTLTOOL_XML_RULE INTLTOOL_CAVES_RULE INTLTOOL_SCHEMAS_RUL
E INTLTOOL_THEME_RULE INTLTOOL_EXTRACT INTLTOOL_MERGE INTLTOOL_UPDATE INTLTOOL_PERL build build_cpu build_vendor build_os host host_cpu host_vendor host_os LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CXX CXXFLAGS ac_ct_CXX CXXDEPMODE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL GETTEXT_PACKAGE USE_NLS MSGFMT GMSGFMT XGETTEXT CATALOGS CATOBJEXT DATADIRNAME GMOFILES INSTOBJEXT INTLLIBS PO_IN_DATADIR_TRUE PO_IN_DATADIR_FALSE POFILES POSUB MKINSTALLDIRS PKG_CONFIG GLIB_CFLAGS GLIB_LIBS GLIB_GENMARSHAL GOBJECT_QUERY GLIB_MKENUMS LIBGNOMEUI_CFLAGS LIBGNOMEUI_LIBS LIBGNOME_CFLAGS LIBGNOME_LIBS GNOME_APPLETS_CFLAGS GNOME_APPLETS_LIBS PTHREAD_LDFLAGS GSMLIB_CFLAGS osip_prefix IPV6_CFLAGS TRUESPEECH_CFLAGS BUILD_TRUESPEECH_TRUE BUILD_TRUESPEECH_FALSE NASM AVCODEC_LIBS GDK_CFLAGS GDK_LIBS BUILD_MEDIASTREAMER_TRUE BUILD_MEDIASTREAMER_FALSE HAVE_XINELIB_TRUE HAVE_XINELIB_FALSE HAVE_SMPEG_TRUE HAVE_SMPEG_FALSE BUILD_FFMPEG_TRUE BUILD_FFMPEG_FALSE BUILD_GDK_VO_TRUE BUILD_GDK_VO_FALSE BUILD_V4L_TRUE B
UILD_V4L_FALSE BUILD_MEDIA_API_TRUE BUILD_MEDIA_API_FALSE BUILD_UGLIB_TRUE BUILD_UGLIB_FALSE BUILD_GNOME_TRUE BUILD_GNOME_FALSE BUILD_GNOME_APPLET_TRUE BUILD_GNOME_APPLET_FALSE ALSA_LIBS subdirs HTML_DIR GTKDOC HAVE_GTK_DOC_TRUE HAVE_GTK_DOC_FALSE HAVE_GTK_DOC ENABLE_GTK_DOC_TRUE ENABLE_GTK_DOC_FALSE LINPHONE_CFLAGS LINPHONE_LIBS LIBOBJS LTLIBOBJS'
X- ac_subst_files=''
X
X-@@ -22300,19 +22300,19 @@
X-
X-
X- cat >>confdefs.h <<_ACEOF
X+-cat >>confdefs.h <<_ACEOF
X -#define PACKAGE_LOCALE_DIR "${realprefix}/${DATADIRNAME}/locale"
X-+#define PACKAGE_LOCALE_DIR "${realprefix}/share/locale"
X- _ACEOF
X-
X-
X-
X- cat >>confdefs.h <<_ACEOF
X+-_ACEOF
X+-
X+-
X+-
X+-cat >>confdefs.h <<_ACEOF
X -#define PACKAGE_DATA_DIR "${realprefix}/${DATADIRNAME}"
X-+#define PACKAGE_DATA_DIR "${realprefix}/share/gnome"
X- _ACEOF
X-
X-
X-
X- cat >>confdefs.h <<_ACEOF
X+-_ACEOF
X+-
X+-
X+-
X+-cat >>confdefs.h <<_ACEOF
X -#define PACKAGE_SOUND_DIR "${realprefix}/${DATADIRNAME}/sounds/linphone"
X-+#define PACKAGE_SOUND_DIR "${realprefix}/share/gnome/sounds/linphone"
X- _ACEOF
X-
X-
X-@@ -23669,7 +23669,7 @@
X-
X-
X-
X--subdirs="$subdirs ffmpeg speex oRTP osipua"
X-+subdirs="$subdirs ffmpeg oRTP osipua"
X+-_ACEOF
X+-
X+-
X+ found_sound=no
X
X
X- ##################################################
Xdiff -urN /usr/ports/net/linphone/files/patch-console::Makefile.in net/linphone-base/files/patch-console::Makefile.in
X--- /usr/ports/net/linphone/files/patch-console::Makefile.in Thu Oct 23 19:18:35 2003
X+++ net/linphone-base/files/patch-console::Makefile.in Thu Jan 1 09:00:00 1970
X@@ -1,13 +0,0 @@
X-
X-$FreeBSD: ports/net/linphone/files/patch-console::Makefile.in,v 1.6 2003/10/23 03:29:23 edwin Exp $
X-
X---- console/Makefile.in.orig Wed Aug 20 17:47:05 2003
X-+++ console/Makefile.in Sat Aug 23 01:16:01 2003
X-@@ -164,7 +164,6 @@
X- -I$(top_srcdir)/oRTP/src \
X- -I$(top_srcdir)/oRTP/ \
X- -I$(top_srcdir)/mediastreamer \
X-- -I$(top_srcdir)/speex/libspeex \
X- -I$(osip_prefix)/include/
X-
X-
Xdiff -urN /usr/ports/net/linphone/files/patch-coreapi::Makefile.in net/linphone-base/files/patch-coreapi::Makefile.in
X--- /usr/ports/net/linphone/files/patch-coreapi::Makefile.in Thu Oct 23 19:18:35 2003
X+++ net/linphone-base/files/patch-coreapi::Makefile.in Thu Jan 1 09:00:00 1970
X@@ -1,13 +0,0 @@
X-
X-$FreeBSD: ports/net/linphone/files/patch-coreapi::Makefile.in,v 1.5 2003/10/23 03:29:23 edwin Exp $
X-
X---- coreapi/Makefile.in.orig Wed Aug 20 17:46:46 2003
X-+++ coreapi/Makefile.in Sat Aug 23 01:14:24 2003
X-@@ -166,7 +166,6 @@
X- -I$(top_srcdir)/oRTP/src \
X- -I$(top_srcdir)/oRTP/ \
X- -I$(top_srcdir)/mediastreamer \
X-- -I$(top_srcdir)/speex/libspeex \
X- -I$(osip_prefix)/include/
X-
X-
Xdiff -urN /usr/ports/net/linphone/files/patch-coreapi::enum.c net/linphone-base/files/patch-coreapi::enum.c
X--- /usr/ports/net/linphone/files/patch-coreapi::enum.c Thu Jan 1 09:00:00 1970
X+++ net/linphone-base/files/patch-coreapi::enum.c Thu Apr 15 03:47:48 2004
X@@ -0,0 +1,16 @@
X+
X+$FreeBSD$
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/files/patch-gnome::Makefile.in net/linphone-base/files/patch-gnome::Makefile.in
X--- /usr/ports/net/linphone/files/patch-gnome::Makefile.in Thu Oct 23 19:18:35 2003
X+++ net/linphone-base/files/patch-gnome::Makefile.in Sat Jan 17 04:02:58 2004
X@@ -3,11 +3,47 @@
X
X --- gnome/Makefile.in.orig Wed Aug 20 17:47:19 2003
X +++ gnome/Makefile.in Sat Aug 23 01:16:42 2003
X-@@ -162,7 +162,6 @@
X+@@ -160,7 +160,6 @@
X @BUILD_GNOME_TRUE@ -I$(top_srcdir)/oRTP/src \
X @BUILD_GNOME_TRUE@ -I$(top_srcdir)/oRTP/ \
X @BUILD_GNOME_TRUE@ -I$(top_srcdir)/mediastreamer \
X - at BUILD_GNOME_TRUE@ -I$(top_srcdir)/speex/libspeex \
X @BUILD_GNOME_TRUE@ -I$(top_srcdir)/coreapi \
X @BUILD_GNOME_TRUE@ -I$(top_srcdir)/osipua/ \
X- @BUILD_GNOME_TRUE@ -I$(top_srcdir)/osipua/src
X+ @BUILD_GNOME_TRUE@ -I$(top_srcdir)/osipua/src \
X+@@ -183,7 +182,7 @@
X+
X+ @BUILD_GNOME_TRUE at linphone_LDADD = $(LIBGNOMEUI_LIBS) $(INTLLIBS) \
X+ @BUILD_GNOME_TRUE@ $(LIBGNOME_LIBS) \
X+- at BUILD_GNOME_TRUE@ $(top_srcdir)/coreapi/liblinphonegnome.la
X++ at BUILD_GNOME_TRUE@ -llinphonegnome
X+
X+
X+ AM_CFLAGS = $(LIBGNOMEUI_CFLAGS) $(LIBGNOME_CFLAGS) $(GNOME_APPLETS_CFLAGS) $(IPV6_CFLAGS)
X+@@ -206,7 +205,7 @@
X+
X+ @BUILD_GNOME_APPLET_TRUE at linphone_applet_LDADD = \
X+ @BUILD_GNOME_APPLET_TRUE@ $(GNOME_APPLETS_LIBS) \
X+- at BUILD_GNOME_APPLET_TRUE@ $(top_srcdir)/coreapi/liblinphonegnome.la
X++ at BUILD_GNOME_APPLET_TRUE@ -llinphonegnome
X+
X+
X+
X+@@ -241,7 +240,7 @@
X+ @BUILD_GNOME_TRUE@ propertybox.$(OBJEXT) addressbook.$(OBJEXT)
X+ linphone_OBJECTS = $(am_linphone_OBJECTS)
X+ @BUILD_GNOME_TRUE at linphone_DEPENDENCIES = \
X+- at BUILD_GNOME_TRUE@ $(top_srcdir)/coreapi/liblinphonegnome.la
X++ at BUILD_GNOME_TRUE@ -llinphonegnome
X+ @BUILD_GNOME_FALSE at linphone_DEPENDENCIES =
X+ linphone_LDFLAGS =
X+ @BUILD_GNOME_APPLET_TRUE at am_linphone_applet_OBJECTS = \
X+@@ -256,7 +255,7 @@
X+ @BUILD_GNOME_APPLET_TRUE@ linphone_applet-applet.$(OBJEXT)
X+ linphone_applet_OBJECTS = $(am_linphone_applet_OBJECTS)
X+ @BUILD_GNOME_APPLET_TRUE at linphone_applet_DEPENDENCIES = \
X+- at BUILD_GNOME_APPLET_TRUE@ $(top_srcdir)/coreapi/liblinphonegnome.la
X++ at BUILD_GNOME_APPLET_TRUE@ -llinphonegnome
X+ @BUILD_GNOME_APPLET_FALSE at linphone_applet_DEPENDENCIES =
X+ linphone_applet_LDFLAGS =
X+
Xdiff -urN /usr/ports/net/linphone/files/patch-mediastreamer::Makefile.in net/linphone-base/files/patch-mediastreamer::Makefile.in
X--- /usr/ports/net/linphone/files/patch-mediastreamer::Makefile.in Sun Nov 23 10:21:03 2003
X+++ net/linphone-base/files/patch-mediastreamer::Makefile.in Thu Apr 15 03:31:04 2004
X@@ -1,8 +1,8 @@
X
X $FreeBSD: ports/net/linphone/files/patch-mediastreamer::Makefile.in,v 1.7 2003/11/22 21:24:41 krion Exp $
X
X---- mediastreamer/Makefile.in.orig Thu Nov 20 19:41:39 2003
X-+++ mediastreamer/Makefile.in Fri Nov 21 10:59:28 2003
X+--- mediastreamer/Makefile.in.orig Thu Apr 1 05:40:41 2004
X++++ mediastreamer/Makefile.in Thu Apr 15 03:30:15 2004
X @@ -222,7 +222,7 @@
X
X
X@@ -11,30 +11,16 @@
X + -lgsm \
X ../lpc10-1.5/liblpc10.la \
X ../oRTP/src/libortp.la \
X- $(ALSA_LIBS) \
X-@@ -252,7 +252,7 @@
X-
X- #the speex encoder and decoder
X- libmsspeex_la_SOURCES = msspeexenc.c msspeexenc.h msspeexdec.c msspeexdec.h
X--libmsspeex_la_LIBADD = libmediastreamer.la $(top_srcdir)/speex/libspeex/libspeex.la
X-+libmsspeex_la_LIBADD = libmediastreamer.la -lspeex
X-
X- #the v4l plugin
X- libmsv4l_la_SOURCES = msv4l.c msv4l.h
X-@@ -335,12 +335,8 @@
X+ $(SUPPORTLIB) \
X+@@ -336,7 +336,6 @@
X -I$(top_srcdir)/mediastreamer \
X -I$(top_srcdir)/oRTP/src \
X -I$(top_srcdir)/oRTP \
X - -I$(top_srcdir)/gsmlib \
X -I$(top_srcdir)/lpc10-1.5 \
X -I$(top_srcdir)/ffmpeg/libavcodec \
X-- -I/usr/X11R6/include/X11 \
X-- -I/usr/include/SDL \
X-- -I$(top_srcdir)/speex/libspeex \
X- $(TRUESPEECH_INCLUDES)
X-
X- subdir = mediastreamer
X-@@ -351,12 +347,12 @@
X+ -I/usr/X11R6/include/X11 \
X+@@ -352,12 +351,12 @@
X
X libmediastreamer_la_LDFLAGS =
X @BUILD_TRUESPEECH_TRUE at libmediastreamer_la_DEPENDENCIES = \
X@@ -49,12 +35,3 @@
X @BUILD_TRUESPEECH_FALSE@ ../lpc10-1.5/liblpc10.la \
X @BUILD_TRUESPEECH_FALSE@ ../oRTP/src/libortp.la
X @BUILD_TRUESPEECH_TRUE at am__objects_1 = mstruespeechencoder.lo \
X-@@ -386,7 +382,7 @@
X- libmssmpeg_la_OBJECTS = $(am_libmssmpeg_la_OBJECTS)
X- libmsspeex_la_LDFLAGS =
X- libmsspeex_la_DEPENDENCIES = libmediastreamer.la \
X-- $(top_srcdir)/speex/libspeex/libspeex.la
X-+ -lspeex
X- am_libmsspeex_la_OBJECTS = msspeexenc.lo msspeexdec.lo
X- libmsspeex_la_OBJECTS = $(am_libmsspeex_la_OBJECTS)
X- libmsv4l_la_LDFLAGS =
Xdiff -urN /usr/ports/net/linphone/files/patch-oRTP::ltmain.sh net/linphone-base/files/patch-oRTP::ltmain.sh
X--- /usr/ports/net/linphone/files/patch-oRTP::ltmain.sh Sun Nov 23 06:24:41 2003
X+++ net/linphone-base/files/patch-oRTP::ltmain.sh Thu Jan 1 09:00:00 1970
X@@ -1,15 +0,0 @@
X---- oRTP/ltmain.sh.orig Thu Nov 20 19:42:06 2003
X-+++ oRTP/ltmain.sh Fri Nov 21 13:13:05 2003
X-@@ -5478,10 +5478,12 @@
X- fi
X-
X- # Install the pseudo-library for information purposes.
X-+ if /usr/bin/false; then
X- name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
X- instname="$dir/$name"i
X- $show "$install_prog $instname $destdir/$name"
X- $run eval "$install_prog $instname $destdir/$name" || exit $?
X-+ fi
X-
X- # Maybe install the static library, too.
X- test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
Xdiff -urN /usr/ports/net/linphone/files/patch-osipua::ltmain.sh net/linphone-base/files/patch-osipua::ltmain.sh
X--- /usr/ports/net/linphone/files/patch-osipua::ltmain.sh Thu Oct 23 12:29:23 2003
X+++ net/linphone-base/files/patch-osipua::ltmain.sh Thu Jan 1 09:00:00 1970
X@@ -1,18 +0,0 @@
X-
X-$FreeBSD: ports/net/linphone/files/patch-osipua::ltmain.sh,v 1.3 2003/10/23 03:29:23 edwin Exp $
X-
X---- osipua/ltmain.sh.orig Wed May 14 00:40:19 2003
X-+++ osipua/ltmain.sh Sun Aug 17 19:30:25 2003
X-@@ -4325,10 +4325,12 @@
X- fi
X-
X- # Install the pseudo-library for information purposes.
X-+ if /usr/bin/false; then
X- name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
X- instname="$dir/$name"i
X- $show "$install_prog $instname $destdir/$name"
X- $run eval "$install_prog $instname $destdir/$name" || exit $?
X-+ fi
X-
X- # Maybe install the static library, too.
X- test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
Xdiff -urN /usr/ports/net/linphone/files/patch-osipua::src::osipua.c net/linphone-base/files/patch-osipua::src::osipua.c
X--- /usr/ports/net/linphone/files/patch-osipua::src::osipua.c Sun Nov 23 10:21:04 2003
X+++ net/linphone-base/files/patch-osipua::src::osipua.c Thu Jan 1 09:00:00 1970
X@@ -1,12 +0,0 @@
X---- osipua/src/osipua.c.orig Mon Oct 20 17:55:05 2003
X-+++ osipua/src/osipua.c Fri Nov 21 11:52:31 2003
X-@@ -591,8 +591,7 @@
X- if (ipaddr != NULL)
X- {
X- osip_trace(OSIP_INFO1,("osip_ua_find 1: %s <> %s \n",ua->ua_ipaddr,ipaddr));
X-- if ((strcasecmp(ua->ua_ipaddr,ipaddr)==0) || (strcasecmp("127.0.0.1",ipaddr)==0) ||
X-- IN6_IS_ADDR_LOOPBACK(res->ai_addr))
X-+ if ((strcasecmp(ua->ua_ipaddr,ipaddr)==0) || (strcasecmp("127.0.0.1",ipaddr)==0))
X- {
X- ret_ua=ua; /* ip addresses match */
X- }
Xdiff -urN /usr/ports/net/linphone/pkg-plist net/linphone-base/pkg-plist
X--- /usr/ports/net/linphone/pkg-plist Tue Jan 13 14:00:42 2004
X+++ net/linphone-base/pkg-plist Thu Apr 15 04:01:22 2004
X@@ -1,9 +1,12 @@
X-%%GNOME%%bin/linphone
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/sndcard.h
X+include/linphone/uglib.h
X include/ortp/ortp-config.h
X include/ortp/ortp.h
X include/ortp/payloadtype.h
X@@ -51,119 +54,52 @@
X lib/libosipua.a
X lib/libosipua.so
X lib/libosipua.so.2
X-%%GNOME%%libdata/bonobo/servers/GNOME_LinphoneApplet.server
X libdata/pkgconfig/linphone.pc
X-%%GNOME%%libexec/linphone_applet
X-%%HTMLDOCSDIR%%/mediastreamer/book1.html
X-%%HTMLDOCSDIR%%/mediastreamer/coreapi.html
X-%%HTMLDOCSDIR%%/mediastreamer/index.sgml
X-%%HTMLDOCSDIR%%/mediastreamer/mediastreamer-filters.html
X-%%HTMLDOCSDIR%%/mediastreamer/mediastreamer-msringplayer.html
X-%%HTMLDOCSDIR%%/mediastreamer/mediastreamer-mssync.html
X-%%HTMLDOCSDIR%%/mediastreamer/mediastreamer-running-processing-chains.html
X-%%HTMLDOCSDIR%%/mediastreamer/msfilterimplementations.html
X-%%HTMLDOCSDIR%%/mediastreamer/userapi.html
X-%%HTMLDOCSDIR%%/ortp/book1.html
X-%%HTMLDOCSDIR%%/ortp/index.sgml
X-%%HTMLDOCSDIR%%/ortp/ortp-library-management-functions.html
X-%%HTMLDOCSDIR%%/ortp/ortp-multiplexing-sessions-(in-a-one-thread-design).html
X-%%HTMLDOCSDIR%%/ortp/ortp-rtp-payloads-and-profiles.html
X-%%HTMLDOCSDIR%%/ortp/ortp-rtpsession-api.html
X-%%HTMLDOCSDIR%%/ortp/ortp-stack-management-functions.html
X-%%HTMLDOCSDIR%%/ortp/ortp-telephone-events-(rfc2833)-.html
X-%%HTMLDOCSDIR%%/ortp/ortpapi.html
X-%%HTMLDOCSDIR%%/osipua/book1.html
X-%%HTMLDOCSDIR%%/osipua/index.sgml
X-%%HTMLDOCSDIR%%/osipua/osipcallleg.html
X-%%HTMLDOCSDIR%%/osipua/osipua--registrationctxt-api-.html
X-%%HTMLDOCSDIR%%/osipua/osipua-osipcallleg-private-api.html
X-%%HTMLDOCSDIR%%/osipua/osipua-osipcallleg-public-api.html
X-%%HTMLDOCSDIR%%/osipua/osipua-osipua-private-api.html
X-%%HTMLDOCSDIR%%/osipua/osipua-osipua-public-api.html
X-%%HTMLDOCSDIR%%/osipua/osipua.html
X-%%HTMLDOCSDIR%%/osipua/registrationctxt.html
X-share/gnome/apps/Internet/linphone.desktop
X-%%GNOME%%share/gnome/gnome-2.0/ui/GNOME_LinphoneApplet.xml
X-share/gnome/help/linphone/C/docbook.css
X-share/gnome/help/linphone/C/index.html
X-share/gnome/help/linphone/C/params.html
X-share/gnome/help/linphone/C/t1.html
X-share/gnome/help/linphone/C/x118.html
X-share/gnome/help/linphone/C/x121.html
X-share/gnome/help/linphone/C/x137.html
X-share/gnome/help/linphone/C/x143.html
X-share/gnome/help/linphone/C/x167.html
X-share/gnome/help/linphone/C/x172.html
X-share/gnome/help/linphone/C/x188.html
X-share/gnome/help/linphone/C/x26.html
X-share/gnome/help/linphone/C/x36.html
X-share/gnome/help/linphone/fr/docbook.css
X-share/gnome/help/linphone/fr/params.html
X-share/gnome/help/linphone/fr/registering.html
X-share/gnome/help/linphone/fr/t1.html
X-share/gnome/help/linphone/fr/x116.html
X-share/gnome/help/linphone/fr/x134.html
X-share/gnome/help/linphone/fr/x140.html
X-share/gnome/help/linphone/fr/x164.html
X-share/gnome/help/linphone/fr/x170.html
X-share/gnome/help/linphone/fr/x188.html
X-share/gnome/help/linphone/fr/x24.html
X-share/gnome/help/linphone/fr/x34.html
X-share/gnome/help/linphone/it/docbook.css
X-share/gnome/help/linphone/it/params.html
X-share/gnome/help/linphone/it/registering.html
X-share/gnome/help/linphone/it/t1.html
X-share/gnome/help/linphone/it/x116.html
X-share/gnome/help/linphone/it/x134.html
X-share/gnome/help/linphone/it/x140.html
X-share/gnome/help/linphone/it/x164.html
X-share/gnome/help/linphone/it/x170.html
X-share/gnome/help/linphone/it/x189.html
X-share/gnome/help/linphone/it/x24.html
X-share/gnome/help/linphone/it/x34.html
X-share/gnome/help/linphone/ja/params.html
X-share/gnome/help/linphone/ja/t1.html
X-share/gnome/help/linphone/ja/x112.html
X-share/gnome/help/linphone/ja/x115.html
X-share/gnome/help/linphone/ja/x131.html
X-share/gnome/help/linphone/ja/x137.html
X-share/gnome/help/linphone/ja/x161.html
X-share/gnome/help/linphone/ja/x166.html
X-share/gnome/help/linphone/ja/x182.html
X-share/gnome/help/linphone/ja/x25.html
X-share/gnome/help/linphone/ja/x35.html
X-share/%%GNOME_PATH%%linphonec/linphonec
X-share/%%GNOME_PATH%%pixmaps/linphone/linphone.png
X-share/%%GNOME_PATH%%pixmaps/linphone/linphone2.png
X-share/%%GNOME_PATH%%pixmaps/linphone/linphone2.xpm
X-share/%%GNOME_PATH%%sounds/linphone/hello16000.wav
X-share/%%GNOME_PATH%%sounds/linphone/hello8000.wav
X-share/%%GNOME_PATH%%sounds/linphone/ringback.wav
X-share/%%GNOME_PATH%%sounds/linphone/rings/bigben.wav
X-share/%%GNOME_PATH%%sounds/linphone/rings/oldphone.wav
X-share/%%GNOME_PATH%%sounds/linphone/rings/orig.wav
X-share/%%GNOME_PATH%%sounds/linphone/rings/rock.wav
X-share/%%GNOME_PATH%%sounds/linphone/rings/sweet.wav
X-share/%%GNOME_PATH%%sounds/linphone/rings/synth.wav
X-share/%%GNOME_PATH%%sounds/linphone/rings/tapping.wav
X-share/%%GNOME_PATH%%sounds/linphone/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+%%DOCSDIR%%/ortp/book1.html
X+%%DOCSDIR%%/ortp/index.sgml
X+%%DOCSDIR%%/ortp/ortp-library-management-functions.html
X+%%DOCSDIR%%/ortp/ortp-multiplexing-sessions-(in-a-one-thread-design).html
X+%%DOCSDIR%%/ortp/ortp-rtp-payloads-and-profiles.html
X+%%DOCSDIR%%/ortp/ortp-rtpsession-api.html
X+%%DOCSDIR%%/ortp/ortp-telephone-events-(rfc2833)-.html
X+%%DOCSDIR%%/ortp/ortpapi.html
X+%%DOCSDIR%%/osipua/book1.html
X+%%DOCSDIR%%/osipua/index.sgml
X+%%DOCSDIR%%/osipua/osipcallleg.html
X+%%DOCSDIR%%/osipua/osipua--registrationctxt-api-.html
X+%%DOCSDIR%%/osipua/osipua-osipcallleg-private-api.html
X+%%DOCSDIR%%/osipua/osipua-osipcallleg-public-api.html
X+%%DOCSDIR%%/osipua/osipua-osipua-private-api.html
X+%%DOCSDIR%%/osipua/osipua-osipua-public-api.html
X+%%DOCSDIR%%/osipua/osipua.html
X+%%DOCSDIR%%/osipua/registrationctxt.html
X+%%DATADIR%%/sounds/hello16000.wav
X+%%DATADIR%%/sounds/hello8000.wav
X+%%DATADIR%%/sounds/ringback.wav
X+%%DATADIR%%/sounds/rings/oldphone.wav
X+%%DATADIR%%/sounds/rings/orig.wav
X+share/linphonec/linphonec
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/pl/LC_MESSAGES/linphone.mo
X- at dirrm share/%%GNOME_PATH%%sounds/linphone/rings
X- at dirrm share/%%GNOME_PATH%%sounds/linphone
X- at dirrm share/%%GNOME_PATH%%pixmaps/linphone
X- at dirrm share/%%GNOME_PATH%%linphonec
X- at dirrm share/gnome/help/linphone/ja
X- at dirrm share/gnome/help/linphone/it
X- at dirrm share/gnome/help/linphone/fr
X- at dirrm share/gnome/help/linphone/C
X- at dirrm share/gnome/help/linphone
X- at dirrm %%HTMLDOCSDIR%%/osipua
X- at dirrm %%HTMLDOCSDIR%%/ortp
X- at dirrm %%HTMLDOCSDIR%%/mediastreamer
X+ at dirrm share/linphonec
X+ at dirrm %%DATADIR%%/sounds/rings
X+ at dirrm %%DATADIR%%/sounds
X+ at dirrm %%DATADIR%%
X+ at dirrm %%DOCSDIR%%/osipua
X+ at dirrm %%DOCSDIR%%/ortp
X+ at dirrm %%DOCSDIR%%/mediastreamer
X @dirrm include/osipua
X @dirrm include/ortp
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 Mon Apr 5 13:52:56 2004
X+++ net/linphone/Makefile Thu Apr 15 04:18:59 2004
X@@ -5,43 +5,48 @@
X # $FreeBSD: ports/net/linphone/Makefile,v 1.23 2004/04/05 03:30:10 marcus Exp $
X #
X
X-PORTNAME= linphone
X-PORTVERSION= 0.12.1
X-PORTREVISION= 2
X-PORTEPOCH= 1
X-CATEGORIES= net
X-MASTER_SITES= http://simon.morlat.free.fr/download/%SUBDIR%/
X-MASTER_SITE_SUBDIR= ${PORTVERSION}/source
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
X MAINTAINER= ports at FreeBSD.org
X COMMENT= A web phone that supports SIP protocol
X
X-LIB_DEPENDS= gsm.1:${PORTSDIR}/audio/gsm \
X- speex.2:${PORTSDIR}/audio/speex \
X- osip.9:${PORTSDIR}/net/libosip
X+LIB_DEPENDS= linphone.0:${PORTSDIR}/net/linphone-base
X
X-USE_GNOME= gnomehack gnometarget
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
X-INSTALLS_SHLIB= yes
X+MAKE_ENV= SUBDIRS="pixmaps gnome"
X
X-MAN1= linphone.1 linphonec.1 sipomatic.1
X+MAN1= linphone.1
X
X-.if defined(WITHOUT_X11)
X-CONFIGURE_ARGS+= --enable-gnome_ui=no --with-html-dir=${DOCSDIR}
X-PLIST_SUB+= GNOME="@comment " \
X- GNOME_PATH="" \
X- HTMLDOCSDIR="${DOCSDIR:S,^${PREFIX}/,,}"
X-.else
X-USE_X_PREFIX= yes
X-USE_GNOME+= gnomepanel gnomeprefix
X-DOCSDIR= ${GNOME_HTML_DIR}
X-PLIST_SUB+= GNOME="" \
X- GNOME_PATH="gnome/" \
X- HTMLDOCSDIR="${GNOME_HTML_DIR:S,^${PREFIX}/,,}"
X-.endif
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+.for lang in C fr it ja
X+ @${MKDIR} ${PREFIX}/share/gnome/help/linphone/${lang}
X+ ${INSTALL_DATA} ${WRKSRC}/share/${lang}/manual/*.html \
X+ ${PREFIX}/share/gnome/help/linphone/${lang}
X+.endfor
X+.for lang in C fr it
X+ ${INSTALL_DATA} ${WRKSRC}/share/${lang}/manual/*.css \
X+ ${PREFIX}/share/gnome/help/linphone/${lang}
X+.endfor
X
X-.include <bsd.port.mk>
X+.include <bsd.port.post.mk>
Xdiff -urN /usr/ports/net/linphone/distinfo net/linphone/distinfo
X--- /usr/ports/net/linphone/distinfo Fri Jan 30 14:52:21 2004
X+++ net/linphone/distinfo Thu Jan 1 09:00:00 1970
X@@ -1,2 +0,0 @@
X-MD5 (linphone-0.12.1.tar.gz) = 62e94ca8e3a95297175ee0c3c6de13b1
X-SIZE (linphone-0.12.1.tar.gz) = 8296534
Xdiff -urN /usr/ports/net/linphone/files/patch-Makefile.in net/linphone/files/patch-Makefile.in
X--- /usr/ports/net/linphone/files/patch-Makefile.in Sun Nov 23 10:21:02 2003
X+++ net/linphone/files/patch-Makefile.in Thu Jan 1 09:00:00 1970
X@@ -1,16 +0,0 @@
X-
X-$FreeBSD: ports/net/linphone/files/patch-Makefile.in,v 1.4 2003/11/22 21:24:41 krion Exp $
X-
X---- Makefile.in.orig Thu Nov 20 19:41:33 2003
X-+++ Makefile.in Fri Nov 21 11:04:35 2003
X-@@ -156,8 +156,8 @@
X-
X- @BUILD_TRUESPEECH_TRUE at WIN32ACM_DIR = win32acm
X-
X--SUBDIRS = support pixmaps ffmpeg po macros debian ipkg oRTP gsmlib lpc10-1.5 \
X-- speex $(WIN32ACM_DIR) mediastreamer \
X-+SUBDIRS = support pixmaps ffmpeg po macros debian ipkg oRTP lpc10-1.5 \
X-+ $(WIN32ACM_DIR) mediastreamer \
X- media_api osipua coreapi console gnome share developer-docs
X-
X-
Xdiff -urN /usr/ports/net/linphone/files/patch-config.h.in net/linphone/files/patch-config.h.in
X--- /usr/ports/net/linphone/files/patch-config.h.in Thu Oct 23 19:18:34 2003
X+++ net/linphone/files/patch-config.h.in Thu Jan 1 09:00:00 1970
X@@ -1,14 +0,0 @@
X-
X-$FreeBSD: ports/net/linphone/files/patch-config.h.in,v 1.4 2003/10/23 03:29:23 edwin 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/files/patch-configure net/linphone/files/patch-configure
X--- /usr/ports/net/linphone/files/patch-configure Sun Nov 23 10:21:02 2003
X+++ net/linphone/files/patch-configure Thu Jan 1 09:00:00 1970
X@@ -1,43 +0,0 @@
X---- configure.orig Thu Nov 20 19:41:45 2003
X-+++ configure Fri Nov 21 11:02:43 2003
X-@@ -463,7 +463,7 @@
X- # include <unistd.h>
X- #endif"
X-
X--ac_subdirs_all="$ac_subdirs_all ffmpeg speex oRTP osipua"
X-+ac_subdirs_all="$ac_subdirs_all ffmpeg oRTP osipua"
X- ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE INSIDE_GNOME_COMMON_TRUE INSIDE_GNOME_COMMON_FALSE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE CPP EGREP INTLTOOL_DESKTOP_RULE INTLTOOL_DIRECTORY_RULE INTLTOOL_KEYS_RULE INTLTOOL_PROP_RULE INTLTOOL_OAF_RULE INTLTOOL_PONG_RULE INTLTOOL_SERVER_RULE INTLTOOL_SHEET_RULE INTLTOOL_SOUNDLIST_RULE INTLTOOL_UI_RULE INTLTOOL_XAM_RULE INTLTOOL_XML_RULE INTLTOOL_CAVES_RULE INTLTOOL_SCHEMAS_RUL
E INTLTOOL_THEME_RULE INTLTOOL_EXTRACT INTLTOOL_MERGE INTLTOOL_UPDATE INTLTOOL_PERL build build_cpu build_vendor build_os host host_cpu host_vendor host_os LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CXX CXXFLAGS ac_ct_CXX CXXDEPMODE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL GETTEXT_PACKAGE USE_NLS MSGFMT GMSGFMT XGETTEXT CATALOGS CATOBJEXT DATADIRNAME GMOFILES INSTOBJEXT INTLLIBS PO_IN_DATADIR_TRUE PO_IN_DATADIR_FALSE POFILES POSUB MKINSTALLDIRS PKG_CONFIG GLIB_CFLAGS GLIB_LIBS GLIB_GENMARSHAL GOBJECT_QUERY GLIB_MKENUMS LIBGNOMEUI_CFLAGS LIBGNOMEUI_LIBS LIBGNOME_CFLAGS LIBGNOME_LIBS GNOME_APPLETS_CFLAGS GNOME_APPLETS_LIBS PTHREAD_LDFLAGS GSMLIB_CFLAGS osip_prefix IPV6_CFLAGS TRUESPEECH_CFLAGS BUILD_TRUESPEECH_TRUE BUILD_TRUESPEECH_FALSE NASM AVCODEC_LIBS GDK_CFLAGS GDK_LIBS BUILD_MEDIASTREAMER_TRUE BUILD_MEDIASTREAMER_FALSE HAVE_XINELIB_TRUE HAVE_XINELIB_FALSE HAVE_SMPEG_TRUE HAVE_SMPEG_FALSE BUILD_FFMPEG_TRUE BUILD_FFMPEG_FALSE BUILD_GDK_VO_TRUE BUILD_GDK_VO_FALSE BUILD_V4L_TRUE B
UILD_V4L_FALSE BUILD_MEDIA_API_TRUE BUILD_MEDIA_API_FALSE BUILD_UGLIB_TRUE BUILD_UGLIB_FALSE BUILD_GNOME_TRUE BUILD_GNOME_FALSE BUILD_GNOME_APPLET_TRUE BUILD_GNOME_APPLET_FALSE ALSA_LIBS subdirs HTML_DIR GTKDOC HAVE_GTK_DOC_TRUE HAVE_GTK_DOC_FALSE HAVE_GTK_DOC ENABLE_GTK_DOC_TRUE ENABLE_GTK_DOC_FALSE LINPHONE_CFLAGS LINPHONE_LIBS LIBOBJS LTLIBOBJS'
X- ac_subst_files=''
X-
X-@@ -22300,19 +22300,19 @@
X-
X-
X- cat >>confdefs.h <<_ACEOF
X--#define PACKAGE_LOCALE_DIR "${realprefix}/${DATADIRNAME}/locale"
X-+#define PACKAGE_LOCALE_DIR "${realprefix}/share/locale"
X- _ACEOF
X-
X-
X-
X- cat >>confdefs.h <<_ACEOF
X--#define PACKAGE_DATA_DIR "${realprefix}/${DATADIRNAME}"
X-+#define PACKAGE_DATA_DIR "${realprefix}/share/gnome"
X- _ACEOF
X-
X-
X-
X- cat >>confdefs.h <<_ACEOF
X--#define PACKAGE_SOUND_DIR "${realprefix}/${DATADIRNAME}/sounds/linphone"
X-+#define PACKAGE_SOUND_DIR "${realprefix}/share/gnome/sounds/linphone"
X- _ACEOF
X-
X-
X-@@ -23669,7 +23669,7 @@
X-
X-
X-
X--subdirs="$subdirs ffmpeg speex oRTP osipua"
X-+subdirs="$subdirs ffmpeg oRTP osipua"
X-
X-
X- ##################################################
Xdiff -urN /usr/ports/net/linphone/files/patch-console::Makefile.in net/linphone/files/patch-console::Makefile.in
X--- /usr/ports/net/linphone/files/patch-console::Makefile.in Thu Oct 23 19:18:35 2003
X+++ net/linphone/files/patch-console::Makefile.in Thu Jan 1 09:00:00 1970
X@@ -1,13 +0,0 @@
X-
X-$FreeBSD: ports/net/linphone/files/patch-console::Makefile.in,v 1.6 2003/10/23 03:29:23 edwin Exp $
X-
X---- console/Makefile.in.orig Wed Aug 20 17:47:05 2003
X-+++ console/Makefile.in Sat Aug 23 01:16:01 2003
X-@@ -164,7 +164,6 @@
X- -I$(top_srcdir)/oRTP/src \
X- -I$(top_srcdir)/oRTP/ \
X- -I$(top_srcdir)/mediastreamer \
X-- -I$(top_srcdir)/speex/libspeex \
X- -I$(osip_prefix)/include/
X-
X-
Xdiff -urN /usr/ports/net/linphone/files/patch-coreapi::Makefile.in net/linphone/files/patch-coreapi::Makefile.in
X--- /usr/ports/net/linphone/files/patch-coreapi::Makefile.in Thu Oct 23 19:18:35 2003
X+++ net/linphone/files/patch-coreapi::Makefile.in Thu Jan 1 09:00:00 1970
X@@ -1,13 +0,0 @@
X-
X-$FreeBSD: ports/net/linphone/files/patch-coreapi::Makefile.in,v 1.5 2003/10/23 03:29:23 edwin Exp $
X-
X---- coreapi/Makefile.in.orig Wed Aug 20 17:46:46 2003
X-+++ coreapi/Makefile.in Sat Aug 23 01:14:24 2003
X-@@ -166,7 +166,6 @@
X- -I$(top_srcdir)/oRTP/src \
X- -I$(top_srcdir)/oRTP/ \
X- -I$(top_srcdir)/mediastreamer \
X-- -I$(top_srcdir)/speex/libspeex \
X- -I$(osip_prefix)/include/
X-
X-
Xdiff -urN /usr/ports/net/linphone/files/patch-coreapi::linphonecore.c net/linphone/files/patch-coreapi::linphonecore.c
X--- /usr/ports/net/linphone/files/patch-coreapi::linphonecore.c Sun Nov 23 06:24:41 2003
X+++ net/linphone/files/patch-coreapi::linphonecore.c Thu Jan 1 09:00:00 1970
X@@ -1,10 +0,0 @@
X---- coreapi/linphonecore.c.orig Fri Nov 7 00:27:42 2003
X-+++ coreapi/linphonecore.c Fri Nov 21 11:59:25 2003
X-@@ -33,6 +33,7 @@
X- #include <sys/socket.h>
X- #include <netinet/in.h>
X- #include <arpa/inet.h>
X-+#include <netdb.h>
X-
X- #ifdef INET6
X- #include <netdb.h>
Xdiff -urN /usr/ports/net/linphone/files/patch-coreapi::misc.c net/linphone/files/patch-coreapi::misc.c
X--- /usr/ports/net/linphone/files/patch-coreapi::misc.c Thu Oct 23 19:18:35 2003
X+++ net/linphone/files/patch-coreapi::misc.c Thu Jan 1 09:00:00 1970
X@@ -1,23 +0,0 @@
X-
X-$FreeBSD: ports/net/linphone/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/files/patch-gnome::Makefile.in net/linphone/files/patch-gnome::Makefile.in
X--- /usr/ports/net/linphone/files/patch-gnome::Makefile.in Thu Oct 23 19:18:35 2003
X+++ net/linphone/files/patch-gnome::Makefile.in Thu Jan 1 09:00:00 1970
X@@ -1,13 +0,0 @@
X-
X-$FreeBSD: ports/net/linphone/files/patch-gnome::Makefile.in,v 1.6 2003/10/23 03:29:23 edwin Exp $
X-
X---- gnome/Makefile.in.orig Wed Aug 20 17:47:19 2003
X-+++ gnome/Makefile.in Sat Aug 23 01:16:42 2003
X-@@ -162,7 +162,6 @@
X- @BUILD_GNOME_TRUE@ -I$(top_srcdir)/oRTP/src \
X- @BUILD_GNOME_TRUE@ -I$(top_srcdir)/oRTP/ \
X- @BUILD_GNOME_TRUE@ -I$(top_srcdir)/mediastreamer \
X-- at BUILD_GNOME_TRUE@ -I$(top_srcdir)/speex/libspeex \
X- @BUILD_GNOME_TRUE@ -I$(top_srcdir)/coreapi \
X- @BUILD_GNOME_TRUE@ -I$(top_srcdir)/osipua/ \
X- @BUILD_GNOME_TRUE@ -I$(top_srcdir)/osipua/src
Xdiff -urN /usr/ports/net/linphone/files/patch-gnome::callbacks.c net/linphone/files/patch-gnome::callbacks.c
X--- /usr/ports/net/linphone/files/patch-gnome::callbacks.c Sun Nov 23 06:24:41 2003
X+++ net/linphone/files/patch-gnome::callbacks.c Thu Jan 1 09:00:00 1970
X@@ -1,11 +0,0 @@
X---- gnome/callbacks.c.orig Fri Nov 7 21:08:34 2003
X-+++ gnome/callbacks.c Fri Nov 21 12:57:20 2003
X-@@ -82,7 +82,7 @@
X- on_user_manual1_activate (GtkMenuItem *menuitem,
X- gpointer user_data)
X- {
X-- gnome_help_display("manual/index.html",NULL,NULL);
X-+ gnome_help_display("index.html",NULL,NULL);
X- }
X-
X-
Xdiff -urN /usr/ports/net/linphone/files/patch-lpc10-1.5::lpcini.c net/linphone/files/patch-lpc10-1.5::lpcini.c
X--- /usr/ports/net/linphone/files/patch-lpc10-1.5::lpcini.c Thu Oct 23 19:18:35 2003
X+++ net/linphone/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/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/files/patch-ltmain.sh net/linphone/files/patch-ltmain.sh
X--- /usr/ports/net/linphone/files/patch-ltmain.sh Thu Oct 23 12:29:23 2003
X+++ net/linphone/files/patch-ltmain.sh Thu Jan 1 09:00:00 1970
X@@ -1,18 +0,0 @@
X-
X-$FreeBSD: ports/net/linphone/files/patch-ltmain.sh,v 1.3 2003/10/23 03:29:23 edwin Exp $
X-
X---- ltmain.sh.orig Wed May 14 00:39:58 2003
X-+++ ltmain.sh Sun Aug 17 19:29:50 2003
X-@@ -4325,10 +4325,12 @@
X- fi
X-
X- # Install the pseudo-library for information purposes.
X-+ if /usr/bin/false; then
X- name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
X- instname="$dir/$name"i
X- $show "$install_prog $instname $destdir/$name"
X- $run eval "$install_prog $instname $destdir/$name" || exit $?
X-+ fi
X-
X- # Maybe install the static library, too.
X- test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
Xdiff -urN /usr/ports/net/linphone/files/patch-media_api::Makefile.in net/linphone/files/patch-media_api::Makefile.in
X--- /usr/ports/net/linphone/files/patch-media_api::Makefile.in Thu Oct 23 12:29:23 2003
X+++ net/linphone/files/patch-media_api::Makefile.in Thu Jan 1 09:00:00 1970
X@@ -1,13 +0,0 @@
X-
X-$FreeBSD: ports/net/linphone/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/files/patch-mediastreamer::Makefile.in net/linphone/files/patch-mediastreamer::Makefile.in
X--- /usr/ports/net/linphone/files/patch-mediastreamer::Makefile.in Sun Nov 23 10:21:03 2003
X+++ net/linphone/files/patch-mediastreamer::Makefile.in Thu Jan 1 09:00:00 1970
X@@ -1,60 +0,0 @@
X-
X-$FreeBSD: ports/net/linphone/files/patch-mediastreamer::Makefile.in,v 1.7 2003/11/22 21:24:41 krion Exp $
X-
X---- mediastreamer/Makefile.in.orig Thu Nov 20 19:41:39 2003
X-+++ mediastreamer/Makefile.in Fri Nov 21 10:59:28 2003
X-@@ -222,7 +222,7 @@
X-
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- $(ALSA_LIBS) \
X-@@ -252,7 +252,7 @@
X-
X- #the speex encoder and decoder
X- libmsspeex_la_SOURCES = msspeexenc.c msspeexenc.h msspeexdec.c msspeexdec.h
X--libmsspeex_la_LIBADD = libmediastreamer.la $(top_srcdir)/speex/libspeex/libspeex.la
X-+libmsspeex_la_LIBADD = libmediastreamer.la -lspeex
X-
X- #the v4l plugin
X- libmsv4l_la_SOURCES = msv4l.c msv4l.h
X-@@ -335,12 +335,8 @@
X- -I$(top_srcdir)/mediastreamer \
X- -I$(top_srcdir)/oRTP/src \
X- -I$(top_srcdir)/oRTP \
X-- -I$(top_srcdir)/gsmlib \
X- -I$(top_srcdir)/lpc10-1.5 \
X- -I$(top_srcdir)/ffmpeg/libavcodec \
X-- -I/usr/X11R6/include/X11 \
X-- -I/usr/include/SDL \
X-- -I$(top_srcdir)/speex/libspeex \
X- $(TRUESPEECH_INCLUDES)
X-
X- subdir = mediastreamer
X-@@ -351,12 +347,12 @@
X-
X- libmediastreamer_la_LDFLAGS =
X- @BUILD_TRUESPEECH_TRUE at libmediastreamer_la_DEPENDENCIES = \
X-- at BUILD_TRUESPEECH_TRUE@ ../gsmlib/libgsm.la \
X-+ at BUILD_TRUESPEECH_TRUE@ -lgsm \
X- @BUILD_TRUESPEECH_TRUE@ ../lpc10-1.5/liblpc10.la \
X- @BUILD_TRUESPEECH_TRUE@ ../oRTP/src/libortp.la \
X- @BUILD_TRUESPEECH_TRUE@ ../win32acm/libwin32acm.a
X- @BUILD_TRUESPEECH_FALSE at libmediastreamer_la_DEPENDENCIES = \
X-- at BUILD_TRUESPEECH_FALSE@ ../gsmlib/libgsm.la \
X-+ at BUILD_TRUESPEECH_FALSE@ -lgsm \
X- @BUILD_TRUESPEECH_FALSE@ ../lpc10-1.5/liblpc10.la \
X- @BUILD_TRUESPEECH_FALSE@ ../oRTP/src/libortp.la
X- @BUILD_TRUESPEECH_TRUE at am__objects_1 = mstruespeechencoder.lo \
X-@@ -386,7 +382,7 @@
X- libmssmpeg_la_OBJECTS = $(am_libmssmpeg_la_OBJECTS)
X- libmsspeex_la_LDFLAGS =
X- libmsspeex_la_DEPENDENCIES = libmediastreamer.la \
X-- $(top_srcdir)/speex/libspeex/libspeex.la
X-+ -lspeex
X- am_libmsspeex_la_OBJECTS = msspeexenc.lo msspeexdec.lo
X- libmsspeex_la_OBJECTS = $(am_libmsspeex_la_OBJECTS)
X- libmsv4l_la_LDFLAGS =
Xdiff -urN /usr/ports/net/linphone/files/patch-mediastreamer::msfifo.c net/linphone/files/patch-mediastreamer::msfifo.c
X--- /usr/ports/net/linphone/files/patch-mediastreamer::msfifo.c Thu Oct 23 19:18:36 2003
X+++ net/linphone/files/patch-mediastreamer::msfifo.c Thu Jan 1 09:00:00 1970
X@@ -1,15 +0,0 @@
X-
X-$FreeBSD: ports/net/linphone/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/files/patch-oRTP::configure net/linphone/files/patch-oRTP::configure
X--- /usr/ports/net/linphone/files/patch-oRTP::configure Sun Nov 23 10:21:03 2003
X+++ net/linphone/files/patch-oRTP::configure Thu Jan 1 09:00:00 1970
X@@ -1,11 +0,0 @@
X---- oRTP/configure.orig Thu Nov 20 19:42:24 2003
X-+++ oRTP/configure Fri Nov 21 11:14:07 2003
X-@@ -19430,8 +19430,6 @@
X- CFLAGS="$CFLAGS +DA2.0W +DS2.0"
X- fi
X- fi
X--else
X-- CFLAGS="-O2 -g -Wall"
X- fi
X-
X- build_scheduler=yes
Xdiff -urN /usr/ports/net/linphone/files/patch-oRTP::ltmain.sh net/linphone/files/patch-oRTP::ltmain.sh
X--- /usr/ports/net/linphone/files/patch-oRTP::ltmain.sh Sun Nov 23 06:24:41 2003
X+++ net/linphone/files/patch-oRTP::ltmain.sh Thu Jan 1 09:00:00 1970
X@@ -1,15 +0,0 @@
X---- oRTP/ltmain.sh.orig Thu Nov 20 19:42:06 2003
X-+++ oRTP/ltmain.sh Fri Nov 21 13:13:05 2003
X-@@ -5478,10 +5478,12 @@
X- fi
X-
X- # Install the pseudo-library for information purposes.
X-+ if /usr/bin/false; then
X- name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
X- instname="$dir/$name"i
X- $show "$install_prog $instname $destdir/$name"
X- $run eval "$install_prog $instname $destdir/$name" || exit $?
X-+ fi
X-
X- # Maybe install the static library, too.
X- test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
Xdiff -urN /usr/ports/net/linphone/files/patch-oRTP::src::port_fct.c net/linphone/files/patch-oRTP::src::port_fct.c
X--- /usr/ports/net/linphone/files/patch-oRTP::src::port_fct.c Thu Oct 23 19:18:36 2003
X+++ net/linphone/files/patch-oRTP::src::port_fct.c Thu Jan 1 09:00:00 1970
X@@ -1,14 +0,0 @@
X-
X-$FreeBSD: ports/net/linphone/files/patch-oRTP::src::port_fct.c,v 1.4 2003/10/23 03:29:23 edwin Exp $
X-
X---- oRTP/src/port_fct.c 2002/12/30 08:13:23 1.1
X-+++ oRTP/src/port_fct.c 2002/12/30 08:13:35
X-@@ -20,7 +20,7 @@
X-
X- /* port_fct.h. define methods to help for portability between unix and win32 */
X-
X--
X-+#include <sched.h>
X- #include "rtpsession.h"
X-
X- #include "port_fct.h"
Xdiff -urN /usr/ports/net/linphone/files/patch-oRTP::src::scheduler.h net/linphone/files/patch-oRTP::src::scheduler.h
X--- /usr/ports/net/linphone/files/patch-oRTP::src::scheduler.h Thu Oct 23 19:18:36 2003
X+++ net/linphone/files/patch-oRTP::src::scheduler.h Thu Jan 1 09:00:00 1970
X@@ -1,14 +0,0 @@
X-
X-$FreeBSD: ports/net/linphone/files/patch-oRTP::src::scheduler.h,v 1.4 2003/10/23 03:29:23 edwin Exp $
X-
X---- oRTP/src/scheduler.h 2002/12/30 08:15:08 1.1
X-+++ oRTP/src/scheduler.h 2002/12/30 08:15:16
X-@@ -20,6 +20,8 @@
X- #ifndef SCHEDULER_H
X- #define SCHEDULER_H
X-
X-+#include <pthread.h>
X-+
X- #include "rtpsession.h"
X- #include "rtptimer.h"
X- #include "sessionset.h"
Xdiff -urN /usr/ports/net/linphone/files/patch-osipua::ltmain.sh net/linphone/files/patch-osipua::ltmain.sh
X--- /usr/ports/net/linphone/files/patch-osipua::ltmain.sh Thu Oct 23 12:29:23 2003
X+++ net/linphone/files/patch-osipua::ltmain.sh Thu Jan 1 09:00:00 1970
X@@ -1,18 +0,0 @@
X-
X-$FreeBSD: ports/net/linphone/files/patch-osipua::ltmain.sh,v 1.3 2003/10/23 03:29:23 edwin Exp $
X-
X---- osipua/ltmain.sh.orig Wed May 14 00:40:19 2003
X-+++ osipua/ltmain.sh Sun Aug 17 19:30:25 2003
X-@@ -4325,10 +4325,12 @@
X- fi
X-
X- # Install the pseudo-library for information purposes.
X-+ if /usr/bin/false; then
X- name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
X- instname="$dir/$name"i
X- $show "$install_prog $instname $destdir/$name"
X- $run eval "$install_prog $instname $destdir/$name" || exit $?
X-+ fi
X-
X- # Maybe install the static library, too.
X- test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
Xdiff -urN /usr/ports/net/linphone/files/patch-osipua::src::osipua.c net/linphone/files/patch-osipua::src::osipua.c
X--- /usr/ports/net/linphone/files/patch-osipua::src::osipua.c Sun Nov 23 10:21:04 2003
X+++ net/linphone/files/patch-osipua::src::osipua.c Thu Jan 1 09:00:00 1970
X@@ -1,12 +0,0 @@
X---- osipua/src/osipua.c.orig Mon Oct 20 17:55:05 2003
X-+++ osipua/src/osipua.c Fri Nov 21 11:52:31 2003
X-@@ -591,8 +591,7 @@
X- if (ipaddr != NULL)
X- {
X- osip_trace(OSIP_INFO1,("osip_ua_find 1: %s <> %s \n",ua->ua_ipaddr,ipaddr));
X-- if ((strcasecmp(ua->ua_ipaddr,ipaddr)==0) || (strcasecmp("127.0.0.1",ipaddr)==0) ||
X-- IN6_IS_ADDR_LOOPBACK(res->ai_addr))
X-+ if ((strcasecmp(ua->ua_ipaddr,ipaddr)==0) || (strcasecmp("127.0.0.1",ipaddr)==0))
X- {
X- ret_ua=ua; /* ip addresses match */
X- }
Xdiff -urN /usr/ports/net/linphone/files/patch-osipua::src::sdphandler.c net/linphone/files/patch-osipua::src::sdphandler.c
X--- /usr/ports/net/linphone/files/patch-osipua::src::sdphandler.c Thu Oct 23 19:18:36 2003
X+++ net/linphone/files/patch-osipua::src::sdphandler.c Thu Jan 1 09:00:00 1970
X@@ -1,13 +0,0 @@
X-
X-$FreeBSD: ports/net/linphone/files/patch-osipua::src::sdphandler.c,v 1.4 2003/10/23 03:29:23 edwin Exp $
X-
X---- osipua/src/sdphandler.c 2003/06/13 13:02:40 1.1
X-+++ osipua/src/sdphandler.c 2003/06/13 13:02:48
X-@@ -26,6 +26,7 @@
X- #include <string.h>
X- #include <sys/types.h>
X- #include <sys/socket.h>
X-+#include <netinet/in.h>
X-
X- #ifdef HAVE_IFADDRS_H
X- #include <ifaddrs.h>
Xdiff -urN /usr/ports/net/linphone/files/patch-osipua::src::utils.c net/linphone/files/patch-osipua::src::utils.c
X--- /usr/ports/net/linphone/files/patch-osipua::src::utils.c Thu Oct 23 12:29:23 2003
X+++ net/linphone/files/patch-osipua::src::utils.c Thu Jan 1 09:00:00 1970
X@@ -1,10 +0,0 @@
X---- osipua/src/utils.c.orig Thu Oct 23 13:06:43 2003
X-+++ osipua/src/utils.c Thu Oct 23 13:07:24 2003
X-@@ -382,6 +382,7 @@
X- abort();
X- return -1;
X- }
X-+ ((struct sockaddr_in *)(res->ai_addr))->sin_port=htons(9999);
X- err=connect(sock,res->ai_addr,res->ai_addrlen);
X- if (err<0) {
X- osip_trace(OSIP_ERROR,("Error in connect: %s\n",strerror(errno)));
Xdiff -urN /usr/ports/net/linphone/files/patch-share::Makefile.in net/linphone/files/patch-share::Makefile.in
X--- /usr/ports/net/linphone/files/patch-share::Makefile.in Thu Oct 23 12:29:23 2003
X+++ net/linphone/files/patch-share::Makefile.in Thu Jan 1 09:00:00 1970
X@@ -1,14 +0,0 @@
X-
X-$FreeBSD: ports/net/linphone/files/patch-share::Makefile.in,v 1.5 2003/10/23 03:29:23 edwin Exp $
X-
X---- share/Makefile.in.orig Wed Aug 20 17:49:21 2003
X-+++ share/Makefile.in Sat Aug 23 01:55:33 2003
X-@@ -170,7 +170,7 @@
X- confexdir = $(datadir)/linphonec
X- confex_DATA = linphonec
X-
X--pkgconfigdir = $(prefix)/lib/pkgconfig
X-+pkgconfigdir = $(prefix)/libdata/pkgconfig
X- pkgconfig_DATA = linphone.pc
X-
X- EXTRA_DIST = $(LINPHONE_SOUNDS) \
Xdiff -urN /usr/ports/net/linphone/pkg-plist net/linphone/pkg-plist
X--- /usr/ports/net/linphone/pkg-plist Tue Jan 13 14:00:42 2004
X+++ net/linphone/pkg-plist Thu Apr 15 04:08:25 2004
X@@ -1,89 +1,8 @@
X-%%GNOME%%bin/linphone
X-bin/linphonec
X-bin/sipomatic
X-include/linphone/config.h
X-include/linphone/linphonecore.h
X-include/linphone/sndcard.h
X-include/ortp/ortp-config.h
X-include/ortp/ortp.h
X-include/ortp/payloadtype.h
X-include/ortp/port_fct.h
X-include/ortp/rtcp.h
X-include/ortp/rtp.h
X-include/ortp/rtpmod.h
X-include/ortp/rtpport.h
X-include/ortp/rtpsession.h
X-include/ortp/rtpsignaltable.h
X-include/ortp/rtptimer.h
X-include/ortp/scheduler.h
X-include/ortp/sessionset.h
X-include/ortp/str_utils.h
X-include/ortp/telephonyevents.h
X-include/osipua/bodycontext.h
X-include/osipua/bodyhandler.h
X-include/osipua/osipdialog.h
X-include/osipua/osipmanager.h
X-include/osipua/osipua-config.h
X-include/osipua/osipua.h
X-include/osipua/regctxt.h
X-include/osipua/resolver.h
X-include/osipua/sdpcontext.h
X-include/osipua/sdphandler.h
X-include/osipua/utils.h
X-lib/liblinphone.a
X-lib/liblinphone.so
X-lib/liblinphone.so.0
X-lib/liblinphonegnome.a
X-lib/liblinphonegnome.so
X-lib/liblinphonegnome.so.0
X-lib/libmediastreamer.a
X-lib/libmediastreamer.so
X-lib/libmediastreamer.so.0
X-lib/libmsspeex.a
X-lib/libmsspeex.so
X-lib/libmsspeex.so.0
X-lib/libortp.a
X-lib/libortp.so
X-lib/libortp.so.0
X-lib/libosipalloc.a
X-lib/libosipalloc.so
X-lib/libosipalloc.so.0
X-lib/libosipua.a
X-lib/libosipua.so
X-lib/libosipua.so.2
X-%%GNOME%%libdata/bonobo/servers/GNOME_LinphoneApplet.server
X-libdata/pkgconfig/linphone.pc
X-%%GNOME%%libexec/linphone_applet
X-%%HTMLDOCSDIR%%/mediastreamer/book1.html
X-%%HTMLDOCSDIR%%/mediastreamer/coreapi.html
X-%%HTMLDOCSDIR%%/mediastreamer/index.sgml
X-%%HTMLDOCSDIR%%/mediastreamer/mediastreamer-filters.html
X-%%HTMLDOCSDIR%%/mediastreamer/mediastreamer-msringplayer.html
X-%%HTMLDOCSDIR%%/mediastreamer/mediastreamer-mssync.html
X-%%HTMLDOCSDIR%%/mediastreamer/mediastreamer-running-processing-chains.html
X-%%HTMLDOCSDIR%%/mediastreamer/msfilterimplementations.html
X-%%HTMLDOCSDIR%%/mediastreamer/userapi.html
X-%%HTMLDOCSDIR%%/ortp/book1.html
X-%%HTMLDOCSDIR%%/ortp/index.sgml
X-%%HTMLDOCSDIR%%/ortp/ortp-library-management-functions.html
X-%%HTMLDOCSDIR%%/ortp/ortp-multiplexing-sessions-(in-a-one-thread-design).html
X-%%HTMLDOCSDIR%%/ortp/ortp-rtp-payloads-and-profiles.html
X-%%HTMLDOCSDIR%%/ortp/ortp-rtpsession-api.html
X-%%HTMLDOCSDIR%%/ortp/ortp-stack-management-functions.html
X-%%HTMLDOCSDIR%%/ortp/ortp-telephone-events-(rfc2833)-.html
X-%%HTMLDOCSDIR%%/ortp/ortpapi.html
X-%%HTMLDOCSDIR%%/osipua/book1.html
X-%%HTMLDOCSDIR%%/osipua/index.sgml
X-%%HTMLDOCSDIR%%/osipua/osipcallleg.html
X-%%HTMLDOCSDIR%%/osipua/osipua--registrationctxt-api-.html
X-%%HTMLDOCSDIR%%/osipua/osipua-osipcallleg-private-api.html
X-%%HTMLDOCSDIR%%/osipua/osipua-osipcallleg-public-api.html
X-%%HTMLDOCSDIR%%/osipua/osipua-osipua-private-api.html
X-%%HTMLDOCSDIR%%/osipua/osipua-osipua-public-api.html
X-%%HTMLDOCSDIR%%/osipua/osipua.html
X-%%HTMLDOCSDIR%%/osipua/registrationctxt.html
X-share/gnome/apps/Internet/linphone.desktop
X-%%GNOME%%share/gnome/gnome-2.0/ui/GNOME_LinphoneApplet.xml
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/help/linphone/C/docbook.css
X share/gnome/help/linphone/C/index.html
X share/gnome/help/linphone/C/params.html
X@@ -132,38 +51,12 @@
X share/gnome/help/linphone/ja/x182.html
X share/gnome/help/linphone/ja/x25.html
X share/gnome/help/linphone/ja/x35.html
X-share/%%GNOME_PATH%%linphonec/linphonec
X-share/%%GNOME_PATH%%pixmaps/linphone/linphone.png
X-share/%%GNOME_PATH%%pixmaps/linphone/linphone2.png
X-share/%%GNOME_PATH%%pixmaps/linphone/linphone2.xpm
X-share/%%GNOME_PATH%%sounds/linphone/hello16000.wav
X-share/%%GNOME_PATH%%sounds/linphone/hello8000.wav
X-share/%%GNOME_PATH%%sounds/linphone/ringback.wav
X-share/%%GNOME_PATH%%sounds/linphone/rings/bigben.wav
X-share/%%GNOME_PATH%%sounds/linphone/rings/oldphone.wav
X-share/%%GNOME_PATH%%sounds/linphone/rings/orig.wav
X-share/%%GNOME_PATH%%sounds/linphone/rings/rock.wav
X-share/%%GNOME_PATH%%sounds/linphone/rings/sweet.wav
X-share/%%GNOME_PATH%%sounds/linphone/rings/synth.wav
X-share/%%GNOME_PATH%%sounds/linphone/rings/tapping.wav
X-share/%%GNOME_PATH%%sounds/linphone/rings/toy.wav
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/pl/LC_MESSAGES/linphone.mo
X- at dirrm share/%%GNOME_PATH%%sounds/linphone/rings
X- at dirrm share/%%GNOME_PATH%%sounds/linphone
X- at dirrm share/%%GNOME_PATH%%pixmaps/linphone
X- at dirrm share/%%GNOME_PATH%%linphonec
X+share/gnome/pixmaps/linphone/linphone.png
X+share/gnome/pixmaps/linphone/linphone2.png
X+share/gnome/pixmaps/linphone/linphone2.xpm
X+ at dirrm share/gnome/pixmaps/linphone
X @dirrm share/gnome/help/linphone/ja
X @dirrm share/gnome/help/linphone/it
X @dirrm share/gnome/help/linphone/fr
X @dirrm share/gnome/help/linphone/C
X @dirrm share/gnome/help/linphone
X- at dirrm %%HTMLDOCSDIR%%/osipua
X- at dirrm %%HTMLDOCSDIR%%/ortp
X- at dirrm %%HTMLDOCSDIR%%/mediastreamer
X- at dirrm include/osipua
X- at dirrm include/ortp
END-of-net_linphone.diff
exit
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list