Update libsoup to 2.54.1

Note: ABI issue

Changes in libsoup from 2.54.0.1 to 2.54.1:

        * *** IMPORTANT ***
          Fixed an ABI break in 2.54.0 caused by adding a member to
          SoupAuthClass; 2.54.1 is ABI-compatible with 2.53.92 and
          earlier, but NOT with the anomalous 2.54.0. If you built
          packages against 2.54.0, you will need to rebuild them
          against 2.54.1.

        * Fixed NTLM authentication when ntlm_auth from the latest
          version of Samba is present. [#765106, Milan Crha]

        * Updates to MSVC build, including for GSS-API support
          [Chun-wei Fan]

        * Updated translations:
          Friulian

5 files changed, 21 insertions, 28 deletions

diff --git a/net/libsoup/Makefile b/net/libsoup/Makefile
index 3a59b3980c2..edad9dc6628 100644
--- a/net/libsoup/Makefile
+++ b/net/libsoup/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.25 2016/04/21 21:32:03 prlw1 Exp $
+# $NetBSD: Makefile,v 1.26 2016/05/03 11:37:39 prlw1 Exp $
 
-DISTNAME=	libsoup-2.54.0.1
+DISTNAME=	libsoup-2.54.1
 CATEGORIES=	net gnome
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/libsoup/${PKGVERSION_NOREV:R:R}/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/libsoup/${PKGVERSION_NOREV:R}/}
 EXTRACT_SUFX=	.tar.xz
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
diff --git a/net/libsoup/buildlink3.mk b/net/libsoup/buildlink3.mk
index 3aa0b84d86a..5cc69609ca0 100644
--- a/net/libsoup/buildlink3.mk
+++ b/net/libsoup/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.20 2016/04/21 21:32:03 prlw1 Exp $
+# $NetBSD: buildlink3.mk,v 1.21 2016/05/03 11:37:39 prlw1 Exp $
 
 BUILDLINK_TREE+=	libsoup
 
@@ -6,11 +6,21 @@ BUILDLINK_TREE+=	libsoup
 LIBSOUP_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libsoup+=	libsoup>=2.50.0
+BUILDLINK_ABI_DEPENDS.libsoup+=	libsoup>=2.54.1
+
 BUILDLINK_PKGSRCDIR.libsoup?=	../../net/libsoup
 
+pkgbase := libsoup
+.include "../../mk/pkg-build-options.mk"
+
 .include "../../databases/sqlite3/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
+
+.if !empty(PKG_BUILD_OPTIONS.libsoup:Mgssapi)
+.include "../../mk/krb5.buildlink3.mk"
+.endif
+
 .endif	# LIBSOUP_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-libsoup
diff --git a/net/libsoup/distinfo b/net/libsoup/distinfo
index e8e4384e179..278a48ad969 100644
--- a/net/libsoup/distinfo
+++ b/net/libsoup/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.11 2016/04/21 21:32:03 prlw1 Exp $
+$NetBSD: distinfo,v 1.12 2016/05/03 11:37:39 prlw1 Exp $
 
-SHA1 (libsoup-2.54.0.1.tar.xz) = 25605694bae292ddff43e820fdc44a07f45e7354
-RMD160 (libsoup-2.54.0.1.tar.xz) = 847e231f9745a229f52a4f31975f1d7445983eb0
-SHA512 (libsoup-2.54.0.1.tar.xz) = 27216b7e7d68328eb67ff3b9da3e872c3f271934fdd3011f58ffcf3b81edcf78110e6f33447a2b2c03d8ed5aa516b69e2fcef84c626d8ba3f6013dab5a70bc9d
-Size (libsoup-2.54.0.1.tar.xz) = 1843144 bytes
-SHA1 (patch-configure) = d1958edac9b0ad6ee736530bc98c9265e9634a2d
+SHA1 (libsoup-2.54.1.tar.xz) = 15884a4a764175b6e3ac6321b0bd9e8ecbf73ac4
+RMD160 (libsoup-2.54.1.tar.xz) = 63d72bcb133987b355a073f136389a53955189af
+SHA512 (libsoup-2.54.1.tar.xz) = 7bbcdd8c0995afee0715f6757d91b1f1c115cc55e8941f3795b27f89c533d832b3a2fbd469755a385a4e5dd00513d84cb2834d8cb194fc2651bb5895cf278871
+Size (libsoup-2.54.1.tar.xz) = 1793108 bytes
diff --git a/net/libsoup/options.mk b/net/libsoup/options.mk
index ee70233783e..1458ecd2e34 100644
--- a/net/libsoup/options.mk
+++ b/net/libsoup/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2016/04/21 21:32:03 prlw1 Exp $
+# $NetBSD: options.mk,v 1.4 2016/05/03 11:37:39 prlw1 Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.libsoup
 PKG_SUPPORTED_OPTIONS=	gssapi
@@ -9,7 +9,7 @@ PKG_SUGGESTED_OPTIONS=
 .if !empty(PKG_OPTIONS:Mgssapi)
 .  include "../../mk/krb5.buildlink3.mk"
 CONFIGURE_ARGS+=	--with-gssapi
-CONFIGURE_ARGS+=	--with-krb5-config=${SH_KRB5_CONFIG}
+CONFIGURE_ARGS+=	--with-krb5-config=${KRB5_CONFIG}
 .else
 CONFIGURE_ARGS+=	--without-gssapi
 .endif
diff --git a/net/libsoup/patches/patch-configure b/net/libsoup/patches/patch-configure
deleted file mode 100644
index 1761eea7781..00000000000
--- a/net/libsoup/patches/patch-configure
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-configure,v 1.1 2016/04/21 21:32:03 prlw1 Exp $
-
-test(1) uses '=' for string equality
-https://bugzilla.gnome.org/show_bug.cgi?id=764974
-
---- configure.orig	2016-03-23 12:17:02.000000000 +0000
-+++ configure
-@@ -15200,7 +15200,7 @@ $as_echo "#define LIBSOUP_HAVE_GSSAPI 1"
- 
- 	fi
-     else
--	if test "$with_gssapi" == "yes"; then
-+	if test "$with_gssapi" = "yes"; then
- 	    as_fn_error $? "GSSAPI support requested but failed to found krb5-config. Try to set KRB5_CONFIG." "$LINENO" 5
- 	fi
-     fi