Update inkscape to 0.92.2.

* Use correct MPL version (1.1)
* Correct typo's in the LICENSE_FILE_LGPL21 line so it actually used

* Changelog: http://wiki.inkscape.org/wiki/index.php/Release_notes/0.92.2

4 files changed, 9 insertions, 46 deletions

diff --git a/graphics/inkscape/Makefile b/graphics/inkscape/Makefile
index 7458cef70e50..53d3071e3b5a 100644
--- a/graphics/inkscape/Makefile
+++ b/graphics/inkscape/Makefile
@@ -2,20 +2,20 @@
 # $FreeBSD$
 
 PORTNAME=	inkscape
-PORTVERSION=	0.92.1
-PORTREVISION=	7
+PORTVERSION=	0.92.2
 CATEGORIES=	graphics gnome
-MASTER_SITES=	https://launchpadlibrarian.net/306309537/ \
+MASTER_SITES=	https://launchpadlibrarian.net/332184472/ \
+		https://inkscape.org/en/gallery/item/11254/ \
 		LOCAL/kwm
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Full featured open source SVG editor
 
-LICENSE=	GPLv2+ GPLv3+ LGPL21 MPL
+LICENSE=	GPLv2+ GPLv3+ LGPL21 MPL11
 LICENSE_COMB=	multi
 LICENSE_FILE_GPLv2=	${WRKSRC}/GPL2.txt
 LICENSE_FILE_GPLv3=	${WRKSRC}/GPL3.txt
-LICENSE_FILE_LGPL2=	${WRKRSC}/LGPL2.txt
+LICENSE_FILE_LGPL21=	${WRKSRC}/LGPL2.1.txt
 
 BUILD_DEPENDS=	${LOCALBASE}/include/boost/concept_check.hpp:devel/boost-libs
 LIB_DEPENDS=	libpopt.so:devel/popt \
diff --git a/graphics/inkscape/distinfo b/graphics/inkscape/distinfo
index 233969392f93..3f75223aafab 100644
--- a/graphics/inkscape/distinfo
+++ b/graphics/inkscape/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1495104994
-SHA256 (inkscape-0.92.1.tar.bz2) = 257405bf802de125f17d123638093a37db02ebe334d243cf9b0d8903f7c89005
-SIZE (inkscape-0.92.1.tar.bz2) = 31222684
+TIMESTAMP = 1506622350
+SHA256 (inkscape-0.92.2.tar.bz2) = a628d0e04c254e9840947e6d866974f92c68ae31631a38b94d9b65e5cd84cfd3
+SIZE (inkscape-0.92.2.tar.bz2) = 31224100
diff --git a/graphics/inkscape/files/patch-src_ui_tools_flood-tool.cpp b/graphics/inkscape/files/patch-src_ui_tools_flood-tool.cpp
deleted file mode 100644
index ea146ee29637..000000000000
--- a/graphics/inkscape/files/patch-src_ui_tools_flood-tool.cpp
+++ /dev/null
@@ -1,33 +0,0 @@
---- src/ui/tools/flood-tool.cpp.orig	2014-11-30 18:45:32 UTC
-+++ src/ui/tools/flood-tool.cpp
-@@ -252,13 +252,13 @@ static bool compare_pixels(guint32 check
-     
-     switch (method) {
-         case FLOOD_CHANNELS_ALPHA:
--            return abs(static_cast<int>(ac) - ao) <= threshold;
-+            return abs(static_cast<int>(ac) - static_cast<int>(ao)) <= threshold;
-         case FLOOD_CHANNELS_R:
--            return abs(static_cast<int>(ac ? unpremul_alpha(rc, ac) : 0) - (ao ? unpremul_alpha(ro, ao) : 0)) <= threshold;
-+            return abs(static_cast<int>(ac ? unpremul_alpha(rc, ac) : 0) - static_cast<int>(ao ? unpremul_alpha(ro, ao) : 0)) <= threshold;
-         case FLOOD_CHANNELS_G:
--            return abs(static_cast<int>(ac ? unpremul_alpha(gc, ac) : 0) - (ao ? unpremul_alpha(go, ao) : 0)) <= threshold;
-+            return abs(static_cast<int>(ac ? unpremul_alpha(gc, ac) : 0) - static_cast<int>(ao ? unpremul_alpha(go, ao) : 0)) <= threshold;
-         case FLOOD_CHANNELS_B:
--            return abs(static_cast<int>(ac ? unpremul_alpha(bc, ac) : 0) - (ao ? unpremul_alpha(bo, ao) : 0)) <= threshold;
-+            return abs(static_cast<int>(ac ? unpremul_alpha(bc, ac) : 0) - static_cast<int>(ao ? unpremul_alpha(bo, ao) : 0)) <= threshold;
-         case FLOOD_CHANNELS_RGB:
-             guint32 amc, rmc, bmc, gmc;
-             //amc = 255*255 - (255-ac)*(255-ad); amc = (amc + 127) / 255;
-@@ -268,9 +268,9 @@ static bool compare_pixels(guint32 check
-             gmc = (255-ac)*gd + 255*gc; gmc = (gmc + 127) / 255;
-             bmc = (255-ac)*bd + 255*bc; bmc = (bmc + 127) / 255;
- 
--            diff += abs(static_cast<int>(amc ? unpremul_alpha(rmc, amc) : 0) - (amop ? unpremul_alpha(rmop, amop) : 0));
--            diff += abs(static_cast<int>(amc ? unpremul_alpha(gmc, amc) : 0) - (amop ? unpremul_alpha(gmop, amop) : 0));
--            diff += abs(static_cast<int>(amc ? unpremul_alpha(bmc, amc) : 0) - (amop ? unpremul_alpha(bmop, amop) : 0));
-+            diff += abs(static_cast<int>(amc ? unpremul_alpha(rmc, amc) : 0) - static_cast<int>(amop ? unpremul_alpha(rmop, amop) : 0));
-+            diff += abs(static_cast<int>(amc ? unpremul_alpha(gmc, amc) : 0) - static_cast<int>(amop ? unpremul_alpha(gmop, amop) : 0));
-+            diff += abs(static_cast<int>(amc ? unpremul_alpha(bmc, amc) : 0) - static_cast<int>(amop ? unpremul_alpha(bmop, amop) : 0));
-             return ((diff / 3) <= ((threshold * 3) / 4));
-         
-         case FLOOD_CHANNELS_H:
diff --git a/graphics/inkscape/pkg-plist b/graphics/inkscape/pkg-plist
index 3d6fd911dae6..035e166545ed 100644
--- a/graphics/inkscape/pkg-plist
+++ b/graphics/inkscape/pkg-plist
@@ -35,6 +35,7 @@ share/icons/hicolor/48x48/apps/inkscape.png
 %%DATADIR%%/branding/README
 %%DATADIR%%/branding/inkscape-flat.svg
 %%DATADIR%%/branding/inkscape-text.svg
+%%DATADIR%%/branding/inkscape.logo.svg
 %%DATADIR%%/branding/inkscape.svg
 %%DATADIR%%/branding/sodipodi.svg
 %%DATADIR%%/branding/tux.svg
@@ -568,7 +569,6 @@ share/icons/hicolor/48x48/apps/inkscape.png
 %%DATADIR%%/extensions/xaml2svg/transform.xsl
 %%DATADIR%%/filters/README
 %%DATADIR%%/filters/filters.svg
-%%DATADIR%%/filters/filters.svg.h
 %%DATADIR%%/fonts/README
 %%DATADIR%%/gradients/README
 %%DATADIR%%/icons/OCAL.png
@@ -644,14 +644,12 @@ share/icons/hicolor/48x48/apps/inkscape.png
 %%DATADIR%%/palettes/Ubuntu.gpl
 %%DATADIR%%/palettes/echo-palette.gpl
 %%DATADIR%%/palettes/inkscape.gpl
-%%DATADIR%%/palettes/palettes.h
 %%DATADIR%%/palettes/svg.gpl
 %%DATADIR%%/palettes/webhex.gpl
 %%DATADIR%%/palettes/websafe22.gpl
 %%DATADIR%%/palettes/windowsXP.gpl
 %%DATADIR%%/patterns/README
 %%DATADIR%%/patterns/patterns.svg
-%%DATADIR%%/patterns/patterns.svg.h
 %%DATADIR%%/screens/README
 %%DATADIR%%/screens/about.svg
 %%DATADIR%%/symbols/AigaSymbols.svg
@@ -660,7 +658,6 @@ share/icons/hicolor/48x48/apps/inkscape.png
 %%DATADIR%%/symbols/LogicSymbols.svg
 %%DATADIR%%/symbols/MapSymbolsNPS.svg
 %%DATADIR%%/symbols/README
-%%DATADIR%%/symbols/symbols.h
 %%DATADIR%%/templates/CD_label_120x120.svg
 %%DATADIR%%/templates/LaTeX_Beamer.svg
 %%DATADIR%%/templates/README
@@ -690,7 +687,6 @@ share/icons/hicolor/48x48/apps/inkscape.png
 %%DATADIR%%/templates/default_pt.svg
 %%DATADIR%%/templates/default_px.svg
 %%DATADIR%%/templates/no_layers.svg
-%%DATADIR%%/templates/templates.h
 %%DATADIR%%/tutorials/README
 %%DATADIR%%/tutorials/edge3d.svg
 %%DATADIR%%/tutorials/gpl-2.svg