- Update to 1.2.0

PR:		ports/90933
Submitted by:	KATO Tsuguru <tkato432@yahoo.com>

5 files changed, 69 insertions, 20 deletions

diff --git a/net/linphone-base/Makefile.common b/net/linphone-base/Makefile.common
index bf680a5a8199..bbdb23ed7743 100644
--- a/net/linphone-base/Makefile.common
+++ b/net/linphone-base/Makefile.common
@@ -3,7 +3,7 @@
 #
 
 LINPHONE_PORTNAME=	linphone
-LINPHONE_PORTVERSION=	1.1.0
+LINPHONE_PORTVERSION=	1.2.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 18993ab64790..a55694b7a190 100644
--- a/net/linphone-base/distinfo
+++ b/net/linphone-base/distinfo
@@ -1,3 +1,3 @@
-MD5 (linphone-1.1.0.tar.gz) = 9f164b41c76ef1caca164909dea199a1
-SHA256 (linphone-1.1.0.tar.gz) = 2bd35760ec2e7b9ac8e501ca16ccaacdb96f5e753477fa7b35842336a8597984
-SIZE (linphone-1.1.0.tar.gz) = 7334577
+MD5 (linphone-1.2.0.tar.gz) = bd5e513a665ce2e381afce64d569c707
+SHA256 (linphone-1.2.0.tar.gz) = 24496cae7c4919473d6f8e78506d762e671fe84a627a5dfda5cb44cda5c421d2
+SIZE (linphone-1.2.0.tar.gz) = 7372152
diff --git a/net/linphone-base/files/patch-console__linphonec.c b/net/linphone-base/files/patch-console__linphonec.c
new file mode 100644
index 000000000000..cb14869cec25
--- /dev/null
+++ b/net/linphone-base/files/patch-console__linphonec.c
@@ -0,0 +1,32 @@
+--- console/linphonec.c.orig	Wed Nov 30 21:11:54 2005
++++ console/linphonec.c	Tue Dec 20 13:29:42 2005
+@@ -71,8 +71,8 @@
+ //Process termination handling
+ void term(int sig)
+ {
+-   terminate = TRUE;
+    char input[LINE_MAX_LEN];
++   terminate = TRUE;
+    snprintf (input,sizeof(LINE_MAX_LEN),"%s", "terminate");
+    linphonec_parse_command_line(&linphonec,input);
+    snprintf (input,sizeof(LINE_MAX_LEN), "%s", "quit");
+@@ -161,9 +161,6 @@
+ int
+ linphonec_main_loop (LinphoneCore * opm, char * sipAddr)
+ {
+-	if (terminate_on_close) {
+-           signal(SIGTERM, term); 
+-        }
+ 	//auto call handling
+ 	gboolean firstTimeInLoop=TRUE;
+ 	char input[LINE_MAX_LEN];
+@@ -171,6 +168,9 @@
+ 	fd_set fdset;
+ 	struct timeval timeout;
+ 	gboolean run=TRUE;
++	if (terminate_on_close) {
++           signal(SIGTERM, term); 
++        }
+ 	printf("linphonec> ");fflush(stdout);
+ 	while (run && !terminate)
+ 	{
diff --git a/net/linphone-base/files/patch-coreapi::linphonecore.c b/net/linphone-base/files/patch-coreapi::linphonecore.c
index e8f15b806410..b28ea91b165c 100644
--- a/net/linphone-base/files/patch-coreapi::linphonecore.c
+++ b/net/linphone-base/files/patch-coreapi::linphonecore.c
@@ -1,6 +1,6 @@
---- coreapi/linphonecore.c.orig	Thu Mar 17 01:16:55 2005
-+++ coreapi/linphonecore.c	Wed Mar 23 13:17:30 2005
-@@ -34,9 +34,7 @@
+--- coreapi/linphonecore.c.orig	Thu Dec  8 02:37:31 2005
++++ coreapi/linphonecore.c	Tue Dec 20 13:24:10 2005
+@@ -36,9 +36,7 @@
  #include <arpa/inet.h>
  #include <time.h>
  
@@ -10,3 +10,17 @@
  
  #include "enum.h"
  
+@@ -1225,12 +1223,12 @@
+ {
+     char *real_url=NULL;
+     osip_to_t *real_parsed_url=NULL;
++    LinphoneCall *call=lc->call;
+     if (!linphone_core_interpret_url(lc,url,&real_url,&real_parsed_url)){
+         /* bad url */
+         return -1;
+     }
+ 
+-    LinphoneCall *call=lc->call;
+     if (call==NULL){
+         g_warning("No established call to refer.");
+         return -1;
diff --git a/net/linphone-base/pkg-plist b/net/linphone-base/pkg-plist
index f109fa592c73..ca2581942417 100644
--- a/net/linphone-base/pkg-plist
+++ b/net/linphone-base/pkg-plist
@@ -5,6 +5,7 @@ include/linphone/glist.h
 include/linphone/gshell.h
 include/linphone/gspawn.h
 include/linphone/linphonecore.h
+include/linphone/lpconfig.h
 include/linphone/sndcard.h
 include/linphone/uglib.h
 include/ortp/ortp-config.h
@@ -20,10 +21,10 @@ include/ortp/str_utils.h
 include/ortp/telephonyevents.h
 lib/liblinphone.a
 lib/liblinphone.so
-lib/liblinphone.so.2
+lib/liblinphone.so.3
 lib/libortp.a
 lib/libortp.so
-lib/libortp.so.7
+lib/libortp.so.2
 libdata/pkgconfig/linphone.pc
 libdata/pkgconfig/ortp.pc
 %%DATADIR%%/sounds/hello16000.wav
@@ -37,15 +38,15 @@ libdata/pkgconfig/ortp.pc
 %%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/doc/linphone/mediastreamer/book1.html
+share/doc/linphone/mediastreamer/coreapi.html
+share/doc/linphone/mediastreamer/index.sgml
+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/locale/cs/LC_MESSAGES/linphone.mo
 share/locale/de/LC_MESSAGES/linphone.mo
 share/locale/es/LC_MESSAGES/linphone.mo
@@ -54,8 +55,10 @@ 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 %%DOCSDIR%%/mediastreamer
-@dirrm %%DOCSDIR%%
+share/locale/pt_BR/LC_MESSAGES/linphone.mo
+share/locale/sv/LC_MESSAGES/linphone.mo
+@dirrm share/doc/linphone/mediastreamer
+@dirrm share/doc/linphone
 @dirrm %%DATADIR%%/sounds/rings
 @dirrm %%DATADIR%%/sounds
 @dirrm %%DATADIR%%