diff options
| author | edwin <edwin@FreeBSD.org> | 2003-10-20 07:35:36 +0000 |
|---|---|---|
| committer | edwin <edwin@FreeBSD.org> | 2003-10-20 07:35:36 +0000 |
| commit | 25b1f42296c3a427a048c6f897409a70b5e183ad (patch) | |
| tree | 293d7080a87e8f545dafd96bbd858a2e47f8ec39 | |
| parent | ae59e324e7e8f0117d0fed60e436e8c46322bc53 (diff) | |
| download | FreeBSD-ports-25b1f42296c3a427a048c6f897409a70b5e183ad.zip FreeBSD-ports-25b1f42296c3a427a048c6f897409a70b5e183ad.tar.gz | |
Undo update of net/linphone. The port uses some kind of programming
trick to find out the IP address of the outgoing interface. This
trick works fine on Linux, but fails on *BSD. For more information,
see udpcliserv/udpcli09.c in the book of Richard Stevens.
Touched port-epoch
54 files changed, 224 insertions, 810 deletions
diff --git a/net/linphone-base/Makefile b/net/linphone-base/Makefile index 69b84fc..faa9204 100644 --- a/net/linphone-base/Makefile +++ b/net/linphone-base/Makefile @@ -6,26 +6,26 @@ # PORTNAME= linphone -PORTVERSION= 0.12.0 +PORTVERSION= 0.11.0 +PORTREVISION= 2 +PORTEPOCH= 1 CATEGORIES= net -MASTER_SITES= http://simon.morlat.free.fr/download/%SUBDIR%/ -MASTER_SITE_SUBDIR= ${PORTVERSION}/source +MASTER_SITES= http://simon.morlat.free.fr/download/${PORTVERSION}/source/ MAINTAINER= ports@FreeBSD.org COMMENT= A web phone that supports SIP protocol -LIB_DEPENDS= gsm.1:${PORTSDIR}/audio/gsm \ - speex.2:${PORTSDIR}/audio/speex \ - osip.9:${PORTSDIR}/net/libosip - +LIB_DEPENDS= osip.9:${PORTSDIR}/net/libosip \ + ogg.4:${PORTSDIR}/audio/libogg USE_X_PREFIX= yes USE_GMAKE= yes -USE_GNOME= gnomehack gnomeprefix gnomepanel -GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ - LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" -CONFIGURE_ARGS= --enable-platform-gnome-2 +USE_LIBTOOL= yes +LIBTOOLFILES= configure oRTP/configure speex/configure osipua/configure +USE_GNOME= gnomehack gnomeprefix libgnomeui gnomepanel +CONFIGURE_ARGS= --disable-ipv6 +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" MAN1= linphone.1 linphonec.1 sipomatic.1 diff --git a/net/linphone-base/distinfo b/net/linphone-base/distinfo index ba3c941..b0c90d6 100644 --- a/net/linphone-base/distinfo +++ b/net/linphone-base/distinfo @@ -1 +1 @@ -MD5 (linphone-0.12.0.tar.gz) = 79abbdcbec4c59cdd28a2722fe333b6e +MD5 (linphone-0.11.0.tar.gz) = d44393ea9cfbd276c0cf0415849c9cc6 diff --git a/net/linphone-base/files/patch-Makefile.in b/net/linphone-base/files/patch-Makefile.in deleted file mode 100644 index f6b1b03..0000000 --- a/net/linphone-base/files/patch-Makefile.in +++ /dev/null @@ -1,16 +0,0 @@ - -$FreeBSD$ - ---- Makefile.in.orig Wed Aug 20 17:43:49 2003 -+++ Makefile.in Sat Aug 23 01:36:29 2003 -@@ -158,8 +158,8 @@ - - @BUILD_TRUESPEECH_TRUE@WIN32ACM_DIR = win32acm - --SUBDIRS = pixmaps ffmpeg po macros debian ipkg oRTP gsmlib lpc10-1.5 \ -- speex $(WIN32ACM_DIR) mediastreamer \ -+SUBDIRS = pixmaps ffmpeg po macros debian ipkg oRTP lpc10-1.5 \ -+ $(WIN32ACM_DIR) mediastreamer \ - media_api osipua coreapi console gnome share developer-docs - - diff --git a/net/linphone-base/files/patch-config.h.in b/net/linphone-base/files/patch-config.h.in deleted file mode 100644 index 464bc65..0000000 --- a/net/linphone-base/files/patch-config.h.in +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD$ - ---- config.h.in 2003/02/27 23:47:19 1.1 -+++ config.h.in 2003/02/27 23:47:35 -@@ -122,8 +122,5 @@ - first (like Motorola and SPARC, unlike Intel and VAX). */ - #undef WORDS_BIGENDIAN - --/* Defined if we are compiling for FreeBSD */ --#undef __FreeBSD__ -- - /* Defined if we are compiling for linux */ - #undef __LINUX__ diff --git a/net/linphone-base/files/patch-configure b/net/linphone-base/files/patch-configure deleted file mode 100644 index df73b24..0000000 --- a/net/linphone-base/files/patch-configure +++ /dev/null @@ -1,43 +0,0 @@ ---- configure.orig Mon Oct 20 13:00:16 2003 -+++ configure Mon Oct 20 13:01:22 2003 -@@ -462,7 +462,7 @@ - # include <unistd.h> - #endif" - --ac_subdirs_all="$ac_subdirs_all ffmpeg speex oRTP osipua" -+ac_subdirs_all="$ac_subdirs_all ffmpeg oRTP osipua" - 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_XML_RULE INTLTOOL_CAVES_RULE INTLTOOL_SCHEMAS_RULE 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 PLATFORM_GNOME_2_TRUE PLATFORM_GNOME_2_FALSE GNOME_INTERFACE_VERSION WARN_CFLAGS LIBGNOMEUI_CFLAGS LIBGNOMEUI_LIBS LIBGNOME_CFLAGS LIBGNOME_LIBS GNOME_APPLETS_CFLAGS GNOME_APPLETS_LIBS BUILD_MINIMALGLIB_TRUE BUILD_MINIMALGLIB_FALSE GLIB_CFLAGS GLIB_LIBS GLIB_GENMARSHAL GOBJECT_QUERY GLIB_MKENUMS 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 BUILD_V4L_FALSE BUILD_MEDIA_API_TRUE BUILD_MEDIA_API_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' - ac_subst_files='' - -@@ -21818,19 +21818,19 @@ - - - cat >>confdefs.h <<_ACEOF --#define PACKAGE_LOCALE_DIR "${realprefix}/${DATADIRNAME}/locale" -+#define PACKAGE_LOCALE_DIR "${realprefix}/share/locale" - _ACEOF - - - - cat >>confdefs.h <<_ACEOF --#define PACKAGE_DATA_DIR "${realprefix}/${DATADIRNAME}" -+#define PACKAGE_DATA_DIR "${realprefix}/share/gnome" - _ACEOF - - - - cat >>confdefs.h <<_ACEOF --#define PACKAGE_SOUND_DIR "${realprefix}/${DATADIRNAME}/sounds/linphone" -+#define PACKAGE_SOUND_DIR "${realprefix}/share/gnome/sounds/linphone" - _ACEOF - - -@@ -22869,7 +22869,7 @@ - - - --subdirs="$subdirs ffmpeg speex oRTP osipua" -+subdirs="$subdirs ffmpeg oRTP osipua" - - - ################################################## diff --git a/net/linphone-base/files/patch-console::Makefile.in b/net/linphone-base/files/patch-console::Makefile.in deleted file mode 100644 index 3061818..0000000 --- a/net/linphone-base/files/patch-console::Makefile.in +++ /dev/null @@ -1,13 +0,0 @@ - -$FreeBSD$ - ---- console/Makefile.in.orig Wed Aug 20 17:47:05 2003 -+++ console/Makefile.in Sat Aug 23 01:16:01 2003 -@@ -164,7 +164,6 @@ - -I$(top_srcdir)/oRTP/src \ - -I$(top_srcdir)/oRTP/ \ - -I$(top_srcdir)/mediastreamer \ -- -I$(top_srcdir)/speex/libspeex \ - -I$(osip_prefix)/include/ - - diff --git a/net/linphone-base/files/patch-coreapi::Makefile.in b/net/linphone-base/files/patch-coreapi::Makefile.in deleted file mode 100644 index 4606e67..0000000 --- a/net/linphone-base/files/patch-coreapi::Makefile.in +++ /dev/null @@ -1,13 +0,0 @@ - -$FreeBSD$ - ---- coreapi/Makefile.in.orig Wed Aug 20 17:46:46 2003 -+++ coreapi/Makefile.in Sat Aug 23 01:14:24 2003 -@@ -166,7 +166,6 @@ - -I$(top_srcdir)/oRTP/src \ - -I$(top_srcdir)/oRTP/ \ - -I$(top_srcdir)/mediastreamer \ -- -I$(top_srcdir)/speex/libspeex \ - -I$(osip_prefix)/include/ - - diff --git a/net/linphone-base/files/patch-coreapi::misc.c b/net/linphone-base/files/patch-coreapi::misc.c deleted file mode 100644 index 499b6f2..0000000 --- a/net/linphone-base/files/patch-coreapi::misc.c +++ /dev/null @@ -1,23 +0,0 @@ - -$FreeBSD$ - ---- coreapi/misc.c.orig Sat Aug 9 00:10:47 2003 -+++ coreapi/misc.c Sat Aug 23 00:08:50 2003 -@@ -93,7 +93,7 @@ - pid_t pid; - - /* try to kill all artsd*/ -- command=g_strdup_printf("ps -u %s |grep artsd",getenv("LOGNAME")); -+ command=g_strdup_printf("ps -c %s |grep artsd",getenv("LOGNAME")); - out=popen(command,"r"); - if (out!=NULL) - { -@@ -123,7 +123,7 @@ - g_free(command); - - /* do the same with esd*/ -- command=g_strdup_printf("ps -u %s |grep esd",getenv("LOGNAME")); -+ command=g_strdup_printf("ps -c %s |grep esd",getenv("LOGNAME")); - out=popen(command,"r"); - if (out!=NULL) - { diff --git a/net/linphone-base/files/patch-gnome::Makefile.in b/net/linphone-base/files/patch-gnome::Makefile.in deleted file mode 100644 index 265978d..0000000 --- a/net/linphone-base/files/patch-gnome::Makefile.in +++ /dev/null @@ -1,13 +0,0 @@ - -$FreeBSD$ - ---- gnome/Makefile.in.orig Wed Aug 20 17:47:19 2003 -+++ gnome/Makefile.in Sat Aug 23 01:16:42 2003 -@@ -162,7 +162,6 @@ - @BUILD_GNOME_TRUE@ -I$(top_srcdir)/oRTP/src \ - @BUILD_GNOME_TRUE@ -I$(top_srcdir)/oRTP/ \ - @BUILD_GNOME_TRUE@ -I$(top_srcdir)/mediastreamer \ --@BUILD_GNOME_TRUE@ -I$(top_srcdir)/speex/libspeex \ - @BUILD_GNOME_TRUE@ -I$(top_srcdir)/coreapi \ - @BUILD_GNOME_TRUE@ -I$(top_srcdir)/osipua/ \ - @BUILD_GNOME_TRUE@ -I$(top_srcdir)/osipua/src diff --git a/net/linphone-base/files/patch-lpc10-1.5::lpcini.c b/net/linphone-base/files/patch-lpc10-1.5::lpcini.c deleted file mode 100644 index 4398a70..0000000 --- a/net/linphone-base/files/patch-lpc10-1.5::lpcini.c +++ /dev/null @@ -1,17 +0,0 @@ - -$FreeBSD$ - ---- lpc10-1.5/lpcini.c 2002/12/30 08:26:21 1.1 -+++ lpc10-1.5/lpcini.c 2002/12/30 08:28:01 -@@ -32,9 +32,9 @@ - -lf2c -lm (in that order) - */ - --#include "f2c.h" -+#include <stdlib.h> - --#include <malloc.h> -+#include "f2c.h" - - /* Common Block Declarations */ - diff --git a/net/linphone-base/files/patch-ltmain.sh b/net/linphone-base/files/patch-ltmain.sh deleted file mode 100644 index d35bdf9..0000000 --- a/net/linphone-base/files/patch-ltmain.sh +++ /dev/null @@ -1,18 +0,0 @@ - -$FreeBSD$ - ---- ltmain.sh.orig Wed May 14 00:39:58 2003 -+++ ltmain.sh Sun Aug 17 19:29:50 2003 -@@ -4325,10 +4325,12 @@ - fi - - # Install the pseudo-library for information purposes. -+ if /usr/bin/false; then - name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` - instname="$dir/$name"i - $show "$install_prog $instname $destdir/$name" - $run eval "$install_prog $instname $destdir/$name" || exit $? -+ fi - - # Maybe install the static library, too. - test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" diff --git a/net/linphone-base/files/patch-media_api::Makefile.in b/net/linphone-base/files/patch-media_api::Makefile.in deleted file mode 100644 index 2cc794e..0000000 --- a/net/linphone-base/files/patch-media_api::Makefile.in +++ /dev/null @@ -1,13 +0,0 @@ - -$FreeBSD$ - ---- media_api/Makefile.in.orig Wed Aug 20 17:46:39 2003 -+++ media_api/Makefile.in Sat Aug 23 01:38:46 2003 -@@ -176,7 +176,6 @@ - - INCLUDES = -I$(top_srcdir)/mediastreamer \ - -I$(top_srcdir)/speex \ -- -I$(top_srcdir)/gsmlib \ - -I$(top_srcdir)/oRTP \ - -I$(top_srcdir)/oRTP/src \ - -I$(top_srcdir)/lpc10-1.5 \ diff --git a/net/linphone-base/files/patch-mediastreamer::Makefile.in b/net/linphone-base/files/patch-mediastreamer::Makefile.in deleted file mode 100644 index 8a383c1..0000000 --- a/net/linphone-base/files/patch-mediastreamer::Makefile.in +++ /dev/null @@ -1,79 +0,0 @@ - -$FreeBSD$ - ---- mediastreamer/Makefile.in.orig Wed Aug 20 17:45:14 2003 -+++ mediastreamer/Makefile.in Sat Aug 23 01:37:49 2003 -@@ -224,14 +224,14 @@ - $(TRUESPEECH_SOURCES) - - --@BUILD_MINIMALGLIB_TRUE@libmediastreamer_la_LIBADD = ../gsmlib/libgsm.la \ -+@BUILD_MINIMALGLIB_TRUE@libmediastreamer_la_LIBADD = -lgsm \ - @BUILD_MINIMALGLIB_TRUE@ ../lpc10-1.5/liblpc10.la \ - @BUILD_MINIMALGLIB_TRUE@ ../oRTP/src/libortp.la \ - @BUILD_MINIMALGLIB_TRUE@ $(ALSA_LIBS) \ - @BUILD_MINIMALGLIB_TRUE@ $(TRUESPEECH_LIBADD) - - @BUILD_MINIMALGLIB_FALSE@libmediastreamer_la_LIBADD = $(GLIB_LIBS) \ --@BUILD_MINIMALGLIB_FALSE@ ../gsmlib/libgsm.la \ -+@BUILD_MINIMALGLIB_FALSE@ -lgsm \ - @BUILD_MINIMALGLIB_FALSE@ ../lpc10-1.5/liblpc10.la \ - @BUILD_MINIMALGLIB_FALSE@ ../oRTP/src/libortp.la \ - @BUILD_MINIMALGLIB_FALSE@ $(ALSA_LIBS) \ -@@ -261,7 +261,7 @@ - - #the speex encoder and decoder - libmsspeex_la_SOURCES = msspeexenc.c msspeexenc.h msspeexdec.c msspeexdec.h --libmsspeex_la_LIBADD = libmediastreamer.la $(top_srcdir)/speex/libspeex/libspeex.la -+libmsspeex_la_LIBADD = libmediastreamer.la -lspeex - - #the v4l plugin - libmsv4l_la_SOURCES = msv4l.c msv4l.h -@@ -349,12 +349,8 @@ - -I$(top_srcdir)/mediastreamer \ - -I$(top_srcdir)/oRTP/src \ - -I$(top_srcdir)/oRTP \ -- -I$(top_srcdir)/gsmlib \ - -I$(top_srcdir)/lpc10-1.5 \ - -I$(top_srcdir)/ffmpeg/libavcodec \ -- -I/usr/X11R6/include/X11 \ -- -I/usr/include/SDL \ -- -I$(top_srcdir)/speex/libspeex \ - $(TRUESPEECH_INCLUDES) - - subdir = mediastreamer -@@ -365,21 +361,21 @@ - - libmediastreamer_la_LDFLAGS = - @BUILD_MINIMALGLIB_FALSE@@BUILD_TRUESPEECH_TRUE@libmediastreamer_la_DEPENDENCIES = \ --@BUILD_MINIMALGLIB_FALSE@@BUILD_TRUESPEECH_TRUE@ ../gsmlib/libgsm.la \ -+@BUILD_MINIMALGLIB_FALSE@@BUILD_TRUESPEECH_TRUE@ -lgsm \ - @BUILD_MINIMALGLIB_FALSE@@BUILD_TRUESPEECH_TRUE@ ../lpc10-1.5/liblpc10.la \ - @BUILD_MINIMALGLIB_FALSE@@BUILD_TRUESPEECH_TRUE@ ../oRTP/src/libortp.la \ - @BUILD_MINIMALGLIB_FALSE@@BUILD_TRUESPEECH_TRUE@ ../win32acm/libwin32acm.a - @BUILD_MINIMALGLIB_FALSE@@BUILD_TRUESPEECH_FALSE@libmediastreamer_la_DEPENDENCIES = \ --@BUILD_MINIMALGLIB_FALSE@@BUILD_TRUESPEECH_FALSE@ ../gsmlib/libgsm.la \ -+@BUILD_MINIMALGLIB_FALSE@@BUILD_TRUESPEECH_FALSE@ -lgsm \ - @BUILD_MINIMALGLIB_FALSE@@BUILD_TRUESPEECH_FALSE@ ../lpc10-1.5/liblpc10.la \ - @BUILD_MINIMALGLIB_FALSE@@BUILD_TRUESPEECH_FALSE@ ../oRTP/src/libortp.la - @BUILD_MINIMALGLIB_TRUE@@BUILD_TRUESPEECH_TRUE@libmediastreamer_la_DEPENDENCIES = \ --@BUILD_MINIMALGLIB_TRUE@@BUILD_TRUESPEECH_TRUE@ ../gsmlib/libgsm.la \ -+@BUILD_MINIMALGLIB_TRUE@@BUILD_TRUESPEECH_TRUE@ -lgsm \ - @BUILD_MINIMALGLIB_TRUE@@BUILD_TRUESPEECH_TRUE@ ../lpc10-1.5/liblpc10.la \ - @BUILD_MINIMALGLIB_TRUE@@BUILD_TRUESPEECH_TRUE@ ../oRTP/src/libortp.la \ - @BUILD_MINIMALGLIB_TRUE@@BUILD_TRUESPEECH_TRUE@ ../win32acm/libwin32acm.a - @BUILD_MINIMALGLIB_TRUE@@BUILD_TRUESPEECH_FALSE@libmediastreamer_la_DEPENDENCIES = \ --@BUILD_MINIMALGLIB_TRUE@@BUILD_TRUESPEECH_FALSE@ ../gsmlib/libgsm.la \ -+@BUILD_MINIMALGLIB_TRUE@@BUILD_TRUESPEECH_FALSE@ -lgsm \ - @BUILD_MINIMALGLIB_TRUE@@BUILD_TRUESPEECH_FALSE@ ../lpc10-1.5/liblpc10.la \ - @BUILD_MINIMALGLIB_TRUE@@BUILD_TRUESPEECH_FALSE@ ../oRTP/src/libortp.la - @BUILD_TRUESPEECH_TRUE@am__objects_1 = mstruespeechencoder.lo \ -@@ -410,7 +406,7 @@ - libmssmpeg_la_OBJECTS = $(am_libmssmpeg_la_OBJECTS) - libmsspeex_la_LDFLAGS = - libmsspeex_la_DEPENDENCIES = libmediastreamer.la \ -- $(top_srcdir)/speex/libspeex/libspeex.la -+ -lspeex - am_libmsspeex_la_OBJECTS = msspeexenc.lo msspeexdec.lo - libmsspeex_la_OBJECTS = $(am_libmsspeex_la_OBJECTS) - libmsv4l_la_LDFLAGS = diff --git a/net/linphone-base/files/patch-mediastreamer::msfifo.c b/net/linphone-base/files/patch-mediastreamer::msfifo.c deleted file mode 100644 index f30f637..0000000 --- a/net/linphone-base/files/patch-mediastreamer::msfifo.c +++ /dev/null @@ -1,15 +0,0 @@ - -$FreeBSD$ - ---- mediastreamer/msfifo.c 2002/12/30 08:33:16 1.1 -+++ mediastreamer/msfifo.c 2002/12/30 08:33:36 -@@ -23,6 +23,9 @@ - #include "msutils.h" - #include "msfifo.h" - -+#ifndef ENODATA -+#define ENODATA 61 -+#endif - - MSFifo * ms_fifo_new(MSBuffer *buf, gint r_gran, gint w_gran, gint r_offset, gint w_offset) - { diff --git a/net/linphone-base/files/patch-oRTP::configure b/net/linphone-base/files/patch-oRTP::configure deleted file mode 100644 index da85f68..0000000 --- a/net/linphone-base/files/patch-oRTP::configure +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD$ - ---- oRTP/configure.orig Wed Aug 13 01:22:52 2003 -+++ oRTP/configure Sat Aug 23 00:17:21 2003 -@@ -18804,8 +18804,6 @@ - CFLAGS="$CFLAGS +DA2.0W +DS2.0" - fi - fi --else -- CFLAGS="-O2 -g" - fi - - build_scheduler=yes diff --git a/net/linphone-base/files/patch-oRTP::src::Makefile.in b/net/linphone-base/files/patch-oRTP::src::Makefile.in new file mode 100644 index 0000000..7cbfb5c --- /dev/null +++ b/net/linphone-base/files/patch-oRTP::src::Makefile.in @@ -0,0 +1,14 @@ + +$FreeBSD$ + +--- 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) $(IPV6_CFLAGS) + LDFLAGS = $(PTHREAD_LDFLAGS) + diff --git a/net/linphone-base/files/patch-oRTP::src::port_fct.c b/net/linphone-base/files/patch-oRTP::src::port_fct.c deleted file mode 100644 index ececcc8..0000000 --- a/net/linphone-base/files/patch-oRTP::src::port_fct.c +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD$ - ---- oRTP/src/port_fct.c 2002/12/30 08:13:23 1.1 -+++ oRTP/src/port_fct.c 2002/12/30 08:13:35 -@@ -20,7 +20,7 @@ - - /* port_fct.h. define methods to help for portability between unix and win32 */ - -- -+#include <sched.h> - #include "rtpsession.h" - - #include "port_fct.h" diff --git a/net/linphone-base/files/patch-oRTP::src::scheduler.h b/net/linphone-base/files/patch-oRTP::src::scheduler.h deleted file mode 100644 index a872fc2..0000000 --- a/net/linphone-base/files/patch-oRTP::src::scheduler.h +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD$ - ---- oRTP/src/scheduler.h 2002/12/30 08:15:08 1.1 -+++ oRTP/src/scheduler.h 2002/12/30 08:15:16 -@@ -20,6 +20,8 @@ - #ifndef SCHEDULER_H - #define SCHEDULER_H - -+#include <pthread.h> -+ - #include "rtpsession.h" - #include "rtptimer.h" - #include "sessionset.h" diff --git a/net/linphone-base/files/patch-osipua::configure b/net/linphone-base/files/patch-osipua::configure new file mode 100644 index 0000000..d9bfcae --- /dev/null +++ b/net/linphone-base/files/patch-osipua::configure @@ -0,0 +1,13 @@ + +$FreeBSD$ + +--- osipua/configure 2003/02/27 23:48:28 1.1 ++++ osipua/configure 2003/02/27 23:49:11 +@@ -8652,6 +8652,7 @@ + + # This can be used to rebuild libtool when needed + LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" ++$ac_aux_dir/ltconfig $LIBTOOL_DEPS + + # Always use our own libtool. + LIBTOOL='$(SHELL) $(top_builddir)/libtool' diff --git a/net/linphone-base/files/patch-osipua::ltmain.sh b/net/linphone-base/files/patch-osipua::ltmain.sh deleted file mode 100644 index e2ecc7c..0000000 --- a/net/linphone-base/files/patch-osipua::ltmain.sh +++ /dev/null @@ -1,18 +0,0 @@ - -$FreeBSD$ - ---- osipua/ltmain.sh.orig Wed May 14 00:40:19 2003 -+++ osipua/ltmain.sh Sun Aug 17 19:30:25 2003 -@@ -4325,10 +4325,12 @@ - fi - - # Install the pseudo-library for information purposes. -+ if /usr/bin/false; then - name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` - instname="$dir/$name"i - $show "$install_prog $instname $destdir/$name" - $run eval "$install_prog $instname $destdir/$name" || exit $? -+ fi - - # Maybe install the static library, too. - test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" diff --git a/net/linphone-base/files/patch-osipua::src::osipua.c b/net/linphone-base/files/patch-osipua::src::osipua.c deleted file mode 100644 index 652cc86..0000000 --- a/net/linphone-base/files/patch-osipua::src::osipua.c +++ /dev/null @@ -1,15 +0,0 @@ - -$FreeBSD$ - ---- osipua/src/osipua.c.orig Sat Aug 16 01:30:51 2003 -+++ osipua/src/osipua.c Sat Aug 23 00:07:02 2003 -@@ -591,8 +591,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 deleted file mode 100644 index 3af14a5..0000000 --- a/net/linphone-base/files/patch-osipua::src::sdphandler.c +++ /dev/null @@ -1,13 +0,0 @@ - -$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-share::Makefile.in b/net/linphone-base/files/patch-share::Makefile.in deleted file mode 100644 index cb41ac4..0000000 --- a/net/linphone-base/files/patch-share::Makefile.in +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD$ - ---- share/Makefile.in.orig Wed Aug 20 17:49:21 2003 -+++ share/Makefile.in Sat Aug 23 01:55:33 2003 -@@ -170,7 +170,7 @@ - confexdir = $(datadir)/linphonec - confex_DATA = linphonec - --pkgconfigdir = $(prefix)/lib/pkgconfig -+pkgconfigdir = $(prefix)/libdata/pkgconfig - pkgconfig_DATA = linphone.pc - - EXTRA_DIST = $(LINPHONE_SOUNDS) \ diff --git a/net/linphone-base/files/patch-speex::configure b/net/linphone-base/files/patch-speex::configure new file mode 100644 index 0000000..9fa7eb3 --- /dev/null +++ b/net/linphone-base/files/patch-speex::configure @@ -0,0 +1,13 @@ + +$FreeBSD$ + +--- speex/configure 2003/02/27 23:48:28 1.1 ++++ speex/configure 2003/02/27 23:49:06 +@@ -7764,6 +7764,7 @@ + + # This can be used to rebuild libtool when needed + LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" ++$ac_aux_dir/ltconfig $LIBTOOL_DEPS + + # Always use our own libtool. + LIBTOOL='$(SHELL) $(top_builddir)/libtool' diff --git a/net/linphone-base/files/patch-speex::doc::Makefile.in b/net/linphone-base/files/patch-speex::doc::Makefile.in new file mode 100644 index 0000000..3a20772 --- /dev/null +++ b/net/linphone-base/files/patch-speex::doc::Makefile.in @@ -0,0 +1,14 @@ + +$FreeBSD$ + +--- 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/@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 new file mode 100644 index 0000000..099da74 --- /dev/null +++ b/net/linphone-base/files/patch-speex::src::Makefile.in @@ -0,0 +1,14 @@ + +$FreeBSD$ + +--- 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@ + +-mandir = $(prefix)/share/man ++mandir = $(prefix)/man + AMTAR = @AMTAR@ + AS = @AS@ + AWK = @AWK@ diff --git a/net/linphone-base/pkg-plist b/net/linphone-base/pkg-plist index 9c4704e..f78e3c3 100644 --- a/net/linphone-base/pkg-plist +++ b/net/linphone-base/pkg-plist @@ -2,10 +2,9 @@ bin/linphone bin/linphonec bin/osipua_tester bin/sipomatic +bin/speexdec +bin/speexenc bin/test_sdphandler -include/linphone/config.h -include/linphone/linphonecore.h -include/linphone/sndcard.h include/ortp/ortp-config.h include/ortp/ortp.h include/ortp/payloadtype.h @@ -31,12 +30,11 @@ include/osipua/resolver.h include/osipua/sdpcontext.h include/osipua/sdphandler.h include/osipua/utils.h -lib/liblinphone.a -lib/liblinphone.so -lib/liblinphone.so.0 -lib/liblinphonegnome.a -lib/liblinphonegnome.so -lib/liblinphonegnome.so.0 +include/speex.h +include/speex_bits.h +include/speex_callbacks.h +include/speex_header.h +include/speex_stereo.h lib/libmediastreamer.a lib/libmediastreamer.so lib/libmediastreamer.so.0 @@ -52,8 +50,10 @@ lib/libosipalloc.so.0 lib/libosipua.a lib/libosipua.so lib/libosipua.so.2 +lib/libspeex.a +lib/libspeex.so +lib/libspeex.so.1 libdata/bonobo/servers/GNOME_LinphoneApplet.server -libdata/pkgconfig/linphone.pc libexec/linphone_applet share/doc/mediastreamer/book1.html share/doc/mediastreamer/coreapi.html @@ -69,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 @@ -82,6 +87,7 @@ share/doc/osipua/osipua-osipua-private-api.html share/doc/osipua/osipua-osipua-public-api.html share/doc/osipua/osipua.html share/doc/osipua/registrationctxt.html +share/doc/speex/manual.pdf share/gnome/apps/Internet/linphone.desktop share/gnome/gnome-2.0/ui/GNOME_LinphoneApplet.xml share/gnome/help/linphone/C/manual/CVS/Entries @@ -143,6 +149,18 @@ 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 @@ -157,18 +175,17 @@ 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/hello16000.wav -share/gnome/sounds/linphone/hello8000.wav +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/es/LC_MESSAGES/linphone.mo share/locale/fr/LC_MESSAGES/linphone.mo share/locale/it/LC_MESSAGES/linphone.mo 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 @@ -188,6 +205,7 @@ share/locale/ja/LC_MESSAGES/linphone.mo @dirrm share/gnome/help/linphone/C/manual @dirrm share/gnome/help/linphone/C @dirrm share/gnome/help/linphone +@dirrm share/doc/speex @dirrm share/doc/osipua @dirrm share/doc/ortp @dirrm share/doc/mediastreamer diff --git a/net/linphone/Makefile b/net/linphone/Makefile index 69b84fc..faa9204 100644 --- a/net/linphone/Makefile +++ b/net/linphone/Makefile @@ -6,26 +6,26 @@ # PORTNAME= linphone -PORTVERSION= 0.12.0 +PORTVERSION= 0.11.0 +PORTREVISION= 2 +PORTEPOCH= 1 CATEGORIES= net -MASTER_SITES= http://simon.morlat.free.fr/download/%SUBDIR%/ -MASTER_SITE_SUBDIR= ${PORTVERSION}/source +MASTER_SITES= http://simon.morlat.free.fr/download/${PORTVERSION}/source/ MAINTAINER= ports@FreeBSD.org COMMENT= A web phone that supports SIP protocol -LIB_DEPENDS= gsm.1:${PORTSDIR}/audio/gsm \ - speex.2:${PORTSDIR}/audio/speex \ - osip.9:${PORTSDIR}/net/libosip - +LIB_DEPENDS= osip.9:${PORTSDIR}/net/libosip \ + ogg.4:${PORTSDIR}/audio/libogg USE_X_PREFIX= yes USE_GMAKE= yes -USE_GNOME= gnomehack gnomeprefix gnomepanel -GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ - LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" -CONFIGURE_ARGS= --enable-platform-gnome-2 +USE_LIBTOOL= yes +LIBTOOLFILES= configure oRTP/configure speex/configure osipua/configure +USE_GNOME= gnomehack gnomeprefix libgnomeui gnomepanel +CONFIGURE_ARGS= --disable-ipv6 +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" MAN1= linphone.1 linphonec.1 sipomatic.1 diff --git a/net/linphone/distinfo b/net/linphone/distinfo index ba3c941..b0c90d6 100644 --- a/net/linphone/distinfo +++ b/net/linphone/distinfo @@ -1 +1 @@ -MD5 (linphone-0.12.0.tar.gz) = 79abbdcbec4c59cdd28a2722fe333b6e +MD5 (linphone-0.11.0.tar.gz) = d44393ea9cfbd276c0cf0415849c9cc6 diff --git a/net/linphone/files/patch-Makefile.in b/net/linphone/files/patch-Makefile.in deleted file mode 100644 index f6b1b03..0000000 --- a/net/linphone/files/patch-Makefile.in +++ /dev/null @@ -1,16 +0,0 @@ - -$FreeBSD$ - ---- Makefile.in.orig Wed Aug 20 17:43:49 2003 -+++ Makefile.in Sat Aug 23 01:36:29 2003 -@@ -158,8 +158,8 @@ - - @BUILD_TRUESPEECH_TRUE@WIN32ACM_DIR = win32acm - --SUBDIRS = pixmaps ffmpeg po macros debian ipkg oRTP gsmlib lpc10-1.5 \ -- speex $(WIN32ACM_DIR) mediastreamer \ -+SUBDIRS = pixmaps ffmpeg po macros debian ipkg oRTP lpc10-1.5 \ -+ $(WIN32ACM_DIR) mediastreamer \ - media_api osipua coreapi console gnome share developer-docs - - diff --git a/net/linphone/files/patch-config.h.in b/net/linphone/files/patch-config.h.in deleted file mode 100644 index 464bc65..0000000 --- a/net/linphone/files/patch-config.h.in +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD$ - ---- config.h.in 2003/02/27 23:47:19 1.1 -+++ config.h.in 2003/02/27 23:47:35 -@@ -122,8 +122,5 @@ - first (like Motorola and SPARC, unlike Intel and VAX). */ - #undef WORDS_BIGENDIAN - --/* Defined if we are compiling for FreeBSD */ --#undef __FreeBSD__ -- - /* Defined if we are compiling for linux */ - #undef __LINUX__ diff --git a/net/linphone/files/patch-configure b/net/linphone/files/patch-configure deleted file mode 100644 index df73b24..0000000 --- a/net/linphone/files/patch-configure +++ /dev/null @@ -1,43 +0,0 @@ ---- configure.orig Mon Oct 20 13:00:16 2003 -+++ configure Mon Oct 20 13:01:22 2003 -@@ -462,7 +462,7 @@ - # include <unistd.h> - #endif" - --ac_subdirs_all="$ac_subdirs_all ffmpeg speex oRTP osipua" -+ac_subdirs_all="$ac_subdirs_all ffmpeg oRTP osipua" - 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_XML_RULE INTLTOOL_CAVES_RULE INTLTOOL_SCHEMAS_RULE 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 PLATFORM_GNOME_2_TRUE PLATFORM_GNOME_2_FALSE GNOME_INTERFACE_VERSION WARN_CFLAGS LIBGNOMEUI_CFLAGS LIBGNOMEUI_LIBS LIBGNOME_CFLAGS LIBGNOME_LIBS GNOME_APPLETS_CFLAGS GNOME_APPLETS_LIBS BUILD_MINIMALGLIB_TRUE BUILD_MINIMALGLIB_FALSE GLIB_CFLAGS GLIB_LIBS GLIB_GENMARSHAL GOBJECT_QUERY GLIB_MKENUMS 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 BUILD_V4L_FALSE BUILD_MEDIA_API_TRUE BUILD_MEDIA_API_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' - ac_subst_files='' - -@@ -21818,19 +21818,19 @@ - - - cat >>confdefs.h <<_ACEOF --#define PACKAGE_LOCALE_DIR "${realprefix}/${DATADIRNAME}/locale" -+#define PACKAGE_LOCALE_DIR "${realprefix}/share/locale" - _ACEOF - - - - cat >>confdefs.h <<_ACEOF --#define PACKAGE_DATA_DIR "${realprefix}/${DATADIRNAME}" -+#define PACKAGE_DATA_DIR "${realprefix}/share/gnome" - _ACEOF - - - - cat >>confdefs.h <<_ACEOF --#define PACKAGE_SOUND_DIR "${realprefix}/${DATADIRNAME}/sounds/linphone" -+#define PACKAGE_SOUND_DIR "${realprefix}/share/gnome/sounds/linphone" - _ACEOF - - -@@ -22869,7 +22869,7 @@ - - - --subdirs="$subdirs ffmpeg speex oRTP osipua" -+subdirs="$subdirs ffmpeg oRTP osipua" - - - ################################################## diff --git a/net/linphone/files/patch-console::Makefile.in b/net/linphone/files/patch-console::Makefile.in deleted file mode 100644 index 3061818..0000000 --- a/net/linphone/files/patch-console::Makefile.in +++ /dev/null @@ -1,13 +0,0 @@ - -$FreeBSD$ - ---- console/Makefile.in.orig Wed Aug 20 17:47:05 2003 -+++ console/Makefile.in Sat Aug 23 01:16:01 2003 -@@ -164,7 +164,6 @@ - -I$(top_srcdir)/oRTP/src \ - -I$(top_srcdir)/oRTP/ \ - -I$(top_srcdir)/mediastreamer \ -- -I$(top_srcdir)/speex/libspeex \ - -I$(osip_prefix)/include/ - - diff --git a/net/linphone/files/patch-coreapi::Makefile.in b/net/linphone/files/patch-coreapi::Makefile.in deleted file mode 100644 index 4606e67..0000000 --- a/net/linphone/files/patch-coreapi::Makefile.in +++ /dev/null @@ -1,13 +0,0 @@ - -$FreeBSD$ - ---- coreapi/Makefile.in.orig Wed Aug 20 17:46:46 2003 -+++ coreapi/Makefile.in Sat Aug 23 01:14:24 2003 -@@ -166,7 +166,6 @@ - -I$(top_srcdir)/oRTP/src \ - -I$(top_srcdir)/oRTP/ \ - -I$(top_srcdir)/mediastreamer \ -- -I$(top_srcdir)/speex/libspeex \ - -I$(osip_prefix)/include/ - - diff --git a/net/linphone/files/patch-coreapi::misc.c b/net/linphone/files/patch-coreapi::misc.c deleted file mode 100644 index 499b6f2..0000000 --- a/net/linphone/files/patch-coreapi::misc.c +++ /dev/null @@ -1,23 +0,0 @@ - -$FreeBSD$ - ---- coreapi/misc.c.orig Sat Aug 9 00:10:47 2003 -+++ coreapi/misc.c Sat Aug 23 00:08:50 2003 -@@ -93,7 +93,7 @@ - pid_t pid; - - /* try to kill all artsd*/ -- command=g_strdup_printf("ps -u %s |grep artsd",getenv("LOGNAME")); -+ command=g_strdup_printf("ps -c %s |grep artsd",getenv("LOGNAME")); - out=popen(command,"r"); - if (out!=NULL) - { -@@ -123,7 +123,7 @@ - g_free(command); - - /* do the same with esd*/ -- command=g_strdup_printf("ps -u %s |grep esd",getenv("LOGNAME")); -+ command=g_strdup_printf("ps -c %s |grep esd",getenv("LOGNAME")); - out=popen(command,"r"); - if (out!=NULL) - { diff --git a/net/linphone/files/patch-gnome::Makefile.in b/net/linphone/files/patch-gnome::Makefile.in deleted file mode 100644 index 265978d..0000000 --- a/net/linphone/files/patch-gnome::Makefile.in +++ /dev/null @@ -1,13 +0,0 @@ - -$FreeBSD$ - ---- gnome/Makefile.in.orig Wed Aug 20 17:47:19 2003 -+++ gnome/Makefile.in Sat Aug 23 01:16:42 2003 -@@ -162,7 +162,6 @@ - @BUILD_GNOME_TRUE@ -I$(top_srcdir)/oRTP/src \ - @BUILD_GNOME_TRUE@ -I$(top_srcdir)/oRTP/ \ - @BUILD_GNOME_TRUE@ -I$(top_srcdir)/mediastreamer \ --@BUILD_GNOME_TRUE@ -I$(top_srcdir)/speex/libspeex \ - @BUILD_GNOME_TRUE@ -I$(top_srcdir)/coreapi \ - @BUILD_GNOME_TRUE@ -I$(top_srcdir)/osipua/ \ - @BUILD_GNOME_TRUE@ -I$(top_srcdir)/osipua/src diff --git a/net/linphone/files/patch-lpc10-1.5::lpcini.c b/net/linphone/files/patch-lpc10-1.5::lpcini.c deleted file mode 100644 index 4398a70..0000000 --- a/net/linphone/files/patch-lpc10-1.5::lpcini.c +++ /dev/null @@ -1,17 +0,0 @@ - -$FreeBSD$ - ---- lpc10-1.5/lpcini.c 2002/12/30 08:26:21 1.1 -+++ lpc10-1.5/lpcini.c 2002/12/30 08:28:01 -@@ -32,9 +32,9 @@ - -lf2c -lm (in that order) - */ - --#include "f2c.h" -+#include <stdlib.h> - --#include <malloc.h> -+#include "f2c.h" - - /* Common Block Declarations */ - diff --git a/net/linphone/files/patch-ltmain.sh b/net/linphone/files/patch-ltmain.sh deleted file mode 100644 index d35bdf9..0000000 --- a/net/linphone/files/patch-ltmain.sh +++ /dev/null @@ -1,18 +0,0 @@ - -$FreeBSD$ - ---- ltmain.sh.orig Wed May 14 00:39:58 2003 -+++ ltmain.sh Sun Aug 17 19:29:50 2003 -@@ -4325,10 +4325,12 @@ - fi - - # Install the pseudo-library for information purposes. -+ if /usr/bin/false; then - name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` - instname="$dir/$name"i - $show "$install_prog $instname $destdir/$name" - $run eval "$install_prog $instname $destdir/$name" || exit $? -+ fi - - # Maybe install the static library, too. - test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" diff --git a/net/linphone/files/patch-media_api::Makefile.in b/net/linphone/files/patch-media_api::Makefile.in deleted file mode 100644 index 2cc794e..0000000 --- a/net/linphone/files/patch-media_api::Makefile.in +++ /dev/null @@ -1,13 +0,0 @@ - -$FreeBSD$ - ---- media_api/Makefile.in.orig Wed Aug 20 17:46:39 2003 -+++ media_api/Makefile.in Sat Aug 23 01:38:46 2003 -@@ -176,7 +176,6 @@ - - INCLUDES = -I$(top_srcdir)/mediastreamer \ - -I$(top_srcdir)/speex \ -- -I$(top_srcdir)/gsmlib \ - -I$(top_srcdir)/oRTP \ - -I$(top_srcdir)/oRTP/src \ - -I$(top_srcdir)/lpc10-1.5 \ diff --git a/net/linphone/files/patch-mediastreamer::Makefile.in b/net/linphone/files/patch-mediastreamer::Makefile.in deleted file mode 100644 index 8a383c1..0000000 --- a/net/linphone/files/patch-mediastreamer::Makefile.in +++ /dev/null @@ -1,79 +0,0 @@ - -$FreeBSD$ - ---- mediastreamer/Makefile.in.orig Wed Aug 20 17:45:14 2003 -+++ mediastreamer/Makefile.in Sat Aug 23 01:37:49 2003 -@@ -224,14 +224,14 @@ - $(TRUESPEECH_SOURCES) - - --@BUILD_MINIMALGLIB_TRUE@libmediastreamer_la_LIBADD = ../gsmlib/libgsm.la \ -+@BUILD_MINIMALGLIB_TRUE@libmediastreamer_la_LIBADD = -lgsm \ - @BUILD_MINIMALGLIB_TRUE@ ../lpc10-1.5/liblpc10.la \ - @BUILD_MINIMALGLIB_TRUE@ ../oRTP/src/libortp.la \ - @BUILD_MINIMALGLIB_TRUE@ $(ALSA_LIBS) \ - @BUILD_MINIMALGLIB_TRUE@ $(TRUESPEECH_LIBADD) - - @BUILD_MINIMALGLIB_FALSE@libmediastreamer_la_LIBADD = $(GLIB_LIBS) \ --@BUILD_MINIMALGLIB_FALSE@ ../gsmlib/libgsm.la \ -+@BUILD_MINIMALGLIB_FALSE@ -lgsm \ - @BUILD_MINIMALGLIB_FALSE@ ../lpc10-1.5/liblpc10.la \ - @BUILD_MINIMALGLIB_FALSE@ ../oRTP/src/libortp.la \ - @BUILD_MINIMALGLIB_FALSE@ $(ALSA_LIBS) \ -@@ -261,7 +261,7 @@ - - #the speex encoder and decoder - libmsspeex_la_SOURCES = msspeexenc.c msspeexenc.h msspeexdec.c msspeexdec.h --libmsspeex_la_LIBADD = libmediastreamer.la $(top_srcdir)/speex/libspeex/libspeex.la -+libmsspeex_la_LIBADD = libmediastreamer.la -lspeex - - #the v4l plugin - libmsv4l_la_SOURCES = msv4l.c msv4l.h -@@ -349,12 +349,8 @@ - -I$(top_srcdir)/mediastreamer \ - -I$(top_srcdir)/oRTP/src \ - -I$(top_srcdir)/oRTP \ -- -I$(top_srcdir)/gsmlib \ - -I$(top_srcdir)/lpc10-1.5 \ - -I$(top_srcdir)/ffmpeg/libavcodec \ -- -I/usr/X11R6/include/X11 \ -- -I/usr/include/SDL \ -- -I$(top_srcdir)/speex/libspeex \ - $(TRUESPEECH_INCLUDES) - - subdir = mediastreamer -@@ -365,21 +361,21 @@ - - libmediastreamer_la_LDFLAGS = - @BUILD_MINIMALGLIB_FALSE@@BUILD_TRUESPEECH_TRUE@libmediastreamer_la_DEPENDENCIES = \ --@BUILD_MINIMALGLIB_FALSE@@BUILD_TRUESPEECH_TRUE@ ../gsmlib/libgsm.la \ -+@BUILD_MINIMALGLIB_FALSE@@BUILD_TRUESPEECH_TRUE@ -lgsm \ - @BUILD_MINIMALGLIB_FALSE@@BUILD_TRUESPEECH_TRUE@ ../lpc10-1.5/liblpc10.la \ - @BUILD_MINIMALGLIB_FALSE@@BUILD_TRUESPEECH_TRUE@ ../oRTP/src/libortp.la \ - @BUILD_MINIMALGLIB_FALSE@@BUILD_TRUESPEECH_TRUE@ ../win32acm/libwin32acm.a - @BUILD_MINIMALGLIB_FALSE@@BUILD_TRUESPEECH_FALSE@libmediastreamer_la_DEPENDENCIES = \ --@BUILD_MINIMALGLIB_FALSE@@BUILD_TRUESPEECH_FALSE@ ../gsmlib/libgsm.la \ -+@BUILD_MINIMALGLIB_FALSE@@BUILD_TRUESPEECH_FALSE@ -lgsm \ - @BUILD_MINIMALGLIB_FALSE@@BUILD_TRUESPEECH_FALSE@ ../lpc10-1.5/liblpc10.la \ - @BUILD_MINIMALGLIB_FALSE@@BUILD_TRUESPEECH_FALSE@ ../oRTP/src/libortp.la - @BUILD_MINIMALGLIB_TRUE@@BUILD_TRUESPEECH_TRUE@libmediastreamer_la_DEPENDENCIES = \ --@BUILD_MINIMALGLIB_TRUE@@BUILD_TRUESPEECH_TRUE@ ../gsmlib/libgsm.la \ -+@BUILD_MINIMALGLIB_TRUE@@BUILD_TRUESPEECH_TRUE@ -lgsm \ - @BUILD_MINIMALGLIB_TRUE@@BUILD_TRUESPEECH_TRUE@ ../lpc10-1.5/liblpc10.la \ - @BUILD_MINIMALGLIB_TRUE@@BUILD_TRUESPEECH_TRUE@ ../oRTP/src/libortp.la \ - @BUILD_MINIMALGLIB_TRUE@@BUILD_TRUESPEECH_TRUE@ ../win32acm/libwin32acm.a - @BUILD_MINIMALGLIB_TRUE@@BUILD_TRUESPEECH_FALSE@libmediastreamer_la_DEPENDENCIES = \ --@BUILD_MINIMALGLIB_TRUE@@BUILD_TRUESPEECH_FALSE@ ../gsmlib/libgsm.la \ -+@BUILD_MINIMALGLIB_TRUE@@BUILD_TRUESPEECH_FALSE@ -lgsm \ - @BUILD_MINIMALGLIB_TRUE@@BUILD_TRUESPEECH_FALSE@ ../lpc10-1.5/liblpc10.la \ - @BUILD_MINIMALGLIB_TRUE@@BUILD_TRUESPEECH_FALSE@ ../oRTP/src/libortp.la - @BUILD_TRUESPEECH_TRUE@am__objects_1 = mstruespeechencoder.lo \ -@@ -410,7 +406,7 @@ - libmssmpeg_la_OBJECTS = $(am_libmssmpeg_la_OBJECTS) - libmsspeex_la_LDFLAGS = - libmsspeex_la_DEPENDENCIES = libmediastreamer.la \ -- $(top_srcdir)/speex/libspeex/libspeex.la -+ -lspeex - am_libmsspeex_la_OBJECTS = msspeexenc.lo msspeexdec.lo - libmsspeex_la_OBJECTS = $(am_libmsspeex_la_OBJECTS) - libmsv4l_la_LDFLAGS = diff --git a/net/linphone/files/patch-mediastreamer::msfifo.c b/net/linphone/files/patch-mediastreamer::msfifo.c deleted file mode 100644 index f30f637..0000000 --- a/net/linphone/files/patch-mediastreamer::msfifo.c +++ /dev/null @@ -1,15 +0,0 @@ - -$FreeBSD$ - ---- mediastreamer/msfifo.c 2002/12/30 08:33:16 1.1 -+++ mediastreamer/msfifo.c 2002/12/30 08:33:36 -@@ -23,6 +23,9 @@ - #include "msutils.h" - #include "msfifo.h" - -+#ifndef ENODATA -+#define ENODATA 61 -+#endif - - MSFifo * ms_fifo_new(MSBuffer *buf, gint r_gran, gint w_gran, gint r_offset, gint w_offset) - { diff --git a/net/linphone/files/patch-oRTP::configure b/net/linphone/files/patch-oRTP::configure deleted file mode 100644 index da85f68..0000000 --- a/net/linphone/files/patch-oRTP::configure +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD$ - ---- oRTP/configure.orig Wed Aug 13 01:22:52 2003 -+++ oRTP/configure Sat Aug 23 00:17:21 2003 -@@ -18804,8 +18804,6 @@ - CFLAGS="$CFLAGS +DA2.0W +DS2.0" - fi - fi --else -- CFLAGS="-O2 -g" - fi - - build_scheduler=yes diff --git a/net/linphone/files/patch-oRTP::src::Makefile.in b/net/linphone/files/patch-oRTP::src::Makefile.in new file mode 100644 index 0000000..7cbfb5c --- /dev/null +++ b/net/linphone/files/patch-oRTP::src::Makefile.in @@ -0,0 +1,14 @@ + +$FreeBSD$ + +--- 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) $(IPV6_CFLAGS) + LDFLAGS = $(PTHREAD_LDFLAGS) + diff --git a/net/linphone/files/patch-oRTP::src::port_fct.c b/net/linphone/files/patch-oRTP::src::port_fct.c deleted file mode 100644 index ececcc8..0000000 --- a/net/linphone/files/patch-oRTP::src::port_fct.c +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD$ - ---- oRTP/src/port_fct.c 2002/12/30 08:13:23 1.1 -+++ oRTP/src/port_fct.c 2002/12/30 08:13:35 -@@ -20,7 +20,7 @@ - - /* port_fct.h. define methods to help for portability between unix and win32 */ - -- -+#include <sched.h> - #include "rtpsession.h" - - #include "port_fct.h" diff --git a/net/linphone/files/patch-oRTP::src::scheduler.h b/net/linphone/files/patch-oRTP::src::scheduler.h deleted file mode 100644 index a872fc2..0000000 --- a/net/linphone/files/patch-oRTP::src::scheduler.h +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD$ - ---- oRTP/src/scheduler.h 2002/12/30 08:15:08 1.1 -+++ oRTP/src/scheduler.h 2002/12/30 08:15:16 -@@ -20,6 +20,8 @@ - #ifndef SCHEDULER_H - #define SCHEDULER_H - -+#include <pthread.h> -+ - #include "rtpsession.h" - #include "rtptimer.h" - #include "sessionset.h" diff --git a/net/linphone/files/patch-osipua::configure b/net/linphone/files/patch-osipua::configure new file mode 100644 index 0000000..d9bfcae --- /dev/null +++ b/net/linphone/files/patch-osipua::configure @@ -0,0 +1,13 @@ + +$FreeBSD$ + +--- osipua/configure 2003/02/27 23:48:28 1.1 ++++ osipua/configure 2003/02/27 23:49:11 +@@ -8652,6 +8652,7 @@ + + # This can be used to rebuild libtool when needed + LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" ++$ac_aux_dir/ltconfig $LIBTOOL_DEPS + + # Always use our own libtool. + LIBTOOL='$(SHELL) $(top_builddir)/libtool' diff --git a/net/linphone/files/patch-osipua::ltmain.sh b/net/linphone/files/patch-osipua::ltmain.sh deleted file mode 100644 index e2ecc7c..0000000 --- a/net/linphone/files/patch-osipua::ltmain.sh +++ /dev/null @@ -1,18 +0,0 @@ - -$FreeBSD$ - ---- osipua/ltmain.sh.orig Wed May 14 00:40:19 2003 -+++ osipua/ltmain.sh Sun Aug 17 19:30:25 2003 -@@ -4325,10 +4325,12 @@ - fi - - # Install the pseudo-library for information purposes. -+ if /usr/bin/false; then - name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` - instname="$dir/$name"i - $show "$install_prog $instname $destdir/$name" - $run eval "$install_prog $instname $destdir/$name" || exit $? -+ fi - - # Maybe install the static library, too. - test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" diff --git a/net/linphone/files/patch-osipua::src::osipua.c b/net/linphone/files/patch-osipua::src::osipua.c deleted file mode 100644 index 652cc86..0000000 --- a/net/linphone/files/patch-osipua::src::osipua.c +++ /dev/null @@ -1,15 +0,0 @@ - -$FreeBSD$ - ---- osipua/src/osipua.c.orig Sat Aug 16 01:30:51 2003 -+++ osipua/src/osipua.c Sat Aug 23 00:07:02 2003 -@@ -591,8 +591,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 deleted file mode 100644 index 3af14a5..0000000 --- a/net/linphone/files/patch-osipua::src::sdphandler.c +++ /dev/null @@ -1,13 +0,0 @@ - -$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-share::Makefile.in b/net/linphone/files/patch-share::Makefile.in deleted file mode 100644 index cb41ac4..0000000 --- a/net/linphone/files/patch-share::Makefile.in +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD$ - ---- share/Makefile.in.orig Wed Aug 20 17:49:21 2003 -+++ share/Makefile.in Sat Aug 23 01:55:33 2003 -@@ -170,7 +170,7 @@ - confexdir = $(datadir)/linphonec - confex_DATA = linphonec - --pkgconfigdir = $(prefix)/lib/pkgconfig -+pkgconfigdir = $(prefix)/libdata/pkgconfig - pkgconfig_DATA = linphone.pc - - EXTRA_DIST = $(LINPHONE_SOUNDS) \ diff --git a/net/linphone/files/patch-speex::configure b/net/linphone/files/patch-speex::configure new file mode 100644 index 0000000..9fa7eb3 --- /dev/null +++ b/net/linphone/files/patch-speex::configure @@ -0,0 +1,13 @@ + +$FreeBSD$ + +--- speex/configure 2003/02/27 23:48:28 1.1 ++++ speex/configure 2003/02/27 23:49:06 +@@ -7764,6 +7764,7 @@ + + # This can be used to rebuild libtool when needed + LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" ++$ac_aux_dir/ltconfig $LIBTOOL_DEPS + + # Always use our own libtool. + LIBTOOL='$(SHELL) $(top_builddir)/libtool' diff --git a/net/linphone/files/patch-speex::doc::Makefile.in b/net/linphone/files/patch-speex::doc::Makefile.in new file mode 100644 index 0000000..3a20772 --- /dev/null +++ b/net/linphone/files/patch-speex::doc::Makefile.in @@ -0,0 +1,14 @@ + +$FreeBSD$ + +--- 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/@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 new file mode 100644 index 0000000..099da74 --- /dev/null +++ b/net/linphone/files/patch-speex::src::Makefile.in @@ -0,0 +1,14 @@ + +$FreeBSD$ + +--- 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@ + +-mandir = $(prefix)/share/man ++mandir = $(prefix)/man + AMTAR = @AMTAR@ + AS = @AS@ + AWK = @AWK@ diff --git a/net/linphone/pkg-plist b/net/linphone/pkg-plist index 9c4704e..f78e3c3 100644 --- a/net/linphone/pkg-plist +++ b/net/linphone/pkg-plist @@ -2,10 +2,9 @@ bin/linphone bin/linphonec bin/osipua_tester bin/sipomatic +bin/speexdec +bin/speexenc bin/test_sdphandler -include/linphone/config.h -include/linphone/linphonecore.h -include/linphone/sndcard.h include/ortp/ortp-config.h include/ortp/ortp.h include/ortp/payloadtype.h @@ -31,12 +30,11 @@ include/osipua/resolver.h include/osipua/sdpcontext.h include/osipua/sdphandler.h include/osipua/utils.h -lib/liblinphone.a -lib/liblinphone.so -lib/liblinphone.so.0 -lib/liblinphonegnome.a -lib/liblinphonegnome.so -lib/liblinphonegnome.so.0 +include/speex.h +include/speex_bits.h +include/speex_callbacks.h +include/speex_header.h +include/speex_stereo.h lib/libmediastreamer.a lib/libmediastreamer.so lib/libmediastreamer.so.0 @@ -52,8 +50,10 @@ lib/libosipalloc.so.0 lib/libosipua.a lib/libosipua.so lib/libosipua.so.2 +lib/libspeex.a +lib/libspeex.so +lib/libspeex.so.1 libdata/bonobo/servers/GNOME_LinphoneApplet.server -libdata/pkgconfig/linphone.pc libexec/linphone_applet share/doc/mediastreamer/book1.html share/doc/mediastreamer/coreapi.html @@ -69,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 @@ -82,6 +87,7 @@ share/doc/osipua/osipua-osipua-private-api.html share/doc/osipua/osipua-osipua-public-api.html share/doc/osipua/osipua.html share/doc/osipua/registrationctxt.html +share/doc/speex/manual.pdf share/gnome/apps/Internet/linphone.desktop share/gnome/gnome-2.0/ui/GNOME_LinphoneApplet.xml share/gnome/help/linphone/C/manual/CVS/Entries @@ -143,6 +149,18 @@ 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 @@ -157,18 +175,17 @@ 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/hello16000.wav -share/gnome/sounds/linphone/hello8000.wav +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/es/LC_MESSAGES/linphone.mo share/locale/fr/LC_MESSAGES/linphone.mo share/locale/it/LC_MESSAGES/linphone.mo 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 @@ -188,6 +205,7 @@ share/locale/ja/LC_MESSAGES/linphone.mo @dirrm share/gnome/help/linphone/C/manual @dirrm share/gnome/help/linphone/C @dirrm share/gnome/help/linphone +@dirrm share/doc/speex @dirrm share/doc/osipua @dirrm share/doc/ortp @dirrm share/doc/mediastreamer |
