13 files changed, 53 insertions, 172 deletions

diff --git a/net/linphone-base/Makefile b/net/linphone-base/Makefile
index b443b58d8090..a186d93ca43e 100644
--- a/net/linphone-base/Makefile
+++ b/net/linphone-base/Makefile
@@ -7,7 +7,6 @@
 
 PORTNAME=	${LINPHONE_PORTNAME}
 PORTVERSION=	${LINPHONE_PORTVERSION}
-PORTREVISION=	1
 PORTREVISION=	${LINPHONE_PORTREVISION}
 PORTEPOCH=	${LINPHONE_PORTEPOCH}
 CATEGORIES=	net
@@ -24,12 +23,14 @@ LIB_DEPENDS=	gsm.1:${PORTSDIR}/audio/gsm \
 		osip2.3:${PORTSDIR}/net/libosip2
 
 USE_GNOME=	glib20 gnomehack gnometarget intlhack pkgconfig
+USE_REINPLACE=	yes
 USE_GMAKE=	yes
 USE_LIBTOOL_VER=	15
 LIBTOOLFILES=	configure oRTP/configure
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
 		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
 CONFIGURE_ARGS=	--disable-ipv6 --disable-gtk-doc --enable-gnome_ui=no \
+		--disable-ewarning --without-ilbc \
 		--with-speex=${LOCALBASE} --with-osip=${LOCALBASE} \
 		--with-html-dir=${DOCSDIR}
 INSTALLS_SHLIB=	yes
@@ -43,6 +44,9 @@ CFLAGS+=	-DPACKAGE_LOCALE_DIR='\"${PREFIX}/share/locale\"' \
 .include "Makefile.common"
 .include <bsd.port.pre.mk>
 
+post-patch:
+	@${REINPLACE_CMD} -e '/^SUBDIRS =/s|docs||g' ${WRKSRC}/oRTP/Makefile.in
+
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/share/C/linphonec.1 ${MANPREFIX}/man/man1
 	${INSTALL_MAN} ${WRKSRC}/share/C/sipomatic.1 ${MANPREFIX}/man/man1
diff --git a/net/linphone-base/Makefile.common b/net/linphone-base/Makefile.common
index 2ed625fca402..bf680a5a8199 100644
--- a/net/linphone-base/Makefile.common
+++ b/net/linphone-base/Makefile.common
@@ -3,7 +3,7 @@
 #
 
 LINPHONE_PORTNAME=	linphone
-LINPHONE_PORTVERSION=	1.0.1
+LINPHONE_PORTVERSION=	1.1.0
 LINPHONE_PORTREVISION=	0
 LINPHONE_PORTEPOCH=	1
 LINPHONE_MASTER_SITES=	http://simon.morlat.free.fr/download/stable/source/
diff --git a/net/linphone-base/distinfo b/net/linphone-base/distinfo
index 9bbc55d0cf00..c811c79aad5a 100644
--- a/net/linphone-base/distinfo
+++ b/net/linphone-base/distinfo
@@ -1,2 +1,2 @@
-MD5 (linphone-1.0.1.tar.gz) = d65f977dd6512b7725fcb2e2c9713e65
-SIZE (linphone-1.0.1.tar.gz) = 7315742
+MD5 (linphone-1.1.0.tar.gz) = 9f164b41c76ef1caca164909dea199a1
+SIZE (linphone-1.1.0.tar.gz) = 7334577
diff --git a/net/linphone-base/files/patch-configure b/net/linphone-base/files/patch-configure
index 46c404eae50a..1cdf9ac14450 100644
--- a/net/linphone-base/files/patch-configure
+++ b/net/linphone-base/files/patch-configure
@@ -1,9 +1,22 @@
---- configure.orig	Thu Apr  1 05:40:47 2004
-+++ configure	Thu Apr 15 03:28:18 2004
-@@ -22220,23 +22220,6 @@
- fi
+--- configure.orig	Thu Aug 25 07:37:04 2005
++++ configure	Thu Aug 25 23:31:24 2005
+@@ -23818,10 +23818,6 @@
+ 		;;
+ esac
+ 
+-if test "$GCC" = "yes" ; then
+-	STRICT_OPTIONS="-Wall -Werror"
+-fi
+-
  
  
+ # Check whether --with-realprefix or --without-realprefix was given.
+@@ -23930,23 +23926,6 @@
+ if test "x${realprefix}" = "xnone"; then
+ 	realprefix=${prefix}
+ fi
+-
+-
 -cat >>confdefs.h <<_ACEOF
 -#define PACKAGE_LOCALE_DIR "${realprefix}/${DATADIRNAME}/locale"
 -_ACEOF
@@ -19,8 +32,6 @@
 -cat >>confdefs.h <<_ACEOF
 -#define PACKAGE_SOUND_DIR "${realprefix}/${DATADIRNAME}/sounds/linphone"
 -_ACEOF
--
--
- found_sound=no
  
  
+ found_sound=no
diff --git a/net/linphone-base/files/patch-console::commands.c b/net/linphone-base/files/patch-console::commands.c
deleted file mode 100644
index 4301aa17be7b..000000000000
--- a/net/linphone-base/files/patch-console::commands.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- console/commands.c.orig	Tue Mar  8 03:31:49 2005
-+++ console/commands.c	Wed Mar 23 17:46:13 2005
-@@ -112,9 +112,9 @@
- 
- void linphonec_proxy_list(LinphoneCore *lc){
- 	GList *proxies;
--	int n;
-+	int def, n;
- 	proxies=linphone_core_get_proxy_config_list(lc);
--	int def=linphone_core_get_default_proxy(lc,NULL);
-+	def=linphone_core_get_default_proxy(lc,NULL);
- 	for(n=0;proxies!=NULL;proxies=g_list_next(proxies),n++){
- 		if (n==def)
- 			printf("****** Proxy %i - this is the default one - *******\n",n);
diff --git a/net/linphone-base/files/patch-coreapi::lpconfig.c b/net/linphone-base/files/patch-coreapi::lpconfig.c
deleted file mode 100644
index ca83b0e9cf7e..000000000000
--- a/net/linphone-base/files/patch-coreapi::lpconfig.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- coreapi/lpconfig.c.orig	Fri Mar 11 21:53:12 2005
-+++ coreapi/lpconfig.c	Wed Mar 23 17:44:35 2005
-@@ -266,8 +266,9 @@
- }
- 
- int lp_config_sync(LpConfig *lpconfig){
-+	FILE *file;
- 	if (lpconfig->filename==NULL) return;
--	FILE *file=fopen(lpconfig->filename,"w");
-+	file=fopen(lpconfig->filename,"w");
- 	if (file==NULL){
- 		g_warning("Could not write %s !",lpconfig->filename);
- 		return -1;
diff --git a/net/linphone-base/files/patch-coreapi::proxy.c b/net/linphone-base/files/patch-coreapi::proxy.c
deleted file mode 100644
index 23dddbddcbc6..000000000000
--- a/net/linphone-base/files/patch-coreapi::proxy.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- coreapi/proxy.c.orig	Fri Mar 11 01:54:25 2005
-+++ coreapi/proxy.c	Wed Mar 23 17:43:30 2005
-@@ -59,8 +59,8 @@
- 
- gint linphone_proxy_config_set_server_addr(LinphoneProxyConfig *obj, const gchar *server_addr){
- 	int err;
--	if (server_addr==NULL || strlen(server_addr)==0) return -1;
- 	osip_from_t *url;
-+	if (server_addr==NULL || strlen(server_addr)==0) return -1;
- 	osip_from_init(&url);
- 	err=osip_from_parse(url,server_addr);
- 	if (err<0){
diff --git a/net/linphone-base/files/patch-gnome-callbacks.c b/net/linphone-base/files/patch-gnome-callbacks.c
new file mode 100644
index 000000000000..b511a9c72232
--- /dev/null
+++ b/net/linphone-base/files/patch-gnome-callbacks.c
@@ -0,0 +1,14 @@
+--- gnome/callbacks.c.orig	Sat Jul  9 22:32:24 2005
++++ gnome/callbacks.c	Thu Aug 25 23:44:43 2005
+@@ -595,9 +595,10 @@
+                                         gpointer         user_data)
+ {
+ 	gchar *sipurl;
++	GtkWidget *gcr;
+ 	
+ 	sipurl=gtk_editable_get_chars(GTK_EDITABLE(get_main_window()->addressentry),0,-1);
+-	GtkWidget *gcr=chatroom_new(sipurl,NULL);
++	gcr=chatroom_new(sipurl,NULL);
+ 	if (gcr!=NULL) gtk_widget_show(gcr);
+ 	g_free(sipurl);
+ }
diff --git a/net/linphone-base/files/patch-gnome::linphone.c b/net/linphone-base/files/patch-gnome::linphone.c
deleted file mode 100644
index 3d3939dc064d..000000000000
--- a/net/linphone-base/files/patch-gnome::linphone.c
+++ /dev/null
@@ -1,15 +0,0 @@
---- gnome/linphone.c.orig	Fri Mar 11 00:38:56 2005
-+++ gnome/linphone.c	Wed Mar 23 19:33:00 2005
-@@ -255,9 +255,10 @@
- 	LinphoneCore *lc=get_core();
- 	GList *elem=linphone_core_get_proxy_config_list(lc);
- 	LinphoneProxyConfig *cfg=NULL;
--	linphone_core_get_default_proxy(lc,&cfg);
- 	GtkWidget *combo;
--	GtkWidget *hbox=lookup_widget(window,"proxy_hbox");
-+	GtkWidget *hbox;
-+	linphone_core_get_default_proxy(lc,&cfg);
-+	hbox=lookup_widget(window,"proxy_hbox");
- 	if (elem==NULL){
- 		gtk_widget_hide(hbox);
- 		return;
diff --git a/net/linphone-base/files/patch-oRTP::Makefile.in b/net/linphone-base/files/patch-oRTP::Makefile.in
deleted file mode 100644
index 9feb0c030ecf..000000000000
--- a/net/linphone-base/files/patch-oRTP::Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- oRTP/Makefile.in.orig	Tue Mar 22 00:53:54 2005
-+++ oRTP/Makefile.in	Wed Mar 23 18:51:57 2005
-@@ -209,7 +209,7 @@
- #config.h.in and acconfig.h to avoid a bug in automake that prevent them to be included in the
- #dist...
- EXTRA_DIST = oRTP.prj   ortp-config.h.in	TODO pkg.list
--SUBDIRS = src docs build include
-+SUBDIRS = src build include
- @WITH_EPM_TRUE@PKG_NAME = $(PACKAGE)-$(VERSION)-$(RELEASE)
- all: ortp-config.h
- 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
diff --git a/net/linphone-base/files/patch-oRTP::configure b/net/linphone-base/files/patch-oRTP::configure
deleted file mode 100644
index 1114fd9cd837..000000000000
--- a/net/linphone-base/files/patch-oRTP::configure
+++ /dev/null
@@ -1,13 +0,0 @@
---- oRTP/configure.orig	Wed Mar 23 13:35:19 2005
-+++ oRTP/configure	Wed Mar 23 13:41:11 2005
-@@ -20712,10 +20712,6 @@
- 		posixtimer_interval=20000
- fi
- 
--if test "$GCC" = "yes" ; then
--	CFLAGS="$CFLAGS -Werror"
--fi
--
- 
- cat >>confdefs.h <<_ACEOF
- #define POSIXTIMER_INTERVAL $posixtimer_interval
diff --git a/net/linphone-base/files/patch-oRTP::src::rtpsession.c b/net/linphone-base/files/patch-oRTP::src::rtpsession.c
deleted file mode 100644
index 1b36e29a001c..000000000000
--- a/net/linphone-base/files/patch-oRTP::src::rtpsession.c
+++ /dev/null
@@ -1,71 +0,0 @@
---- oRTP/src/rtpsession.c.orig	Thu Mar 10 01:34:59 2005
-+++ oRTP/src/rtpsession.c	Wed Mar 23 15:27:20 2005
-@@ -377,16 +377,22 @@
- 		    close_socket (session->rtp.socket);
- 		    continue;
- 		  }
--#ifndef __hpux
-+#if !defined(__hpux) && !defined(__FreeBSD__)
- 		switch (res->ai_family)
- 		  {
- 		    case AF_INET:
- 		      if (IN_MULTICAST(ntohl(((struct sockaddr_in *) res->ai_addr)->sin_addr.s_addr)))
- 			{
-+#if !defined(__FreeBSD__)
- 		          struct ip_mreqn mreq;
-+#else
-+		          struct ip_mreq mreq;
-+#endif
- 			  mreq.imr_multiaddr.s_addr = ((struct sockaddr_in *) res->ai_addr)->sin_addr.s_addr;
- 			  mreq.imr_address.s_addr = INADDR_ANY;
-+#if !defined(__FreeBSD__)
- 			  mreq.imr_ifindex = 0;
-+#endif
- 			  err = setsockopt(session->rtp.socket, IPPROTO_IP, IP_ADD_MEMBERSHIP, &mreq, sizeof(mreq));
- 			  if (err < 0)
- 			    {
-@@ -454,16 +460,22 @@
- 		    close_socket (session->rtcp.socket);
- 		    continue;
- 		  }
--#ifndef __hpux
-+#if !defined(__hpux) && !defined(__FreeBSD__)
- 		switch (res->ai_family)
- 		  {
- 		    case AF_INET:
- 		      if (IN_MULTICAST(ntohl(((struct sockaddr_in *) res->ai_addr)->sin_addr.s_addr)))
- 			{
-+#if !defined(__FreeBSD__)
- 		          struct ip_mreqn mreq;
-+#else
-+		          struct ip_mreq mreq;
-+#endif
- 			  mreq.imr_multiaddr.s_addr = ((struct sockaddr_in *) res->ai_addr)->sin_addr.s_addr;
- 			  mreq.imr_address.s_addr = INADDR_ANY;
-+#if !defined(__FreeBSD__)
- 			  mreq.imr_ifindex = 0;
-+#endif
- 			  err = setsockopt(session->rtcp.socket, IPPROTO_IP, IP_ADD_MEMBERSHIP, &mreq, sizeof(mreq));
- 			  if (err < 0)
- 			    {
-@@ -555,13 +567,19 @@
- 		close_socket (session->rtcp.socket);
- 		return -1;
- 	}
--#ifndef __hpux
-+#if !defined(__hpux) && !defined(__FreeBSD__)
- 	if (IN_MULTICAST(ntohl(session->rtp.loc_addr.sin_addr.s_addr)))
- 	  {
-+#if !defined(__FreeBSD__)
- 	    struct ip_mreqn mreq;
-+#else
-+	    struct ip_mreq mreq;
-+#endif
- 	    mreq.imr_multiaddr.s_addr = session->rtp.loc_addr.sin_addr.s_addr;
- 	    mreq.imr_address.s_addr = INADDR_ANY;
-+#if !defined(__FreeBSD__)
- 	    mreq.imr_ifindex = 0;
-+#endif
- 	    err = setsockopt(session->rtp.socket, IPPROTO_IP, IP_ADD_MEMBERSHIP, &mreq, sizeof(mreq));
- 	    if (err == 0)
- 	      err = setsockopt(session->rtcp.socket, IPPROTO_IP, IP_ADD_MEMBERSHIP, &mreq, sizeof(mreq));
diff --git a/net/linphone-base/pkg-plist b/net/linphone-base/pkg-plist
index 3aaf6bb2f337..f109fa592c73 100644
--- a/net/linphone-base/pkg-plist
+++ b/net/linphone-base/pkg-plist
@@ -20,20 +20,12 @@ include/ortp/str_utils.h
 include/ortp/telephonyevents.h
 lib/liblinphone.a
 lib/liblinphone.so
-lib/liblinphone.so.1
+lib/liblinphone.so.2
 lib/libortp.a
 lib/libortp.so
 lib/libortp.so.7
 libdata/pkgconfig/linphone.pc
-share/doc/linphone/mediastreamer/book1.html
-share/doc/linphone/mediastreamer/coreapi.html
-share/doc/linphone/mediastreamer/mediastreamer-filters.html
-share/doc/linphone/mediastreamer/mediastreamer-msringplayer.html
-share/doc/linphone/mediastreamer/mediastreamer-mssync.html
-share/doc/linphone/mediastreamer/mediastreamer-running-processing-chains.html
-share/doc/linphone/mediastreamer/msfilterimplementations.html
-share/doc/linphone/mediastreamer/userapi.html
-share/doc/linphone/mediastreamer/index.sgml
+libdata/pkgconfig/ortp.pc
 %%DATADIR%%/sounds/hello16000.wav
 %%DATADIR%%/sounds/hello8000.wav
 %%DATADIR%%/sounds/ringback.wav
@@ -45,6 +37,15 @@ share/doc/linphone/mediastreamer/index.sgml
 %%DATADIR%%/sounds/rings/synth.wav
 %%DATADIR%%/sounds/rings/tapping.wav
 %%DATADIR%%/sounds/rings/toy.wav
+%%DOCSDIR%%/mediastreamer/book1.html
+%%DOCSDIR%%/mediastreamer/coreapi.html
+%%DOCSDIR%%/mediastreamer/mediastreamer-filters.html
+%%DOCSDIR%%/mediastreamer/mediastreamer-msringplayer.html
+%%DOCSDIR%%/mediastreamer/mediastreamer-mssync.html
+%%DOCSDIR%%/mediastreamer/mediastreamer-running-processing-chains.html
+%%DOCSDIR%%/mediastreamer/msfilterimplementations.html
+%%DOCSDIR%%/mediastreamer/userapi.html
+%%DOCSDIR%%/mediastreamer/index.sgml
 share/locale/cs/LC_MESSAGES/linphone.mo
 share/locale/de/LC_MESSAGES/linphone.mo
 share/locale/es/LC_MESSAGES/linphone.mo
@@ -53,8 +54,8 @@ share/locale/it/LC_MESSAGES/linphone.mo
 share/locale/ja/LC_MESSAGES/linphone.mo
 share/locale/nl/LC_MESSAGES/linphone.mo
 share/locale/pl/LC_MESSAGES/linphone.mo
-@dirrm share/doc/linphone/mediastreamer
-@dirrm share/doc/linphone
+@dirrm %%DOCSDIR%%/mediastreamer
+@dirrm %%DOCSDIR%%
 @dirrm %%DATADIR%%/sounds/rings
 @dirrm %%DATADIR%%/sounds
 @dirrm %%DATADIR%%