Index: branches/2020Q1/graphics/librsvg2/Makefile
===================================================================
--- branches/2020Q1/graphics/librsvg2/Makefile	(revision 527793)
+++ branches/2020Q1/graphics/librsvg2/Makefile	(revision 527794)
@@ -1,40 +1,43 @@
 # Created by: Ade Lovett <ade@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	librsvg
-PORTVERSION=	2.40.20
+PORTVERSION=	2.40.21
 CATEGORIES=	graphics gnome
 MASTER_SITES=	GNOME
 PKGNAMESUFFIX=	2
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Library for parsing and rendering SVG vector-graphic files
+
+LICENSE=	GPLv2 LGPL20
+LICENSE_COMB=	multi
 
 CONFLICTS_INSTALL=	librsvg2-rust
 # librsvg2 2.42+ needs rust to build, which is not available on all
 # FreeBSD archs. So limit pure C version 2.40.x.
 PORTSCOUT=	limit:^2\.40\.
 
 BUILD_DEPENDS=	valac:lang/vala
 LIB_DEPENDS=	libfreetype.so:print/freetype2 \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libpng.so:graphics/png \
 		libcroco-0.6.so:textproc/libcroco
 
 USES=		gettext gmake gnome libtool localbase pathfix pkgconfig tar:xz
 USE_GNOME=	cairo gnomeprefix libgsf gdkpixbuf2 introspection:build \
 		libxml2 pango
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
 CONFIGURE_ARGS=	--enable-vala \
 		--disable-Bsymbolic
 
 PLIST_SUB+=	PORTVERSION=${PORTVERSION}
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|GTK3_REQUIRED=3.[0-9][0-9].[0-9]|GTK3_REQUIRED=9.90.0|g' \
 		${WRKSRC}/configure
 
 .include <bsd.port.mk>
Index: branches/2020Q1/graphics/librsvg2/distinfo
===================================================================
--- branches/2020Q1/graphics/librsvg2/distinfo	(revision 527793)
+++ branches/2020Q1/graphics/librsvg2/distinfo	(revision 527794)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1516305968
-SHA256 (gnome2/librsvg-2.40.20.tar.xz) = cff4dd3c3b78bfe99d8fcfad3b8ba1eee3289a0823c0e118d78106be6b84c92b
-SIZE (gnome2/librsvg-2.40.20.tar.xz) = 1796376
+TIMESTAMP = 1583164702
+SHA256 (gnome2/librsvg-2.40.21.tar.xz) = f7628905f1cada84e87e2b14883ed57d8094dca3281d5bcb24ece4279e9a92ba
+SIZE (gnome2/librsvg-2.40.21.tar.xz) = 1655860
Index: branches/2020Q1/graphics/librsvg2/pkg-plist
===================================================================
--- branches/2020Q1/graphics/librsvg2/pkg-plist	(revision 527793)
+++ branches/2020Q1/graphics/librsvg2/pkg-plist	(revision 527794)
@@ -1,47 +1,39 @@
 bin/rsvg-convert
 include/librsvg-2.0/librsvg/librsvg-enum-types.h
 include/librsvg-2.0/librsvg/librsvg-features.h
 include/librsvg-2.0/librsvg/rsvg-cairo.h
 include/librsvg-2.0/librsvg/rsvg.h
 lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-svg.a
 lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-svg.so
 lib/girepository-1.0/Rsvg-2.0.typelib
 lib/librsvg-2.a
 lib/librsvg-2.so
 lib/librsvg-2.so.2
 lib/librsvg-2.so.%%PORTVERSION%%
 libdata/pkgconfig/librsvg-2.0.pc
 man/man1/rsvg-convert.1.gz
 share/doc/rsvg-2.0/RsvgHandle.html
 share/doc/rsvg-2.0/annotation-glossary.html
-share/doc/rsvg-2.0/api-index-2-14.html
-share/doc/rsvg-2.0/api-index-2-22.html
-share/doc/rsvg-2.0/api-index-2-32.html
-share/doc/rsvg-2.0/api-index-2-36.html
-share/doc/rsvg-2.0/api-index-2-4.html
-share/doc/rsvg-2.0/api-index-2-8.html
-share/doc/rsvg-2.0/api-index-2-9.html
-share/doc/rsvg-2.0/api-index-deprecated.html
 share/doc/rsvg-2.0/api-index-full.html
 share/doc/rsvg-2.0/home.png
 share/doc/rsvg-2.0/index.html
 share/doc/rsvg-2.0/left-insensitive.png
 share/doc/rsvg-2.0/left.png
 share/doc/rsvg-2.0/licence.html
 share/doc/rsvg-2.0/object-tree.html
 share/doc/rsvg-2.0/right-insensitive.png
 share/doc/rsvg-2.0/right.png
 share/doc/rsvg-2.0/rsvg-2.0.devhelp2
 share/doc/rsvg-2.0/rsvg-Using-RSVG-with-GIO.html
 share/doc/rsvg-2.0/rsvg-Using-RSVG-with-GdkPixbuf.html
 share/doc/rsvg-2.0/rsvg-Using-RSVG-with-cairo.html
 share/doc/rsvg-2.0/rsvg-Version-check-and-feature-tests.html
 share/doc/rsvg-2.0/rsvg.html
 share/doc/rsvg-2.0/style.css
 share/doc/rsvg-2.0/up-insensitive.png
 share/doc/rsvg-2.0/up.png
 share/gir-1.0/Rsvg-2.0.gir
 share/thumbnailers/librsvg.thumbnailer
 share/vala/vapi/librsvg-2.0.vapi
 @postexec %D/bin/gdk-pixbuf-query-loaders > /dev/null 2>&1 && %D/bin/gdk-pixbuf-query-loaders > %D/lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders.cache 2>/dev/null || /usr/bin/true
 @postunexec %D/bin/gdk-pixbuf-query-loaders > /dev/null 2>&1 && %D/bin/gdk-pixbuf-query-loaders > %D/lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders.cache 2>/dev/null || /usr/bin/true
Index: branches/2020Q1
===================================================================
--- branches/2020Q1	(revision 527793)
+++ branches/2020Q1	(revision 527794)

Property changes on: branches/2020Q1
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r527732