- update to 1.12.0 [1]

- fix pkg-plist problem

PR:		164391
Submitted by:	Golyashov Sergey <svvord at ulona dot org>
Approved by:	maintainer

6 files changed, 13 insertions, 56 deletions

diff --git a/net-im/pidgin-sipe/Makefile b/net-im/pidgin-sipe/Makefile
index acb45e1489ba..c2382e42670a 100644
--- a/net-im/pidgin-sipe/Makefile
+++ b/net-im/pidgin-sipe/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	pidgin-sipe
-PORTVERSION=	1.11.2
-PORTREVISION=	4
+PORTVERSION=	1.12.0
 CATEGORIES=	net-im
 MASTER_SITES=	SF/sipe/sipe/${DISTNAME}
 
diff --git a/net-im/pidgin-sipe/distinfo b/net-im/pidgin-sipe/distinfo
index f2613d27a2e1..695334fc1e7c 100644
--- a/net-im/pidgin-sipe/distinfo
+++ b/net-im/pidgin-sipe/distinfo
@@ -1,2 +1,2 @@
-SHA256 (pidgin-sipe-1.11.2.tar.bz2) = 90c424942cad50f271367acb0ddcf8e5c648d1aed1f395200e5d909515ce7ae9
-SIZE (pidgin-sipe-1.11.2.tar.bz2) = 605656
+SHA256 (pidgin-sipe-1.12.0.tar.bz2) = 302a495bbe37d45e6d8836cd29031295eef631211b0cc15067b2f687d2b25717
+SIZE (pidgin-sipe-1.12.0.tar.bz2) = 673336
diff --git a/net-im/pidgin-sipe/files/patch-src__purple__purple-dnsquery.c b/net-im/pidgin-sipe/files/patch-src__purple__purple-dnsquery.c
index 301fdce22ef9..0cfbded12549 100644
--- a/net-im/pidgin-sipe/files/patch-src__purple__purple-dnsquery.c
+++ b/net-im/pidgin-sipe/files/patch-src__purple__purple-dnsquery.c
@@ -1,13 +1,15 @@
---- ./src/purple/purple-dnsquery.c.orig	2010-11-03 05:13:51.000000000 +0100
-+++ ./src/purple/purple-dnsquery.c	2011-06-21 11:23:35.000000000 +0200
-@@ -22,6 +22,10 @@
- 
- #include "glib.h"
+--- src/purple/purple-dnsquery.c.orig	2011-08-29 17:05:26.000000000 +1100
++++ src/purple/purple-dnsquery.c	2012-01-23 12:24:33.000000000 +1100
+@@ -29,6 +29,12 @@
+ #endif
  
+ #include <glib.h>
++#include <sys/socket.h>
++
 +#include "version.h"
 +#if PURPLE_VERSION_CHECK(2,8,0)
 +#include "account.h"
 +#endif
- #include "dnssrv.h"
  
- #include "sipe-backend.h"
+ #include "dnsquery.h"
+ #include "dnssrv.h"
diff --git a/net-im/pidgin-sipe/files/patch-src__purple__purple-plugin.c b/net-im/pidgin-sipe/files/patch-src__purple__purple-plugin.c
deleted file mode 100644
index 88d296c11393..000000000000
--- a/net-im/pidgin-sipe/files/patch-src__purple__purple-plugin.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- ./src/purple/purple-plugin.c.orig	2010-11-03 05:13:51.000000000 +0100
-+++ ./src/purple/purple-plugin.c	2011-06-21 11:23:35.000000000 +0200
-@@ -506,6 +506,10 @@
- 	NULL,					/* get_moods */
- 	NULL,					/* set_public_alias */
- 	NULL,					/* get_public_alias */
-+#if PURPLE_VERSION_CHECK(2,8,0)
-+	NULL,					/* add_buddy_with_invite */
-+	NULL,					/* add_buddies_with_invite */
-+#endif
- #endif
- #endif
- #endif
diff --git a/net-im/pidgin-sipe/files/patch-src__purple__purple-private.h b/net-im/pidgin-sipe/files/patch-src__purple__purple-private.h
deleted file mode 100644
index eefc01a5f9cb..000000000000
--- a/net-im/pidgin-sipe/files/patch-src__purple__purple-private.h
+++ /dev/null
@@ -1,31 +0,0 @@
---- ./src/purple/purple-private.h.orig	2010-11-03 05:13:51.000000000 +0100
-+++ ./src/purple/purple-private.h	2011-06-21 11:23:35.000000000 +0200
-@@ -20,18 +20,28 @@
-  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-  */
- 
-+#include "version.h"
-+
- /* Forward declarations */
- struct sipe_core_public;
- struct _PurpleAccount;
- struct _PurpleConnection;
-+#if PURPLE_VERSION_CHECK(2,8,0)
-+struct _PurpleSrvTxtQueryData;
-+#else
- struct _PurpleSrvQueryData;
-+#endif
- struct _PurpleXfer;
- 
- struct sipe_backend_private {
- 	struct sipe_core_public *public;
- 	struct _PurpleConnection *gc;
- 	struct _PurpleAccount *account;
-+#if PURPLE_VERSION_CHECK(2,8,0)
-+	struct _PurpleSrvTxtQueryData *dns_query;
-+#else
- 	struct _PurpleSrvQueryData *dns_query;
-+#endif
- 	time_t last_keepalive;
- };
- 
diff --git a/net-im/pidgin-sipe/pkg-descr b/net-im/pidgin-sipe/pkg-descr
index 2eb5e68897d6..bce428186550 100644
--- a/net-im/pidgin-sipe/pkg-descr
+++ b/net-im/pidgin-sipe/pkg-descr
@@ -1,4 +1,4 @@
-Pidgin Plug-in for OCS/LCS (Live Communication Server). 
+Pidgin Plug-in for OCS/LCS (Live Communication Server).
 SIP/Simple protocol implementation for connect to LCS/OCS.
 
 WWW: http://www.sourceforge.net/projects/sipe