3 files changed, 71 insertions, 61 deletions

diff --git a/graphics/krita/Makefile b/graphics/krita/Makefile
index 9603dd2f775e..17a5bc904a4d 100644
--- a/graphics/krita/Makefile
+++ b/graphics/krita/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	krita
-DISTVERSION=	4.1.8
-PORTREVISION=	6
+DISTVERSION=	4.2.1
 CATEGORIES=	graphics kde
 MASTER_SITES=	KDE/stable/${PORTNAME}/${DISTVERSION}
 DIST_SUBDIR=	KDE/${PORTNAME}
@@ -26,6 +25,7 @@ LIB_DEPENDS=	libImath.so:graphics/ilmbase \
 		libpng.so:graphics/png \
 		libpoppler.so:graphics/poppler \
 		libpoppler-qt5.so:graphics/poppler-qt5 \
+		libquazip5.so:archivers/quazip \
 		libraw.so:graphics/libraw \
 		libtiff.so:graphics/tiff \
 		libxcb.so:x11/libxcb \
diff --git a/graphics/krita/distinfo b/graphics/krita/distinfo
index 75dea104f4d2..743181807dc5 100644
--- a/graphics/krita/distinfo
+++ b/graphics/krita/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1552086765
-SHA256 (KDE/krita/krita-4.1.8.tar.gz) = 0476c9e2279f0ae690c2ed02e1aa9c3d491943643f9859355a02657318bd5940
-SIZE (KDE/krita/krita-4.1.8.tar.gz) = 244065767
+TIMESTAMP = 1559748616
+SHA256 (KDE/krita/krita-4.2.1.tar.gz) = 35367adde808c9460a9d6e08f80255a64d08470acbef391e56d00acc929ca9ca
+SIZE (KDE/krita/krita-4.2.1.tar.gz) = 245929278
diff --git a/graphics/krita/pkg-plist b/graphics/krita/pkg-plist
index 220b952cc5f3..efaca12a8f98 100644
--- a/graphics/krita/pkg-plist
+++ b/graphics/krita/pkg-plist
@@ -35,7 +35,6 @@ lib/kritaplugins/kritaconvolutionfilters.so
 lib/kritaplugins/kritacsvexport.so
 lib/kritaplugins/kritacsvimport.so
 lib/kritaplugins/kritacurvepaintop.so
-lib/kritaplugins/kritadefaultdockers.so
 lib/kritaplugins/kritadefaultpaintops.so
 lib/kritaplugins/kritadefaulttools.so
 lib/kritaplugins/kritadeformpaintop.so
@@ -50,6 +49,7 @@ lib/kritaplugins/kritaexperimentpaintop.so
 lib/kritaplugins/kritaextensioncolorsfilters.so
 lib/kritaplugins/kritafastcolortransferfilter.so
 lib/kritaplugins/kritafilterop.so
+lib/kritaplugins/kritagamutmask.so
 lib/kritaplugins/kritagifexport.so
 lib/kritaplugins/kritagifimport.so
 lib/kritaplugins/kritagradientmap.so
@@ -60,7 +60,6 @@ lib/kritaplugins/kritahalftone.so
 lib/kritaplugins/kritahatchingpaintop.so
 lib/kritaplugins/kritaheightmapexport.so
 lib/kritaplugins/kritaheightmapimport.so
-lib/kritaplugins/kritahistogram.so
 lib/kritaplugins/kritahistogramdocker.so
 lib/kritaplugins/kritahistorydocker.so
 lib/kritaplugins/kritaimageenhancement.so
@@ -71,10 +70,12 @@ lib/kritaplugins/kritajpegexport.so
 lib/kritaplugins/kritajpegimport.so
 lib/kritaplugins/kritakraexport.so
 lib/kritaplugins/kritakraimport.so
+lib/kritaplugins/kritalayerdocker.so
 lib/kritaplugins/kritalayergroupswitcher.so
 lib/kritaplugins/kritalayersplit.so
 lib/kritaplugins/kritalcmsengine.so
 lib/kritaplugins/kritalevelfilter.so
+lib/kritaplugins/kritalogdocker.so
 lib/kritaplugins/kritalutdocker.so
 lib/kritaplugins/kritametadataeditor.so
 lib/kritaplugins/kritamodifyselection.so
@@ -114,6 +115,7 @@ lib/kritaplugins/kritaroundmarkerpaintop.so
 lib/kritaplugins/kritaselectiontools.so
 lib/kritaplugins/kritaseparatechannels.so
 lib/kritaplugins/kritashearimage.so
+lib/kritaplugins/kritasimplexnoisegenerator.so
 lib/kritaplugins/kritasketchpaintop.so
 lib/kritaplugins/kritasmallcolorselector.so
 lib/kritaplugins/kritasmalltilesfilter.so
@@ -138,85 +140,84 @@ lib/kritaplugins/kritatoolpolyline.so
 lib/kritaplugins/kritatooltransform.so
 lib/kritaplugins/kritatouchdocker.so
 lib/kritaplugins/kritaunsharpfilter.so
-lib/kritaplugins/kritavideoexport.so
 lib/kritaplugins/kritawavefilter.so
 lib/kritaplugins/kritawaveletdecompose.so
 lib/kritaplugins/kritaxcfimport.so
 lib/libkritabasicflakes.so
-lib/libkritabasicflakes.so.17
-lib/libkritabasicflakes.so.17.0.0
+lib/libkritabasicflakes.so.18
+lib/libkritabasicflakes.so.%%SHLIB_VER%%
 lib/libkritacolor.so
-lib/libkritacolor.so.17
-lib/libkritacolor.so.17.0.0
+lib/libkritacolor.so.18
+lib/libkritacolor.so.%%SHLIB_VER%%
 lib/libkritacolord.so
-lib/libkritacolord.so.17
-lib/libkritacolord.so.17.0.0
+lib/libkritacolord.so.18
+lib/libkritacolord.so.%%SHLIB_VER%%
 lib/libkritacommand.so
-lib/libkritacommand.so.17
-lib/libkritacommand.so.17.0.0
+lib/libkritacommand.so.18
+lib/libkritacommand.so.%%SHLIB_VER%%
 lib/libkritaflake.so
-lib/libkritaflake.so.17
-lib/libkritaflake.so.17.0.0
+lib/libkritaflake.so.18
+lib/libkritaflake.so.%%SHLIB_VER%%
 lib/libkritaglobal.so
-lib/libkritaglobal.so.17
-lib/libkritaglobal.so.17.0.0
+lib/libkritaglobal.so.18
+lib/libkritaglobal.so.%%SHLIB_VER%%
 lib/libkritaimage.so
-lib/libkritaimage.so.17
-lib/libkritaimage.so.17.0.0
+lib/libkritaimage.so.18
+lib/libkritaimage.so.%%SHLIB_VER%%
 lib/libkritaimpex.so
-lib/libkritaimpex.so.17
-lib/libkritaimpex.so.17.0.0
+lib/libkritaimpex.so.18
+lib/libkritaimpex.so.%%SHLIB_VER%%
 lib/libkritalibbrush.so
-lib/libkritalibbrush.so.17
-lib/libkritalibbrush.so.17.0.0
+lib/libkritalibbrush.so.18
+lib/libkritalibbrush.so.%%SHLIB_VER%%
 lib/libkritalibkis.so
-lib/libkritalibkis.so.17
-lib/libkritalibkis.so.17.0.0
+lib/libkritalibkis.so.18
+lib/libkritalibkis.so.%%SHLIB_VER%%
 lib/libkritalibkra.so
-lib/libkritalibkra.so.17
-lib/libkritalibkra.so.17.0.0
+lib/libkritalibkra.so.18
+lib/libkritalibkra.so.%%SHLIB_VER%%
 lib/libkritalibpaintop.so
-lib/libkritalibpaintop.so.17
-lib/libkritalibpaintop.so.17.0.0
+lib/libkritalibpaintop.so.18
+lib/libkritalibpaintop.so.%%SHLIB_VER%%
+lib/libkritametadata.so
+lib/libkritametadata.so.18
+lib/libkritametadata.so.%%SHLIB_VER%%
 lib/libkritaodf.so
-lib/libkritaodf.so.17
-lib/libkritaodf.so.17.0.0
+lib/libkritaodf.so.18
+lib/libkritaodf.so.%%SHLIB_VER%%
 lib/libkritapigment.so
-lib/libkritapigment.so.17
-lib/libkritapigment.so.17.0.0
+lib/libkritapigment.so.18
+lib/libkritapigment.so.%%SHLIB_VER%%
 lib/libkritaplugin.so
-lib/libkritaplugin.so.17
-lib/libkritaplugin.so.17.0.0
+lib/libkritaplugin.so.18
+lib/libkritaplugin.so.%%SHLIB_VER%%
 lib/libkritapsd.so
-lib/libkritapsd.so.17
-lib/libkritapsd.so.17.0.0
+lib/libkritapsd.so.18
+lib/libkritapsd.so.%%SHLIB_VER%%
 lib/libkritaqml.so
-lib/libkritaqml.so.17
-lib/libkritaqml.so.17.0.0
+lib/libkritaqml.so.18
+lib/libkritaqml.so.%%SHLIB_VER%%
 lib/libkritastore.so
-lib/libkritastore.so.17
-lib/libkritastore.so.17.0.0
+lib/libkritastore.so.18
+lib/libkritastore.so.%%SHLIB_VER%%
 lib/libkritatext.so
-lib/libkritatext.so.17
-lib/libkritatext.so.17.0.0
+lib/libkritatext.so.18
+lib/libkritatext.so.%%SHLIB_VER%%
 lib/libkritatextlayout.so
-lib/libkritatextlayout.so.17
-lib/libkritatextlayout.so.17.0.0
+lib/libkritatextlayout.so.18
+lib/libkritatextlayout.so.%%SHLIB_VER%%
 lib/libkritaui.so
-lib/libkritaui.so.17
-lib/libkritaui.so.17.0.0
-lib/libkritavectorimage.so
-lib/libkritavectorimage.so.17
-lib/libkritavectorimage.so.17.0.0
+lib/libkritaui.so.18
+lib/libkritaui.so.%%SHLIB_VER%%
 lib/libkritaversion.so
-lib/libkritaversion.so.17
-lib/libkritaversion.so.17.0.0
+lib/libkritaversion.so.18
+lib/libkritaversion.so.%%SHLIB_VER%%
 lib/libkritawidgets.so
-lib/libkritawidgets.so.17
-lib/libkritawidgets.so.17.0.0
+lib/libkritawidgets.so.18
+lib/libkritawidgets.so.%%SHLIB_VER%%
 lib/libkritawidgetutils.so
-lib/libkritawidgetutils.so.17
-lib/libkritawidgetutils.so.17.0.0
+lib/libkritawidgetutils.so.18
+lib/libkritawidgetutils.so.%%SHLIB_VER%%
 %%QT_QMLDIR%%/org/krita/draganddrop/libdraganddropplugin.so
 %%QT_QMLDIR%%/org/krita/draganddrop/qmldir
 %%QT_QMLDIR%%/org/krita/sketch/components/BusyIndicator.qml
@@ -290,9 +291,11 @@ share/color/icc/krita/Gray-D50-elle-V4-g22.icc
 share/color/icc/krita/Gray-D50-elle-V4-labl.icc
 share/color/icc/krita/Gray-D50-elle-V4-rec709.icc
 share/color/icc/krita/Gray-D50-elle-V4-srgbtrc.icc
+share/color/icc/krita/ITUR_2100_PQ_FULL.ICC
 share/color/icc/krita/Lab-D50-Identity-elle-V2.icc
 share/color/icc/krita/Lab-D50-Identity-elle-V4.icc
 share/color/icc/krita/README
+share/color/icc/krita/Rec2020-elle-V4-g10.icc
 share/color/icc/krita/XYZ-D50-Identity-elle-V4.icc
 share/color/icc/krita/cmyk.icm
 share/color/icc/krita/krita25_lcms-builtin-sRGB_g100-truegamma.icc
@@ -320,6 +323,7 @@ share/icons/hicolor/64x64/mimetypes/application-x-krita.png
 share/icons/hicolor/scalable/apps/calligrakrita.svgz
 %%DATADIR%%/actions/ConnectionTool.action
 %%DATADIR%%/actions/InteractionTool.action
+%%DATADIR%%/actions/KarbonCalligraphyTool.action
 %%DATADIR%%/actions/KisAssistantTool.action
 %%DATADIR%%/actions/KisToolCrop.action
 %%DATADIR%%/actions/KisToolPath.action
@@ -364,6 +368,14 @@ share/icons/hicolor/scalable/apps/calligrakrita.svgz
 %%DATADIR%%/defaultpresets/spraybrush.kpp
 %%DATADIR%%/defaultpresets/tangentnormal.kpp
 %%DATADIR%%/dtd/krita.dtd
+%%DATADIR%%/gamutmasks/Atmosphere_With_Accent.kgm
+%%DATADIR%%/gamutmasks/Atmospheric_Triad.kgm
+%%DATADIR%%/gamutmasks/Complementary.kgm
+%%DATADIR%%/gamutmasks/Dominant_Hue_With_Accent.kgm
+%%DATADIR%%/gamutmasks/GamutMaskTemplate.kra
+%%DATADIR%%/gamutmasks/Shifted_Triad.kgm
+%%DATADIR%%/gamutmasks/Split_Complementary.kgm
+%%DATADIR%%/gamutmasks/empty_mask_preview.png
 %%DATADIR%%/gradients/BG-Krita2.ggr
 %%DATADIR%%/gradients/GPS-FG-Glare.ggr
 %%DATADIR%%/gradients/GPS-Fire-Blueish.ggr
@@ -797,7 +809,6 @@ share/icons/hicolor/scalable/apps/calligrakrita.svgz
 %%DATADIR%%/symbols/BalloonSymbols.svg
 %%DATADIR%%/symbols/pepper_carrot_speech_bubbles.svg
 %%DATADIR%%/symbols/preset_icons.svg
-%%DATADIR%%/tags/kis_paintoppresets_tags.xml
 %%DATADIR%%/templates/animation/.directory
 %%DATADIR%%/templates/animation/.source/Anim-Jp-EN.kra
 %%DATADIR%%/templates/animation/.source/Anim-Jp-JP.kra
@@ -875,7 +886,6 @@ share/kritaplugins/buginfo.xmlgui
 share/kritaplugins/clonesarray.xmlgui
 share/kritaplugins/colorrange.xmlgui
 share/kritaplugins/colorspaceconversion.xmlgui
-share/kritaplugins/histogram.xmlgui
 share/kritaplugins/imageseparate.xmlgui
 share/kritaplugins/imagesize.xmlgui
 share/kritaplugins/imagesplit.xmlgui