--- libsoup/Makefile	(révision 550284)
+++ libsoup/Makefile	(copie de travail)
@@ -2,7 +2,7 @@ 
 # $FreeBSD$
 
 PORTNAME=	libsoup
-PORTVERSION=	2.62.3
+PORTVERSION=	2.72.0
 CATEGORIES=	devel gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome
@@ -13,61 +13,39 @@ 
 LICENSE=	LGPL20
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	glib-networking>=2.29.18:net/glib-networking
-LIB_DEPENDS=	libgcrypt.so:security/libgcrypt
+BUILD_DEPENDS=	glib-networking>=2.29.18:net/glib-networking \
+		valac:lang/vala
+LIB_DEPENDS=	libgcrypt.so:security/libgcrypt \
+		libpsl.so:dns/libpsl \
+		libbrotlidec.so:archivers/brotli
 RUN_DEPENDS=	glib-networking>=2.29.18:net/glib-networking
 
 PORTSCOUT=	limitw:1,even
 
-USES=		gettext gmake gnome libtool localbase pathfix \
-		pkgconfig python:3.6+,build sqlite ssl tar:xz
-USE_GNOME=	glib20 intlhack introspection:build \
-		libxml2 referencehack
+USES=		gettext gnome meson localbase pkgconfig \
+		python:3.6+,build sqlite tar:xz
+USE_GNOME=	glib20 introspection:build libxml2
 USE_LDCONFIG=	yes
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--disable-more-warnings \
-		--disable-vala
-INSTALL_TARGET=	install-strip
 
-LIBVERSION=	1.8.0
+MESON_ARGS=	-Dsysprof=disabled
+
+LIBVERSION=	1.11.0
 PLIST_SUB=	VERSION="2.4" LIBVERSION=${LIBVERSION}
 
 .if defined(SOUP_SLAVE)
-USES+=		sqlite
+EXTRA_PATCHES=	${FILESDIR}/extra-patch-libsoup_meson.build \
+		${FILESDIR}/extra-patch-meson.build
+
 LIB_DEPENDS+=	libsoup-2.4.so:devel/libsoup
-CONFIGURE_ARGS+=--with-gnome
 .else
-CONFIGURE_ARGS+=--without-gnome
+MESON_ARGS+=	-Dgnome=false
 .endif
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|-Wmissing-include-dirs||g' \
-		${WRKSRC}/configure
-	@${REINPLACE_CMD} -e 's|env python3|env ${PYTHON_VERSION}|g' \
-		${WRKSRC}/libsoup/tld-parser.py
-	@${REINPLACE_CMD} -e 's|DATADIRNAME=lib|DATADIRNAME=share|g' \
-		${WRKSRC}/configure
 
-.if defined(SOUP_SLAVE)
-do-install:
-	@${MKDIR} ${STAGEDIR}${PREFIX}/share/gir-1.0/
-	${INSTALL_DATA} ${WRKSRC}/libsoup/SoupGNOME-2.4.gir ${STAGEDIR}${PREFIX}/share/gir-1.0/
-	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/girepository-1.0/
-	${INSTALL_DATA} ${WRKSRC}/libsoup/SoupGNOME-2.4.typelib ${STAGEDIR}${PREFIX}/lib/girepository-1.0/
-	${INSTALL_PROGRAM} ${WRKSRC}/libsoup/.libs/libsoup-gnome-2.4.so ${STAGEDIR}${PREFIX}/lib/
-	${INSTALL_PROGRAM} ${WRKSRC}/libsoup/.libs/libsoup-gnome-2.4.so.1 ${STAGEDIR}${PREFIX}/lib/
-	${INSTALL_PROGRAM} ${WRKSRC}/libsoup/.libs/libsoup-gnome-2.4.so.${LIBVERSION} ${STAGEDIR}${PREFIX}/lib/
-	cd ${WRKSRC}/libsoup && DESTDIR=${STAGEDIR} ${GMAKE} install-libsoupgnomeincludeHEADERS
-.endif
-
 post-install:
 .if defined(SOUP_SLAVE)
-	@${MKDIR} ${STAGEDIR}${PREFIX}/libdata/pkgconfig
-	${INSTALL_DATA} ${WRKSRC}/libsoup-gnome-2.4.pc \
-		${STAGEDIR}${PREFIX}/libdata/pkgconfig/
-.else
-	${INSTALL_DATA} ${WRKSRC}/libsoup/soup-connection.h \
-		${STAGEDIR}${PREFIX}/include/libsoup-2.4/libsoup/soup-connection.h
+	@${RM} -R ${STAGEDIR}${PREFIX}/include/libsoup-2.4/
+	@${RM} ${STAGEDIR}${PREFIX}/libdata/pkgconfig/libsoup-2.4.pc
 .endif
 
 .include <bsd.port.mk>
--- libsoup/distinfo	(révision 550284)
+++ libsoup/distinfo	(copie de travail)
@@ -1,3 +1,3 @@ 
-TIMESTAMP = 1539116814
-SHA256 (gnome/libsoup-2.62.3.tar.xz) = d312ade547495c2093ff8bda61f9b9727a98cfdae339f3263277dd39c0451172
-SIZE (gnome/libsoup-2.62.3.tar.xz) = 1851780
+TIMESTAMP = 1600253366
+SHA256 (gnome/libsoup-2.72.0.tar.xz) = 170c3f8446b0f65f8e4b93603349172b1085fb8917c181d10962f02bb85f5387
+SIZE (gnome/libsoup-2.72.0.tar.xz) = 1477940
--- libsoup/files/extra-patch-libsoup_meson.build	(nonexistent)
+++ libsoup/files/extra-patch-libsoup_meson.build	(copie de travail)
@@ -0,0 +1,47 @@ 
+--- libsoup/meson.build.orig	2020-03-07 02:43:34 UTC
++++ libsoup/meson.build
+@@ -203,7 +203,7 @@ endif
+ 
+ 
+ includedir = join_paths(libsoup_api_name, meson.project_name())
+-install_headers(soup_installed_headers, subdir : includedir)
++#install_headers(soup_installed_headers, subdir : includedir)
+ 
+ version_cdata = configuration_data()
+ version_cdata.set('SOUP_MAJOR_VERSION', soup_version_major)
+@@ -223,7 +223,7 @@ soup_enums = gnome.mkenums('soup-enum-types',
+   ],
+   h_template : enum_types + '.h.template',
+   c_template : enum_types + '.c.template',
+-  install_header : true,
++  install_header : false,
+   install_dir : join_paths(get_option('includedir'), includedir))
+ 
+ soup_enum_h = soup_enums[1]
+@@ -253,7 +253,7 @@ libsoup = library('soup-@0@'.format(apiversion),
+   darwin_versions: darwin_versions,
+   c_args : libsoup_c_args + hidden_visibility_flag,
+   include_directories : configinc,
+-  install : true,
++  install : false,
+   dependencies : deps)
+ 
+ pkg.generate(libsoup,
+@@ -319,7 +319,7 @@ if enable_introspection or enable_vapi
+     export_packages : libsoup_api_name,
+     extra_args : soup_gir_args,
+     includes : 'Gio-2.0',
+-    install : true,
++    install : false,
+     header: join_paths(meson.project_name(), 'soup.h'),
+   )
+ 
+@@ -336,7 +336,7 @@ if enable_introspection or enable_vapi
+         soup_ns_version + '-custom.vala'
+       ],
+       packages : 'gio-2.0',
+-      install : true,
++      install : false,
+     )
+   endif
+ 
--- libsoup/files/extra-patch-meson.build	(nonexistent)
+++ libsoup/files/extra-patch-meson.build	(copie de travail)
@@ -0,0 +1,14 @@ 
+--- meson.build.orig	2020-03-07 02:43:35 UTC
++++ meson.build
+@@ -369,9 +369,9 @@ configure_file(output : 'config.h', configuration : cd
+ subdir('libsoup')
+ # xgettext is optional (on Windows for instance)
+ if find_program('xgettext', required : false).found()
+-  subdir('po')
++  #subdir('po')
+ endif
+-subdir('examples')
++#subdir('examples')
+ 
+ if get_option('tests')
+   subdir('tests')
--- libsoup/files/patch-libsoup_Makefile.in	(révision 550284)
+++ libsoup/files/patch-libsoup_Makefile.in	(nonexistent)
@@ -1,29 +0,0 @@ 
---- libsoup/Makefile.in.orig	2016-04-26 12:36:13 UTC
-+++ libsoup/Makefile.in
-@@ -290,7 +290,7 @@ libsoup_2_4_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
- 	$(libsoup_2_4_la_CFLAGS) $(CFLAGS) $(libsoup_2_4_la_LDFLAGS) \
- 	$(LDFLAGS) -o $@
- @BUILD_LIBSOUP_GNOME_TRUE@libsoup_gnome_2_4_la_DEPENDENCIES =  \
--@BUILD_LIBSOUP_GNOME_TRUE@	libsoup-2.4.la $(am__DEPENDENCIES_1)
-+@BUILD_LIBSOUP_GNOME_TRUE@	$(am__DEPENDENCIES_1)
- am__libsoup_gnome_2_4_la_SOURCES_DIST = soup-cookie-jar-sqlite.c \
- 	soup-gnome-features.c soup-proxy-resolver-gnome.h \
- 	soup-proxy-resolver-gnome.c soup-password-manager-gnome.h \
-@@ -788,7 +788,7 @@ TLD_DATA_FILE = $(top_srcdir)/data/effective_tld_names
- @BUILD_LIBSOUP_GNOME_TRUE@	-export-dynamic
- 
- @BUILD_LIBSOUP_GNOME_TRUE@libsoup_gnome_2_4_la_LIBADD = \
--@BUILD_LIBSOUP_GNOME_TRUE@	libsoup-2.4.la			\
-+@BUILD_LIBSOUP_GNOME_TRUE@	-lsoup-2.4			\
- @BUILD_LIBSOUP_GNOME_TRUE@	$(GLIB_LIBS)
- 
- @BUILD_LIBSOUP_GNOME_TRUE@libsoup_gnome_2_4_la_SOURCES = \
-@@ -848,7 +848,7 @@ INTROSPECTION_COMPILER_ARGS = --includedir=.
- @BUILD_LIBSOUP_GNOME_TRUE@@HAVE_INTROSPECTION_TRUE@	--include-uninstalled=$(builddir)/Soup-2.4.gir
- 
- @BUILD_LIBSOUP_GNOME_TRUE@@HAVE_INTROSPECTION_TRUE@SoupGNOME_2_4_gir_CFLAGS = $(AM_CPPFLAGS)
--@BUILD_LIBSOUP_GNOME_TRUE@@HAVE_INTROSPECTION_TRUE@SoupGNOME_2_4_gir_LIBS = libsoup-gnome-2.4.la libsoup-2.4.la
-+@BUILD_LIBSOUP_GNOME_TRUE@@HAVE_INTROSPECTION_TRUE@SoupGNOME_2_4_gir_LIBS = libsoup-gnome-2.4.la soup-2.4
- @BUILD_LIBSOUP_GNOME_TRUE@@HAVE_INTROSPECTION_TRUE@SoupGNOME_2_4_gir_FILES = $(addprefix $(srcdir)/,$(gi_soup_gnome_files))
- @BUILD_LIBSOUP_GNOME_TRUE@@HAVE_INTROSPECTION_TRUE@SoupGNOME_2_4_gir_EXPORT_PACKAGES = libsoup-gnome-2.4
- @HAVE_INTROSPECTION_TRUE@girdir = $(datadir)/gir-1.0
--- libsoup/pkg-plist	(révision 550284)
+++ libsoup/pkg-plist	(copie de travail)
@@ -6,7 +6,6 @@ 
 include/libsoup-%%VERSION%%/libsoup/soup-auth.h
 include/libsoup-%%VERSION%%/libsoup/soup-autocleanups.h
 include/libsoup-%%VERSION%%/libsoup/soup-cache.h
-include/libsoup-%%VERSION%%/libsoup/soup-connection.h
 include/libsoup-%%VERSION%%/libsoup/soup-content-decoder.h
 include/libsoup-%%VERSION%%/libsoup/soup-content-sniffer.h
 include/libsoup-%%VERSION%%/libsoup/soup-cookie-jar-db.h
@@ -17,6 +16,9 @@ 
 include/libsoup-%%VERSION%%/libsoup/soup-enum-types.h
 include/libsoup-%%VERSION%%/libsoup/soup-form.h
 include/libsoup-%%VERSION%%/libsoup/soup-headers.h
+include/libsoup-%%VERSION%%/libsoup/soup-hsts-enforcer-db.h
+include/libsoup-%%VERSION%%/libsoup/soup-hsts-enforcer.h
+include/libsoup-%%VERSION%%/libsoup/soup-hsts-policy.h
 include/libsoup-%%VERSION%%/libsoup/soup-logger.h
 include/libsoup-%%VERSION%%/libsoup/soup-message-body.h
 include/libsoup-%%VERSION%%/libsoup/soup-message-headers.h
@@ -48,79 +50,19 @@ 
 include/libsoup-%%VERSION%%/libsoup/soup-value-utils.h
 include/libsoup-%%VERSION%%/libsoup/soup-version.h
 include/libsoup-%%VERSION%%/libsoup/soup-websocket-connection.h
+include/libsoup-%%VERSION%%/libsoup/soup-websocket-extension-deflate.h
+include/libsoup-%%VERSION%%/libsoup/soup-websocket-extension-manager.h
+include/libsoup-%%VERSION%%/libsoup/soup-websocket-extension.h
 include/libsoup-%%VERSION%%/libsoup/soup-websocket.h
 include/libsoup-%%VERSION%%/libsoup/soup-xmlrpc-old.h
 include/libsoup-%%VERSION%%/libsoup/soup-xmlrpc.h
 include/libsoup-%%VERSION%%/libsoup/soup.h
 lib/girepository-1.0/Soup-%%VERSION%%.typelib
-lib/libsoup-%%VERSION%%.a
 lib/libsoup-%%VERSION%%.so
 lib/libsoup-%%VERSION%%.so.1
 lib/libsoup-%%VERSION%%.so.%%LIBVERSION%%
 libdata/pkgconfig/libsoup-%%VERSION%%.pc
 share/gir-1.0/Soup-%%VERSION%%.gir
-share/gtk-doc/html/libsoup-%%VERSION%%/SoupAddress.html
-share/gtk-doc/html/libsoup-%%VERSION%%/SoupAuth.html
-share/gtk-doc/html/libsoup-%%VERSION%%/SoupAuthDomain.html
-share/gtk-doc/html/libsoup-%%VERSION%%/SoupAuthDomainBasic.html
-share/gtk-doc/html/libsoup-%%VERSION%%/SoupAuthDomainDigest.html
-share/gtk-doc/html/libsoup-%%VERSION%%/SoupAuthManager.html
-share/gtk-doc/html/libsoup-%%VERSION%%/SoupCache.html
-share/gtk-doc/html/libsoup-%%VERSION%%/SoupContentDecoder.html
-share/gtk-doc/html/libsoup-%%VERSION%%/SoupContentSniffer.html
-share/gtk-doc/html/libsoup-%%VERSION%%/SoupCookie.html
-share/gtk-doc/html/libsoup-%%VERSION%%/SoupCookieJar.html
-share/gtk-doc/html/libsoup-%%VERSION%%/SoupCookieJarDB.html
-share/gtk-doc/html/libsoup-%%VERSION%%/SoupCookieJarText.html
-share/gtk-doc/html/libsoup-%%VERSION%%/SoupLogger.html
-share/gtk-doc/html/libsoup-%%VERSION%%/SoupMessage.html
-share/gtk-doc/html/libsoup-%%VERSION%%/SoupMessageBody.html
-share/gtk-doc/html/libsoup-%%VERSION%%/SoupMessageHeaders.html
-share/gtk-doc/html/libsoup-%%VERSION%%/SoupMultipart.html
-share/gtk-doc/html/libsoup-%%VERSION%%/SoupMultipartInputStream.html
-share/gtk-doc/html/libsoup-%%VERSION%%/SoupProxyResolverDefault.html
-share/gtk-doc/html/libsoup-%%VERSION%%/SoupRequest.html
-share/gtk-doc/html/libsoup-%%VERSION%%/SoupRequestData.html
-share/gtk-doc/html/libsoup-%%VERSION%%/SoupRequestFile.html
-share/gtk-doc/html/libsoup-%%VERSION%%/SoupRequestHTTP.html
-share/gtk-doc/html/libsoup-%%VERSION%%/SoupServer.html
-share/gtk-doc/html/libsoup-%%VERSION%%/SoupSession.html
-share/gtk-doc/html/libsoup-%%VERSION%%/SoupSessionAsync.html
-share/gtk-doc/html/libsoup-%%VERSION%%/SoupSessionFeature.html
-share/gtk-doc/html/libsoup-%%VERSION%%/SoupSessionSync.html
-share/gtk-doc/html/libsoup-%%VERSION%%/SoupSocket.html
-share/gtk-doc/html/libsoup-%%VERSION%%/SoupURI.html
-share/gtk-doc/html/libsoup-%%VERSION%%/annotation-glossary.html
-share/gtk-doc/html/libsoup-%%VERSION%%/ch01.html
-share/gtk-doc/html/libsoup-%%VERSION%%/ch02.html
-share/gtk-doc/html/libsoup-%%VERSION%%/ch03.html
-share/gtk-doc/html/libsoup-%%VERSION%%/ch04.html
-share/gtk-doc/html/libsoup-%%VERSION%%/ch05.html
-share/gtk-doc/html/libsoup-%%VERSION%%/home.png
-share/gtk-doc/html/libsoup-%%VERSION%%/index.html
-share/gtk-doc/html/libsoup-%%VERSION%%/ix01.html
-share/gtk-doc/html/libsoup-%%VERSION%%/left-insensitive.png
-share/gtk-doc/html/libsoup-%%VERSION%%/left.png
-share/gtk-doc/html/libsoup-%%VERSION%%/libsoup-%%VERSION%%-HTML-Form-Support.html
-share/gtk-doc/html/libsoup-%%VERSION%%/libsoup-%%VERSION%%-Soup-Miscellaneous-Utilities.html
-share/gtk-doc/html/libsoup-%%VERSION%%/libsoup-%%VERSION%%-SoupServer-deprecated-API.html
-share/gtk-doc/html/libsoup-%%VERSION%%/libsoup-%%VERSION%%-Top-Level-Domain-utils.html
-share/gtk-doc/html/libsoup-%%VERSION%%/libsoup-%%VERSION%%-Version-Information.html
-share/gtk-doc/html/libsoup-%%VERSION%%/libsoup-%%VERSION%%-WebSockets.html
-share/gtk-doc/html/libsoup-%%VERSION%%/libsoup-%%VERSION%%-XMLRPC-Support.html
-share/gtk-doc/html/libsoup-%%VERSION%%/libsoup-%%VERSION%%-soup-method.html
-share/gtk-doc/html/libsoup-%%VERSION%%/libsoup-%%VERSION%%-soup-status.html
-share/gtk-doc/html/libsoup-%%VERSION%%/libsoup-%%VERSION%%.devhelp2
-share/gtk-doc/html/libsoup-%%VERSION%%/libsoup-build-howto.html
-share/gtk-doc/html/libsoup-%%VERSION%%/libsoup-client-howto.html
-share/gtk-doc/html/libsoup-%%VERSION%%/libsoup-request-howto.html
-share/gtk-doc/html/libsoup-%%VERSION%%/libsoup-server-howto.html
-share/gtk-doc/html/libsoup-%%VERSION%%/libsoup-session-porting.html
-share/gtk-doc/html/libsoup-%%VERSION%%/right-insensitive.png
-share/gtk-doc/html/libsoup-%%VERSION%%/right.png
-share/gtk-doc/html/libsoup-%%VERSION%%/style.css
-share/gtk-doc/html/libsoup-%%VERSION%%/up-insensitive.png
-share/gtk-doc/html/libsoup-%%VERSION%%/up.png
 share/locale/an/LC_MESSAGES/libsoup.mo
 share/locale/as/LC_MESSAGES/libsoup.mo
 share/locale/be/LC_MESSAGES/libsoup.mo
@@ -139,6 +81,7 @@ 
 share/locale/et/LC_MESSAGES/libsoup.mo
 share/locale/eu/LC_MESSAGES/libsoup.mo
 share/locale/fa/LC_MESSAGES/libsoup.mo
+share/locale/fi/LC_MESSAGES/libsoup.mo
 share/locale/fr/LC_MESSAGES/libsoup.mo
 share/locale/fur/LC_MESSAGES/libsoup.mo
 share/locale/gd/LC_MESSAGES/libsoup.mo
@@ -157,6 +100,7 @@ 
 share/locale/lv/LC_MESSAGES/libsoup.mo
 share/locale/ml/LC_MESSAGES/libsoup.mo
 share/locale/mr/LC_MESSAGES/libsoup.mo
+share/locale/ms/LC_MESSAGES/libsoup.mo
 share/locale/nb/LC_MESSAGES/libsoup.mo
 share/locale/ne/LC_MESSAGES/libsoup.mo
 share/locale/nl/LC_MESSAGES/libsoup.mo
@@ -185,3 +129,5 @@ 
 share/locale/zh_CN/LC_MESSAGES/libsoup.mo
 share/locale/zh_HK/LC_MESSAGES/libsoup.mo
 share/locale/zh_TW/LC_MESSAGES/libsoup.mo
+share/vala/vapi/libsoup-%%VERSION%%.deps
+share/vala/vapi/libsoup-%%VERSION%%.vapi