aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorkrion <krion@FreeBSD.org>2004-05-12 22:06:31 +0800
committerkrion <krion@FreeBSD.org>2004-05-12 22:06:31 +0800
commit122be01f2961b936adf1fc6b6621cbeec70a7575 (patch)
treefff4d6a123e311c444afe5399132ea70b277afcd /net
parentecef38569efb4180830a263ab2560d83b06d9d38 (diff)
downloadfreebsd-ports-gnome-122be01f2961b936adf1fc6b6621cbeec70a7575.tar.gz
freebsd-ports-gnome-122be01f2961b936adf1fc6b6621cbeec70a7575.tar.zst
freebsd-ports-gnome-122be01f2961b936adf1fc6b6621cbeec70a7575.zip
- Update to version 0.12.2
- Divide net/linphone into 2 ports: net/linphone and net/linphone-base PR: ports/66396 Submitted by: Ports Fury
Diffstat (limited to 'net')
-rw-r--r--net/Makefile1
-rw-r--r--net/linphone-base/Makefile55
-rw-r--r--net/linphone-base/distinfo4
-rw-r--r--net/linphone-base/files/patch-Makefile.in24
-rw-r--r--net/linphone-base/files/patch-configure55
-rw-r--r--net/linphone-base/files/patch-console::Makefile.in13
-rw-r--r--net/linphone-base/files/patch-coreapi::Makefile.in13
-rw-r--r--net/linphone-base/files/patch-coreapi::enum.c16
-rw-r--r--net/linphone-base/files/patch-gnome::Makefile.in40
-rw-r--r--net/linphone-base/files/patch-mediastreamer::Makefile.in35
-rw-r--r--net/linphone-base/files/patch-oRTP::ltmain.sh15
-rw-r--r--net/linphone-base/files/patch-osipua::ltmain.sh18
-rw-r--r--net/linphone-base/files/patch-osipua::src::osipua.c12
-rw-r--r--net/linphone-base/pkg-plist152
-rw-r--r--net/linphone/Makefile61
-rw-r--r--net/linphone/distinfo2
-rw-r--r--net/linphone/files/patch-Makefile.in16
-rw-r--r--net/linphone/files/patch-config.h.in14
-rw-r--r--net/linphone/files/patch-configure43
-rw-r--r--net/linphone/files/patch-console::Makefile.in13
-rw-r--r--net/linphone/files/patch-coreapi::Makefile.in13
-rw-r--r--net/linphone/files/patch-coreapi::linphonecore.c10
-rw-r--r--net/linphone/files/patch-coreapi::misc.c23
-rw-r--r--net/linphone/files/patch-gnome::Makefile.in13
-rw-r--r--net/linphone/files/patch-gnome::callbacks.c11
-rw-r--r--net/linphone/files/patch-lpc10-1.5::lpcini.c17
-rw-r--r--net/linphone/files/patch-ltmain.sh18
-rw-r--r--net/linphone/files/patch-media_api::Makefile.in13
-rw-r--r--net/linphone/files/patch-mediastreamer::Makefile.in60
-rw-r--r--net/linphone/files/patch-mediastreamer::msfifo.c15
-rw-r--r--net/linphone/files/patch-oRTP::configure11
-rw-r--r--net/linphone/files/patch-oRTP::ltmain.sh15
-rw-r--r--net/linphone/files/patch-oRTP::src::port_fct.c14
-rw-r--r--net/linphone/files/patch-oRTP::src::scheduler.h14
-rw-r--r--net/linphone/files/patch-osipua::ltmain.sh18
-rw-r--r--net/linphone/files/patch-osipua::src::osipua.c12
-rw-r--r--net/linphone/files/patch-osipua::src::sdphandler.c13
-rw-r--r--net/linphone/files/patch-osipua::src::utils.c10
-rw-r--r--net/linphone/files/patch-share::Makefile.in14
-rw-r--r--net/linphone/pkg-plist125
40 files changed, 214 insertions, 827 deletions
diff --git a/net/Makefile b/net/Makefile
index 4b184b83dc17..6716584c2ed7 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -289,6 +289,7 @@
SUBDIR += limewire
SUBDIR += linc
SUBDIR += linphone
+ SUBDIR += linphone-base
SUBDIR += linpopup
SUBDIR += linux-agsatellite
SUBDIR += linux-edonkey-core
diff --git a/net/linphone-base/Makefile b/net/linphone-base/Makefile
index 3627b501f23e..ed62b6128ed8 100644
--- a/net/linphone-base/Makefile
+++ b/net/linphone-base/Makefile
@@ -5,13 +5,13 @@
# $FreeBSD$
#
-PORTNAME= linphone
-PORTVERSION= 0.12.1
-PORTREVISION= 2
-PORTEPOCH= 1
+PORTNAME= ${LINPHONE_PORTNAME}
+PORTVERSION= ${LINPHONE_PORTVERSION}
+PORTREVISION= ${LINPHONE_PORTREVISION}
+PORTEPOCH= ${LINPHONE_PORTEPOCH}
CATEGORIES= net
-MASTER_SITES= http://simon.morlat.free.fr/download/%SUBDIR%/
-MASTER_SITE_SUBDIR= ${PORTVERSION}/source
+MASTER_SITES= ${LINPHONE_MASTER_SITES}
+PKGNAMESUFFIX= -base
MAINTAINER= ports@FreeBSD.org
COMMENT= A web phone that supports SIP protocol
@@ -20,28 +20,33 @@ LIB_DEPENDS= gsm.1:${PORTSDIR}/audio/gsm \
speex.2:${PORTSDIR}/audio/speex \
osip.9:${PORTSDIR}/net/libosip
-USE_GNOME= gnomehack gnometarget
+USE_GNOME= glib20 gnomehack gnometarget intlhack pkgconfig
USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
-CONFIGURE_ARGS= --disable-ipv6
+CONFIGURE_ARGS= --disable-ipv6 --enable-gnome_ui=no \
+ --with-speex=${LOCALBASE} --with-html-dir=${DOCSDIR}
INSTALLS_SHLIB= yes
-MAN1= linphone.1 linphonec.1 sipomatic.1
-
-.if defined(WITHOUT_X11)
-CONFIGURE_ARGS+= --enable-gnome_ui=no --with-html-dir=${DOCSDIR}
-PLIST_SUB+= GNOME="@comment " \
- GNOME_PATH="" \
- HTMLDOCSDIR="${DOCSDIR:S,^${PREFIX}/,,}"
-.else
-USE_X_PREFIX= yes
-USE_GNOME+= gnomepanel gnomeprefix
-DOCSDIR= ${GNOME_HTML_DIR}
-PLIST_SUB+= GNOME="" \
- GNOME_PATH="gnome/" \
- HTMLDOCSDIR="${GNOME_HTML_DIR:S,^${PREFIX}/,,}"
-.endif
-
-.include <bsd.port.mk>
+MAN1= linphonec.1 sipomatic.1
+
+CFLAGS+= -DPACKAGE_LOCALE_DIR='\"${PREFIX}/share/locale\"' \
+ -DPACKAGE_DATA_DIR='\"${PREFIX}/share\"' \
+ -DPACKAGE_SOUND_DIR='\"${DATADIR}/sounds\"'
+
+.include "Makefile.common"
+.include <bsd.port.pre.mk>
+
+post-install:
+ ${INSTALL_MAN} ${WRKSRC}/share/C/linphonec.1 ${MANPREFIX}/man/man1
+ ${INSTALL_MAN} ${WRKSRC}/share/C/sipomatic.1 ${MANPREFIX}/man/man1
+ ${INSTALL_DATA} ${WRKSRC}/share/linphone.pc ${PREFIX}/libdata/pkgconfig
+ @${MKDIR} ${DATADIR}/sounds
+ ${INSTALL_DATA} ${WRKSRC}/share/*.wav ${DATADIR}/sounds
+ @${MKDIR} ${DATADIR}/sounds/rings
+ ${INSTALL_DATA} ${WRKSRC}/share/rings/*.wav ${DATADIR}/sounds/rings
+ @${MKDIR} ${PREFIX}/share/linphonec
+ ${INSTALL_DATA} ${WRKSRC}/share/linphonec ${PREFIX}/share/linphonec
+
+.include <bsd.port.post.mk>
diff --git a/net/linphone-base/distinfo b/net/linphone-base/distinfo
index 58da85137534..92d010f38da8 100644
--- a/net/linphone-base/distinfo
+++ b/net/linphone-base/distinfo
@@ -1,2 +1,2 @@
-MD5 (linphone-0.12.1.tar.gz) = 62e94ca8e3a95297175ee0c3c6de13b1
-SIZE (linphone-0.12.1.tar.gz) = 8296534
+MD5 (linphone-0.12.2.tar.gz) = 86c01dbbcdb41786229f51ec0994ff67
+SIZE (linphone-0.12.2.tar.gz) = 3044602
diff --git a/net/linphone-base/files/patch-Makefile.in b/net/linphone-base/files/patch-Makefile.in
index 1431371048bc..c68c8ec72648 100644
--- a/net/linphone-base/files/patch-Makefile.in
+++ b/net/linphone-base/files/patch-Makefile.in
@@ -1,16 +1,24 @@
$FreeBSD$
---- Makefile.in.orig Thu Nov 20 19:41:33 2003
-+++ Makefile.in Fri Nov 21 11:04:35 2003
-@@ -156,8 +156,8 @@
+--- Makefile.in.orig Thu Apr 1 05:40:35 2004
++++ Makefile.in Thu Apr 15 03:26:01 2004
+@@ -156,13 +156,15 @@
@BUILD_TRUESPEECH_TRUE@WIN32ACM_DIR = win32acm
--SUBDIRS = support pixmaps ffmpeg po macros debian ipkg oRTP gsmlib lpc10-1.5 \
-- speex $(WIN32ACM_DIR) mediastreamer \
-+SUBDIRS = support pixmaps ffmpeg po macros debian ipkg oRTP lpc10-1.5 \
-+ $(WIN32ACM_DIR) mediastreamer \
- media_api osipua coreapi console gnome share developer-docs
++ifndef SUBDIRS
+ @BUILD_SPEEX_TRUE@SUBDIRS = support pixmaps ffmpeg po debian ipkg oRTP gsmlib lpc10-1.5 \
+ @BUILD_SPEEX_TRUE@ $(WIN32ACM_DIR) speex mediastreamer \
+ @BUILD_SPEEX_TRUE@ media_api osipua coreapi console gnome share developer-docs
+-@BUILD_SPEEX_FALSE@SUBDIRS = support pixmaps ffmpeg po debian ipkg oRTP gsmlib lpc10-1.5 \
+-@BUILD_SPEEX_FALSE@ $(WIN32ACM_DIR) speex mediastreamer \
+-@BUILD_SPEEX_FALSE@ media_api osipua coreapi console gnome share developer-docs
++@BUILD_SPEEX_FALSE@SUBDIRS = support ffmpeg po debian ipkg oRTP lpc10-1.5 \
++@BUILD_SPEEX_FALSE@ $(WIN32ACM_DIR) mediastreamer \
++@BUILD_SPEEX_FALSE@ media_api osipua coreapi console gnome developer-docs
++endif
+
+ EXTRA_DIST = linphone2.glade BUGS linphone.kdevprj \
diff --git a/net/linphone-base/files/patch-configure b/net/linphone-base/files/patch-configure
index c9d5cb8c243e..46c404eae50a 100644
--- a/net/linphone-base/files/patch-configure
+++ b/net/linphone-base/files/patch-configure
@@ -1,43 +1,26 @@
---- configure.orig Thu Nov 20 19:41:45 2003
-+++ configure Fri Nov 21 11:02:43 2003
-@@ -463,7 +463,7 @@
- # include <unistd.h>
- #endif"
+--- configure.orig Thu Apr 1 05:40:47 2004
++++ configure Thu Apr 15 03:28:18 2004
+@@ -22220,23 +22220,6 @@
+ fi
--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_XAM_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 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 BUILD_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'
- ac_subst_files=''
-@@ -22300,19 +22300,19 @@
-
-
- cat >>confdefs.h <<_ACEOF
+-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_LOCALE_DIR "${realprefix}/${DATADIRNAME}/locale"
-+#define PACKAGE_LOCALE_DIR "${realprefix}/share/locale"
- _ACEOF
-
-
-
- cat >>confdefs.h <<_ACEOF
+-_ACEOF
+-
+-
+-
+-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_DATA_DIR "${realprefix}/${DATADIRNAME}"
-+#define PACKAGE_DATA_DIR "${realprefix}/share/gnome"
- _ACEOF
-
-
-
- cat >>confdefs.h <<_ACEOF
+-_ACEOF
+-
+-
+-
+-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_SOUND_DIR "${realprefix}/${DATADIRNAME}/sounds/linphone"
-+#define PACKAGE_SOUND_DIR "${realprefix}/share/gnome/sounds/linphone"
- _ACEOF
-
-
-@@ -23669,7 +23669,7 @@
-
-
-
--subdirs="$subdirs ffmpeg speex oRTP osipua"
-+subdirs="$subdirs ffmpeg oRTP osipua"
+-_ACEOF
+-
+-
+ found_sound=no
- ##################################################
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 3061818ddb79..000000000000
--- 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 4606e6766796..000000000000
--- 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::enum.c b/net/linphone-base/files/patch-coreapi::enum.c
new file mode 100644
index 000000000000..268a81731e88
--- /dev/null
+++ b/net/linphone-base/files/patch-coreapi::enum.c
@@ -0,0 +1,16 @@
+
+$FreeBSD$
+
+--- coreapi/enum.c.orig Sat Mar 6 01:21:40 2004
++++ coreapi/enum.c Thu Apr 15 03:46:41 2004
+@@ -21,7 +21,10 @@
+
+ #include "enum.h"
+
++#include <sys/types.h>
++#include <sys/socket.h>
+ #include <netinet/in.h>
++#include <arpa/inet.h>
+ #include <arpa/nameser.h>
+ #include <resolv.h>
+ #include <errno.h>
diff --git a/net/linphone-base/files/patch-gnome::Makefile.in b/net/linphone-base/files/patch-gnome::Makefile.in
index 265978dd7665..e6994ad1bad5 100644
--- a/net/linphone-base/files/patch-gnome::Makefile.in
+++ b/net/linphone-base/files/patch-gnome::Makefile.in
@@ -3,11 +3,47 @@ $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 @@
+@@ -160,7 +160,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
+ @BUILD_GNOME_TRUE@ -I$(top_srcdir)/osipua/src \
+@@ -183,7 +182,7 @@
+
+ @BUILD_GNOME_TRUE@linphone_LDADD = $(LIBGNOMEUI_LIBS) $(INTLLIBS) \
+ @BUILD_GNOME_TRUE@ $(LIBGNOME_LIBS) \
+-@BUILD_GNOME_TRUE@ $(top_srcdir)/coreapi/liblinphonegnome.la
++@BUILD_GNOME_TRUE@ -llinphonegnome
+
+
+ AM_CFLAGS = $(LIBGNOMEUI_CFLAGS) $(LIBGNOME_CFLAGS) $(GNOME_APPLETS_CFLAGS) $(IPV6_CFLAGS)
+@@ -206,7 +205,7 @@
+
+ @BUILD_GNOME_APPLET_TRUE@linphone_applet_LDADD = \
+ @BUILD_GNOME_APPLET_TRUE@ $(GNOME_APPLETS_LIBS) \
+-@BUILD_GNOME_APPLET_TRUE@ $(top_srcdir)/coreapi/liblinphonegnome.la
++@BUILD_GNOME_APPLET_TRUE@ -llinphonegnome
+
+
+
+@@ -241,7 +240,7 @@
+ @BUILD_GNOME_TRUE@ propertybox.$(OBJEXT) addressbook.$(OBJEXT)
+ linphone_OBJECTS = $(am_linphone_OBJECTS)
+ @BUILD_GNOME_TRUE@linphone_DEPENDENCIES = \
+-@BUILD_GNOME_TRUE@ $(top_srcdir)/coreapi/liblinphonegnome.la
++@BUILD_GNOME_TRUE@ -llinphonegnome
+ @BUILD_GNOME_FALSE@linphone_DEPENDENCIES =
+ linphone_LDFLAGS =
+ @BUILD_GNOME_APPLET_TRUE@am_linphone_applet_OBJECTS = \
+@@ -256,7 +255,7 @@
+ @BUILD_GNOME_APPLET_TRUE@ linphone_applet-applet.$(OBJEXT)
+ linphone_applet_OBJECTS = $(am_linphone_applet_OBJECTS)
+ @BUILD_GNOME_APPLET_TRUE@linphone_applet_DEPENDENCIES = \
+-@BUILD_GNOME_APPLET_TRUE@ $(top_srcdir)/coreapi/liblinphonegnome.la
++@BUILD_GNOME_APPLET_TRUE@ -llinphonegnome
+ @BUILD_GNOME_APPLET_FALSE@linphone_applet_DEPENDENCIES =
+ linphone_applet_LDFLAGS =
+
diff --git a/net/linphone-base/files/patch-mediastreamer::Makefile.in b/net/linphone-base/files/patch-mediastreamer::Makefile.in
index bab51371dd00..4570677c1ee6 100644
--- a/net/linphone-base/files/patch-mediastreamer::Makefile.in
+++ b/net/linphone-base/files/patch-mediastreamer::Makefile.in
@@ -1,8 +1,8 @@
$FreeBSD$
---- mediastreamer/Makefile.in.orig Thu Nov 20 19:41:39 2003
-+++ mediastreamer/Makefile.in Fri Nov 21 10:59:28 2003
+--- mediastreamer/Makefile.in.orig Thu Apr 1 05:40:41 2004
++++ mediastreamer/Makefile.in Thu Apr 15 03:30:15 2004
@@ -222,7 +222,7 @@
@@ -11,30 +11,16 @@ $FreeBSD$
+ -lgsm \
../lpc10-1.5/liblpc10.la \
../oRTP/src/libortp.la \
- $(ALSA_LIBS) \
-@@ -252,7 +252,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
-@@ -335,12 +335,8 @@
+ $(SUPPORTLIB) \
+@@ -336,7 +336,6 @@
-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
-@@ -351,12 +347,12 @@
+ -I/usr/X11R6/include/X11 \
+@@ -352,12 +351,12 @@
libmediastreamer_la_LDFLAGS =
@BUILD_TRUESPEECH_TRUE@libmediastreamer_la_DEPENDENCIES = \
@@ -49,12 +35,3 @@ $FreeBSD$
@BUILD_TRUESPEECH_FALSE@ ../lpc10-1.5/liblpc10.la \
@BUILD_TRUESPEECH_FALSE@ ../oRTP/src/libortp.la
@BUILD_TRUESPEECH_TRUE@am__objects_1 = mstruespeechencoder.lo \
-@@ -386,7 +382,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-oRTP::ltmain.sh b/net/linphone-base/files/patch-oRTP::ltmain.sh
deleted file mode 100644
index b2ed1cfb3dd6..000000000000
--- a/net/linphone-base/files/patch-oRTP::ltmain.sh
+++ /dev/null
@@ -1,15 +0,0 @@
---- oRTP/ltmain.sh.orig Thu Nov 20 19:42:06 2003
-+++ oRTP/ltmain.sh Fri Nov 21 13:13:05 2003
-@@ -5478,10 +5478,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::ltmain.sh b/net/linphone-base/files/patch-osipua::ltmain.sh
deleted file mode 100644
index e2ecc7c5b1fa..000000000000
--- 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 0ebdee4d5cd1..000000000000
--- a/net/linphone-base/files/patch-osipua::src::osipua.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- osipua/src/osipua.c.orig Mon Oct 20 17:55:05 2003
-+++ osipua/src/osipua.c Fri Nov 21 11:52:31 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/pkg-plist b/net/linphone-base/pkg-plist
index 04d8816161e5..13e55a0a3683 100644
--- a/net/linphone-base/pkg-plist
+++ b/net/linphone-base/pkg-plist
@@ -1,9 +1,12 @@
-%%GNOME%%bin/linphone
bin/linphonec
bin/sipomatic
include/linphone/config.h
+include/linphone/glist.h
+include/linphone/gshell.h
+include/linphone/gspawn.h
include/linphone/linphonecore.h
include/linphone/sndcard.h
+include/linphone/uglib.h
include/ortp/ortp-config.h
include/ortp/ortp.h
include/ortp/payloadtype.h
@@ -51,119 +54,52 @@ lib/libosipalloc.so.0
lib/libosipua.a
lib/libosipua.so
lib/libosipua.so.2
-%%GNOME%%libdata/bonobo/servers/GNOME_LinphoneApplet.server
libdata/pkgconfig/linphone.pc
-%%GNOME%%libexec/linphone_applet
-%%HTMLDOCSDIR%%/mediastreamer/book1.html
-%%HTMLDOCSDIR%%/mediastreamer/coreapi.html
-%%HTMLDOCSDIR%%/mediastreamer/index.sgml
-%%HTMLDOCSDIR%%/mediastreamer/mediastreamer-filters.html
-%%HTMLDOCSDIR%%/mediastreamer/mediastreamer-msringplayer.html
-%%HTMLDOCSDIR%%/mediastreamer/mediastreamer-mssync.html
-%%HTMLDOCSDIR%%/mediastreamer/mediastreamer-running-processing-chains.html
-%%HTMLDOCSDIR%%/mediastreamer/msfilterimplementations.html
-%%HTMLDOCSDIR%%/mediastreamer/userapi.html
-%%HTMLDOCSDIR%%/ortp/book1.html
-%%HTMLDOCSDIR%%/ortp/index.sgml
-%%HTMLDOCSDIR%%/ortp/ortp-library-management-functions.html
-%%HTMLDOCSDIR%%/ortp/ortp-multiplexing-sessions-(in-a-one-thread-design).html
-%%HTMLDOCSDIR%%/ortp/ortp-rtp-payloads-and-profiles.html
-%%HTMLDOCSDIR%%/ortp/ortp-rtpsession-api.html
-%%HTMLDOCSDIR%%/ortp/ortp-stack-management-functions.html
-%%HTMLDOCSDIR%%/ortp/ortp-telephone-events-(rfc2833)-.html
-%%HTMLDOCSDIR%%/ortp/ortpapi.html
-%%HTMLDOCSDIR%%/osipua/book1.html
-%%HTMLDOCSDIR%%/osipua/index.sgml
-%%HTMLDOCSDIR%%/osipua/osipcallleg.html
-%%HTMLDOCSDIR%%/osipua/osipua--registrationctxt-api-.html
-%%HTMLDOCSDIR%%/osipua/osipua-osipcallleg-private-api.html
-%%HTMLDOCSDIR%%/osipua/osipua-osipcallleg-public-api.html
-%%HTMLDOCSDIR%%/osipua/osipua-osipua-private-api.html
-%%HTMLDOCSDIR%%/osipua/osipua-osipua-public-api.html
-%%HTMLDOCSDIR%%/osipua/osipua.html
-%%HTMLDOCSDIR%%/osipua/registrationctxt.html
-share/gnome/apps/Internet/linphone.desktop
-%%GNOME%%share/gnome/gnome-2.0/ui/GNOME_LinphoneApplet.xml
-share/gnome/help/linphone/C/docbook.css
-share/gnome/help/linphone/C/index.html
-share/gnome/help/linphone/C/params.html
-share/gnome/help/linphone/C/t1.html
-share/gnome/help/linphone/C/x118.html
-share/gnome/help/linphone/C/x121.html
-share/gnome/help/linphone/C/x137.html
-share/gnome/help/linphone/C/x143.html
-share/gnome/help/linphone/C/x167.html
-share/gnome/help/linphone/C/x172.html
-share/gnome/help/linphone/C/x188.html
-share/gnome/help/linphone/C/x26.html
-share/gnome/help/linphone/C/x36.html
-share/gnome/help/linphone/fr/docbook.css
-share/gnome/help/linphone/fr/params.html
-share/gnome/help/linphone/fr/registering.html
-share/gnome/help/linphone/fr/t1.html
-share/gnome/help/linphone/fr/x116.html
-share/gnome/help/linphone/fr/x134.html
-share/gnome/help/linphone/fr/x140.html
-share/gnome/help/linphone/fr/x164.html
-share/gnome/help/linphone/fr/x170.html
-share/gnome/help/linphone/fr/x188.html
-share/gnome/help/linphone/fr/x24.html
-share/gnome/help/linphone/fr/x34.html
-share/gnome/help/linphone/it/docbook.css
-share/gnome/help/linphone/it/params.html
-share/gnome/help/linphone/it/registering.html
-share/gnome/help/linphone/it/t1.html
-share/gnome/help/linphone/it/x116.html
-share/gnome/help/linphone/it/x134.html
-share/gnome/help/linphone/it/x140.html
-share/gnome/help/linphone/it/x164.html
-share/gnome/help/linphone/it/x170.html
-share/gnome/help/linphone/it/x189.html
-share/gnome/help/linphone/it/x24.html
-share/gnome/help/linphone/it/x34.html
-share/gnome/help/linphone/ja/params.html
-share/gnome/help/linphone/ja/t1.html
-share/gnome/help/linphone/ja/x112.html
-share/gnome/help/linphone/ja/x115.html
-share/gnome/help/linphone/ja/x131.html
-share/gnome/help/linphone/ja/x137.html
-share/gnome/help/linphone/ja/x161.html
-share/gnome/help/linphone/ja/x166.html
-share/gnome/help/linphone/ja/x182.html
-share/gnome/help/linphone/ja/x25.html
-share/gnome/help/linphone/ja/x35.html
-share/%%GNOME_PATH%%linphonec/linphonec
-share/%%GNOME_PATH%%pixmaps/linphone/linphone.png
-share/%%GNOME_PATH%%pixmaps/linphone/linphone2.png
-share/%%GNOME_PATH%%pixmaps/linphone/linphone2.xpm
-share/%%GNOME_PATH%%sounds/linphone/hello16000.wav
-share/%%GNOME_PATH%%sounds/linphone/hello8000.wav
-share/%%GNOME_PATH%%sounds/linphone/ringback.wav
-share/%%GNOME_PATH%%sounds/linphone/rings/bigben.wav
-share/%%GNOME_PATH%%sounds/linphone/rings/oldphone.wav
-share/%%GNOME_PATH%%sounds/linphone/rings/orig.wav
-share/%%GNOME_PATH%%sounds/linphone/rings/rock.wav
-share/%%GNOME_PATH%%sounds/linphone/rings/sweet.wav
-share/%%GNOME_PATH%%sounds/linphone/rings/synth.wav
-share/%%GNOME_PATH%%sounds/linphone/rings/tapping.wav
-share/%%GNOME_PATH%%sounds/linphone/rings/toy.wav
+%%DOCSDIR%%/mediastreamer/book1.html
+%%DOCSDIR%%/mediastreamer/coreapi.html
+%%DOCSDIR%%/mediastreamer/index.sgml
+%%DOCSDIR%%/mediastreamer/mediastreamer-filters.html
+%%DOCSDIR%%/mediastreamer/mediastreamer-msringplayer.html
+%%DOCSDIR%%/mediastreamer/mediastreamer-mssync.html
+%%DOCSDIR%%/mediastreamer/mediastreamer-running-processing-chains.html
+%%DOCSDIR%%/mediastreamer/msfilterimplementations.html
+%%DOCSDIR%%/mediastreamer/userapi.html
+%%DOCSDIR%%/ortp/book1.html
+%%DOCSDIR%%/ortp/index.sgml
+%%DOCSDIR%%/ortp/ortp-library-management-functions.html
+%%DOCSDIR%%/ortp/ortp-multiplexing-sessions-(in-a-one-thread-design).html
+%%DOCSDIR%%/ortp/ortp-rtp-payloads-and-profiles.html
+%%DOCSDIR%%/ortp/ortp-rtpsession-api.html
+%%DOCSDIR%%/ortp/ortp-telephone-events-(rfc2833)-.html
+%%DOCSDIR%%/ortp/ortpapi.html
+%%DOCSDIR%%/osipua/book1.html
+%%DOCSDIR%%/osipua/index.sgml
+%%DOCSDIR%%/osipua/osipcallleg.html
+%%DOCSDIR%%/osipua/osipua--registrationctxt-api-.html
+%%DOCSDIR%%/osipua/osipua-osipcallleg-private-api.html
+%%DOCSDIR%%/osipua/osipua-osipcallleg-public-api.html
+%%DOCSDIR%%/osipua/osipua-osipua-private-api.html
+%%DOCSDIR%%/osipua/osipua-osipua-public-api.html
+%%DOCSDIR%%/osipua/osipua.html
+%%DOCSDIR%%/osipua/registrationctxt.html
+%%DATADIR%%/sounds/hello16000.wav
+%%DATADIR%%/sounds/hello8000.wav
+%%DATADIR%%/sounds/ringback.wav
+%%DATADIR%%/sounds/rings/oldphone.wav
+%%DATADIR%%/sounds/rings/orig.wav
+share/linphonec/linphonec
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
share/locale/pl/LC_MESSAGES/linphone.mo
-@dirrm share/%%GNOME_PATH%%sounds/linphone/rings
-@dirrm share/%%GNOME_PATH%%sounds/linphone
-@dirrm share/%%GNOME_PATH%%pixmaps/linphone
-@dirrm share/%%GNOME_PATH%%linphonec
-@dirrm share/gnome/help/linphone/ja
-@dirrm share/gnome/help/linphone/it
-@dirrm share/gnome/help/linphone/fr
-@dirrm share/gnome/help/linphone/C
-@dirrm share/gnome/help/linphone
-@dirrm %%HTMLDOCSDIR%%/osipua
-@dirrm %%HTMLDOCSDIR%%/ortp
-@dirrm %%HTMLDOCSDIR%%/mediastreamer
+@dirrm share/linphonec
+@dirrm %%DATADIR%%/sounds/rings
+@dirrm %%DATADIR%%/sounds
+@dirrm %%DATADIR%%
+@dirrm %%DOCSDIR%%/osipua
+@dirrm %%DOCSDIR%%/ortp
+@dirrm %%DOCSDIR%%/mediastreamer
@dirrm include/osipua
@dirrm include/ortp
diff --git a/net/linphone/Makefile b/net/linphone/Makefile
index 3627b501f23e..ad487e9a041c 100644
--- a/net/linphone/Makefile
+++ b/net/linphone/Makefile
@@ -5,43 +5,48 @@
# $FreeBSD$
#
-PORTNAME= linphone
-PORTVERSION= 0.12.1
-PORTREVISION= 2
-PORTEPOCH= 1
-CATEGORIES= net
-MASTER_SITES= http://simon.morlat.free.fr/download/%SUBDIR%/
-MASTER_SITE_SUBDIR= ${PORTVERSION}/source
+PORTNAME= ${LINPHONE_PORTNAME}
+PORTVERSION= ${LINPHONE_PORTVERSION}
+PORTREVISION= ${LINPHONE_PORTREVISION}
+PORTEPOCH= ${LINPHONE_PORTEPOCH}
+CATEGORIES= net gnome
+MASTER_SITES= ${LINPHONE_MASTER_SITES}
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= linphone.0:${PORTSDIR}/net/linphone-base
-USE_GNOME= gnomehack gnometarget
+USE_X_PREFIX= yes
+USE_GNOME= gnomehack gnomeprefix gnomepanel
USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
CONFIGURE_ARGS= --disable-ipv6
-INSTALLS_SHLIB= yes
+MAKE_ENV= SUBDIRS="pixmaps gnome"
-MAN1= linphone.1 linphonec.1 sipomatic.1
+MAN1= linphone.1
-.if defined(WITHOUT_X11)
-CONFIGURE_ARGS+= --enable-gnome_ui=no --with-html-dir=${DOCSDIR}
-PLIST_SUB+= GNOME="@comment " \
- GNOME_PATH="" \
- HTMLDOCSDIR="${DOCSDIR:S,^${PREFIX}/,,}"
-.else
-USE_X_PREFIX= yes
-USE_GNOME+= gnomepanel gnomeprefix
-DOCSDIR= ${GNOME_HTML_DIR}
-PLIST_SUB+= GNOME="" \
- GNOME_PATH="gnome/" \
- HTMLDOCSDIR="${GNOME_HTML_DIR:S,^${PREFIX}/,,}"
-.endif
-
-.include <bsd.port.mk>
+CFLAGS+= -DPACKAGE_LOCALE_DIR='\"${LOCALBASE}/share/locale\"' \
+ -DPACKAGE_DATA_DIR='\"${PREFIX}/share/gnome\"' \
+ -DPACKAGE_SOUND_DIR='\"${LOCALBASE}/share/linphone/sounds\"'
+
+.include "${.CURDIR}/../../net/linphone-base/Makefile.common"
+.include <bsd.port.pre.mk>
+
+post-install:
+ ${INSTALL_MAN} ${WRKSRC}/share/C/linphone.1 ${MANPREFIX}/man/man1
+ ${INSTALL_DATA} ${WRKSRC}/share/linphone.desktop \
+ ${PREFIX}/share/gnome/applications
+.for lang in C fr it ja
+ @${MKDIR} ${PREFIX}/share/gnome/help/linphone/${lang}
+ ${INSTALL_DATA} ${WRKSRC}/share/${lang}/manual/*.html \
+ ${PREFIX}/share/gnome/help/linphone/${lang}
+.endfor
+.for lang in C fr it
+ ${INSTALL_DATA} ${WRKSRC}/share/${lang}/manual/*.css \
+ ${PREFIX}/share/gnome/help/linphone/${lang}
+.endfor
+
+.include <bsd.port.post.mk>
diff --git a/net/linphone/distinfo b/net/linphone/distinfo
deleted file mode 100644
index 58da85137534..000000000000
--- a/net/linphone/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (linphone-0.12.1.tar.gz) = 62e94ca8e3a95297175ee0c3c6de13b1
-SIZE (linphone-0.12.1.tar.gz) = 8296534
diff --git a/net/linphone/files/patch-Makefile.in b/net/linphone/files/patch-Makefile.in
deleted file mode 100644
index 1431371048bc..000000000000
--- a/net/linphone/files/patch-Makefile.in
+++ /dev/null
@@ -1,16 +0,0 @@
-
-$FreeBSD$
-
---- Makefile.in.orig Thu Nov 20 19:41:33 2003
-+++ Makefile.in Fri Nov 21 11:04:35 2003
-@@ -156,8 +156,8 @@
-
- @BUILD_TRUESPEECH_TRUE@WIN32ACM_DIR = win32acm
-
--SUBDIRS = support pixmaps ffmpeg po macros debian ipkg oRTP gsmlib lpc10-1.5 \
-- speex $(WIN32ACM_DIR) mediastreamer \
-+SUBDIRS = support 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 464bc65832ff..000000000000
--- 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 c9d5cb8c243e..000000000000
--- a/net/linphone/files/patch-configure
+++ /dev/null
@@ -1,43 +0,0 @@
---- configure.orig Thu Nov 20 19:41:45 2003
-+++ configure Fri Nov 21 11:02:43 2003
-@@ -463,7 +463,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_XAM_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 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 BUILD_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'
- ac_subst_files=''
-
-@@ -22300,19 +22300,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
-
-
-@@ -23669,7 +23669,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 3061818ddb79..000000000000
--- 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 4606e6766796..000000000000
--- 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::linphonecore.c b/net/linphone/files/patch-coreapi::linphonecore.c
deleted file mode 100644
index 0e758bdd463a..000000000000
--- a/net/linphone/files/patch-coreapi::linphonecore.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- coreapi/linphonecore.c.orig Fri Nov 7 00:27:42 2003
-+++ coreapi/linphonecore.c Fri Nov 21 11:59:25 2003
-@@ -33,6 +33,7 @@
- #include <sys/socket.h>
- #include <netinet/in.h>
- #include <arpa/inet.h>
-+#include <netdb.h>
-
- #ifdef INET6
- #include <netdb.h>
diff --git a/net/linphone/files/patch-coreapi::misc.c b/net/linphone/files/patch-coreapi::misc.c
deleted file mode 100644
index 499b6f2aa060..000000000000
--- 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 265978dd7665..000000000000
--- 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-gnome::callbacks.c b/net/linphone/files/patch-gnome::callbacks.c
deleted file mode 100644
index ad3af985d852..000000000000
--- a/net/linphone/files/patch-gnome::callbacks.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- gnome/callbacks.c.orig Fri Nov 7 21:08:34 2003
-+++ gnome/callbacks.c Fri Nov 21 12:57:20 2003
-@@ -82,7 +82,7 @@
- on_user_manual1_activate (GtkMenuItem *menuitem,
- gpointer user_data)
- {
-- gnome_help_display("manual/index.html",NULL,NULL);
-+ gnome_help_display("index.html",NULL,NULL);
- }
-
-
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 4398a7075055..000000000000
--- 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 d35bdf99a3c2..000000000000
--- 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 2cc794e5b04b..000000000000
--- 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 bab51371dd00..000000000000
--- a/net/linphone/files/patch-mediastreamer::Makefile.in
+++ /dev/null
@@ -1,60 +0,0 @@
-
-$FreeBSD$
-
---- mediastreamer/Makefile.in.orig Thu Nov 20 19:41:39 2003
-+++ mediastreamer/Makefile.in Fri Nov 21 10:59:28 2003
-@@ -222,7 +222,7 @@
-
-
- libmediastreamer_la_LIBADD = $(GLIB_LIBS) \
-- ../gsmlib/libgsm.la \
-+ -lgsm \
- ../lpc10-1.5/liblpc10.la \
- ../oRTP/src/libortp.la \
- $(ALSA_LIBS) \
-@@ -252,7 +252,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
-@@ -335,12 +335,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
-@@ -351,12 +347,12 @@
-
- libmediastreamer_la_LDFLAGS =
- @BUILD_TRUESPEECH_TRUE@libmediastreamer_la_DEPENDENCIES = \
--@BUILD_TRUESPEECH_TRUE@ ../gsmlib/libgsm.la \
-+@BUILD_TRUESPEECH_TRUE@ -lgsm \
- @BUILD_TRUESPEECH_TRUE@ ../lpc10-1.5/liblpc10.la \
- @BUILD_TRUESPEECH_TRUE@ ../oRTP/src/libortp.la \
- @BUILD_TRUESPEECH_TRUE@ ../win32acm/libwin32acm.a
- @BUILD_TRUESPEECH_FALSE@libmediastreamer_la_DEPENDENCIES = \
--@BUILD_TRUESPEECH_FALSE@ ../gsmlib/libgsm.la \
-+@BUILD_TRUESPEECH_FALSE@ -lgsm \
- @BUILD_TRUESPEECH_FALSE@ ../lpc10-1.5/liblpc10.la \
- @BUILD_TRUESPEECH_FALSE@ ../oRTP/src/libortp.la
- @BUILD_TRUESPEECH_TRUE@am__objects_1 = mstruespeechencoder.lo \
-@@ -386,7 +382,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 f30f63710642..000000000000
--- 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 328fe8ff9f07..000000000000
--- a/net/linphone/files/patch-oRTP::configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- oRTP/configure.orig Thu Nov 20 19:42:24 2003
-+++ oRTP/configure Fri Nov 21 11:14:07 2003
-@@ -19430,8 +19430,6 @@
- CFLAGS="$CFLAGS +DA2.0W +DS2.0"
- fi
- fi
--else
-- CFLAGS="-O2 -g -Wall"
- fi
-
- build_scheduler=yes
diff --git a/net/linphone/files/patch-oRTP::ltmain.sh b/net/linphone/files/patch-oRTP::ltmain.sh
deleted file mode 100644
index b2ed1cfb3dd6..000000000000
--- a/net/linphone/files/patch-oRTP::ltmain.sh
+++ /dev/null
@@ -1,15 +0,0 @@
---- oRTP/ltmain.sh.orig Thu Nov 20 19:42:06 2003
-+++ oRTP/ltmain.sh Fri Nov 21 13:13:05 2003
-@@ -5478,10 +5478,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-oRTP::src::port_fct.c b/net/linphone/files/patch-oRTP::src::port_fct.c
deleted file mode 100644
index ececcc89e337..000000000000
--- 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 a872fc24fcbd..000000000000
--- 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::ltmain.sh b/net/linphone/files/patch-osipua::ltmain.sh
deleted file mode 100644
index e2ecc7c5b1fa..000000000000
--- 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 0ebdee4d5cd1..000000000000
--- a/net/linphone/files/patch-osipua::src::osipua.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- osipua/src/osipua.c.orig Mon Oct 20 17:55:05 2003
-+++ osipua/src/osipua.c Fri Nov 21 11:52:31 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 3af14a5dfbc1..000000000000
--- 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-osipua::src::utils.c b/net/linphone/files/patch-osipua::src::utils.c
deleted file mode 100644
index de13b44ec129..000000000000
--- a/net/linphone/files/patch-osipua::src::utils.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- osipua/src/utils.c.orig Thu Oct 23 13:06:43 2003
-+++ osipua/src/utils.c Thu Oct 23 13:07:24 2003
-@@ -382,6 +382,7 @@
- abort();
- return -1;
- }
-+ ((struct sockaddr_in *)(res->ai_addr))->sin_port=htons(9999);
- err=connect(sock,res->ai_addr,res->ai_addrlen);
- if (err<0) {
- osip_trace(OSIP_ERROR,("Error in connect: %s\n",strerror(errno)));
diff --git a/net/linphone/files/patch-share::Makefile.in b/net/linphone/files/patch-share::Makefile.in
deleted file mode 100644
index cb41ac4afd97..000000000000
--- 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/pkg-plist b/net/linphone/pkg-plist
index 04d8816161e5..89f78a20efbc 100644
--- a/net/linphone/pkg-plist
+++ b/net/linphone/pkg-plist
@@ -1,89 +1,8 @@
-%%GNOME%%bin/linphone
-bin/linphonec
-bin/sipomatic
-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
-include/ortp/port_fct.h
-include/ortp/rtcp.h
-include/ortp/rtp.h
-include/ortp/rtpmod.h
-include/ortp/rtpport.h
-include/ortp/rtpsession.h
-include/ortp/rtpsignaltable.h
-include/ortp/rtptimer.h
-include/ortp/scheduler.h
-include/ortp/sessionset.h
-include/ortp/str_utils.h
-include/ortp/telephonyevents.h
-include/osipua/bodycontext.h
-include/osipua/bodyhandler.h
-include/osipua/osipdialog.h
-include/osipua/osipmanager.h
-include/osipua/osipua-config.h
-include/osipua/osipua.h
-include/osipua/regctxt.h
-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
-lib/libmediastreamer.a
-lib/libmediastreamer.so
-lib/libmediastreamer.so.0
-lib/libmsspeex.a
-lib/libmsspeex.so
-lib/libmsspeex.so.0
-lib/libortp.a
-lib/libortp.so
-lib/libortp.so.0
-lib/libosipalloc.a
-lib/libosipalloc.so
-lib/libosipalloc.so.0
-lib/libosipua.a
-lib/libosipua.so
-lib/libosipua.so.2
-%%GNOME%%libdata/bonobo/servers/GNOME_LinphoneApplet.server
-libdata/pkgconfig/linphone.pc
-%%GNOME%%libexec/linphone_applet
-%%HTMLDOCSDIR%%/mediastreamer/book1.html
-%%HTMLDOCSDIR%%/mediastreamer/coreapi.html
-%%HTMLDOCSDIR%%/mediastreamer/index.sgml
-%%HTMLDOCSDIR%%/mediastreamer/mediastreamer-filters.html
-%%HTMLDOCSDIR%%/mediastreamer/mediastreamer-msringplayer.html
-%%HTMLDOCSDIR%%/mediastreamer/mediastreamer-mssync.html
-%%HTMLDOCSDIR%%/mediastreamer/mediastreamer-running-processing-chains.html
-%%HTMLDOCSDIR%%/mediastreamer/msfilterimplementations.html
-%%HTMLDOCSDIR%%/mediastreamer/userapi.html
-%%HTMLDOCSDIR%%/ortp/book1.html
-%%HTMLDOCSDIR%%/ortp/index.sgml
-%%HTMLDOCSDIR%%/ortp/ortp-library-management-functions.html
-%%HTMLDOCSDIR%%/ortp/ortp-multiplexing-sessions-(in-a-one-thread-design).html
-%%HTMLDOCSDIR%%/ortp/ortp-rtp-payloads-and-profiles.html
-%%HTMLDOCSDIR%%/ortp/ortp-rtpsession-api.html
-%%HTMLDOCSDIR%%/ortp/ortp-stack-management-functions.html
-%%HTMLDOCSDIR%%/ortp/ortp-telephone-events-(rfc2833)-.html
-%%HTMLDOCSDIR%%/ortp/ortpapi.html
-%%HTMLDOCSDIR%%/osipua/book1.html
-%%HTMLDOCSDIR%%/osipua/index.sgml
-%%HTMLDOCSDIR%%/osipua/osipcallleg.html
-%%HTMLDOCSDIR%%/osipua/osipua--registrationctxt-api-.html
-%%HTMLDOCSDIR%%/osipua/osipua-osipcallleg-private-api.html
-%%HTMLDOCSDIR%%/osipua/osipua-osipcallleg-public-api.html
-%%HTMLDOCSDIR%%/osipua/osipua-osipua-private-api.html
-%%HTMLDOCSDIR%%/osipua/osipua-osipua-public-api.html
-%%HTMLDOCSDIR%%/osipua/osipua.html
-%%HTMLDOCSDIR%%/osipua/registrationctxt.html
-share/gnome/apps/Internet/linphone.desktop
-%%GNOME%%share/gnome/gnome-2.0/ui/GNOME_LinphoneApplet.xml
+bin/linphone
+libdata/bonobo/servers/GNOME_LinphoneApplet.server
+libexec/linphone_applet
+share/gnome/applications/linphone.desktop
+share/gnome/gnome-2.0/ui/GNOME_LinphoneApplet.xml
share/gnome/help/linphone/C/docbook.css
share/gnome/help/linphone/C/index.html
share/gnome/help/linphone/C/params.html
@@ -132,38 +51,12 @@ share/gnome/help/linphone/ja/x166.html
share/gnome/help/linphone/ja/x182.html
share/gnome/help/linphone/ja/x25.html
share/gnome/help/linphone/ja/x35.html
-share/%%GNOME_PATH%%linphonec/linphonec
-share/%%GNOME_PATH%%pixmaps/linphone/linphone.png
-share/%%GNOME_PATH%%pixmaps/linphone/linphone2.png
-share/%%GNOME_PATH%%pixmaps/linphone/linphone2.xpm
-share/%%GNOME_PATH%%sounds/linphone/hello16000.wav
-share/%%GNOME_PATH%%sounds/linphone/hello8000.wav
-share/%%GNOME_PATH%%sounds/linphone/ringback.wav
-share/%%GNOME_PATH%%sounds/linphone/rings/bigben.wav
-share/%%GNOME_PATH%%sounds/linphone/rings/oldphone.wav
-share/%%GNOME_PATH%%sounds/linphone/rings/orig.wav
-share/%%GNOME_PATH%%sounds/linphone/rings/rock.wav
-share/%%GNOME_PATH%%sounds/linphone/rings/sweet.wav
-share/%%GNOME_PATH%%sounds/linphone/rings/synth.wav
-share/%%GNOME_PATH%%sounds/linphone/rings/tapping.wav
-share/%%GNOME_PATH%%sounds/linphone/rings/toy.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
-share/locale/pl/LC_MESSAGES/linphone.mo
-@dirrm share/%%GNOME_PATH%%sounds/linphone/rings
-@dirrm share/%%GNOME_PATH%%sounds/linphone
-@dirrm share/%%GNOME_PATH%%pixmaps/linphone
-@dirrm share/%%GNOME_PATH%%linphonec
+share/gnome/pixmaps/linphone/linphone.png
+share/gnome/pixmaps/linphone/linphone2.png
+share/gnome/pixmaps/linphone/linphone2.xpm
+@dirrm share/gnome/pixmaps/linphone
@dirrm share/gnome/help/linphone/ja
@dirrm share/gnome/help/linphone/it
@dirrm share/gnome/help/linphone/fr
@dirrm share/gnome/help/linphone/C
@dirrm share/gnome/help/linphone
-@dirrm %%HTMLDOCSDIR%%/osipua
-@dirrm %%HTMLDOCSDIR%%/ortp
-@dirrm %%HTMLDOCSDIR%%/mediastreamer
-@dirrm include/osipua
-@dirrm include/ortp