--- graphics/gmic-qt/Makefile	(revision 523498)
+++ graphics/gmic-qt/Makefile	(working copy)
@@ -3,7 +3,7 @@ 
 PORTNAME=	gmic-qt
 DISTVERSIONPREFIX=	v.
 DISTVERSION=	2.3.6
-PORTREVISION=	3
+PORTREVISION=	4
 PORTEPOCH=	1
 CATEGORIES=	graphics kde
 MASTER_SITES=	http://gmic.eu/:stdlib \
@@ -22,6 +22,11 @@ 
 		libfftw3.so:math/fftw3 \
 		libpng.so:graphics/png
 
+FLAVORS=	none krita gimp # reflect the value of GMIC_QT_HOST for simplicity
+FLAVOR?=	${FLAVORS:[1]}
+krita_PKGNAMESUFFIX=	-krita
+gimp_PKGNAMESUFFIX=	-gimp
+
 USES=		cmake compiler:c++14-lang pkgconfig qt:5 xorg
 USE_QT=		core gui network widgets \
 		buildtools_build linguisttools_build qmake_build
@@ -34,11 +39,22 @@ 
 
 # Use the extracted cimg/gmic & Co, as we do not want to depend on graphics/gimp
 # which would get pulled in by graphics/cimg.
-CMAKE_ARGS=	-DGMIC_QT_HOST:STRING="krita" \
+CMAKE_ARGS=	-DGMIC_QT_HOST:STRING="${FLAVOR}" \
 		-DGMIC_PATH:STRING="${WRKSRC_gmic}/src"
 
+PLIST_FILES=	bin/gmic_${FLAVOR:S/$/_/:S/none_//}qt
+
 PORTSCOUT=	limit:[0-9]\..*
 
+.if ${FLAVOR} == gimp
+LIB_DEPENDS+=	libbabl-0.1.so:x11/babl \
+		libgegl-0.4.so:graphics/gegl \
+		libgimp-2.0.so:graphics/gimp-app \
+		libjson-glib-1.0.so:devel/json-glib
+USES+=		gettext-runtime gnome
+USE_GNOME=	cairo gdkpixbuf2 glib20
+.endif
+
 pre-configure:
 # Copy the necessary files
 	${CP} ${WRKSRC_cimg}/CImg.h ${WRKSRC_gmic}/src
@@ -45,7 +61,7 @@ 
 	${CP} ${DISTDIR}/${DIST_SUBDIR}/gmic_stdlib.h ${WRKSRC_gmic}/src
 
 do-install:
-	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/gmic_krita_qt ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/gmic_${FLAVOR:S/$/_/:S/none_//}qt ${STAGEDIR}${PREFIX}/bin
 	${MKDIR} ${STAGEDIR}${DATADIR}/translations
 	${INSTALL_DATA} ${BUILD_WRKSRC}/*.qm ${STAGEDIR}${DATADIR}/translations
 
--- graphics/gmic-qt/pkg-plist	(revision 523498)
+++ graphics/gmic-qt/pkg-plist	(working copy)
@@ -1,4 +1,3 @@ 
-bin/gmic_krita_qt
 %%DATADIR%%/translations/cs.qm
 %%DATADIR%%/translations/de.qm
 %%DATADIR%%/translations/es.qm
--- UPDATING	(revision 527478)
+++ UPDATING	(working copy)
@@ -6,6 +6,16 @@ 
 you update your ports collection, before attempting any port upgrades.
 
 20200229:
+  AFFECTS: users of graphics/gmic-qt
+  AUTHOR: kde@FreeBSD.org
+
+  graphics/gmic-qt has been split into 3 flavors. The previous behavior
+  (Krita plugin) is now available as a port flavor graphics/gmic-qt@krita
+  and as a package gmic-qt-krita. Additionally, the 'gimp' flavor is now
+  available that provides a Gimp plugin, and 'none' flavor is availbale
+  that provides a standalone application.
+
+20200229:
   AFFECTS: users of textproc/apache-solr
   AUTHOR: mfechner@FreeBSD.org