Update to 2.10.11 and fix the build with the ncurses port.

Submitted by:	Matthias Apitz <guru@unixarea.de> (ncurses fix)

7 files changed, 20 insertions, 24 deletions

diff --git a/net-im/finch/Makefile b/net-im/finch/Makefile
index fe217207624e..e1d51440d6f8 100644
--- a/net-im/finch/Makefile
+++ b/net-im/finch/Makefile
@@ -3,7 +3,6 @@
 #   $MCom: ports-stable/net-im/gaim-consoleui-devel/Makefile,v 1.2 2006/10/29 18:55:28 marcus Exp $
 
 PORTNAME=	finch
-PORTREVISION=	6
 
 MAINTAINER=	marcus@FreeBSD.org
 COMMENT=	Finch multi-protocol messaging client (Console UI)
diff --git a/net-im/libpurple/Makefile b/net-im/libpurple/Makefile
index 25e3b857a22a..da2bbe9a4f32 100644
--- a/net-im/libpurple/Makefile
+++ b/net-im/libpurple/Makefile
@@ -2,8 +2,8 @@
 # $FreeBSD$
 
 PORTNAME?=	libpurple
-PORTVERSION=	2.10.10
-PORTREVISION?=	3
+PORTVERSION=	2.10.11
+PORTREVISION?=	0
 CATEGORIES?=	net-im
 MASTER_SITES=	SF/pidgin/Pidgin/${PORTVERSION}
 DISTNAME=	pidgin-${PORTVERSION}
diff --git a/net-im/libpurple/distinfo b/net-im/libpurple/distinfo
index cf2cbdd20453..63c5fd560aaf 100644
--- a/net-im/libpurple/distinfo
+++ b/net-im/libpurple/distinfo
@@ -1,2 +1,2 @@
-SHA256 (pidgin-2.10.10.tar.bz2) = dc6b95512eaec75aef170aabce471491fc70584932599dfead20f1f1c45c822d
-SIZE (pidgin-2.10.10.tar.bz2) = 9409485
+SHA256 (pidgin-2.10.11.tar.bz2) = f2ae211341fc77efb9945d40e9932aa535cdf3a6c8993fe7919fca8cc1c04007
+SIZE (pidgin-2.10.11.tar.bz2) = 9458050
diff --git a/net-im/libpurple/files/patch-configure b/net-im/libpurple/files/patch-configure
new file mode 100644
index 000000000000..22bc0eea6bbc
--- /dev/null
+++ b/net-im/libpurple/files/patch-configure
@@ -0,0 +1,11 @@
+--- configure.orig	2014-12-02 11:21:18.056424694 -0500
++++ configure	2014-12-02 11:21:43.067421364 -0500
+@@ -17452,7 +17452,7 @@ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ncursesw_initscr" >&5
+ $as_echo "$ac_cv_lib_ncursesw_initscr" >&6; }
+ if test "x$ac_cv_lib_ncursesw_initscr" = xyes; then :
+-  GNT_LIBS="-lncursesw"
++  GNT_LIBS="-lncursesw -ltinfow"
+ else
+   enable_consoleui=no
+ fi
diff --git a/net-im/libpurple/files/patch-libpurple_protocols_msn_contact.h b/net-im/libpurple/files/patch-libpurple_protocols_msn_contact.h
deleted file mode 100644
index 287897cfe182..000000000000
--- a/net-im/libpurple/files/patch-libpurple_protocols_msn_contact.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- libpurple/protocols/msn/contact.h.orig	2014-11-13 15:42:16.000000000 -0500
-+++ libpurple/protocols/msn/contact.h	2014-11-13 15:42:27.000000000 -0500
-@@ -60,7 +60,7 @@ typedef enum
- #include "session.h"
- #include "soap.h"
- 
--#define MSN_APPLICATION_ID "CFE80F9D-180F-4399-82AB-413F33A1FA11"
-+#define MSN_APPLICATION_ID "484AAC02-7F59-41B7-9601-772045DCC569"
- 
- #define MSN_CONTACT_SERVER	"local-bay.contacts.msn.com"
- 
diff --git a/net-im/libpurple/pkg-plist b/net-im/libpurple/pkg-plist
index c1691108fbb2..c447e202eab1 100644
--- a/net-im/libpurple/pkg-plist
+++ b/net-im/libpurple/pkg-plist
@@ -130,6 +130,8 @@ lib/purple-2/log_reader.a
 lib/purple-2/log_reader.so
 lib/purple-2/newline.a
 lib/purple-2/newline.so
+lib/purple-2/nss-prefs.a
+lib/purple-2/nss-prefs.so
 lib/purple-2/offlinemsg.a
 lib/purple-2/offlinemsg.so
 %%PERL:%%lib/purple-2/perl.a
@@ -152,11 +154,11 @@ lib/purple-2/statenotify.so
 %%DBUS%%lib/libpurple-client.a
 %%DBUS%%lib/libpurple-client.so
 %%DBUS%%lib/libpurple-client.so.0
-%%DBUS%%lib/libpurple-client.so.0.10.10
+%%DBUS%%lib/libpurple-client.so.0.10.11
 lib/libpurple.a
 lib/libpurple.so
 lib/libpurple.so.0
-lib/libpurple.so.0.10.10
+lib/libpurple.so.0.10.11
 libdata/pkgconfig/purple.pc
 %%CONSOLEUI%%man/man1/finch.1.gz
 %%GTKUI%%man/man1/pidgin.1.gz
@@ -205,6 +207,7 @@ share/locale/ko/LC_MESSAGES/pidgin.mo
 share/locale/km/LC_MESSAGES/pidgin.mo
 share/locale/kn/LC_MESSAGES/pidgin.mo
 share/locale/ku/LC_MESSAGES/pidgin.mo
+share/locale/ku_IQ/LC_MESSAGES/pidgin.mo
 share/locale/lt/LC_MESSAGES/pidgin.mo
 share/locale/lv/LC_MESSAGES/pidgin.mo
 share/locale/mai/LC_MESSAGES/pidgin.mo
diff --git a/net-im/pidgin/Makefile b/net-im/pidgin/Makefile
index 677ee7376a73..794ef0f5dc81 100644
--- a/net-im/pidgin/Makefile
+++ b/net-im/pidgin/Makefile
@@ -29,13 +29,7 @@ CONFIGURE_ARGS=	--disable-consoleui \
 		--enable-screensaver \
 		--with-dynamic_prpls=${PRPL_MODULES:S/,$//}
 
-post-build:
-	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} \
-	    	Makefile ${MAKE_ARGS} pidgin.desktop
-
 post-install:
-	${INSTALL_DATA} ${WRKSRC}/pidgin.desktop \
-	    	${STAGEDIR}${PREFIX}/share/applications/pidgin.desktop
 	${INSTALL_MAN} ${WRKSRC}/doc/pidgin.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
 
 .include "${MASTERDIR}/Makefile"