Attachment #34377 for bug #55872

View | Details | Raw Unified | Return to bug 55872
Collapse All | Expand All




#

PORTNAME=	linphone
PORTVERSION=	0.12.0
PORTREVISION=	2
CATEGORIES=	net
MASTER_SITES=	http://simon.morlat.free.fr/download/%SUBDIR%/
MASTER_SITE_SUBDIR=	${PORTVERSION}/source

MAINTAINER=	ports@FreeBSD.org
COMMENT=	A web phone that supports SIP protocol

LIB_DEPENDS=	gsm.1:${PORTSDIR}/audio/gsm \
		speex.2:${PORTSDIR}/audio/speex \
		osip.9:${PORTSDIR}/net/libosip
		ogg.4:${PORTSDIR}/audio/libogg

USE_X_PREFIX=	yes
USE_GNOME=	gnomehack gnomepanel gnomeprefix
USE_GMAKE=	yes
GNU_CONFIGURE=	yes
CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
CONFIGURE_ARGS=	--enable-platform-gnome-2
CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
		LDFLAGS="-L${LOCALBASE}/lib"

MAN1=		linphone.1 linphonec.1 sipomatic.1


Line 1 Link Here

(-)net/linphone/distinfo (-1 / +1 lines)
1	MD5 (linphone-0.11.0.tar.gz) = d44393ea9cfbd276c0cf0415849c9cc6	1	MD5 (linphone-0.12.0.tar.gz) = 79abbdcbec4c59cdd28a2722fe333b6e





$FreeBSD$

--- Makefile.in.orig	Wed Aug 20 17:43:49 2003
+++ Makefile.in	Sat Aug 23 01:36:29 2003
@@ -158,8 +158,8 @@
 
 @BUILD_TRUESPEECH_TRUE@WIN32ACM_DIR = win32acm
 
-SUBDIRS = pixmaps ffmpeg po macros debian ipkg oRTP gsmlib lpc10-1.5 \
-                speex $(WIN32ACM_DIR) mediastreamer \
+SUBDIRS = pixmaps ffmpeg po macros debian ipkg oRTP lpc10-1.5 \
+                $(WIN32ACM_DIR) mediastreamer \
 		media_api osipua coreapi console gnome share developer-docs
 
 





$FreeBSD: ports/net/linphone/files/patch-configure,v 1.4 2003/06/14 09:38:44 sobomax Exp $

--- configure.orig	Wed Aug 20 17:44:03 2003
+++ configure	Fri Aug 22 23:41:49 2003
@@ -462,7 +462,7 @@
 # include <unistd.h>
 #endif"
 
-ac_subdirs_all="$ac_subdirs_all ffmpeg speex oRTP osipua"
+ac_subdirs_all="$ac_subdirs_all ffmpeg oRTP osipua"
 ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE INSIDE_GNOME_COMMON_TRUE INSIDE_GNOME_COMMON_FALSE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE CPP EGREP INTLTOOL_DESKTOP_RULE INTLTOOL_DIRECTORY_RULE INTLTOOL_KEYS_RULE INTLTOOL_PROP_RULE INTLTOOL_OAF_RULE INTLTOOL_PONG_RULE INTLTOOL_SERVER_RULE INTLTOOL_SHEET_RULE INTLTOOL_SOUNDLIST_RULE INTLTOOL_UI_RULE INTLTOOL_XML_RULE INTLTOOL_CAVES_RULE INTLTOOL_SCHEMAS_RULE INTLTOOL_THEME_RU
 LIBTOOL='$(SHELL) $(top_builddir)/libtool'
@@ -11056,19 +11057,19 @@
LE INTLTOOL_EXTRACT INTLTOOL_MERGE INTLTOOL_UPDATE INTLTOOL_PERL build build_cpu build_vendor build_os host host_cpu host_vendor host_os LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CXX CXXFLAGS ac_ct_CXX CXXDEPMODE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL GETTEXT_PACKAGE USE_NLS MSGFMT GMSGFMT XGETTEXT CATALOGS CATOBJEXT DATADIRNAME GMOFILES INSTOBJEXT INTLLIBS PO_IN_DATADIR_TRUE PO_IN_DATADIR_FALSE POFILES POSUB MKINSTALLDIRS PKG_CONFIG PLATFORM_GNOME_2_TRUE PLATFORM_GNOME_2_FALSE GNOME_INTERFACE_VERSION WARN_CFLAGS LIBGNOMEUI_CFLAGS LIBGNOMEUI_LIBS LIBGNOME_CFLAGS LIBGNOME_LIBS GNOME_APPLETS_CFLAGS GNOME_APPLETS_LIBS BUILD_MINIMALGLIB_TRUE BUILD_MINIMALGLIB_FALSE GLIB_CFLAGS GLIB_LIBS GLIB_GENMARSHAL GOBJECT_QUERY GLIB_MKENUMS PTHREAD_LDFLAGS GSMLIB_CFLAGS osip_prefix IPV6_CFLAGS TRUESPEECH_CFLAGS BUILD_TRUESPEECH_TRUE BUILD_TRUESPEECH_FALSE NASM AVCODEC_LIBS GDK_CFLAGS GDK_LIBS BUILD_MEDIASTREAMER_TRUE BUILD_MEDIASTREAMER_FALSE HAVE_XINELIB_TRUE HAVE_XINELIB_FALSE HAVE_SMPEG_TRU
E HAVE_SMPEG_FALSE BUILD_FFMPEG_TRUE BUILD_FFMPEG_FALSE BUILD_GDK_VO_TRUE BUILD_GDK_VO_FALSE BUILD_V4L_TRUE BUILD_V4L_FALSE BUILD_MEDIA_API_TRUE BUILD_MEDIA_API_FALSE BUILD_GNOME_TRUE BUILD_GNOME_FALSE BUILD_GNOME_APPLET_TRUE BUILD_GNOME_APPLET_FALSE ALSA_LIBS subdirs HTML_DIR GTKDOC HAVE_GTK_DOC_TRUE HAVE_GTK_DOC_FALSE HAVE_GTK_DOC ENABLE_GTK_DOC_TRUE ENABLE_GTK_DOC_FALSE LINPHONE_CFLAGS LINPHONE_LIBS LIBOBJS LTLIBOBJS'
 ac_subst_files=''
 
@@ -21818,19 +21818,19 @@
 
 
 cat >>confdefs.h <<_ACEOF

 _ACEOF
 
 
@@ -22869,7 +22869,7 @@
 
 
 
-subdirs="$subdirs ffmpeg speex oRTP osipua"
+subdirs="$subdirs ffmpeg oRTP osipua"
 
 
 ##################################################





$FreeBSD: ports/net/linphone/files/patch-console::Makefile.in,v 1.2 2003/02/28 16:27:12 sobomax Exp $

--- 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/ 
+				$(top_srcdir)/speex/libspeex/libspeex.la
 
 
 sipomatic_SOURCES = \
@@ -177,7 +178,8 @@
 				$(top_srcdir)/osipua/src/libosipua.la \
 				$(top_srcdir)/mediastreamer/audiostream.o \
 				$(top_srcdir)/mediastreamer/libmediastreamer.la \
-				$(top_srcdir)/mediastreamer/libmsspeex.la
+				$(top_srcdir)/mediastreamer/.libs/libmsspeex.so \
+				$(top_srcdir)/speex/libspeex/libspeex.la
 
 
 noinst_PROGRAMS = wav2raw





$FreeBSD: ports/net/linphone/files/patch-coreapi::Makefile.in,v 1.1 2003/02/28 16:27:12 sobomax Exp $

--- 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/ 
 
 
-libcoreapignome_a_LIBADD = $(top_srcdir)/mediastreamer/audiostream.o 
-libcoreapi_a_LIBADD = $(top_srcdir)/mediastreamer/audiostream.o 
-
 DEFS = @DEFS@ @SOUNDDEFS@	-DENABLE_TRACE
 
 CFLAGS = @CFLAGS@ $(GLIB_CFLAGS) -DG_LOG_DOMAIN=\"LinphoneCore\"
@@ -184,13 +181,10 @@
 LIBRARIES = $(noinst_LIBRARIES)
 
 libcoreapi_a_AR = $(AR) cru
-libcoreapi_a_DEPENDENCIES = $(top_srcdir)/mediastreamer/audiostream.o
 am_libcoreapi_a_OBJECTS = linphonecore.$(OBJEXT) osipuacb.$(OBJEXT) \
 	misc.$(OBJEXT) gnome-config.$(OBJEXT)
 libcoreapi_a_OBJECTS = $(am_libcoreapi_a_OBJECTS)
 libcoreapignome_a_AR = $(AR) cru
-libcoreapignome_a_DEPENDENCIES = \
-	$(top_srcdir)/mediastreamer/audiostream.o
 am_libcoreapignome_a_OBJECTS = linphonecore.$(OBJEXT) osipuacb.$(OBJEXT) \
 	misc.$(OBJEXT)
 libcoreapignome_a_OBJECTS = $(am_libcoreapignome_a_OBJECTS)





$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*/

 	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"));





$FreeBSD: ports/net/linphone/files/patch-gnome::Makefile.in,v 1.2 2003/02/28 16:27:12 sobomax Exp $

--- 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 
+@BUILD_GNOME_TRUE@				$(top_srcdir)/speex/libspeex/libspeex.la
 
 
 CFLAGS = @CFLAGS@ $(LIBGNOMEUI_CFLAGS) $(LIBGNOME_CFLAGS) $(GNOME_APPLETS_CFLAGS)		
@@ -199,8 +201,10 @@
 @BUILD_GNOME_APPLET_TRUE@				$(GNOME_APPLETS_LIBS) \
 @BUILD_GNOME_APPLET_TRUE@				$(top_srcdir)/coreapi/libcoreapignome.a \
 @BUILD_GNOME_APPLET_TRUE@				$(top_srcdir)/osipua/src/libosipua.la \
+@BUILD_GNOME_APPLET_TRUE@				$(top_srcdir)/mediastreamer/audiostream.o \
 @BUILD_GNOME_APPLET_TRUE@				$(top_srcdir)/mediastreamer/libmediastreamer.la \
-@BUILD_GNOME_APPLET_TRUE@				$(top_srcdir)/mediastreamer/libmsspeex.la 
+@BUILD_GNOME_APPLET_TRUE@				$(top_srcdir)/mediastreamer/.libs/libmsspeex.so \
+@BUILD_GNOME_APPLET_TRUE@				$(top_srcdir)/speex/libspeex/libspeex.la
 
 
 
@@ -237,6 +241,7 @@
 @BUILD_GNOME_TRUE@linphone_DEPENDENCIES = \
 @BUILD_GNOME_TRUE@	$(top_srcdir)/coreapi/libcoreapignome.a \
 @BUILD_GNOME_TRUE@	$(top_srcdir)/osipua/src/libosipua.la \
+@BUILD_GNOME_TRUE@	$(top_srcdir)/mediastreamer/audiostream.o \
 @BUILD_GNOME_TRUE@	$(top_srcdir)/mediastreamer/libmediastreamer.la \
 @BUILD_GNOME_TRUE@	$(top_srcdir)/mediastreamer/libmsspeex.la
 @BUILD_GNOME_FALSE@linphone_DEPENDENCIES =
@@ -255,6 +260,7 @@
 @BUILD_GNOME_APPLET_TRUE@linphone_applet_DEPENDENCIES = \
 @BUILD_GNOME_APPLET_TRUE@	$(top_srcdir)/coreapi/libcoreapignome.a \
 @BUILD_GNOME_APPLET_TRUE@	$(top_srcdir)/osipua/src/libosipua.la \
+@BUILD_GNOME_APPLET_TRUE@	$(top_srcdir)/mediastreamer/audiostream.o \
 @BUILD_GNOME_APPLET_TRUE@	$(top_srcdir)/mediastreamer/libmediastreamer.la \
 @BUILD_GNOME_APPLET_TRUE@	$(top_srcdir)/mediastreamer/libmsspeex.la
 @BUILD_GNOME_APPLET_FALSE@linphone_applet_DEPENDENCIES =





$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"





$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 \





$FreeBSD: ports/net/linphone/files/patch-mediastreamer::Makefile.in,v 1.2 2003/02/28 16:27:12 sobomax Exp $

--- mediastreamer/Makefile.in.orig	Wed Aug 20 17:45:14 2003
+++ mediastreamer/Makefile.in	Sat Aug 23 01:37:49 2003
@@ -224,14 +224,14 @@
                                                         $(TRUESPEECH_SOURCES)
 
 
-@BUILD_MINIMALGLIB_TRUE@libmediastreamer_la_LIBADD = ../gsmlib/libgsm.la \
+@BUILD_MINIMALGLIB_TRUE@libmediastreamer_la_LIBADD = -lgsm \
 @BUILD_MINIMALGLIB_TRUE@							../lpc10-1.5/liblpc10.la \
 @BUILD_MINIMALGLIB_TRUE@							../oRTP/src/libortp.la \
 @BUILD_MINIMALGLIB_TRUE@							$(ALSA_LIBS) \
 @BUILD_MINIMALGLIB_TRUE@							$(TRUESPEECH_LIBADD)
 
 @BUILD_MINIMALGLIB_FALSE@libmediastreamer_la_LIBADD = $(GLIB_LIBS) \
-@BUILD_MINIMALGLIB_FALSE@							../gsmlib/libgsm.la \
+@BUILD_MINIMALGLIB_FALSE@							-lgsm \
 @BUILD_MINIMALGLIB_FALSE@							../lpc10-1.5/liblpc10.la \
 @BUILD_MINIMALGLIB_FALSE@							../oRTP/src/libortp.la \
 @BUILD_MINIMALGLIB_FALSE@							$(ALSA_LIBS) \
@@ -261,7 +261,7 @@
 
 #the speex encoder and decoder 
 libmsspeex_la_SOURCES = msspeexenc.c msspeexenc.h msspeexdec.c msspeexdec.h
-libmsspeex_la_LIBADD = libmediastreamer.la $(top_srcdir)/speex/libspeex/libspeex.la
+libmsspeex_la_LIBADD = libmediastreamer.la -lspeex
 
 #the v4l plugin 
 libmsv4l_la_SOURCES = msv4l.c msv4l.h
@@ -349,12 +349,8 @@
 						-I$(top_srcdir)/mediastreamer \
 						-I$(top_srcdir)/oRTP/src \
 						-I$(top_srcdir)/oRTP \
-						-I$(top_srcdir)/gsmlib   \
 						-I$(top_srcdir)/lpc10-1.5    \
                         -I$(top_srcdir)/ffmpeg/libavcodec \
-						-I/usr/X11R6/include/X11 \
-						-I/usr/include/SDL \
-						-I$(top_srcdir)/speex/libspeex \
 						$(TRUESPEECH_INCLUDES)
 
 subdir = mediastreamer
@@ -365,21 +361,21 @@
 
 libmediastreamer_la_LDFLAGS =
 @BUILD_MINIMALGLIB_FALSE@@BUILD_TRUESPEECH_TRUE@libmediastreamer_la_DEPENDENCIES = \
-@BUILD_MINIMALGLIB_FALSE@@BUILD_TRUESPEECH_TRUE@	../gsmlib/libgsm.la \
+@BUILD_MINIMALGLIB_FALSE@@BUILD_TRUESPEECH_TRUE@	-lgsm \
 @BUILD_MINIMALGLIB_FALSE@@BUILD_TRUESPEECH_TRUE@	../lpc10-1.5/liblpc10.la \
 @BUILD_MINIMALGLIB_FALSE@@BUILD_TRUESPEECH_TRUE@	../oRTP/src/libortp.la \
 @BUILD_MINIMALGLIB_FALSE@@BUILD_TRUESPEECH_TRUE@	../win32acm/libwin32acm.a
 @BUILD_MINIMALGLIB_FALSE@@BUILD_TRUESPEECH_FALSE@libmediastreamer_la_DEPENDENCIES = \
-@BUILD_MINIMALGLIB_FALSE@@BUILD_TRUESPEECH_FALSE@	../gsmlib/libgsm.la \
+@BUILD_MINIMALGLIB_FALSE@@BUILD_TRUESPEECH_FALSE@	-lgsm \
 @BUILD_MINIMALGLIB_FALSE@@BUILD_TRUESPEECH_FALSE@	../lpc10-1.5/liblpc10.la \
 @BUILD_MINIMALGLIB_FALSE@@BUILD_TRUESPEECH_FALSE@	../oRTP/src/libortp.la
 @BUILD_MINIMALGLIB_TRUE@@BUILD_TRUESPEECH_TRUE@libmediastreamer_la_DEPENDENCIES = \
-@BUILD_MINIMALGLIB_TRUE@@BUILD_TRUESPEECH_TRUE@	../gsmlib/libgsm.la \
+@BUILD_MINIMALGLIB_TRUE@@BUILD_TRUESPEECH_TRUE@	-lgsm \
 @BUILD_MINIMALGLIB_TRUE@@BUILD_TRUESPEECH_TRUE@	../lpc10-1.5/liblpc10.la \
 @BUILD_MINIMALGLIB_TRUE@@BUILD_TRUESPEECH_TRUE@	../oRTP/src/libortp.la \
 @BUILD_MINIMALGLIB_TRUE@@BUILD_TRUESPEECH_TRUE@	../win32acm/libwin32acm.a
 @BUILD_MINIMALGLIB_TRUE@@BUILD_TRUESPEECH_FALSE@libmediastreamer_la_DEPENDENCIES = \
-@BUILD_MINIMALGLIB_TRUE@@BUILD_TRUESPEECH_FALSE@	../gsmlib/libgsm.la \
+@BUILD_MINIMALGLIB_TRUE@@BUILD_TRUESPEECH_FALSE@	-lgsm \
 @BUILD_MINIMALGLIB_TRUE@@BUILD_TRUESPEECH_FALSE@	../lpc10-1.5/liblpc10.la \
 @BUILD_MINIMALGLIB_TRUE@@BUILD_TRUESPEECH_FALSE@	../oRTP/src/libortp.la
 @BUILD_TRUESPEECH_TRUE@am__objects_1 = mstruespeechencoder.lo \
@@ -410,7 +406,7 @@
 libmssmpeg_la_OBJECTS = $(am_libmssmpeg_la_OBJECTS)
 libmsspeex_la_LDFLAGS =
 libmsspeex_la_DEPENDENCIES = libmediastreamer.la \
-	$(top_srcdir)/speex/libspeex/libspeex.la
+	-lspeex
 am_libmsspeex_la_OBJECTS = msspeexenc.lo msspeexdec.lo
 libmsspeex_la_OBJECTS = $(am_libmsspeex_la_OBJECTS)
 libmsv4l_la_LDFLAGS =





$FreeBSD: ports/net/linphone/files/patch-oRTP::configure,v 1.1 2003/02/28 16:27:12 sobomax Exp $

--- oRTP/configure.orig	Wed Aug 13 01:22:52 2003
+++ oRTP/configure	Sat Aug 23 00:17:21 2003
@@ -18804,8 +18804,6 @@
 			CFLAGS="$CFLAGS +DA2.0W +DS2.0"
 		fi
 	fi
-else
-	CFLAGS="-O2 -g"
 fi
 
 build_scheduler=yes
 LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
 
 # Always use our own libtool.
 LIBTOOL='$(SHELL) $(top_builddir)/libtool'





$FreeBSD: ports/net/linphone/files/patch-oRTP::src::Makefile.in,v 1.3 2003/06/14 09:38:44 sobomax Exp $

--- oRTP/src/Makefile.in.orig	Fri Jun 13 15:21:18 2003
+++ oRTP/src/Makefile.in	Fri Jun 13 15:21:48 2003
@@ -98,7 +98,7 @@
 
 EXTRA_DIST = master system LOAD export.c export.h
 
-DEFS = @DEFS@ $(PTHREAD_CFLAGS) -DG_LOG_DOMAIN=\"oRTP\"
+DEFS = @DEFS@ $(PTHREAD_CFLAGS) -DG_LOG_DOMAIN=\"oRTP\" -DBUILD_SCHEDULER
 CFLAGS = -I$(top_srcdir) $(GLIB_CFLAGS) $(IPV6_CFLAGS)
 LDFLAGS = $(PTHREAD_LDFLAGS)
 





$FreeBSD: ports/net/linphone/files/patch-osipua::configure,v 1.1 2003/02/28 16:27:12 sobomax Exp $

--- osipua/configure	2003/02/27 23:48:28	1.1
+++ osipua/configure	2003/02/27 23:49:11
@@ -8652,6 +8652,7 @@
 
 # This can be used to rebuild libtool when needed
 LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
 
 # Always use our own libtool.
 LIBTOOL='$(SHELL) $(top_builddir)/libtool'





$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"





$FreeBSD: ports/net/linphone/files/patch-osipua::src::osipua.c,v 1.1 2003/06/14 09:38:44 sobomax Exp $

--- osipua/src/osipua.c.orig	Sat Aug 16 01:30:51 2003
+++ osipua/src/osipua.c	Sat Aug 23 00:07:02 2003
@@ -591,8 +591,7 @@
 			if (ipaddr != NULL)
 			{
 				osip_trace(OSIP_INFO1,("osip_ua_find 1: %s <> %s \n",ua->ua_ipaddr,ipaddr));
-				if ((strcasecmp(ua->ua_ipaddr,ipaddr)==0) || (strcasecmp("127.0.0.1",ipaddr)==0) ||
-				   	IN6_IS_ADDR_LOOPBACK(res->ai_addr))
+				if ((strcasecmp(ua->ua_ipaddr,ipaddr)==0) || (strcasecmp("127.0.0.1",ipaddr)==0))
 				{
 				   	 ret_ua=ua;       /* ip addresses match */
 				}





$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) \





$FreeBSD: ports/net/linphone/files/patch-speex::configure,v 1.1 2003/02/28 16:27:12 sobomax Exp $

--- speex/configure	2003/02/27 23:48:28	1.1
+++ speex/configure	2003/02/27 23:49:06
@@ -7764,6 +7764,7 @@
 
 # This can be used to rebuild libtool when needed
 LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
 
 # Always use our own libtool.
 LIBTOOL='$(SHELL) $(top_builddir)/libtool'





$FreeBSD: ports/net/linphone/files/patch-speex::doc::Makefile.in,v 1.2 2003/06/14 09:38:44 sobomax Exp $

--- speex/doc/Makefile.in.orig	Fri Jun 13 15:22:04 2003
+++ speex/doc/Makefile.in	Fri Jun 13 15:22:40 2003
@@ -91,7 +91,7 @@
 am__quote = @am__quote@
 install_sh = @install_sh@
 src = @src@
-docdir = $(prefix)/share/doc/@PACKAGE@-@VERSION@
+docdir = $(prefix)/share/doc/@PACKAGE@
 
 doc_DATA = manual.pdf
 





$FreeBSD: ports/net/linphone/files/patch-speex::src::Makefile.in,v 1.2 2003/06/14 09:38:44 sobomax Exp $

--- speex/src/Makefile.in.orig	Fri Jun 13 15:22:55 2003
+++ speex/src/Makefile.in	Fri Jun 13 15:22:56 2003
@@ -70,7 +70,7 @@
 OBJEXT = @OBJEXT@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 
-mandir = $(prefix)/share/man
+mandir = $(prefix)/man
 AMTAR = @AMTAR@
 AS = @AS@
 AWK = @AWK@

Lines 2-10 Link Here

(-)net/linphone/pkg-plist (-31 / +13 lines)
2	bin/linphonec	2	bin/linphonec
3	bin/osipua_tester	3	bin/osipua_tester
4	bin/sipomatic	4	bin/sipomatic
5	bin/speexdec
6	bin/speexenc
7	bin/test_sdphandler	5	bin/test_sdphandler
		6	include/linphone/config.h
		7	include/linphone/linphonecore.h
		8	include/linphone/sndcard.h
8	include/ortp/ortp-config.h	9	include/ortp/ortp-config.h
9	include/ortp/ortp.h	10	include/ortp/ortp.h
10	include/ortp/payloadtype.h	11	include/ortp/payloadtype.h
Lines 30-40 Link Here
30	include/osipua/sdpcontext.h	31	include/osipua/sdpcontext.h
31	include/osipua/sdphandler.h	32	include/osipua/sdphandler.h
32	include/osipua/utils.h	33	include/osipua/utils.h
33	include/speex.h	34	lib/liblinphone.a
34	include/speex_bits.h	35	lib/liblinphone.so
35	include/speex_callbacks.h	36	lib/liblinphone.so.0
36	include/speex_header.h	37	lib/liblinphonegnome.a
37	include/speex_stereo.h	38	lib/liblinphonegnome.so
		39	lib/liblinphonegnome.so.0
38	lib/libmediastreamer.a	40	lib/libmediastreamer.a
39	lib/libmediastreamer.so	41	lib/libmediastreamer.so
40	lib/libmediastreamer.so.0	42	lib/libmediastreamer.so.0
Lines 50-59 Link Here
50	lib/libosipua.a	52	lib/libosipua.a
51	lib/libosipua.so	53	lib/libosipua.so
52	lib/libosipua.so.2	54	lib/libosipua.so.2
53	lib/libspeex.a
54	lib/libspeex.so
55	lib/libspeex.so.1
56	libdata/bonobo/servers/GNOME_LinphoneApplet.server	55	libdata/bonobo/servers/GNOME_LinphoneApplet.server
		56	libdata/pkgconfig/linphone.pc
57	libexec/linphone_applet	57	libexec/linphone_applet
58	share/doc/mediastreamer/book1.html	58	share/doc/mediastreamer/book1.html
59	share/doc/mediastreamer/coreapi.html	59	share/doc/mediastreamer/coreapi.html
Lines 69-82 Link Here
69	share/doc/ortp/ortp-multiplexing-sessions-(in-a-one-thread-design).html	69	share/doc/ortp/ortp-multiplexing-sessions-(in-a-one-thread-design).html
70	share/doc/ortp/ortp-rtp-payloads-and-profiles.html	70	share/doc/ortp/ortp-rtp-payloads-and-profiles.html
71	share/doc/ortp/ortp-rtpsession-api.html	71	share/doc/ortp/ortp-rtpsession-api.html
72	share/doc/ortp/ortp-stack-initialisation.html
73	share/doc/ortp/ortp-stack-management-functions.html	72	share/doc/ortp/ortp-stack-management-functions.html
74	share/doc/ortp/ortp-telephone-events-(rfc2833)-.html	73	share/doc/ortp/ortp-telephone-events-(rfc2833)-.html
75	share/doc/ortp/ortp-telephony-events-(rfc2833)-.html
76	share/doc/ortp/ortpapi.html	74	share/doc/ortp/ortpapi.html
77	share/doc/ortp/rtpsession.html
78	share/doc/ortp/stackinit.html
79	share/doc/ortp/startup.html
80	share/doc/osipua/book1.html	75	share/doc/osipua/book1.html
81	share/doc/osipua/index.sgml	76	share/doc/osipua/index.sgml
82	share/doc/osipua/osipcallleg.html	77	share/doc/osipua/osipcallleg.html
Lines 87-93 Link Here
87	share/doc/osipua/osipua-osipua-public-api.html	82	share/doc/osipua/osipua-osipua-public-api.html
88	share/doc/osipua/osipua.html	83	share/doc/osipua/osipua.html
89	share/doc/osipua/registrationctxt.html	84	share/doc/osipua/registrationctxt.html
90	share/doc/speex/manual.pdf
91	share/gnome/apps/Internet/linphone.desktop	85	share/gnome/apps/Internet/linphone.desktop
92	share/gnome/gnome-2.0/ui/GNOME_LinphoneApplet.xml	86	share/gnome/gnome-2.0/ui/GNOME_LinphoneApplet.xml
93	share/gnome/help/linphone/C/manual/CVS/Entries	87	share/gnome/help/linphone/C/manual/CVS/Entries
Lines 149-166 Link Here
149	share/gnome/help/linphone/ja/manual/CVS/Repository	143	share/gnome/help/linphone/ja/manual/CVS/Repository
150	share/gnome/help/linphone/ja/manual/CVS/Root	144	share/gnome/help/linphone/ja/manual/CVS/Root
151	share/gnome/help/linphone/ja/manual/params.html	145	share/gnome/help/linphone/ja/manual/params.html
152	share/gnome/help/linphone/ja/manual/stylesheet-images/caution.gif
153	share/gnome/help/linphone/ja/manual/stylesheet-images/home.gif
154	share/gnome/help/linphone/ja/manual/stylesheet-images/important.gif
155	share/gnome/help/linphone/ja/manual/stylesheet-images/next.gif
156	share/gnome/help/linphone/ja/manual/stylesheet-images/note.gif
157	share/gnome/help/linphone/ja/manual/stylesheet-images/prev.gif
158	share/gnome/help/linphone/ja/manual/stylesheet-images/tip.gif
159	share/gnome/help/linphone/ja/manual/stylesheet-images/toc-blank.gif
160	share/gnome/help/linphone/ja/manual/stylesheet-images/toc-minus.gif
161	share/gnome/help/linphone/ja/manual/stylesheet-images/toc-plus.gif
162	share/gnome/help/linphone/ja/manual/stylesheet-images/up.gif
163	share/gnome/help/linphone/ja/manual/stylesheet-images/warning.gif
164	share/gnome/help/linphone/ja/manual/t1.html	146	share/gnome/help/linphone/ja/manual/t1.html
165	share/gnome/help/linphone/ja/manual/x112.html	147	share/gnome/help/linphone/ja/manual/x112.html
166	share/gnome/help/linphone/ja/manual/x115.html	148	share/gnome/help/linphone/ja/manual/x115.html
Lines 175-191 Link Here
175	share/gnome/pixmaps/linphone/linphone.png	157	share/gnome/pixmaps/linphone/linphone.png
176	share/gnome/pixmaps/linphone/linphone2.png	158	share/gnome/pixmaps/linphone/linphone2.png
177	share/gnome/pixmaps/linphone/linphone2.xpm	159	share/gnome/pixmaps/linphone/linphone2.xpm
178	share/gnome/sounds/linphone/hello.wav	160	share/gnome/sounds/linphone/hello16000.wav
		161	share/gnome/sounds/linphone/hello8000.wav
179	share/gnome/sounds/linphone/ring.wav	162	share/gnome/sounds/linphone/ring.wav
180	share/gnome/sounds/linphone/ringback.wav	163	share/gnome/sounds/linphone/ringback.wav
181	share/locale/de/LC_MESSAGES/linphone.mo	164	share/locale/de/LC_MESSAGES/linphone.mo
		165	share/locale/es/LC_MESSAGES/linphone.mo
182	share/locale/fr/LC_MESSAGES/linphone.mo	166	share/locale/fr/LC_MESSAGES/linphone.mo
183	share/locale/it/LC_MESSAGES/linphone.mo	167	share/locale/it/LC_MESSAGES/linphone.mo
184	share/locale/ja/LC_MESSAGES/linphone.mo	168	share/locale/ja/LC_MESSAGES/linphone.mo
185	@dirrm share/gnome/sounds/linphone	169	@dirrm share/gnome/sounds/linphone
186	@dirrm share/gnome/pixmaps/linphone	170	@dirrm share/gnome/pixmaps/linphone
187	@dirrm share/gnome/linphonec	171	@dirrm share/gnome/linphonec
188	@dirrm share/gnome/help/linphone/ja/manual/stylesheet-images
189	@dirrm share/gnome/help/linphone/ja/manual/CVS	172	@dirrm share/gnome/help/linphone/ja/manual/CVS
190	@dirrm share/gnome/help/linphone/ja/manual	173	@dirrm share/gnome/help/linphone/ja/manual
191	@dirrm share/gnome/help/linphone/ja	174	@dirrm share/gnome/help/linphone/ja
Lines 205-211 Link Here
205	@dirrm share/gnome/help/linphone/C/manual	188	@dirrm share/gnome/help/linphone/C/manual
206	@dirrm share/gnome/help/linphone/C	189	@dirrm share/gnome/help/linphone/C
207	@dirrm share/gnome/help/linphone	190	@dirrm share/gnome/help/linphone
208	@dirrm share/doc/speex
209	@dirrm share/doc/osipua	191	@dirrm share/doc/osipua
210	@dirrm share/doc/ortp	192	@dirrm share/doc/ortp
211	@dirrm share/doc/mediastreamer	193	@dirrm share/doc/mediastreamer

Return to bug 55872

Lines 6-32 Link Here

(-)net/linphone/Makefile (-13 / +11 lines)
6	#	6	#
7		7
8	PORTNAME= linphone	8	PORTNAME= linphone
9	PORTVERSION= 0.11.0	9	PORTVERSION= 0.12.0
10	PORTREVISION= 2
11	CATEGORIES= net	10	CATEGORIES= net
12	MASTER_SITES= http://simon.morlat.free.fr/download/${PORTVERSION}/source/	11	MASTER_SITES= http://simon.morlat.free.fr/download/%SUBDIR%/
		12	MASTER_SITE_SUBDIR= ${PORTVERSION}/source
13		13
14	MAINTAINER= ports@FreeBSD.org	14	MAINTAINER= ports@FreeBSD.org
15	COMMENT= A web phone that supports SIP protocol	15	COMMENT= A web phone that supports SIP protocol
16		16
17	LIB_DEPENDS= osip.9:${PORTSDIR}/net/libosip \	17	LIB_DEPENDS= gsm.1:${PORTSDIR}/audio/gsm \
18	panel-applet-2.0:${PORTSDIR}/x11/gnomepanel \	18	speex.2:${PORTSDIR}/audio/speex \
19	gnomeui-2.200:${PORTSDIR}/x11-toolkits/libgnomeui \	19	osip.9:${PORTSDIR}/net/libosip
20	ogg.4:${PORTSDIR}/audio/libogg
21		20
22	USE_X_PREFIX= yes	21	USE_X_PREFIX= yes
		22	USE_GNOME= gnomehack gnomepanel gnomeprefix
23	USE_GMAKE= yes	23	USE_GMAKE= yes
24	USE_LIBTOOL= yes	24	GNU_CONFIGURE= yes
25	LIBTOOLFILES= configure oRTP/configure speex/configure osipua/configure	25	CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
26	USE_GNOME= gnomehack gnomeprefix	26	LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
27	CONFIGURE_ARGS= --disable-ipv6	27	CONFIGURE_ARGS= --enable-platform-gnome-2
28	CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
29	LDFLAGS="-L${LOCALBASE}/lib"
30		28
31	MAN1= linphone.1 linphonec.1 sipomatic.1	29	MAN1= linphone.1 linphonec.1 sipomatic.1
32		30

Line 0 Link Here

(-)net/linphone/files/patch-Makefile.in (+16 lines)
	1
	2	$FreeBSD$
	3
	4	--- Makefile.in.orig Wed Aug 20 17:43:49 2003
	5	+++ Makefile.in Sat Aug 23 01:36:29 2003
	6	@@ -158,8 +158,8 @@
	7
	8	@BUILD_TRUESPEECH_TRUE@WIN32ACM_DIR = win32acm
	9
	10	-SUBDIRS = pixmaps ffmpeg po macros debian ipkg oRTP gsmlib lpc10-1.5 \
	11	- speex $(WIN32ACM_DIR) mediastreamer \
	12	+SUBDIRS = pixmaps ffmpeg po macros debian ipkg oRTP lpc10-1.5 \
	13	+ $(WIN32ACM_DIR) mediastreamer \
	14	media_api osipua coreapi console gnome share developer-docs
	15
	16

Lines 1-17 Link Here

(-)net/linphone/files/patch-configure (-11 / +21 lines)
1		1
2	$FreeBSD: ports/net/linphone/files/patch-configure,v 1.4 2003/06/14 09:38:44 sobomax Exp $	2	$FreeBSD: ports/net/linphone/files/patch-configure,v 1.4 2003/06/14 09:38:44 sobomax Exp $
3		3
4	--- configure.orig Mon May 19 12:00:43 2003	4	--- configure.orig Wed Aug 20 17:44:03 2003
5	+++ configure Fri Jun 13 15:20:49 2003	5	+++ configure Fri Aug 22 23:41:49 2003
6	@@ -8786,6 +8786,7 @@	6	@@ -462,7 +462,7 @@
7		7	# include <unistd.h>
8	# This can be used to rebuild libtool when needed	8	#endif"
9	LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"	9
10	+$ac_aux_dir/ltconfig $LIBTOOL_DEPS	10	-ac_subdirs_all="$ac_subdirs_all ffmpeg speex oRTP osipua"
11		11	+ac_subdirs_all="$ac_subdirs_all ffmpeg oRTP osipua"
12	# Always use our own libtool.	12	ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE INSIDE_GNOME_COMMON_TRUE INSIDE_GNOME_COMMON_FALSE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE CPP EGREP INTLTOOL_DESKTOP_RULE INTLTOOL_DIRECTORY_RULE INTLTOOL_KEYS_RULE INTLTOOL_PROP_RULE INTLTOOL_OAF_RULE INTLTOOL_PONG_RULE INTLTOOL_SERVER_RULE INTLTOOL_SHEET_RULE INTLTOOL_SOUNDLIST_RULE INTLTOOL_UI_RULE INTLTOOL_XML_RULE INTLTOOL_CAVES_RULE INTLTOOL_SCHEMAS_RULE INTLTOOL_THEME_RU
13	LIBTOOL='$(SHELL) $(top_builddir)/libtool'
14	@@ -11056,19 +11057,19 @@
15	LE INTLTOOL_EXTRACT INTLTOOL_MERGE INTLTOOL_UPDATE INTLTOOL_PERL build build_cpu build_vendor build_os host host_cpu host_vendor host_os LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CXX CXXFLAGS ac_ct_CXX CXXDEPMODE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL GETTEXT_PACKAGE USE_NLS MSGFMT GMSGFMT XGETTEXT CATALOGS CATOBJEXT DATADIRNAME GMOFILES INSTOBJEXT INTLLIBS PO_IN_DATADIR_TRUE PO_IN_DATADIR_FALSE POFILES POSUB MKINSTALLDIRS PKG_CONFIG PLATFORM_GNOME_2_TRUE PLATFORM_GNOME_2_FALSE GNOME_INTERFACE_VERSION WARN_CFLAGS LIBGNOMEUI_CFLAGS LIBGNOMEUI_LIBS LIBGNOME_CFLAGS LIBGNOME_LIBS GNOME_APPLETS_CFLAGS GNOME_APPLETS_LIBS BUILD_MINIMALGLIB_TRUE BUILD_MINIMALGLIB_FALSE GLIB_CFLAGS GLIB_LIBS GLIB_GENMARSHAL GOBJECT_QUERY GLIB_MKENUMS PTHREAD_LDFLAGS GSMLIB_CFLAGS osip_prefix IPV6_CFLAGS TRUESPEECH_CFLAGS BUILD_TRUESPEECH_TRUE BUILD_TRUESPEECH_FALSE NASM AVCODEC_LIBS GDK_CFLAGS GDK_LIBS BUILD_MEDIASTREAMER_TRUE BUILD_MEDIASTREAMER_FALSE HAVE_XINELIB_TRUE HAVE_XINELIB_FALSE HAVE_SMPEG_TRU	13	LE INTLTOOL_EXTRACT INTLTOOL_MERGE INTLTOOL_UPDATE INTLTOOL_PERL build build_cpu build_vendor build_os host host_cpu host_vendor host_os LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CXX CXXFLAGS ac_ct_CXX CXXDEPMODE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL GETTEXT_PACKAGE USE_NLS MSGFMT GMSGFMT XGETTEXT CATALOGS CATOBJEXT DATADIRNAME GMOFILES INSTOBJEXT INTLLIBS PO_IN_DATADIR_TRUE PO_IN_DATADIR_FALSE POFILES POSUB MKINSTALLDIRS PKG_CONFIG PLATFORM_GNOME_2_TRUE PLATFORM_GNOME_2_FALSE GNOME_INTERFACE_VERSION WARN_CFLAGS LIBGNOMEUI_CFLAGS LIBGNOMEUI_LIBS LIBGNOME_CFLAGS LIBGNOME_LIBS GNOME_APPLETS_CFLAGS GNOME_APPLETS_LIBS BUILD_MINIMALGLIB_TRUE BUILD_MINIMALGLIB_FALSE GLIB_CFLAGS GLIB_LIBS GLIB_GENMARSHAL GOBJECT_QUERY GLIB_MKENUMS PTHREAD_LDFLAGS GSMLIB_CFLAGS osip_prefix IPV6_CFLAGS TRUESPEECH_CFLAGS BUILD_TRUESPEECH_TRUE BUILD_TRUESPEECH_FALSE NASM AVCODEC_LIBS GDK_CFLAGS GDK_LIBS BUILD_MEDIASTREAMER_TRUE BUILD_MEDIASTREAMER_FALSE HAVE_XINELIB_TRUE HAVE_XINELIB_FALSE HAVE_SMPEG_TRU
16	E HAVE_SMPEG_FALSE BUILD_FFMPEG_TRUE BUILD_FFMPEG_FALSE BUILD_GDK_VO_TRUE BUILD_GDK_VO_FALSE BUILD_V4L_TRUE BUILD_V4L_FALSE BUILD_MEDIA_API_TRUE BUILD_MEDIA_API_FALSE BUILD_GNOME_TRUE BUILD_GNOME_FALSE BUILD_GNOME_APPLET_TRUE BUILD_GNOME_APPLET_FALSE ALSA_LIBS subdirs HTML_DIR GTKDOC HAVE_GTK_DOC_TRUE HAVE_GTK_DOC_FALSE HAVE_GTK_DOC ENABLE_GTK_DOC_TRUE ENABLE_GTK_DOC_FALSE LINPHONE_CFLAGS LINPHONE_LIBS LIBOBJS LTLIBOBJS'	14	E HAVE_SMPEG_FALSE BUILD_FFMPEG_TRUE BUILD_FFMPEG_FALSE BUILD_GDK_VO_TRUE BUILD_GDK_VO_FALSE BUILD_V4L_TRUE BUILD_V4L_FALSE BUILD_MEDIA_API_TRUE BUILD_MEDIA_API_FALSE BUILD_GNOME_TRUE BUILD_GNOME_FALSE BUILD_GNOME_APPLET_TRUE BUILD_GNOME_APPLET_FALSE ALSA_LIBS subdirs HTML_DIR GTKDOC HAVE_GTK_DOC_TRUE HAVE_GTK_DOC_FALSE HAVE_GTK_DOC ENABLE_GTK_DOC_TRUE ENABLE_GTK_DOC_FALSE LINPHONE_CFLAGS LINPHONE_LIBS LIBOBJS LTLIBOBJS'
		15	ac_subst_files=''
		16
		17	@@ -21818,19 +21818,19 @@
17		18
18		19
19	cat >>confdefs.h <<_ACEOF	20	cat >>confdefs.h <<_ACEOF
Lines 34-36 Link Here
34	_ACEOF	35	_ACEOF
35		36
36		37
		38	@@ -22869,7 +22869,7 @@
		39
		40
		41
		42	-subdirs="$subdirs ffmpeg speex oRTP osipua"
		43	+subdirs="$subdirs ffmpeg oRTP osipua"
		44
		45
		46	##################################################

Lines 1-25 Link Here

(-)net/linphone/files/patch-console::Makefile.in (-20 / +8 lines)
1		1
2	$FreeBSD: ports/net/linphone/files/patch-console::Makefile.in,v 1.2 2003/02/28 16:27:12 sobomax Exp $	2	$FreeBSD: ports/net/linphone/files/patch-console::Makefile.in,v 1.2 2003/02/28 16:27:12 sobomax Exp $
3		3
4	--- console/Makefile.in.orig Fri Feb 28 01:10:38 2003	4	--- console/Makefile.in.orig Wed Aug 20 17:47:05 2003
5	+++ console/Makefile.in Fri Feb 28 01:12:45 2003	5	+++ console/Makefile.in Sat Aug 23 01:16:01 2003
6	@@ -165,7 +165,8 @@	6	@@ -164,7 +164,6 @@
7	$(top_srcdir)/osipua/src/libosipua.la \	7	-I$(top_srcdir)/oRTP/src \
8	$(top_srcdir)/mediastreamer/audiostream.o \	8	-I$(top_srcdir)/oRTP/ \
9	$(top_srcdir)/mediastreamer/libmediastreamer.la \	9	-I$(top_srcdir)/mediastreamer \
10	- $(top_srcdir)/mediastreamer/libmsspeex.la	10	- -I$(top_srcdir)/speex/libspeex \
11	+ $(top_srcdir)/mediastreamer/.libs/libmsspeex.so \	11	-I$(osip_prefix)/include/
12	+ $(top_srcdir)/speex/libspeex/libspeex.la
13		12
14		13
15	sipomatic_SOURCES = \
16	@@ -177,7 +178,8 @@
17	$(top_srcdir)/osipua/src/libosipua.la \
18	$(top_srcdir)/mediastreamer/audiostream.o \
19	$(top_srcdir)/mediastreamer/libmediastreamer.la \
20	- $(top_srcdir)/mediastreamer/libmsspeex.la
21	+ $(top_srcdir)/mediastreamer/.libs/libmsspeex.so \
22	+ $(top_srcdir)/speex/libspeex/libspeex.la
23
24
25	noinst_PROGRAMS = wav2raw

Lines 1-29 Link Here

(-)net/linphone/files/patch-coreapi::Makefile.in (-24 / +8 lines)
1		1
2	$FreeBSD: ports/net/linphone/files/patch-coreapi::Makefile.in,v 1.1 2003/02/28 16:27:12 sobomax Exp $	2	$FreeBSD: ports/net/linphone/files/patch-coreapi::Makefile.in,v 1.1 2003/02/28 16:27:12 sobomax Exp $
3		3
4	--- coreapi/Makefile.in 2003/02/28 01:08:22 1.1	4	--- coreapi/Makefile.in.orig Wed Aug 20 17:46:46 2003
5	+++ coreapi/Makefile.in 2003/02/28 01:08:45	5	+++ coreapi/Makefile.in Sat Aug 23 01:14:24 2003
6	@@ -171,9 +171,6 @@	6	@@ -166,7 +166,6 @@
7	gnome-config.c gnome-config.h	7	-I$(top_srcdir)/oRTP/src \
		8	-I$(top_srcdir)/oRTP/ \
		9	-I$(top_srcdir)/mediastreamer \
		10	- -I$(top_srcdir)/speex/libspeex \
		11	-I$(osip_prefix)/include/
8		12
9		13
10	-libcoreapignome_a_LIBADD = $(top_srcdir)/mediastreamer/audiostream.o
11	-libcoreapi_a_LIBADD = $(top_srcdir)/mediastreamer/audiostream.o
12	-
13	DEFS = @DEFS@ @SOUNDDEFS@ -DENABLE_TRACE
14
15	CFLAGS = @CFLAGS@ $(GLIB_CFLAGS) -DG_LOG_DOMAIN=\"LinphoneCore\"
16	@@ -184,13 +181,10 @@
17	LIBRARIES = $(noinst_LIBRARIES)
18
19	libcoreapi_a_AR = $(AR) cru
20	-libcoreapi_a_DEPENDENCIES = $(top_srcdir)/mediastreamer/audiostream.o
21	am_libcoreapi_a_OBJECTS = linphonecore.$(OBJEXT) osipuacb.$(OBJEXT) \
22	misc.$(OBJEXT) gnome-config.$(OBJEXT)
23	libcoreapi_a_OBJECTS = $(am_libcoreapi_a_OBJECTS)
24	libcoreapignome_a_AR = $(AR) cru
25	-libcoreapignome_a_DEPENDENCIES = \
26	- $(top_srcdir)/mediastreamer/audiostream.o
27	am_libcoreapignome_a_OBJECTS = linphonecore.$(OBJEXT) osipuacb.$(OBJEXT) \
28	misc.$(OBJEXT)
29	libcoreapignome_a_OBJECTS = $(am_libcoreapignome_a_OBJECTS)

Lines 1-9 Link Here

(-)net/linphone/files/patch-coreapi::misc.c (-6 / +6 lines)
1		1
2		2	$FreeBSD$
3		3
4	--- coreapi/misc.c.orig Wed Mar 12 09:52:05 2003	4	--- coreapi/misc.c.orig Sat Aug 9 00:10:47 2003
5	+++ coreapi/misc.c Wed Mar 12 09:52:39 2003	5	+++ coreapi/misc.c Sat Aug 23 00:08:50 2003
6	@@ -87,7 +87,7 @@	6	@@ -93,7 +93,7 @@
7	pid_t pid;	7	pid_t pid;
8		8
9	/* try to kill all artsd*/	9	/* try to kill all artsd*/
Lines 12-20 Link Here
12	out=popen(command,"r");	12	out=popen(command,"r");
13	if (out!=NULL)	13	if (out!=NULL)
14	{	14	{
15	@@ -102,7 +102,7 @@	15	@@ -123,7 +123,7 @@
16	}
17	g_free(command);	16	g_free(command);
		17
18	/* do the same with esd*/	18	/* do the same with esd*/
19	- command=g_strdup_printf("ps -u %s \|grep esd",getenv("LOGNAME"));	19	- command=g_strdup_printf("ps -u %s \|grep esd",getenv("LOGNAME"));
20	+ command=g_strdup_printf("ps -c %s \|grep esd",getenv("LOGNAME"));	20	+ command=g_strdup_printf("ps -c %s \|grep esd",getenv("LOGNAME"));

Lines 1-45 Link Here

(-)net/linphone/files/patch-gnome::Makefile.in (-42 / +10 lines)
1		1
2	$FreeBSD: ports/net/linphone/files/patch-gnome::Makefile.in,v 1.2 2003/02/28 16:27:12 sobomax Exp $	2	$FreeBSD: ports/net/linphone/files/patch-gnome::Makefile.in,v 1.2 2003/02/28 16:27:12 sobomax Exp $
3		3
4	--- gnome/Makefile.in.orig Fri Feb 28 02:49:43 2003	4	--- gnome/Makefile.in.orig Wed Aug 20 17:47:19 2003
5	+++ gnome/Makefile.in Fri Feb 28 03:01:56 2003	5	+++ gnome/Makefile.in Sat Aug 23 01:16:42 2003
6	@@ -173,8 +173,10 @@	6	@@ -162,7 +162,6 @@
7	@BUILD_GNOME_TRUE@ $(LIBGNOME_LIBS) \	7	@BUILD_GNOME_TRUE@ -I$(top_srcdir)/oRTP/src \
8	@BUILD_GNOME_TRUE@ $(top_srcdir)/coreapi/libcoreapignome.a \	8	@BUILD_GNOME_TRUE@ -I$(top_srcdir)/oRTP/ \
9	@BUILD_GNOME_TRUE@ $(top_srcdir)/osipua/src/libosipua.la \	9	@BUILD_GNOME_TRUE@ -I$(top_srcdir)/mediastreamer \
10	+@BUILD_GNOME_TRUE@ $(top_srcdir)/mediastreamer/audiostream.o \	10	-@BUILD_GNOME_TRUE@ -I$(top_srcdir)/speex/libspeex \
11	@BUILD_GNOME_TRUE@ $(top_srcdir)/mediastreamer/libmediastreamer.la \	11	@BUILD_GNOME_TRUE@ -I$(top_srcdir)/coreapi \
12	-@BUILD_GNOME_TRUE@ $(top_srcdir)/mediastreamer/libmsspeex.la	12	@BUILD_GNOME_TRUE@ -I$(top_srcdir)/osipua/ \
13	+@BUILD_GNOME_TRUE@ $(top_srcdir)/mediastreamer/.libs/libmsspeex.so \	13	@BUILD_GNOME_TRUE@ -I$(top_srcdir)/osipua/src
14	+@BUILD_GNOME_TRUE@ $(top_srcdir)/speex/libspeex/libspeex.la
15
16
17	CFLAGS = @CFLAGS@ $(LIBGNOMEUI_CFLAGS) $(LIBGNOME_CFLAGS) $(GNOME_APPLETS_CFLAGS)
18	@@ -199,8 +201,10 @@
19	@BUILD_GNOME_APPLET_TRUE@ $(GNOME_APPLETS_LIBS) \
20	@BUILD_GNOME_APPLET_TRUE@ $(top_srcdir)/coreapi/libcoreapignome.a \
21	@BUILD_GNOME_APPLET_TRUE@ $(top_srcdir)/osipua/src/libosipua.la \
22	+@BUILD_GNOME_APPLET_TRUE@ $(top_srcdir)/mediastreamer/audiostream.o \
23	@BUILD_GNOME_APPLET_TRUE@ $(top_srcdir)/mediastreamer/libmediastreamer.la \
24	-@BUILD_GNOME_APPLET_TRUE@ $(top_srcdir)/mediastreamer/libmsspeex.la
25	+@BUILD_GNOME_APPLET_TRUE@ $(top_srcdir)/mediastreamer/.libs/libmsspeex.so \
26	+@BUILD_GNOME_APPLET_TRUE@ $(top_srcdir)/speex/libspeex/libspeex.la
27
28
29
30	@@ -237,6 +241,7 @@
31	@BUILD_GNOME_TRUE@linphone_DEPENDENCIES = \
32	@BUILD_GNOME_TRUE@ $(top_srcdir)/coreapi/libcoreapignome.a \
33	@BUILD_GNOME_TRUE@ $(top_srcdir)/osipua/src/libosipua.la \
34	+@BUILD_GNOME_TRUE@ $(top_srcdir)/mediastreamer/audiostream.o \
35	@BUILD_GNOME_TRUE@ $(top_srcdir)/mediastreamer/libmediastreamer.la \
36	@BUILD_GNOME_TRUE@ $(top_srcdir)/mediastreamer/libmsspeex.la
37	@BUILD_GNOME_FALSE@linphone_DEPENDENCIES =
38	@@ -255,6 +260,7 @@
39	@BUILD_GNOME_APPLET_TRUE@linphone_applet_DEPENDENCIES = \
40	@BUILD_GNOME_APPLET_TRUE@ $(top_srcdir)/coreapi/libcoreapignome.a \
41	@BUILD_GNOME_APPLET_TRUE@ $(top_srcdir)/osipua/src/libosipua.la \
42	+@BUILD_GNOME_APPLET_TRUE@ $(top_srcdir)/mediastreamer/audiostream.o \
43	@BUILD_GNOME_APPLET_TRUE@ $(top_srcdir)/mediastreamer/libmediastreamer.la \
44	@BUILD_GNOME_APPLET_TRUE@ $(top_srcdir)/mediastreamer/libmsspeex.la
45	@BUILD_GNOME_APPLET_FALSE@linphone_applet_DEPENDENCIES =

Line 0 Link Here

(-)net/linphone/files/patch-ltmain.sh (+18 lines)
	1
	2	$FreeBSD$
	3
	4	--- ltmain.sh.orig Wed May 14 00:39:58 2003
	5	+++ ltmain.sh Sun Aug 17 19:29:50 2003
	6	@@ -4325,10 +4325,12 @@
	7	fi
	8
	9	# Install the pseudo-library for information purposes.
	10	+ if /usr/bin/false; then
	11	name=`$echo "X$file" \| $Xsed -e 's%^.*/%%'`
	12	instname="$dir/$name"i
	13	$show "$install_prog $instname $destdir/$name"
	14	$run eval "$install_prog $instname $destdir/$name" \|\| exit $?
	15	+ fi
	16
	17	# Maybe install the static library, too.
	18	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"

Line 0 Link Here

(-)net/linphone/files/patch-media_api::Makefile.in (+13 lines)
	1
	2	$FreeBSD$
	3
	4	--- media_api/Makefile.in.orig Wed Aug 20 17:46:39 2003
	5	+++ media_api/Makefile.in Sat Aug 23 01:38:46 2003
	6	@@ -176,7 +176,6 @@
	7
	8	INCLUDES = -I$(top_srcdir)/mediastreamer \
	9	-I$(top_srcdir)/speex \
	10	- -I$(top_srcdir)/gsmlib \
	11	-I$(top_srcdir)/oRTP \
	12	-I$(top_srcdir)/oRTP/src \
	13	-I$(top_srcdir)/lpc10-1.5 \

Lines 1-23 Link Here

(-)net/linphone/files/patch-mediastreamer::Makefile.in (-20 / +76 lines)
1		1
2	$FreeBSD: ports/net/linphone/files/patch-mediastreamer::Makefile.in,v 1.2 2003/02/28 16:27:12 sobomax Exp $	2	$FreeBSD: ports/net/linphone/files/patch-mediastreamer::Makefile.in,v 1.2 2003/02/28 16:27:12 sobomax Exp $
3		3
4	--- mediastreamer/Makefile.in.orig Fri Feb 28 01:20:45 2003	4	--- mediastreamer/Makefile.in.orig Wed Aug 20 17:45:14 2003
5	+++ mediastreamer/Makefile.in Fri Feb 28 01:20:45 2003	5	+++ mediastreamer/Makefile.in Sat Aug 23 01:37:49 2003
6	@@ -163,7 +163,7 @@	6	@@ -224,14 +224,14 @@
7	@BUILD_V4L_TRUE@V4L_PLUGIN_TEST = test_v4l	7	$(TRUESPEECH_SOURCES)
8		8
9	@BUILD_MEDIASTREAMER_TRUE@lib_LTLIBRARIES = libmediastreamer.la $(XINE_PLUGIN) $(SMPEG_PLUGIN)\	9
10	-@BUILD_MEDIASTREAMER_TRUE@ $(FFMPEG_PLUGIN) $(GDK_VO_PLUGIN) $(V4L_PLUGIN) libmsspeex.la	10	-@BUILD_MINIMALGLIB_TRUE@libmediastreamer_la_LIBADD = ../gsmlib/libgsm.la \
11	+@BUILD_MEDIASTREAMER_TRUE@ $(FFMPEG_PLUGIN) $(GDK_VO_PLUGIN) $(V4L_PLUGIN) libmsspeex.la $(top_srcdir)/speex/libspeex/libspeex.la	11	+@BUILD_MINIMALGLIB_TRUE@libmediastreamer_la_LIBADD = -lgsm \
12		12	@BUILD_MINIMALGLIB_TRUE@ ../lpc10-1.5/liblpc10.la \
13		13	@BUILD_MINIMALGLIB_TRUE@ ../oRTP/src/libortp.la \
14	libmediastreamer_la_SOURCES = msfilter.c msfilter.h msutils.h\	14	@BUILD_MINIMALGLIB_TRUE@ $(ALSA_LIBS) \
15	@@ -296,7 +296,7 @@	15	@BUILD_MINIMALGLIB_TRUE@ $(TRUESPEECH_LIBADD)
16		16
17	#the mediastream program that runs a processing that will be used in linphone	17	@BUILD_MINIMALGLIB_FALSE@libmediastreamer_la_LIBADD = $(GLIB_LIBS) \
18	mediastream_SOURCES = mediastream.c audiostream.c mediastream.h	18	-@BUILD_MINIMALGLIB_FALSE@ ../gsmlib/libgsm.la \
19	-mediastream_LDADD = libmediastreamer.la libmsspeex.la	19	+@BUILD_MINIMALGLIB_FALSE@ -lgsm \
20	+mediastream_LDADD = libmediastreamer.la libmsspeex.la $(top_srcdir)/speex/libspeex/libspeex.la	20	@BUILD_MINIMALGLIB_FALSE@ ../lpc10-1.5/liblpc10.la \
21		21	@BUILD_MINIMALGLIB_FALSE@ ../oRTP/src/libortp.la \
22	DEFS = @DEFS@ -DG_LOG_DOMAIN=\"MediaStreamer\"	22	@BUILD_MINIMALGLIB_FALSE@ $(ALSA_LIBS) \
23		23	@@ -261,7 +261,7 @@
		24
		25	#the speex encoder and decoder
		26	libmsspeex_la_SOURCES = msspeexenc.c msspeexenc.h msspeexdec.c msspeexdec.h
		27	-libmsspeex_la_LIBADD = libmediastreamer.la $(top_srcdir)/speex/libspeex/libspeex.la
		28	+libmsspeex_la_LIBADD = libmediastreamer.la -lspeex
		29
		30	#the v4l plugin
		31	libmsv4l_la_SOURCES = msv4l.c msv4l.h
		32	@@ -349,12 +349,8 @@
		33	-I$(top_srcdir)/mediastreamer \
		34	-I$(top_srcdir)/oRTP/src \
		35	-I$(top_srcdir)/oRTP \
		36	- -I$(top_srcdir)/gsmlib \
		37	-I$(top_srcdir)/lpc10-1.5 \
		38	-I$(top_srcdir)/ffmpeg/libavcodec \
		39	- -I/usr/X11R6/include/X11 \
		40	- -I/usr/include/SDL \
		41	- -I$(top_srcdir)/speex/libspeex \
		42	$(TRUESPEECH_INCLUDES)
		43
		44	subdir = mediastreamer
		45	@@ -365,21 +361,21 @@
		46
		47	libmediastreamer_la_LDFLAGS =
		48	@BUILD_MINIMALGLIB_FALSE@@BUILD_TRUESPEECH_TRUE@libmediastreamer_la_DEPENDENCIES = \
		49	-@BUILD_MINIMALGLIB_FALSE@@BUILD_TRUESPEECH_TRUE@ ../gsmlib/libgsm.la \
		50	+@BUILD_MINIMALGLIB_FALSE@@BUILD_TRUESPEECH_TRUE@ -lgsm \
		51	@BUILD_MINIMALGLIB_FALSE@@BUILD_TRUESPEECH_TRUE@ ../lpc10-1.5/liblpc10.la \
		52	@BUILD_MINIMALGLIB_FALSE@@BUILD_TRUESPEECH_TRUE@ ../oRTP/src/libortp.la \
		53	@BUILD_MINIMALGLIB_FALSE@@BUILD_TRUESPEECH_TRUE@ ../win32acm/libwin32acm.a
		54	@BUILD_MINIMALGLIB_FALSE@@BUILD_TRUESPEECH_FALSE@libmediastreamer_la_DEPENDENCIES = \
		55	-@BUILD_MINIMALGLIB_FALSE@@BUILD_TRUESPEECH_FALSE@ ../gsmlib/libgsm.la \
		56	+@BUILD_MINIMALGLIB_FALSE@@BUILD_TRUESPEECH_FALSE@ -lgsm \
		57	@BUILD_MINIMALGLIB_FALSE@@BUILD_TRUESPEECH_FALSE@ ../lpc10-1.5/liblpc10.la \
		58	@BUILD_MINIMALGLIB_FALSE@@BUILD_TRUESPEECH_FALSE@ ../oRTP/src/libortp.la
		59	@BUILD_MINIMALGLIB_TRUE@@BUILD_TRUESPEECH_TRUE@libmediastreamer_la_DEPENDENCIES = \
		60	-@BUILD_MINIMALGLIB_TRUE@@BUILD_TRUESPEECH_TRUE@ ../gsmlib/libgsm.la \
		61	+@BUILD_MINIMALGLIB_TRUE@@BUILD_TRUESPEECH_TRUE@ -lgsm \
		62	@BUILD_MINIMALGLIB_TRUE@@BUILD_TRUESPEECH_TRUE@ ../lpc10-1.5/liblpc10.la \
		63	@BUILD_MINIMALGLIB_TRUE@@BUILD_TRUESPEECH_TRUE@ ../oRTP/src/libortp.la \
		64	@BUILD_MINIMALGLIB_TRUE@@BUILD_TRUESPEECH_TRUE@ ../win32acm/libwin32acm.a
		65	@BUILD_MINIMALGLIB_TRUE@@BUILD_TRUESPEECH_FALSE@libmediastreamer_la_DEPENDENCIES = \
		66	-@BUILD_MINIMALGLIB_TRUE@@BUILD_TRUESPEECH_FALSE@ ../gsmlib/libgsm.la \
		67	+@BUILD_MINIMALGLIB_TRUE@@BUILD_TRUESPEECH_FALSE@ -lgsm \
		68	@BUILD_MINIMALGLIB_TRUE@@BUILD_TRUESPEECH_FALSE@ ../lpc10-1.5/liblpc10.la \
		69	@BUILD_MINIMALGLIB_TRUE@@BUILD_TRUESPEECH_FALSE@ ../oRTP/src/libortp.la
		70	@BUILD_TRUESPEECH_TRUE@am__objects_1 = mstruespeechencoder.lo \
		71	@@ -410,7 +406,7 @@
		72	libmssmpeg_la_OBJECTS = $(am_libmssmpeg_la_OBJECTS)
		73	libmsspeex_la_LDFLAGS =
		74	libmsspeex_la_DEPENDENCIES = libmediastreamer.la \
		75	- $(top_srcdir)/speex/libspeex/libspeex.la
		76	+ -lspeex
		77	am_libmsspeex_la_OBJECTS = msspeexenc.lo msspeexdec.lo
		78	libmsspeex_la_OBJECTS = $(am_libmsspeex_la_OBJECTS)
		79	libmsv4l_la_LDFLAGS =

Lines 1-13 Link Here

(-)net/linphone/files/patch-oRTP::configure (-9 / +10 lines)
1		1
2	$FreeBSD: ports/net/linphone/files/patch-oRTP::configure,v 1.1 2003/02/28 16:27:12 sobomax Exp $	2	$FreeBSD: ports/net/linphone/files/patch-oRTP::configure,v 1.1 2003/02/28 16:27:12 sobomax Exp $
3		3
4	--- oRTP/configure 2003/02/27 23:48:28 1.1	4	--- oRTP/configure.orig Wed Aug 13 01:22:52 2003
5	+++ oRTP/configure 2003/02/27 23:49:02	5	+++ oRTP/configure Sat Aug 23 00:17:21 2003
6	@@ -7793,6 +7793,7 @@	6	@@ -18804,8 +18804,6 @@
		7	CFLAGS="$CFLAGS +DA2.0W +DS2.0"
		8	fi
		9	fi
		10	-else
		11	- CFLAGS="-O2 -g"
		12	fi
7		13
8	# This can be used to rebuild libtool when needed	14	build_scheduler=yes
9	LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
10	+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
11
12	# Always use our own libtool.
13	LIBTOOL='$(SHELL) $(top_builddir)/libtool'

Lines 1-14 Link Here

(-)net/linphone/files/patch-oRTP::src::Makefile.in (-14 lines)
1
2	$FreeBSD: ports/net/linphone/files/patch-oRTP::src::Makefile.in,v 1.3 2003/06/14 09:38:44 sobomax Exp $
3
4	--- oRTP/src/Makefile.in.orig Fri Jun 13 15:21:18 2003
5	+++ oRTP/src/Makefile.in Fri Jun 13 15:21:48 2003
6	@@ -98,7 +98,7 @@
7
8	EXTRA_DIST = master system LOAD export.c export.h
9
10	-DEFS = @DEFS@ $(PTHREAD_CFLAGS) -DG_LOG_DOMAIN=\"oRTP\"
11	+DEFS = @DEFS@ $(PTHREAD_CFLAGS) -DG_LOG_DOMAIN=\"oRTP\" -DBUILD_SCHEDULER
12	CFLAGS = -I$(top_srcdir) $(GLIB_CFLAGS) $(IPV6_CFLAGS)
13	LDFLAGS = $(PTHREAD_LDFLAGS)
14

Lines 1-13 Link Here

(-)net/linphone/files/patch-osipua::configure (-13 lines)
1
2	$FreeBSD: ports/net/linphone/files/patch-osipua::configure,v 1.1 2003/02/28 16:27:12 sobomax Exp $
3
4	--- osipua/configure 2003/02/27 23:48:28 1.1
5	+++ osipua/configure 2003/02/27 23:49:11
6	@@ -8652,6 +8652,7 @@
7
8	# This can be used to rebuild libtool when needed
9	LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
10	+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
11
12	# Always use our own libtool.
13	LIBTOOL='$(SHELL) $(top_builddir)/libtool'

Line 0 Link Here

(-)net/linphone/files/patch-osipua::ltmain.sh (+18 lines)
	1
	2	$FreeBSD$
	3
	4	--- osipua/ltmain.sh.orig Wed May 14 00:40:19 2003
	5	+++ osipua/ltmain.sh Sun Aug 17 19:30:25 2003
	6	@@ -4325,10 +4325,12 @@
	7	fi
	8
	9	# Install the pseudo-library for information purposes.
	10	+ if /usr/bin/false; then
	11	name=`$echo "X$file" \| $Xsed -e 's%^.*/%%'`
	12	instname="$dir/$name"i
	13	$show "$install_prog $instname $destdir/$name"
	14	$run eval "$install_prog $instname $destdir/$name" \|\| exit $?
	15	+ fi
	16
	17	# Maybe install the static library, too.
	18	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"

Lines 1-15 Link Here

(-)net/linphone/files/patch-osipua::src::osipua.c (-7 / +7 lines)
1		1
2	$FreeBSD: ports/net/linphone/files/patch-osipua::src::osipua.c,v 1.1 2003/06/14 09:38:44 sobomax Exp $	2	$FreeBSD: ports/net/linphone/files/patch-osipua::src::osipua.c,v 1.1 2003/06/14 09:38:44 sobomax Exp $
3		3
4	--- osipua/src/osipua.c 2003/06/13 12:25:43 1.1	4	--- osipua/src/osipua.c.orig Sat Aug 16 01:30:51 2003
5	+++ osipua/src/osipua.c 2003/06/13 12:58:48	5	+++ osipua/src/osipua.c Sat Aug 23 00:07:02 2003
6	@@ -595,8 +595,7 @@	6	@@ -591,8 +591,7 @@
7	if (ipaddr != NULL)	7	if (ipaddr != NULL)
8	{	8	{
9	osip_trace(OSIP_INFO1,("osip_ua_find 1: %s <> %s \n",ua->ua_ipaddr,ipaddr));	9	osip_trace(OSIP_INFO1,("osip_ua_find 1: %s <> %s \n",ua->ua_ipaddr,ipaddr));
10	- if ((strcasecmp(ua->ua_ipaddr,ipaddr)==0) \|\| (strcasecmp("127.0.0.1",ipaddr)==0) \|\|	10	- if ((strcasecmp(ua->ua_ipaddr,ipaddr)==0) \|\| (strcasecmp("127.0.0.1",ipaddr)==0) \|\|
11	- IN6_IS_ADDR_LOOPBACK(res->ai_addr))	11	- IN6_IS_ADDR_LOOPBACK(res->ai_addr))
12	+ if ((strcasecmp(ua->ua_ipaddr,ipaddr)==0) \|\| (strcasecmp("127.0.0.1",ipaddr)==0))	12	+ if ((strcasecmp(ua->ua_ipaddr,ipaddr)==0) \|\| (strcasecmp("127.0.0.1",ipaddr)==0))
13	{	13	{
14	ret_ua=ua; /* ip addresses match */	14	ret_ua=ua; /* ip addresses match */
15	}	15	}

Line 0 Link Here

(-)net/linphone/files/patch-share::Makefile.in (+14 lines)
	1
	2	$FreeBSD$
	3
	4	--- share/Makefile.in.orig Wed Aug 20 17:49:21 2003
	5	+++ share/Makefile.in Sat Aug 23 01:55:33 2003
	6	@@ -170,7 +170,7 @@
	7	confexdir = $(datadir)/linphonec
	8	confex_DATA = linphonec
	9
	10	-pkgconfigdir = $(prefix)/lib/pkgconfig
	11	+pkgconfigdir = $(prefix)/libdata/pkgconfig
	12	pkgconfig_DATA = linphone.pc
	13
	14	EXTRA_DIST = $(LINPHONE_SOUNDS) \

Lines 1-13 Link Here

(-)net/linphone/files/patch-speex::configure (-13 lines)
1
2	$FreeBSD: ports/net/linphone/files/patch-speex::configure,v 1.1 2003/02/28 16:27:12 sobomax Exp $
3
4	--- speex/configure 2003/02/27 23:48:28 1.1
5	+++ speex/configure 2003/02/27 23:49:06
6	@@ -7764,6 +7764,7 @@
7
8	# This can be used to rebuild libtool when needed
9	LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
10	+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
11
12	# Always use our own libtool.
13	LIBTOOL='$(SHELL) $(top_builddir)/libtool'

Lines 1-14 Link Here

(-)net/linphone/files/patch-speex::doc::Makefile.in (-14 lines)
1
2	$FreeBSD: ports/net/linphone/files/patch-speex::doc::Makefile.in,v 1.2 2003/06/14 09:38:44 sobomax Exp $
3
4	--- speex/doc/Makefile.in.orig Fri Jun 13 15:22:04 2003
5	+++ speex/doc/Makefile.in Fri Jun 13 15:22:40 2003
6	@@ -91,7 +91,7 @@
7	am__quote = @am__quote@
8	install_sh = @install_sh@
9	src = @src@
10	-docdir = $(prefix)/share/doc/@PACKAGE@-@VERSION@
11	+docdir = $(prefix)/share/doc/@PACKAGE@
12
13	doc_DATA = manual.pdf
14

Lines 1-14 Link Here

(-)net/linphone/files/patch-speex::src::Makefile.in (-14 lines)
1
2	$FreeBSD: ports/net/linphone/files/patch-speex::src::Makefile.in,v 1.2 2003/06/14 09:38:44 sobomax Exp $
3
4	--- speex/src/Makefile.in.orig Fri Jun 13 15:22:55 2003
5	+++ speex/src/Makefile.in Fri Jun 13 15:22:56 2003
6	@@ -70,7 +70,7 @@
7	OBJEXT = @OBJEXT@
8	PATH_SEPARATOR = @PATH_SEPARATOR@
9
10	-mandir = $(prefix)/share/man
11	+mandir = $(prefix)/man
12	AMTAR = @AMTAR@
13	AS = @AS@
14	AWK = @AWK@