- Update to version 1.7.1

PR:		112137
Submitted by:	KATO Tsuguru <tkato432 AT yahoo.com>
Approved by:	clsung (mentor, implicitly)

5 files changed, 27 insertions, 21 deletions

diff --git a/net/linphone-base/Makefile b/net/linphone-base/Makefile
index e8bc75b1864a..26a52ce6cf56 100644
--- a/net/linphone-base/Makefile
+++ b/net/linphone-base/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	linphone
-PORTVERSION=	1.7.0
+PORTVERSION=	1.7.1
 PORTEPOCH=	1
 CATEGORIES?=	net
 MASTER_SITES=	${MASTER_SITE_SAVANNAH:S/$/:linphone/} \
@@ -56,7 +56,6 @@ PLIST_SUB+=	NLS="@comment "
 .else
 USE_GETTEXT=	yes
 PLIST_SUB+=	NLS=""
-LDFLAGS+=	-lintl
 .endif
 
 .if defined(LINPHONE_GUI)
@@ -76,6 +75,7 @@ SUBDIRS=	po gsmlib mediastreamer2 media_api exosip coreapi console
 .endif
 
 post-extract:
+	@${CP} -f ${FILESDIR}/GNOME_LinphoneApplet.xml ${WRKSRC}/gtk
 	@${LN} -sf ${WRKDIR}/libosip2-2.2.2/src/osip2/osip_negotiation.c \
 		${WRKSRC}/exosip
 	@${LN} -sf ${WRKDIR}/libosip2-2.2.2/include/osip2 \
diff --git a/net/linphone-base/distinfo b/net/linphone-base/distinfo
index 3be6a0baace0..7fb84ab7cc19 100644
--- a/net/linphone-base/distinfo
+++ b/net/linphone-base/distinfo
@@ -1,6 +1,6 @@
-MD5 (linphone-1.7.0.tar.gz) = c9ba7cd5089fbd958a17c29d81da9ad5
-SHA256 (linphone-1.7.0.tar.gz) = f47b09889e5b8aacc3fd843ac1a98cbda7260bebab24e375df88bd80f0316a73
-SIZE (linphone-1.7.0.tar.gz) = 7537029
+MD5 (linphone-1.7.1.tar.gz) = 6fe246d072fad2f4a9533317ab7e9060
+SHA256 (linphone-1.7.1.tar.gz) = 3a3c606e2313f9871f07e41dfbeb87f6edb404f7927f7737fc22ab1a59a59e48
+SIZE (linphone-1.7.1.tar.gz) = 7537415
 MD5 (libosip2-2.2.2.tar.gz) = 40ee3ec89030f0d6dfdb2cf6100e6685
 SHA256 (libosip2-2.2.2.tar.gz) = 4e13febd65a2f8f18cb55151cd10f5f0888bf1e7dc2a4c0d54f39f170255de1c
 SIZE (libosip2-2.2.2.tar.gz) = 664050
diff --git a/net/linphone-base/files/GNOME_LinphoneApplet.xml b/net/linphone-base/files/GNOME_LinphoneApplet.xml
new file mode 100644
index 000000000000..9a5350fd22ad
--- /dev/null
+++ b/net/linphone-base/files/GNOME_LinphoneApplet.xml
@@ -0,0 +1,7 @@
+<Root>
+  <popups>
+    <popup name="button3">
+      <menuitem name="About"    verb="About" _label="_About..." pixtype="stock" pixname="gnome-stock-about"/>
+    </popup>
+  </popups>
+</Root>
diff --git a/net/linphone-base/files/patch-configure b/net/linphone-base/files/patch-configure
index fb6f6d5a1659..30f1a49da2f5 100644
--- a/net/linphone-base/files/patch-configure
+++ b/net/linphone-base/files/patch-configure
@@ -1,9 +1,19 @@
---- configure.orig	Fri Nov 10 05:54:17 2006
-+++ configure	Thu Dec 28 00:35:46 2006
-@@ -24896,27 +24896,6 @@
- 	prefix=${ac_default_prefix}
+--- configure.orig	Tue Apr 24 13:11:35 2007
++++ configure	Tue Apr 24 13:14:01 2007
+@@ -23874,7 +23874,7 @@
+ echo "GTK interface compilation is disabled."
  fi
  
+-if test "gtk_ui" = "true" ; then
++if test "$gtk_ui" = "true" ; then
+ 
+ pkg_failed=no
+ { echo "$as_me:$LINENO: checking for GNOME_APPLETS" >&5
+@@ -24072,27 +24072,6 @@
+ if test "x${prefix}" = "xNONE"; then
+ 	prefix=${ac_default_prefix}
+ fi
+-
 -DATADIRNAME=share
 -
 -cat >>confdefs.h <<_ACEOF
@@ -24,7 +34,6 @@
 -
 -
 -
--
+ 
  for ac_func in getifaddrs
  do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
diff --git a/net/linphone-base/files/patch-coreapi::linphonecore.c b/net/linphone-base/files/patch-coreapi::linphonecore.c
index b46618c64329..da6e4fbf3610 100644
--- a/net/linphone-base/files/patch-coreapi::linphonecore.c
+++ b/net/linphone-base/files/patch-coreapi::linphonecore.c
@@ -12,13 +12,3 @@
  
  
  static const char *liblinphone_version=LIBLINPHONE_VERSION;
-@@ -1179,7 +1177,9 @@
- 
- void linphone_core_init_media_streams(LinphoneCore *lc){
- 	lc->audiostream=audio_stream_new(linphone_core_get_audio_port(lc),linphone_core_ipv6_enabled(lc));
-+#ifdef VIDEO_ENABLED
- 	lc->videostream=video_stream_new(linphone_core_get_video_port(lc),linphone_core_ipv6_enabled(lc));
-+#endif
- }
- 
- void linphone_core_start_media_streams(LinphoneCore *lc, LinphoneCall *call){