From tkato@prontomail.com  Sun Jan 18 05:32:10 2004
Return-Path: <tkato@prontomail.com>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 7840116A4DC
	for <FreeBSD-gnats-submit@FreeBSD.org>; Sun, 18 Jan 2004 05:32:05 -0800 (PST)
Received: from hfep04.dion.ne.jp (hfep04.dion.ne.jp [203.181.105.70])
	by mx1.FreeBSD.org (Postfix) with ESMTP id B14D843D41
	for <FreeBSD-gnats-submit@FreeBSD.org>; Sun, 18 Jan 2004 05:32:00 -0800 (PST)
	(envelope-from tkato@prontomail.com)
Received: from localhost ([61.198.241.18]) by hfep04.dion.ne.jp with SMTP
          id <20040118133150693.QUWY@hfep04.dion.ne.jp>
          for <FreeBSD-gnats-submit@FreeBSD.org>;
          Sun, 18 Jan 2004 22:31:50 +0900
Message-Id: <20040118223024.4616b821.tkato@prontomail.com>
Date: Sun, 18 Jan 2004 22:30:24 +0900
From: KATO Tsuguru <tkato@prontomail.com>
To: FreeBSD-gnats-submit@FreeBSD.org
Subject: Update port: net/linphone

>Number:         61525
>Category:       ports
>Synopsis:       Update port: net/linphone
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun Jan 18 05:40:16 PST 2004
>Closed-Date:    Tue May 11 13:35:25 PDT 2004
>Last-Modified:  Tue May 11 13:35:25 PDT 2004
>Originator:     KATO Tsuguru
>Release:        FreeBSD 4.9-RELEASE-p1 i386
>Organization:
>Environment:
>Description:
- Divide linphone port into two ports:
  linphone-base (libraries and console frontends)
  linphone (Gnome2 GUI frontends)

[net/linphone-base]
New file:
Makefile.common

[net/linphone]
Remove file:
distinfo
files/patch-Makefile.in
files/patch-config.h.in
files/patch-configure
files/patch-console::Makefile.in
files/patch-coreapi::Makefile.in
files/patch-coreapi::linphonecore.c
files/patch-coreapi::misc.c
files/patch-gnome::Makefile.in
files/patch-gnome::callbacks.c
files/patch-lpc10-1.5::lpcini.c
files/patch-ltmain.sh
files/patch-media_api::Makefile.in
files/patch-mediastreamer::Makefile.in
files/patch-mediastreamer::msfifo.c
files/patch-oRTP::configure
files/patch-oRTP::ltmain.sh
files/patch-oRTP::src::port_fct.c
files/patch-oRTP::src::scheduler.h
files/patch-osipua::ltmain.sh
files/patch-osipua::src::osipua.c
files/patch-osipua::src::sdphandler.c
files/patch-osipua::src::utils.c
files/patch-share::Makefile.in

>How-To-Repeat:
>Fix:

begin 644 net_linphone.tar.gz
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
8=^VNW;6[=M?NVEV[2[[^!_(%30,`R```
`
end
>Release-Note:
>Audit-Trail:

From: Edwin Groothuis <edwin@freebsd.org>
To: FreeBSD Gnats Submit <freebsd-gnats-submit@freebsd.org>
Cc:  
Subject: Re: ports/61525: Update port: net/linphone
Date: Sat, 6 Mar 2004 16:18:44 +1100

 Quick question: do you have this port working (running :-) under 5.2?
 For me it hangs somewhere in the libosip during the initialisation
 call to osipua_init().
 
 -- 
 Edwin Groothuis      |            Personal website: http://www.mavetju.org
 edwin@freebsd.org    |          Weblog: http://weblog.barnet.com.au/edwin/

From: KATO Tsuguru <tkato@prontomail.com>
To: FreeBSD-gnats-submit@FreeBSD.org
Cc:  
Subject: Re: ports/61525: Update port: net/linphone
Date: Fri, 26 Mar 2004 21:34:28 +0900

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

From: Volker Stolz <vs@FreeBSD.org>
To: freebsd-gnats-submit@FreeBSD.org, tkato@prontomail.com
Cc:  
Subject: Re: ports/61525: Update port: net/linphone
Date: Tue, 11 May 2004 15:52:28 +0200

 I tried handling this, but my head exploded. Could you send me a working 
 diff against the version currently in the ports-tree?
 
 Regards,
    Volker
State-Changed-From-To: open->closed 
State-Changed-By: vs 
State-Changed-When: Tue May 11 13:34:43 PDT 2004 
State-Changed-Why:  
Closed on submitter's request: Superseded by 66396 

http://www.freebsd.org/cgi/query-pr.cgi?pr=61525 
>Unformatted:
