update to 2.40.1

This switches to the 2.40 (gnome-3.6) release branch

3 files changed, 66 insertions, 10 deletions

diff --git a/net/libsoup24/Makefile b/net/libsoup24/Makefile
index 2e8359ac85f..b985eb3d428 100644
--- a/net/libsoup24/Makefile
+++ b/net/libsoup24/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.44 2012/09/15 10:06:04 obache Exp $
+# $NetBSD: Makefile,v 1.45 2012/10/19 18:01:13 drochner Exp $
 
-DISTNAME=	libsoup-2.38.1
+DISTNAME=	libsoup-2.40.1
 PKGNAME=	${DISTNAME:S/libsoup/libsoup24/}
-PKGREVISION=	2
 CATEGORIES=	net gnome
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/libsoup/2.38/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/libsoup/2.40/}
 EXTRACT_SUFX=	.tar.xz
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
@@ -14,7 +13,7 @@ LICENSE=	gnu-lgpl-v2
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-USE_TOOLS+=		pkg-config gmake
+USE_TOOLS+=		pkg-config gmake intltool
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
 
@@ -32,6 +31,10 @@ TEST_TARGET=	check
 CONFIGURE_ARGS+= 	--disable-more-warnings
 .endif
 
+REPLACE_PYTHON= libsoup/tld-parser.py
+PYTHON_FOR_BUILD_ONLY= yes
+.include "../../lang/python/application.mk"
+
 .include "../../databases/sqlite3/buildlink3.mk"
 BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.31.7
 .include "../../devel/glib2/buildlink3.mk"
diff --git a/net/libsoup24/PLIST b/net/libsoup24/PLIST
index a8a9b6fdad0..d5bb92a43e7 100644
--- a/net/libsoup24/PLIST
+++ b/net/libsoup24/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.15 2012/01/30 18:43:52 drochner Exp $
+@comment $NetBSD: PLIST,v 1.16 2012/10/19 18:01:13 drochner Exp $
 include/libsoup-2.4/libsoup/soup-address.h
 include/libsoup-2.4/libsoup/soup-auth-domain-basic.h
 include/libsoup-2.4/libsoup/soup-auth-domain-digest.h
@@ -20,6 +20,7 @@ include/libsoup-2.4/libsoup/soup-message-headers.h
 include/libsoup-2.4/libsoup/soup-message.h
 include/libsoup-2.4/libsoup/soup-method.h
 include/libsoup-2.4/libsoup/soup-misc.h
+include/libsoup-2.4/libsoup/soup-multipart-input-stream.h
 include/libsoup-2.4/libsoup/soup-multipart.h
 include/libsoup-2.4/libsoup/soup-password-manager.h
 include/libsoup-2.4/libsoup/soup-portability.h
@@ -38,6 +39,7 @@ include/libsoup-2.4/libsoup/soup-session-sync.h
 include/libsoup-2.4/libsoup/soup-session.h
 include/libsoup-2.4/libsoup/soup-socket.h
 include/libsoup-2.4/libsoup/soup-status.h
+include/libsoup-2.4/libsoup/soup-tld.h
 include/libsoup-2.4/libsoup/soup-types.h
 include/libsoup-2.4/libsoup/soup-uri.h
 include/libsoup-2.4/libsoup/soup-value-utils.h
@@ -67,6 +69,7 @@ share/gtk-doc/html/libsoup-2.4/SoupMessage.html
 share/gtk-doc/html/libsoup-2.4/SoupMessageBody.html
 share/gtk-doc/html/libsoup-2.4/SoupMessageHeaders.html
 share/gtk-doc/html/libsoup-2.4/SoupMultipart.html
+share/gtk-doc/html/libsoup-2.4/SoupMultipartInputStream.html
 share/gtk-doc/html/libsoup-2.4/SoupProxyResolverDefault.html
 share/gtk-doc/html/libsoup-2.4/SoupProxyURIResolver.html
 share/gtk-doc/html/libsoup-2.4/SoupRequest.html
@@ -97,6 +100,7 @@ share/gtk-doc/html/libsoup-2.4/left.png
 share/gtk-doc/html/libsoup-2.4/libsoup-2.4-GValue-Support.html
 share/gtk-doc/html/libsoup-2.4/libsoup-2.4-HTML-Form-Support.html
 share/gtk-doc/html/libsoup-2.4/libsoup-2.4-Soup-Miscellaneous-Utilities.html
+share/gtk-doc/html/libsoup-2.4/libsoup-2.4-Top-Level-Domain-utils.html
 share/gtk-doc/html/libsoup-2.4/libsoup-2.4-XMLRPC-Support.html
 share/gtk-doc/html/libsoup-2.4/libsoup-2.4-soup-gnome-features.html
 share/gtk-doc/html/libsoup-2.4/libsoup-2.4-soup-method.html
@@ -108,3 +112,52 @@ share/gtk-doc/html/libsoup-2.4/libsoup-server-howto.html
 share/gtk-doc/html/libsoup-2.4/right.png
 share/gtk-doc/html/libsoup-2.4/style.css
 share/gtk-doc/html/libsoup-2.4/up.png
+share/locale/as/LC_MESSAGES/libsoup.mo
+share/locale/be/LC_MESSAGES/libsoup.mo
+share/locale/bg/LC_MESSAGES/libsoup.mo
+share/locale/bn_IN/LC_MESSAGES/libsoup.mo
+share/locale/ca/LC_MESSAGES/libsoup.mo
+share/locale/ca@valencia/LC_MESSAGES/libsoup.mo
+share/locale/cs/LC_MESSAGES/libsoup.mo
+share/locale/da/LC_MESSAGES/libsoup.mo
+share/locale/de/LC_MESSAGES/libsoup.mo
+share/locale/el/LC_MESSAGES/libsoup.mo
+share/locale/en_GB/LC_MESSAGES/libsoup.mo
+share/locale/eo/LC_MESSAGES/libsoup.mo
+share/locale/es/LC_MESSAGES/libsoup.mo
+share/locale/et/LC_MESSAGES/libsoup.mo
+share/locale/fa/LC_MESSAGES/libsoup.mo
+share/locale/fr/LC_MESSAGES/libsoup.mo
+share/locale/gl/LC_MESSAGES/libsoup.mo
+share/locale/gu/LC_MESSAGES/libsoup.mo
+share/locale/he/LC_MESSAGES/libsoup.mo
+share/locale/hi/LC_MESSAGES/libsoup.mo
+share/locale/hu/LC_MESSAGES/libsoup.mo
+share/locale/id/LC_MESSAGES/libsoup.mo
+share/locale/it/LC_MESSAGES/libsoup.mo
+share/locale/ja/LC_MESSAGES/libsoup.mo
+share/locale/ko/LC_MESSAGES/libsoup.mo
+share/locale/lt/LC_MESSAGES/libsoup.mo
+share/locale/lv/LC_MESSAGES/libsoup.mo
+share/locale/ml/LC_MESSAGES/libsoup.mo
+share/locale/mr/LC_MESSAGES/libsoup.mo
+share/locale/nb/LC_MESSAGES/libsoup.mo
+share/locale/pa/LC_MESSAGES/libsoup.mo
+share/locale/pl/LC_MESSAGES/libsoup.mo
+share/locale/pt/LC_MESSAGES/libsoup.mo
+share/locale/pt_BR/LC_MESSAGES/libsoup.mo
+share/locale/ro/LC_MESSAGES/libsoup.mo
+share/locale/ru/LC_MESSAGES/libsoup.mo
+share/locale/sl/LC_MESSAGES/libsoup.mo
+share/locale/sr/LC_MESSAGES/libsoup.mo
+share/locale/sr@latin/LC_MESSAGES/libsoup.mo
+share/locale/sv/LC_MESSAGES/libsoup.mo
+share/locale/ta/LC_MESSAGES/libsoup.mo
+share/locale/te/LC_MESSAGES/libsoup.mo
+share/locale/th/LC_MESSAGES/libsoup.mo
+share/locale/tr/LC_MESSAGES/libsoup.mo
+share/locale/uk/LC_MESSAGES/libsoup.mo
+share/locale/vi/LC_MESSAGES/libsoup.mo
+share/locale/zh_CN/LC_MESSAGES/libsoup.mo
+share/locale/zh_HK/LC_MESSAGES/libsoup.mo
+share/locale/zh_TW/LC_MESSAGES/libsoup.mo
diff --git a/net/libsoup24/distinfo b/net/libsoup24/distinfo
index d316c3957f9..9805ecf65ae 100644
--- a/net/libsoup24/distinfo
+++ b/net/libsoup24/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.28 2012/05/29 20:21:53 joerg Exp $
+$NetBSD: distinfo,v 1.29 2012/10/19 18:01:13 drochner Exp $
 
-SHA1 (libsoup-2.38.1.tar.xz) = 8418440ff59917dee2e5618965cf8683b61258bf
-RMD160 (libsoup-2.38.1.tar.xz) = 6603131f0c1e84225f7b508a18927e3733910ddc
-Size (libsoup-2.38.1.tar.xz) = 620832 bytes
+SHA1 (libsoup-2.40.1.tar.xz) = 6029ca74c46607cb6697cf87214b7624b6c4612a
+RMD160 (libsoup-2.40.1.tar.xz) = 09d3a1b2ec6a06768c54a65968df2833c772c0ee
+Size (libsoup-2.40.1.tar.xz) = 700968 bytes
 SHA1 (patch-tests_coding-test.c) = 2b76cf778cf389d9c67abb2b5222656e7e4191fb