Update to pigdin-sipe version 1.20.1.

[Havard Eidnes <he%floke.uninett.no@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Havard Eidnes <he%floke.uninett.no@localhost>
Pushed By:	he
Date:		Mon Oct 26 12:14:38 2015 +0100
Changeset:	2472e32cab1c6fc7f9263941b25455c9d1f4defb

Modified Files:
	pidgin-sipe/Makefile
	pidgin-sipe/distinfo
Added Files:
	pidgin-sipe/patches/patch-configure
Removed Files:
	pidgin-sipe/patches/patch-aa

Log Message:
Update to pigdin-sipe version 1.20.1.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=2472e32cab1c6fc7f9263941b25455c9d1f4defb

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 pidgin-sipe/Makefile                |  5 +++--
 pidgin-sipe/distinfo                |  8 ++++----
 pidgin-sipe/patches/patch-aa        | 14 --------------
 pidgin-sipe/patches/patch-configure | 33 +++++++++++++++++++++++++++++++++
 4 files changed, 40 insertions(+), 20 deletions(-)

diffs:
diff --git a/pidgin-sipe/Makefile b/pidgin-sipe/Makefile
index c8d94b3..91a009f 100644
--- a/pidgin-sipe/Makefile
+++ b/pidgin-sipe/Makefile
@@ -1,14 +1,15 @@
 # $NetBSD: Makefile,v 1.10 2013/07/06 16:56:24 othyro Exp $
 #
 
-DISTNAME=	pidgin-sipe-1.16.0
+DISTNAME=	pidgin-sipe-1.20.1
 CATEGORIES=	chat
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=sipe/}
-EXTRACT_SUFX=	.tar.bz2
+EXTRACT_SUFX=	.tar.xz
 
 MAINTAINER=	yacht%users.sourceforge.net@localhost
 HOMEPAGE=	http://sipe.sourceforge.net/
 COMMENT=	Pidgin plugin for Microsoft Office Communicator
+LICENSE=	gnu-gpl-v2
 
 GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
diff --git a/pidgin-sipe/distinfo b/pidgin-sipe/distinfo
index d601524..50b117f 100644
--- a/pidgin-sipe/distinfo
+++ b/pidgin-sipe/distinfo
@@ -1,6 +1,6 @@
 $NetBSD: distinfo,v 1.6 2013/07/06 16:56:24 othyro Exp $
 
-SHA1 (pidgin-sipe-1.16.0.tar.bz2) = 7638dae1f3c43954e1cbf93025e6ecd4e01afb8c
-RMD160 (pidgin-sipe-1.16.0.tar.bz2) = 8a89fc5733bf618e8556ef95780ca1ecdb50c164
-Size (pidgin-sipe-1.16.0.tar.bz2) = 825574 bytes
-SHA1 (patch-aa) = 8b4a67fe72b5d3365b3b86fa9829c4ae094d741c
+SHA1 (pidgin-sipe-1.20.1.tar.xz) = 0b6ad418e3b73f0a02891ab41185a7bbd36ecf69
+RMD160 (pidgin-sipe-1.20.1.tar.xz) = 441ab03db54a035eaac27ca57abfe410605a737c
+Size (pidgin-sipe-1.20.1.tar.xz) = 708984 bytes
+SHA1 (patch-configure) = 575217313fdc781364ccd88c076e392b493f3749
diff --git a/pidgin-sipe/patches/patch-aa b/pidgin-sipe/patches/patch-aa
deleted file mode 100644
index 32efc50..0000000
--- a/pidgin-sipe/patches/patch-aa
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-aa,v 1.5 2013/07/06 16:56:24 othyro Exp $
-
-Needs it's own account.h header.
-
---- src/purple/purple-dnsquery.c.orig	2013-04-19 19:41:53.000000000 +0000
-+++ src/purple/purple-dnsquery.c
-@@ -34,6 +34,7 @@
- #include <glib.h>
- 
- #include "dnsquery.h"
-+#include "account.h"
- #include "dnssrv.h"
- #include "version.h"
- 
diff --git a/pidgin-sipe/patches/patch-configure b/pidgin-sipe/patches/patch-configure
new file mode 100644
index 0000000..ced6b07
--- /dev/null
+++ b/pidgin-sipe/patches/patch-configure
@@ -0,0 +1,33 @@
+$NetBSD$
+
+Deal with non-portable "test $a == $b" and $RANDOM.
+
+--- configure.orig	2015-10-24 13:23:59.000000000 +0000
++++ configure
+@@ -11991,7 +11991,7 @@ INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.
+ if test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge 5000; then
+       INTLTOOL_XML_NOMERGE_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u --no-translations $< $@'
+ else
+-      INTLTOOL_XML_NOMERGE_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)_it_tmp_dir=tmp.intltool.$$RANDOM && mkdir $$_it_tmp_dir && LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u $$_it_tmp_dir $< $@ && rmdir $$_it_tmp_dir'
++      INTLTOOL_XML_NOMERGE_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)_it_tmp_dir=tmp.intltool.$${RANDOM-$$$$} && mkdir $$_it_tmp_dir && LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u $$_it_tmp_dir $< $@ && rmdir $$_it_tmp_dir'
+ fi
+       INTLTOOL_XAM_RULE='%.xam:       %.xml.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+       INTLTOOL_KBD_RULE='%.kbd:       %.kbd.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+@@ -14504,7 +14504,7 @@ $as_echo "yes" >&6; }
+ 						if test "x$gstreamer_pkgconfig" != x; then :
+   gstreamer_pkgconfig=gstreamer-$gstreamer_pkgconfig
+ else
+-  if test "x$purple_pkgconfig" == xpurple-3; then :
++  if test "x$purple_pkgconfig" = xpurple-3; then :
+   gstreamer_pkgconfig=gstreamer-1.0
+ else
+   gstreamer_pkgconfig=gstreamer-0.10
+@@ -16913,7 +16913,7 @@ $debug ||
+   test -d "$tmp"
+ }  ||
+ {
+-  tmp=./conf$$-$RANDOM
++  tmp=./conf$$-${RANDOM-$$}
+   (umask 077 && mkdir "$tmp")
+ } || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
+ ac_tmp=$tmp