Update libsoup to 2.54.0.1

Add gssapi option (default off)


Changes in libsoup from 2.53.92 to 2.54.0.1:

	* (2.54.0.1 fixes a build problem with the 2.54.0 tarball,
          which would not build if you configured with
          "--without-gnome". There are no other changes between 2.54.0
          and 2.54.0.1.)

	* Fixed examples/simple-httpd on Windows [#758759, Chun-wei
          Fan]

Changes in libsoup from 2.53.90 to 2.53.92:

	* libsoup now supports HTTP "Negotiate"/GSSAPI/Kerberos
          authentication. It must be enabled specifically by the
          application and is also subject to certain other
          restrictions, some of which are not yet controllable through
          the API. [#587145, Guido Guenther, Tomas Popela, David
          Woodhouse, Dan Winship]

	* Added support for building under MSVC [#758759, Chun-wei
          Fan]

	* Fixed a problem with the 2.53.90 tarball that caused
          translations to be mis-installed.

	* Updated translations:
	  Occitan

Changes in libsoup from 2.53.2 to 2.53.90:

	* NUL bytes in headers are now ignored [#760832, Dan Winship]

	* Fixed transfer annotation of soup_form_decode* functions
          [#743966, Lionel Landwerlin]

	* Updated translations:
	  Bulgarian, Latvian, Norwegian bokmål

Changes in libsoup from 2.53.1 to 2.53.2:

	* Fixed up symbol visibility handling for mingw by copying
          GLib's system [Ignacio Casal Quinteiro, #757146]

	* Finally marked the old SoupSessionAsync and SoupSessionSync
          methods as deprecated [Ignacio Casal Quinteiro, Dan Winship,
          #757146]

	* Added libsoup-2.4.deps for valac [Rico Tzschichholz]

	* Make it possible to build from git without gtk-doc being
          installed [Ignacio Casal Quinteiro]

	* Updated translations:
	  Norwegian bokmål, Occitan

Changes in libsoup from 2.52.1 to 2.53.1:

	* Really fixed build under MinGW for sure this time [Ignacio
          Casal Quinteiro]

        * Fixed SoupServer Web Sockets code so that the
	  SoupClientContext passed to a SoupServerWebsocketCallback is
	  fully usable (rather than crashing when you try to do most
	  things).

5 files changed, 44 insertions, 14 deletions

diff --git a/net/libsoup/Makefile b/net/libsoup/Makefile
index 09f15559a49..3a59b3980c2 100644
--- a/net/libsoup/Makefile
+++ b/net/libsoup/Makefile
@@ -1,13 +1,12 @@
-# $NetBSD: Makefile,v 1.24 2016/04/11 19:01:37 ryoon Exp $
+# $NetBSD: Makefile,v 1.25 2016/04/21 21:32:03 prlw1 Exp $
 
-DISTNAME=	libsoup-2.52.2
-PKGREVISION=	1
+DISTNAME=	libsoup-2.54.0.1
 CATEGORIES=	net gnome
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/libsoup/2.52/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/libsoup/${PKGVERSION_NOREV:R:R}/}
 EXTRACT_SUFX=	.tar.xz
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://www.gnome.org/
+HOMEPAGE=	http://wiki.gnome.org/Projects/libsoup
 COMMENT=	HTTP library implementation in C
 LICENSE=	gnu-lgpl-v2
 
@@ -40,12 +39,13 @@ _WRAP_EXTRA_ARGS.CC+=	-Wno-error=format-nonliteral
 CWRAPPERS_APPEND.cc+=	-Wno-error=format-nonliteral
 .endif
 
+.include "options.mk"
+
 REPLACE_PYTHON= libsoup/tld-parser.py
 PYTHON_FOR_BUILD_ONLY= yes
 .include "../../lang/python/application.mk"
 
 .include "../../databases/sqlite3/buildlink3.mk"
-.include "../../mk/curses.buildlink3.mk"
 BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.38.0
 .include "../../devel/glib2/buildlink3.mk"
 BUILDLINK_API_DEPENDS.gobject-introspection+=	gobject-introspection>=0.9.5
diff --git a/net/libsoup/buildlink3.mk b/net/libsoup/buildlink3.mk
index d90de8e3b30..3aa0b84d86a 100644
--- a/net/libsoup/buildlink3.mk
+++ b/net/libsoup/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.19 2016/04/11 19:01:37 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.20 2016/04/21 21:32:03 prlw1 Exp $
 
 BUILDLINK_TREE+=	libsoup
 
@@ -6,10 +6,8 @@ BUILDLINK_TREE+=	libsoup
 LIBSOUP_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libsoup+=	libsoup>=2.50.0
-BUILDLINK_ABI_DEPENDS.libsoup?=	libsoup>=2.52.2nb1
 BUILDLINK_PKGSRCDIR.libsoup?=	../../net/libsoup
 
-.include "../../mk/curses.buildlink3.mk"
 .include "../../databases/sqlite3/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
diff --git a/net/libsoup/distinfo b/net/libsoup/distinfo
index fcdbf305a8a..e8e4384e179 100644
--- a/net/libsoup/distinfo
+++ b/net/libsoup/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.10 2016/01/04 14:46:37 leot Exp $
+$NetBSD: distinfo,v 1.11 2016/04/21 21:32:03 prlw1 Exp $
 
-SHA1 (libsoup-2.52.2.tar.xz) = f5d0634c60cf218bb647d122a757e57e83919886
-RMD160 (libsoup-2.52.2.tar.xz) = 75c43deb6c261c25288c994b3c7b8ce1fcc5dd36
-SHA512 (libsoup-2.52.2.tar.xz) = 866942d8db43a19630f39db12b22058cf31ef0c56f337e6c5790f5b881aaa768d4dbece1d2fe0d9560a82ae0f362365c19aa9b0d05afeb45bc5774f6713f51b2
-Size (libsoup-2.52.2.tar.xz) = 1764308 bytes
+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
diff --git a/net/libsoup/options.mk b/net/libsoup/options.mk
new file mode 100644
index 00000000000..ee70233783e
--- /dev/null
+++ b/net/libsoup/options.mk
@@ -0,0 +1,15 @@
+# $NetBSD: options.mk,v 1.3 2016/04/21 21:32:03 prlw1 Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.libsoup
+PKG_SUPPORTED_OPTIONS=	gssapi
+PKG_SUGGESTED_OPTIONS=
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mgssapi)
+.  include "../../mk/krb5.buildlink3.mk"
+CONFIGURE_ARGS+=	--with-gssapi
+CONFIGURE_ARGS+=	--with-krb5-config=${SH_KRB5_CONFIG}
+.else
+CONFIGURE_ARGS+=	--without-gssapi
+.endif
diff --git a/net/libsoup/patches/patch-configure b/net/libsoup/patches/patch-configure
new file mode 100644
index 00000000000..1761eea7781
--- /dev/null
+++ b/net/libsoup/patches/patch-configure
@@ -0,0 +1,16 @@
+$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