diff options
| author | Maxim Sobolev <sobomax@FreeBSD.org> | 2003-06-14 09:38:44 +0000 |
|---|---|---|
| committer | Maxim Sobolev <sobomax@FreeBSD.org> | 2003-06-14 09:38:44 +0000 |
| commit | 41a49226e84f9109fd7e2b3ad73e3c64e295b0c6 (patch) | |
| tree | 57c7cc7a5cabf1184b70b1a894663e92ee8549a3 /net | |
| parent | 64dafc71d035c272fdfb44b5c700c427ff49553b (diff) | |
| download | ports-41a49226e84f9109fd7e2b3ad73e3c64e295b0c6.tar.gz ports-41a49226e84f9109fd7e2b3ad73e3c64e295b0c6.zip | |
Notes
Diffstat (limited to 'net')
20 files changed, 212 insertions, 104 deletions
diff --git a/net/linphone-base/Makefile b/net/linphone-base/Makefile index 03ceddb0dfd9..41e27f9766b7 100644 --- a/net/linphone-base/Makefile +++ b/net/linphone-base/Makefile @@ -6,14 +6,14 @@ # PORTNAME= linphone -PORTVERSION= 0.10.0 +PORTVERSION= 0.11.0 CATEGORIES= net -MASTER_SITES= http://savannah.gnu.org/download/linphone/${PORTVERSION}/sources/ +MASTER_SITES= http://simon.morlat.free.fr/download/${PORTVERSION}/source/ MAINTAINER= sobomax@FreeBSD.org COMMENT= A web phone that supports SIP protocol -LIB_DEPENDS= osip.0:${PORTSDIR}/net/libosip \ +LIB_DEPENDS= osip.9:${PORTSDIR}/net/libosip \ panel-applet-2.0:${PORTSDIR}/x11/gnomepanel \ gnomeui-2.200:${PORTSDIR}/x11-toolkits/libgnomeui diff --git a/net/linphone-base/distinfo b/net/linphone-base/distinfo index dac97a589e1c..b0c90d677c5c 100644 --- a/net/linphone-base/distinfo +++ b/net/linphone-base/distinfo @@ -1 +1 @@ -MD5 (linphone-0.10.0.tar.gz) = 22744906226f92ee6b279373c634fb22 +MD5 (linphone-0.11.0.tar.gz) = d44393ea9cfbd276c0cf0415849c9cc6 diff --git a/net/linphone-base/files/patch-configure b/net/linphone-base/files/patch-configure index e36478e09467..f9505767cb37 100644 --- a/net/linphone-base/files/patch-configure +++ b/net/linphone-base/files/patch-configure @@ -1,8 +1,8 @@ $FreeBSD$ ---- configure.orig Mon Jan 27 13:16:04 2003 -+++ configure Fri Feb 28 18:50:31 2003 +--- configure.orig Mon May 19 12:00:43 2003 ++++ configure Fri Jun 13 15:20:49 2003 @@ -8786,6 +8786,7 @@ # This can be used to rebuild libtool when needed @@ -11,26 +11,26 @@ $FreeBSD$ # Always use our own libtool. LIBTOOL='$(SHELL) $(top_builddir)/libtool' -@@ -11010,19 +11011,19 @@ +@@ -11056,19 +11057,19 @@ cat >>confdefs.h <<_ACEOF --#define PACKAGE_LOCALE_DIR "${prefix}/${DATADIRNAME}/locale" -+#define PACKAGE_LOCALE_DIR "${prefix}/share/locale" +-#define PACKAGE_LOCALE_DIR "${realprefix}/${DATADIRNAME}/locale" ++#define PACKAGE_LOCALE_DIR "${realprefix}/share/locale" _ACEOF cat >>confdefs.h <<_ACEOF --#define PACKAGE_DATA_DIR "${prefix}/${DATADIRNAME}" -+#define PACKAGE_DATA_DIR "${prefix}/share/gnome" +-#define PACKAGE_DATA_DIR "${realprefix}/${DATADIRNAME}" ++#define PACKAGE_DATA_DIR "${realprefix}/share/gnome" _ACEOF cat >>confdefs.h <<_ACEOF --#define PACKAGE_SOUND_DIR "${prefix}/${DATADIRNAME}/sounds/linphone" -+#define PACKAGE_SOUND_DIR "${prefix}/share/gnome/sounds/linphone" +-#define PACKAGE_SOUND_DIR "${realprefix}/${DATADIRNAME}/sounds/linphone" ++#define PACKAGE_SOUND_DIR "${realprefix}/share/gnome/sounds/linphone" _ACEOF diff --git a/net/linphone-base/files/patch-coreapi::misc.c b/net/linphone-base/files/patch-coreapi::misc.c new file mode 100644 index 000000000000..0f778af50c58 --- /dev/null +++ b/net/linphone-base/files/patch-coreapi::misc.c @@ -0,0 +1,15 @@ + +$FreeBSD$ + +--- coreapi/misc.c 2003/06/13 12:59:10 1.1 ++++ coreapi/misc.c 2003/06/13 12:59:39 +@@ -249,8 +249,7 @@ + hints.ai_family = PF_UNSPEC; + hints.ai_flags = AI_NUMERICHOST; + getaddrinfo(lc->net_conf.sel_if->ipaddr, NULL, &hints, &res); +- if ( (strcmp(lc->net_conf.sel_if->ipaddr,"127.0.0.1")!=0) +- && !IN6_IS_ADDR_LINKLOCAL(res->ai_addr) && !IN6_IS_ADDR_LOOPBACK(res->ai_addr)) ++ if ( (strcmp(lc->net_conf.sel_if->ipaddr,"127.0.0.1")!=0)) + #else + if (strcmp(lc->net_conf.sel_if->ip4addr,"127.0.0.1")!=0) + #endif diff --git a/net/linphone-base/files/patch-oRTP::src::Makefile.in b/net/linphone-base/files/patch-oRTP::src::Makefile.in index 6e6e4301a508..7cbfb5c82253 100644 --- a/net/linphone-base/files/patch-oRTP::src::Makefile.in +++ b/net/linphone-base/files/patch-oRTP::src::Makefile.in @@ -1,14 +1,14 @@ $FreeBSD$ ---- oRTP/src/Makefile.in.orig Fri Feb 28 01:21:43 2003 -+++ oRTP/src/Makefile.in Fri Feb 28 01:22:12 2003 -@@ -97,7 +97,7 @@ +--- oRTP/src/Makefile.in.orig Fri Jun 13 15:21:18 2003 ++++ oRTP/src/Makefile.in Fri Jun 13 15:21:48 2003 +@@ -98,7 +98,7 @@ EXTRA_DIST = master system LOAD export.c export.h -DEFS = @DEFS@ $(PTHREAD_CFLAGS) -DG_LOG_DOMAIN=\"oRTP\" +DEFS = @DEFS@ $(PTHREAD_CFLAGS) -DG_LOG_DOMAIN=\"oRTP\" -DBUILD_SCHEDULER - CFLAGS = -I$(top_srcdir) $(GLIB_CFLAGS) + CFLAGS = -I$(top_srcdir) $(GLIB_CFLAGS) $(IPV6_CFLAGS) LDFLAGS = $(PTHREAD_LDFLAGS) diff --git a/net/linphone-base/files/patch-osipua::src::osipua.c b/net/linphone-base/files/patch-osipua::src::osipua.c new file mode 100644 index 000000000000..b7111db391ab --- /dev/null +++ b/net/linphone-base/files/patch-osipua::src::osipua.c @@ -0,0 +1,15 @@ + +$FreeBSD$ + +--- osipua/src/osipua.c 2003/06/13 12:25:43 1.1 ++++ osipua/src/osipua.c 2003/06/13 12:58:48 +@@ -595,8 +595,7 @@ + if (ipaddr != NULL) + { + osip_trace(OSIP_INFO1,("osip_ua_find 1: %s <> %s \n",ua->ua_ipaddr,ipaddr)); +- if ((strcasecmp(ua->ua_ipaddr,ipaddr)==0) || (strcasecmp("127.0.0.1",ipaddr)==0) || +- IN6_IS_ADDR_LOOPBACK(res->ai_addr)) ++ if ((strcasecmp(ua->ua_ipaddr,ipaddr)==0) || (strcasecmp("127.0.0.1",ipaddr)==0)) + { + ret_ua=ua; /* ip addresses match */ + } diff --git a/net/linphone-base/files/patch-osipua::src::sdphandler.c b/net/linphone-base/files/patch-osipua::src::sdphandler.c new file mode 100644 index 000000000000..3af14a5dfbc1 --- /dev/null +++ b/net/linphone-base/files/patch-osipua::src::sdphandler.c @@ -0,0 +1,13 @@ + +$FreeBSD$ + +--- osipua/src/sdphandler.c 2003/06/13 13:02:40 1.1 ++++ osipua/src/sdphandler.c 2003/06/13 13:02:48 +@@ -26,6 +26,7 @@ + #include <string.h> + #include <sys/types.h> + #include <sys/socket.h> ++#include <netinet/in.h> + + #ifdef HAVE_IFADDRS_H + #include <ifaddrs.h> diff --git a/net/linphone-base/files/patch-speex::doc::Makefile.in b/net/linphone-base/files/patch-speex::doc::Makefile.in index 1a1e86c1c1d6..3a20772d4288 100644 --- a/net/linphone-base/files/patch-speex::doc::Makefile.in +++ b/net/linphone-base/files/patch-speex::doc::Makefile.in @@ -1,14 +1,14 @@ $FreeBSD$ ---- speex/doc/Makefile.in 2003/02/28 09:50:28 1.1 -+++ speex/doc/Makefile.in 2003/02/28 09:50:44 -@@ -92,7 +92,7 @@ +--- speex/doc/Makefile.in.orig Fri Jun 13 15:22:04 2003 ++++ speex/doc/Makefile.in Fri Jun 13 15:22:40 2003 +@@ -91,7 +91,7 @@ am__quote = @am__quote@ install_sh = @install_sh@ src = @src@ --docdir = $(prefix)/share/doc -+docdir = $(prefix)/share/doc/speex +-docdir = $(prefix)/share/doc/@PACKAGE@-@VERSION@ ++docdir = $(prefix)/share/doc/@PACKAGE@ doc_DATA = manual.pdf diff --git a/net/linphone-base/files/patch-speex::src::Makefile.in b/net/linphone-base/files/patch-speex::src::Makefile.in index daeed296be4b..099da745b66b 100644 --- a/net/linphone-base/files/patch-speex::src::Makefile.in +++ b/net/linphone-base/files/patch-speex::src::Makefile.in @@ -1,8 +1,8 @@ $FreeBSD$ ---- speex/src/Makefile.in.orig Mon Dec 30 11:29:55 2002 -+++ speex/src/Makefile.in Mon Dec 30 11:54:38 2002 +--- speex/src/Makefile.in.orig Fri Jun 13 15:22:55 2003 ++++ speex/src/Makefile.in Fri Jun 13 15:22:56 2003 @@ -70,7 +70,7 @@ OBJEXT = @OBJEXT@ PATH_SEPARATOR = @PATH_SEPARATOR@ @@ -12,12 +12,3 @@ $FreeBSD$ AMTAR = @AMTAR@ AS = @AS@ AWK = @AWK@ -@@ -102,7 +102,7 @@ - ogg_libraries = @ogg_libraries@ - src = @src@ - --INCLUDES = -I$(top_srcdir)/libspeex -+INCLUDES = -I$(top_srcdir)/libspeex @OGG_INCLUDES@ - man_MANS = speexenc.1 speexdec.1 - - EXTRA_DIST = $(man_MANS) getopt_win.h getopt.c getopt1.c wave_out.c wave_out.h diff --git a/net/linphone-base/pkg-plist b/net/linphone-base/pkg-plist index 41bd5d9cda7d..f78e3c32a8cd 100644 --- a/net/linphone-base/pkg-plist +++ b/net/linphone-base/pkg-plist @@ -2,6 +2,8 @@ bin/linphone bin/linphonec bin/osipua_tester bin/sipomatic +bin/speexdec +bin/speexenc bin/test_sdphandler include/ortp/ortp-config.h include/ortp/ortp.h @@ -48,9 +50,9 @@ lib/libosipalloc.so.0 lib/libosipua.a lib/libosipua.so lib/libosipua.so.2 -lib/libspeex-0.99.so lib/libspeex.a lib/libspeex.so +lib/libspeex.so.1 libdata/bonobo/servers/GNOME_LinphoneApplet.server libexec/linphone_applet share/doc/mediastreamer/book1.html @@ -67,9 +69,14 @@ share/doc/ortp/index.sgml share/doc/ortp/ortp-multiplexing-sessions-(in-a-one-thread-design).html share/doc/ortp/ortp-rtp-payloads-and-profiles.html share/doc/ortp/ortp-rtpsession-api.html +share/doc/ortp/ortp-stack-initialisation.html share/doc/ortp/ortp-stack-management-functions.html share/doc/ortp/ortp-telephone-events-(rfc2833)-.html +share/doc/ortp/ortp-telephony-events-(rfc2833)-.html share/doc/ortp/ortpapi.html +share/doc/ortp/rtpsession.html +share/doc/ortp/stackinit.html +share/doc/ortp/startup.html share/doc/osipua/book1.html share/doc/osipua/index.sgml share/doc/osipua/osipcallleg.html @@ -89,35 +96,30 @@ share/gnome/help/linphone/C/manual/CVS/Root share/gnome/help/linphone/C/manual/docbook.css share/gnome/help/linphone/C/manual/index.html share/gnome/help/linphone/C/manual/params.html +share/gnome/help/linphone/C/manual/stylesheet-images/CVS/Entries +share/gnome/help/linphone/C/manual/stylesheet-images/CVS/Repository +share/gnome/help/linphone/C/manual/stylesheet-images/CVS/Root share/gnome/help/linphone/C/manual/t1.html -share/gnome/help/linphone/C/manual/x112.html -share/gnome/help/linphone/C/manual/x115.html share/gnome/help/linphone/C/manual/x118.html share/gnome/help/linphone/C/manual/x121.html -share/gnome/help/linphone/C/manual/x130.html -share/gnome/help/linphone/C/manual/x136.html share/gnome/help/linphone/C/manual/x137.html share/gnome/help/linphone/C/manual/x143.html -share/gnome/help/linphone/C/manual/x160.html -share/gnome/help/linphone/C/manual/x165.html share/gnome/help/linphone/C/manual/x167.html share/gnome/help/linphone/C/manual/x172.html -share/gnome/help/linphone/C/manual/x185.html share/gnome/help/linphone/C/manual/x188.html share/gnome/help/linphone/C/manual/x26.html -share/gnome/help/linphone/C/manual/x34.html share/gnome/help/linphone/C/manual/x36.html -share/gnome/help/linphone/C/manual/x72.html share/gnome/help/linphone/fr/manual/CVS/Entries share/gnome/help/linphone/fr/manual/CVS/Repository share/gnome/help/linphone/fr/manual/CVS/Root share/gnome/help/linphone/fr/manual/docbook.css -share/gnome/help/linphone/fr/manual/index.html share/gnome/help/linphone/fr/manual/params.html share/gnome/help/linphone/fr/manual/registering.html +share/gnome/help/linphone/fr/manual/stylesheet-images/CVS/Entries +share/gnome/help/linphone/fr/manual/stylesheet-images/CVS/Repository +share/gnome/help/linphone/fr/manual/stylesheet-images/CVS/Root share/gnome/help/linphone/fr/manual/t1.html share/gnome/help/linphone/fr/manual/x116.html -share/gnome/help/linphone/fr/manual/x119.html share/gnome/help/linphone/fr/manual/x134.html share/gnome/help/linphone/fr/manual/x140.html share/gnome/help/linphone/fr/manual/x164.html @@ -125,17 +127,17 @@ share/gnome/help/linphone/fr/manual/x170.html share/gnome/help/linphone/fr/manual/x188.html share/gnome/help/linphone/fr/manual/x24.html share/gnome/help/linphone/fr/manual/x34.html -share/gnome/help/linphone/fr/manual/x72.html share/gnome/help/linphone/it/manual/CVS/Entries share/gnome/help/linphone/it/manual/CVS/Repository share/gnome/help/linphone/it/manual/CVS/Root share/gnome/help/linphone/it/manual/docbook.css -share/gnome/help/linphone/it/manual/index.html share/gnome/help/linphone/it/manual/params.html share/gnome/help/linphone/it/manual/registering.html +share/gnome/help/linphone/it/manual/stylesheet-images/CVS/Entries +share/gnome/help/linphone/it/manual/stylesheet-images/CVS/Repository +share/gnome/help/linphone/it/manual/stylesheet-images/CVS/Root share/gnome/help/linphone/it/manual/t1.html share/gnome/help/linphone/it/manual/x116.html -share/gnome/help/linphone/it/manual/x119.html share/gnome/help/linphone/it/manual/x134.html share/gnome/help/linphone/it/manual/x140.html share/gnome/help/linphone/it/manual/x164.html @@ -143,11 +145,22 @@ share/gnome/help/linphone/it/manual/x170.html share/gnome/help/linphone/it/manual/x189.html share/gnome/help/linphone/it/manual/x24.html share/gnome/help/linphone/it/manual/x34.html -share/gnome/help/linphone/it/manual/x72.html share/gnome/help/linphone/ja/manual/CVS/Entries share/gnome/help/linphone/ja/manual/CVS/Repository share/gnome/help/linphone/ja/manual/CVS/Root share/gnome/help/linphone/ja/manual/params.html +share/gnome/help/linphone/ja/manual/stylesheet-images/caution.gif +share/gnome/help/linphone/ja/manual/stylesheet-images/home.gif +share/gnome/help/linphone/ja/manual/stylesheet-images/important.gif +share/gnome/help/linphone/ja/manual/stylesheet-images/next.gif +share/gnome/help/linphone/ja/manual/stylesheet-images/note.gif +share/gnome/help/linphone/ja/manual/stylesheet-images/prev.gif +share/gnome/help/linphone/ja/manual/stylesheet-images/tip.gif +share/gnome/help/linphone/ja/manual/stylesheet-images/toc-blank.gif +share/gnome/help/linphone/ja/manual/stylesheet-images/toc-minus.gif +share/gnome/help/linphone/ja/manual/stylesheet-images/toc-plus.gif +share/gnome/help/linphone/ja/manual/stylesheet-images/up.gif +share/gnome/help/linphone/ja/manual/stylesheet-images/warning.gif share/gnome/help/linphone/ja/manual/t1.html share/gnome/help/linphone/ja/manual/x112.html share/gnome/help/linphone/ja/manual/x115.html @@ -162,9 +175,9 @@ share/gnome/linphonec/linphonec share/gnome/pixmaps/linphone/linphone.png share/gnome/pixmaps/linphone/linphone2.png share/gnome/pixmaps/linphone/linphone2.xpm -share/gnome/sounds/linphone/hello.raw -share/gnome/sounds/linphone/ring.raw -share/gnome/sounds/linphone/ringback.raw +share/gnome/sounds/linphone/hello.wav +share/gnome/sounds/linphone/ring.wav +share/gnome/sounds/linphone/ringback.wav share/locale/de/LC_MESSAGES/linphone.mo share/locale/fr/LC_MESSAGES/linphone.mo share/locale/it/LC_MESSAGES/linphone.mo @@ -172,15 +185,22 @@ share/locale/ja/LC_MESSAGES/linphone.mo @dirrm share/gnome/sounds/linphone @dirrm share/gnome/pixmaps/linphone @dirrm share/gnome/linphonec +@dirrm share/gnome/help/linphone/ja/manual/stylesheet-images @dirrm share/gnome/help/linphone/ja/manual/CVS @dirrm share/gnome/help/linphone/ja/manual @dirrm share/gnome/help/linphone/ja +@dirrm share/gnome/help/linphone/it/manual/stylesheet-images/CVS +@dirrm share/gnome/help/linphone/it/manual/stylesheet-images @dirrm share/gnome/help/linphone/it/manual/CVS @dirrm share/gnome/help/linphone/it/manual @dirrm share/gnome/help/linphone/it +@dirrm share/gnome/help/linphone/fr/manual/stylesheet-images/CVS +@dirrm share/gnome/help/linphone/fr/manual/stylesheet-images @dirrm share/gnome/help/linphone/fr/manual/CVS @dirrm share/gnome/help/linphone/fr/manual @dirrm share/gnome/help/linphone/fr +@dirrm share/gnome/help/linphone/C/manual/stylesheet-images/CVS +@dirrm share/gnome/help/linphone/C/manual/stylesheet-images @dirrm share/gnome/help/linphone/C/manual/CVS @dirrm share/gnome/help/linphone/C/manual @dirrm share/gnome/help/linphone/C diff --git a/net/linphone/Makefile b/net/linphone/Makefile index 03ceddb0dfd9..41e27f9766b7 100644 --- a/net/linphone/Makefile +++ b/net/linphone/Makefile @@ -6,14 +6,14 @@ # PORTNAME= linphone -PORTVERSION= 0.10.0 +PORTVERSION= 0.11.0 CATEGORIES= net -MASTER_SITES= http://savannah.gnu.org/download/linphone/${PORTVERSION}/sources/ +MASTER_SITES= http://simon.morlat.free.fr/download/${PORTVERSION}/source/ MAINTAINER= sobomax@FreeBSD.org COMMENT= A web phone that supports SIP protocol -LIB_DEPENDS= osip.0:${PORTSDIR}/net/libosip \ +LIB_DEPENDS= osip.9:${PORTSDIR}/net/libosip \ panel-applet-2.0:${PORTSDIR}/x11/gnomepanel \ gnomeui-2.200:${PORTSDIR}/x11-toolkits/libgnomeui diff --git a/net/linphone/distinfo b/net/linphone/distinfo index dac97a589e1c..b0c90d677c5c 100644 --- a/net/linphone/distinfo +++ b/net/linphone/distinfo @@ -1 +1 @@ -MD5 (linphone-0.10.0.tar.gz) = 22744906226f92ee6b279373c634fb22 +MD5 (linphone-0.11.0.tar.gz) = d44393ea9cfbd276c0cf0415849c9cc6 diff --git a/net/linphone/files/patch-configure b/net/linphone/files/patch-configure index e36478e09467..f9505767cb37 100644 --- a/net/linphone/files/patch-configure +++ b/net/linphone/files/patch-configure @@ -1,8 +1,8 @@ $FreeBSD$ ---- configure.orig Mon Jan 27 13:16:04 2003 -+++ configure Fri Feb 28 18:50:31 2003 +--- configure.orig Mon May 19 12:00:43 2003 ++++ configure Fri Jun 13 15:20:49 2003 @@ -8786,6 +8786,7 @@ # This can be used to rebuild libtool when needed @@ -11,26 +11,26 @@ $FreeBSD$ # Always use our own libtool. LIBTOOL='$(SHELL) $(top_builddir)/libtool' -@@ -11010,19 +11011,19 @@ +@@ -11056,19 +11057,19 @@ cat >>confdefs.h <<_ACEOF --#define PACKAGE_LOCALE_DIR "${prefix}/${DATADIRNAME}/locale" -+#define PACKAGE_LOCALE_DIR "${prefix}/share/locale" +-#define PACKAGE_LOCALE_DIR "${realprefix}/${DATADIRNAME}/locale" ++#define PACKAGE_LOCALE_DIR "${realprefix}/share/locale" _ACEOF cat >>confdefs.h <<_ACEOF --#define PACKAGE_DATA_DIR "${prefix}/${DATADIRNAME}" -+#define PACKAGE_DATA_DIR "${prefix}/share/gnome" +-#define PACKAGE_DATA_DIR "${realprefix}/${DATADIRNAME}" ++#define PACKAGE_DATA_DIR "${realprefix}/share/gnome" _ACEOF cat >>confdefs.h <<_ACEOF --#define PACKAGE_SOUND_DIR "${prefix}/${DATADIRNAME}/sounds/linphone" -+#define PACKAGE_SOUND_DIR "${prefix}/share/gnome/sounds/linphone" +-#define PACKAGE_SOUND_DIR "${realprefix}/${DATADIRNAME}/sounds/linphone" ++#define PACKAGE_SOUND_DIR "${realprefix}/share/gnome/sounds/linphone" _ACEOF diff --git a/net/linphone/files/patch-coreapi::misc.c b/net/linphone/files/patch-coreapi::misc.c new file mode 100644 index 000000000000..0f778af50c58 --- /dev/null +++ b/net/linphone/files/patch-coreapi::misc.c @@ -0,0 +1,15 @@ + +$FreeBSD$ + +--- coreapi/misc.c 2003/06/13 12:59:10 1.1 ++++ coreapi/misc.c 2003/06/13 12:59:39 +@@ -249,8 +249,7 @@ + hints.ai_family = PF_UNSPEC; + hints.ai_flags = AI_NUMERICHOST; + getaddrinfo(lc->net_conf.sel_if->ipaddr, NULL, &hints, &res); +- if ( (strcmp(lc->net_conf.sel_if->ipaddr,"127.0.0.1")!=0) +- && !IN6_IS_ADDR_LINKLOCAL(res->ai_addr) && !IN6_IS_ADDR_LOOPBACK(res->ai_addr)) ++ if ( (strcmp(lc->net_conf.sel_if->ipaddr,"127.0.0.1")!=0)) + #else + if (strcmp(lc->net_conf.sel_if->ip4addr,"127.0.0.1")!=0) + #endif diff --git a/net/linphone/files/patch-oRTP::src::Makefile.in b/net/linphone/files/patch-oRTP::src::Makefile.in index 6e6e4301a508..7cbfb5c82253 100644 --- a/net/linphone/files/patch-oRTP::src::Makefile.in +++ b/net/linphone/files/patch-oRTP::src::Makefile.in @@ -1,14 +1,14 @@ $FreeBSD$ ---- oRTP/src/Makefile.in.orig Fri Feb 28 01:21:43 2003 -+++ oRTP/src/Makefile.in Fri Feb 28 01:22:12 2003 -@@ -97,7 +97,7 @@ +--- oRTP/src/Makefile.in.orig Fri Jun 13 15:21:18 2003 ++++ oRTP/src/Makefile.in Fri Jun 13 15:21:48 2003 +@@ -98,7 +98,7 @@ EXTRA_DIST = master system LOAD export.c export.h -DEFS = @DEFS@ $(PTHREAD_CFLAGS) -DG_LOG_DOMAIN=\"oRTP\" +DEFS = @DEFS@ $(PTHREAD_CFLAGS) -DG_LOG_DOMAIN=\"oRTP\" -DBUILD_SCHEDULER - CFLAGS = -I$(top_srcdir) $(GLIB_CFLAGS) + CFLAGS = -I$(top_srcdir) $(GLIB_CFLAGS) $(IPV6_CFLAGS) LDFLAGS = $(PTHREAD_LDFLAGS) diff --git a/net/linphone/files/patch-osipua::src::osipua.c b/net/linphone/files/patch-osipua::src::osipua.c new file mode 100644 index 000000000000..b7111db391ab --- /dev/null +++ b/net/linphone/files/patch-osipua::src::osipua.c @@ -0,0 +1,15 @@ + +$FreeBSD$ + +--- osipua/src/osipua.c 2003/06/13 12:25:43 1.1 ++++ osipua/src/osipua.c 2003/06/13 12:58:48 +@@ -595,8 +595,7 @@ + if (ipaddr != NULL) + { + osip_trace(OSIP_INFO1,("osip_ua_find 1: %s <> %s \n",ua->ua_ipaddr,ipaddr)); +- if ((strcasecmp(ua->ua_ipaddr,ipaddr)==0) || (strcasecmp("127.0.0.1",ipaddr)==0) || +- IN6_IS_ADDR_LOOPBACK(res->ai_addr)) ++ if ((strcasecmp(ua->ua_ipaddr,ipaddr)==0) || (strcasecmp("127.0.0.1",ipaddr)==0)) + { + ret_ua=ua; /* ip addresses match */ + } diff --git a/net/linphone/files/patch-osipua::src::sdphandler.c b/net/linphone/files/patch-osipua::src::sdphandler.c new file mode 100644 index 000000000000..3af14a5dfbc1 --- /dev/null +++ b/net/linphone/files/patch-osipua::src::sdphandler.c @@ -0,0 +1,13 @@ + +$FreeBSD$ + +--- osipua/src/sdphandler.c 2003/06/13 13:02:40 1.1 ++++ osipua/src/sdphandler.c 2003/06/13 13:02:48 +@@ -26,6 +26,7 @@ + #include <string.h> + #include <sys/types.h> + #include <sys/socket.h> ++#include <netinet/in.h> + + #ifdef HAVE_IFADDRS_H + #include <ifaddrs.h> diff --git a/net/linphone/files/patch-speex::doc::Makefile.in b/net/linphone/files/patch-speex::doc::Makefile.in index 1a1e86c1c1d6..3a20772d4288 100644 --- a/net/linphone/files/patch-speex::doc::Makefile.in +++ b/net/linphone/files/patch-speex::doc::Makefile.in @@ -1,14 +1,14 @@ $FreeBSD$ ---- speex/doc/Makefile.in 2003/02/28 09:50:28 1.1 -+++ speex/doc/Makefile.in 2003/02/28 09:50:44 -@@ -92,7 +92,7 @@ +--- speex/doc/Makefile.in.orig Fri Jun 13 15:22:04 2003 ++++ speex/doc/Makefile.in Fri Jun 13 15:22:40 2003 +@@ -91,7 +91,7 @@ am__quote = @am__quote@ install_sh = @install_sh@ src = @src@ --docdir = $(prefix)/share/doc -+docdir = $(prefix)/share/doc/speex +-docdir = $(prefix)/share/doc/@PACKAGE@-@VERSION@ ++docdir = $(prefix)/share/doc/@PACKAGE@ doc_DATA = manual.pdf diff --git a/net/linphone/files/patch-speex::src::Makefile.in b/net/linphone/files/patch-speex::src::Makefile.in index daeed296be4b..099da745b66b 100644 --- a/net/linphone/files/patch-speex::src::Makefile.in +++ b/net/linphone/files/patch-speex::src::Makefile.in @@ -1,8 +1,8 @@ $FreeBSD$ ---- speex/src/Makefile.in.orig Mon Dec 30 11:29:55 2002 -+++ speex/src/Makefile.in Mon Dec 30 11:54:38 2002 +--- speex/src/Makefile.in.orig Fri Jun 13 15:22:55 2003 ++++ speex/src/Makefile.in Fri Jun 13 15:22:56 2003 @@ -70,7 +70,7 @@ OBJEXT = @OBJEXT@ PATH_SEPARATOR = @PATH_SEPARATOR@ @@ -12,12 +12,3 @@ $FreeBSD$ AMTAR = @AMTAR@ AS = @AS@ AWK = @AWK@ -@@ -102,7 +102,7 @@ - ogg_libraries = @ogg_libraries@ - src = @src@ - --INCLUDES = -I$(top_srcdir)/libspeex -+INCLUDES = -I$(top_srcdir)/libspeex @OGG_INCLUDES@ - man_MANS = speexenc.1 speexdec.1 - - EXTRA_DIST = $(man_MANS) getopt_win.h getopt.c getopt1.c wave_out.c wave_out.h diff --git a/net/linphone/pkg-plist b/net/linphone/pkg-plist index 41bd5d9cda7d..f78e3c32a8cd 100644 --- a/net/linphone/pkg-plist +++ b/net/linphone/pkg-plist @@ -2,6 +2,8 @@ bin/linphone bin/linphonec bin/osipua_tester bin/sipomatic +bin/speexdec +bin/speexenc bin/test_sdphandler include/ortp/ortp-config.h include/ortp/ortp.h @@ -48,9 +50,9 @@ lib/libosipalloc.so.0 lib/libosipua.a lib/libosipua.so lib/libosipua.so.2 -lib/libspeex-0.99.so lib/libspeex.a lib/libspeex.so +lib/libspeex.so.1 libdata/bonobo/servers/GNOME_LinphoneApplet.server libexec/linphone_applet share/doc/mediastreamer/book1.html @@ -67,9 +69,14 @@ share/doc/ortp/index.sgml share/doc/ortp/ortp-multiplexing-sessions-(in-a-one-thread-design).html share/doc/ortp/ortp-rtp-payloads-and-profiles.html share/doc/ortp/ortp-rtpsession-api.html +share/doc/ortp/ortp-stack-initialisation.html share/doc/ortp/ortp-stack-management-functions.html share/doc/ortp/ortp-telephone-events-(rfc2833)-.html +share/doc/ortp/ortp-telephony-events-(rfc2833)-.html share/doc/ortp/ortpapi.html +share/doc/ortp/rtpsession.html +share/doc/ortp/stackinit.html +share/doc/ortp/startup.html share/doc/osipua/book1.html share/doc/osipua/index.sgml share/doc/osipua/osipcallleg.html @@ -89,35 +96,30 @@ share/gnome/help/linphone/C/manual/CVS/Root share/gnome/help/linphone/C/manual/docbook.css share/gnome/help/linphone/C/manual/index.html share/gnome/help/linphone/C/manual/params.html +share/gnome/help/linphone/C/manual/stylesheet-images/CVS/Entries +share/gnome/help/linphone/C/manual/stylesheet-images/CVS/Repository +share/gnome/help/linphone/C/manual/stylesheet-images/CVS/Root share/gnome/help/linphone/C/manual/t1.html -share/gnome/help/linphone/C/manual/x112.html -share/gnome/help/linphone/C/manual/x115.html share/gnome/help/linphone/C/manual/x118.html share/gnome/help/linphone/C/manual/x121.html -share/gnome/help/linphone/C/manual/x130.html -share/gnome/help/linphone/C/manual/x136.html share/gnome/help/linphone/C/manual/x137.html share/gnome/help/linphone/C/manual/x143.html -share/gnome/help/linphone/C/manual/x160.html -share/gnome/help/linphone/C/manual/x165.html share/gnome/help/linphone/C/manual/x167.html share/gnome/help/linphone/C/manual/x172.html -share/gnome/help/linphone/C/manual/x185.html share/gnome/help/linphone/C/manual/x188.html share/gnome/help/linphone/C/manual/x26.html -share/gnome/help/linphone/C/manual/x34.html share/gnome/help/linphone/C/manual/x36.html -share/gnome/help/linphone/C/manual/x72.html share/gnome/help/linphone/fr/manual/CVS/Entries share/gnome/help/linphone/fr/manual/CVS/Repository share/gnome/help/linphone/fr/manual/CVS/Root share/gnome/help/linphone/fr/manual/docbook.css -share/gnome/help/linphone/fr/manual/index.html share/gnome/help/linphone/fr/manual/params.html share/gnome/help/linphone/fr/manual/registering.html +share/gnome/help/linphone/fr/manual/stylesheet-images/CVS/Entries +share/gnome/help/linphone/fr/manual/stylesheet-images/CVS/Repository +share/gnome/help/linphone/fr/manual/stylesheet-images/CVS/Root share/gnome/help/linphone/fr/manual/t1.html share/gnome/help/linphone/fr/manual/x116.html -share/gnome/help/linphone/fr/manual/x119.html share/gnome/help/linphone/fr/manual/x134.html share/gnome/help/linphone/fr/manual/x140.html share/gnome/help/linphone/fr/manual/x164.html @@ -125,17 +127,17 @@ share/gnome/help/linphone/fr/manual/x170.html share/gnome/help/linphone/fr/manual/x188.html share/gnome/help/linphone/fr/manual/x24.html share/gnome/help/linphone/fr/manual/x34.html -share/gnome/help/linphone/fr/manual/x72.html share/gnome/help/linphone/it/manual/CVS/Entries share/gnome/help/linphone/it/manual/CVS/Repository share/gnome/help/linphone/it/manual/CVS/Root share/gnome/help/linphone/it/manual/docbook.css -share/gnome/help/linphone/it/manual/index.html share/gnome/help/linphone/it/manual/params.html share/gnome/help/linphone/it/manual/registering.html +share/gnome/help/linphone/it/manual/stylesheet-images/CVS/Entries +share/gnome/help/linphone/it/manual/stylesheet-images/CVS/Repository +share/gnome/help/linphone/it/manual/stylesheet-images/CVS/Root share/gnome/help/linphone/it/manual/t1.html share/gnome/help/linphone/it/manual/x116.html -share/gnome/help/linphone/it/manual/x119.html share/gnome/help/linphone/it/manual/x134.html share/gnome/help/linphone/it/manual/x140.html share/gnome/help/linphone/it/manual/x164.html @@ -143,11 +145,22 @@ share/gnome/help/linphone/it/manual/x170.html share/gnome/help/linphone/it/manual/x189.html share/gnome/help/linphone/it/manual/x24.html share/gnome/help/linphone/it/manual/x34.html -share/gnome/help/linphone/it/manual/x72.html share/gnome/help/linphone/ja/manual/CVS/Entries share/gnome/help/linphone/ja/manual/CVS/Repository share/gnome/help/linphone/ja/manual/CVS/Root share/gnome/help/linphone/ja/manual/params.html +share/gnome/help/linphone/ja/manual/stylesheet-images/caution.gif +share/gnome/help/linphone/ja/manual/stylesheet-images/home.gif +share/gnome/help/linphone/ja/manual/stylesheet-images/important.gif +share/gnome/help/linphone/ja/manual/stylesheet-images/next.gif +share/gnome/help/linphone/ja/manual/stylesheet-images/note.gif +share/gnome/help/linphone/ja/manual/stylesheet-images/prev.gif +share/gnome/help/linphone/ja/manual/stylesheet-images/tip.gif +share/gnome/help/linphone/ja/manual/stylesheet-images/toc-blank.gif +share/gnome/help/linphone/ja/manual/stylesheet-images/toc-minus.gif +share/gnome/help/linphone/ja/manual/stylesheet-images/toc-plus.gif +share/gnome/help/linphone/ja/manual/stylesheet-images/up.gif +share/gnome/help/linphone/ja/manual/stylesheet-images/warning.gif share/gnome/help/linphone/ja/manual/t1.html share/gnome/help/linphone/ja/manual/x112.html share/gnome/help/linphone/ja/manual/x115.html @@ -162,9 +175,9 @@ share/gnome/linphonec/linphonec share/gnome/pixmaps/linphone/linphone.png share/gnome/pixmaps/linphone/linphone2.png share/gnome/pixmaps/linphone/linphone2.xpm -share/gnome/sounds/linphone/hello.raw -share/gnome/sounds/linphone/ring.raw -share/gnome/sounds/linphone/ringback.raw +share/gnome/sounds/linphone/hello.wav +share/gnome/sounds/linphone/ring.wav +share/gnome/sounds/linphone/ringback.wav share/locale/de/LC_MESSAGES/linphone.mo share/locale/fr/LC_MESSAGES/linphone.mo share/locale/it/LC_MESSAGES/linphone.mo @@ -172,15 +185,22 @@ share/locale/ja/LC_MESSAGES/linphone.mo @dirrm share/gnome/sounds/linphone @dirrm share/gnome/pixmaps/linphone @dirrm share/gnome/linphonec +@dirrm share/gnome/help/linphone/ja/manual/stylesheet-images @dirrm share/gnome/help/linphone/ja/manual/CVS @dirrm share/gnome/help/linphone/ja/manual @dirrm share/gnome/help/linphone/ja +@dirrm share/gnome/help/linphone/it/manual/stylesheet-images/CVS +@dirrm share/gnome/help/linphone/it/manual/stylesheet-images @dirrm share/gnome/help/linphone/it/manual/CVS @dirrm share/gnome/help/linphone/it/manual @dirrm share/gnome/help/linphone/it +@dirrm share/gnome/help/linphone/fr/manual/stylesheet-images/CVS +@dirrm share/gnome/help/linphone/fr/manual/stylesheet-images @dirrm share/gnome/help/linphone/fr/manual/CVS @dirrm share/gnome/help/linphone/fr/manual @dirrm share/gnome/help/linphone/fr +@dirrm share/gnome/help/linphone/C/manual/stylesheet-images/CVS +@dirrm share/gnome/help/linphone/C/manual/stylesheet-images @dirrm share/gnome/help/linphone/C/manual/CVS @dirrm share/gnome/help/linphone/C/manual @dirrm share/gnome/help/linphone/C |