Index: head/editors/calligra/Makefile
===================================================================
--- head/editors/calligra/Makefile	(revision 443735)
+++ head/editors/calligra/Makefile	(revision 443736)
@@ -1,98 +1,110 @@
 # $FreeBSD$
 
 PORTNAME=	calligra
 PORTVERSION=	${CALLIGRA_VERSION}
 PORTREVISION=	11
 CATEGORIES=	editors kde
 MASTER_SITES=	KDE/${CALLIGRA_BRANCH}/${PORTNAME}-${PORTVERSION}/
 DIST_SUBDIR=	KDE/${PORTNAME}/${PORTVERSION}
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KDE graphic art and office suite
 
 LIB_DEPENDS=	libpng.so:graphics/png \
 		libIlmImf.so:graphics/OpenEXR \
 		libboost_thread.so:devel/boost-libs \
 		libqca.so:devel/qca \
 		libexiv2.so:graphics/exiv2 \
 		liblcms2.so:graphics/lcms2 \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2 \
 		libwpd-0.10.so:textproc/libwpd010 \
 		libwpg-0.3.so:graphics/libwpg03 \
 		libpoppler-qt4.so:graphics/poppler-qt4 \
 		libopenjpeg.so:graphics/openjpeg15 \
 		libfftw3.so:math/fftw3 \
 		libtiff.so:graphics/tiff \
 		libgsl.so:math/gsl \
 		libwps-0.3.so:textproc/libwps03 \
 		libvisio-0.1.so:textproc/libvisio01 \
 		libOpenColorIO.so:graphics/opencolorio \
 		libodfgen-0.1.so:textproc/libodfgen01 \
 		libetonyek-0.1.so:graphics/libetonyek01 \
 		librevenge-0.0.so:textproc/librevenge
 BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/eigen3.pc:math/eigen3 \
 		pstoedit:graphics/pstoedit
 RUN_DEPENDS=	pstoedit:graphics/pstoedit
 
 USE_GL=		glew
 USE_GNOME=	glib20 libxml2 libxslt
 USE_KDE=	kactivities kdelibs libkdcraw \
 		okular pimlibs attica automoc4 soprano
 USE_QT4=	corelib dbus designer_build gui opengl phonon \
 		qtestlib_build script sql svg webkit xml \
 		moc_build qmake_build rcc_build uic_build
 USES=		cmake:outsource cpe compiler:c++11-lang iconv:translit jpeg \
 		kde:4 perl5 pkgconfig shared-mime-info sqlite tar:xz
 CMAKE_ARGS=	-DCMAKE_INCLUDE_PATH:STRING="${QT_INCDIR} ${LOCALBASE}/include" \
 		-DPRODUCTSET:STRING="DESKTOP"
 USE_LDCONFIG=	yes
 
 PLIST_SUB+=     SHLIB_VER=14.0.0 \
                 SHLIB_SHVER=14
 
 OPTIONS_DEFINE=	GMIC MARBLE MYSQL PGSQL SYBASE
 OPTIONS_DEFAULT=MARBLE MYSQL PGSQL
 OPTIONS_SUB=	yes
 
 # GMIC does not mix well with clang as compiler. It needs >20GB of memory to be
 # built, which is not sensible on most systems
 # See bug report: https://llvm.org/bugs/show_bug.cgi?id=22199
 GMIC_DESC=	Build the G'Mic plugin (needs lots and lots of RAM)
 GMIC_CMAKE_ON=	-DWITH_GMIC:BOOL=ON
 GMIC_CMAKE_OFF=	-DWITH_GMIC:BOOL=OFF
 
 MARBLE_DESC=	World globe widget support via Marble
 MARBLE_USE=	KDE=marble
 MARBLE_CMAKE_OFF=-DWITH_Marble:BOOL=FALSE
 
 MYSQL_DESC=	MySQL database support in Kexi
 MYSQL_USE=	MYSQL=yes
 MYSQL_CMAKE_OFF=-DWITH_MySQL:BOOL=FALSE
 
 PGSQL_DESC=	PostgreSQL database support in Kexi
 PGSQL_LIB_DEPENDS=libpqxx-3.1.so:databases/postgresql-libpqxx3
 PGSQL_USES=	pgsql
 PGSQL_CMAKE_OFF=-DWITH_PostgreSQL:BOOL=FALSE
 
 SYBASE_DESC=	Sybase database support in Kexi
 SYBASE_LIB_DEPENDS=libsybdb.so:databases/freetds
 SYBASE_CMAKE_OFF=-DWITH_FreeTDS:BOOL=FALSE
 
 post-patch:
 # They require memalign() to build; as they're not installed, they're just a
 # waste of CPU cycles.
 	@${REINPLACE_CMD} -e '/add_subdirectory.*benchmarks/ d' \
 		${PATCH_WRKSRC}/krita/CMakeLists.txt
 # Prevent updating MIME during build/install.
 	@${REINPLACE_CMD} -e '/^update_xdg_mimetypes/ d' \
 		${PATCH_WRKSRC}/filters/libmsooxml/CMakeLists.txt \
 		${PATCH_WRKSRC}/filters/plan/mpxj/import/CMakeLists.txt \
 		${PATCH_WRKSRC}/filters/stage/keynote/import/CMakeLists.txt \
 		${PATCH_WRKSRC}/filters/words/wiki/CMakeLists.txt \
 		${PATCH_WRKSRC}/krita/data/CMakeLists.txt \
 		${PATCH_WRKSRC}/krita/plugins/formats/ora/CMakeLists.txt \
 		${PATCH_WRKSRC}/krita/plugins/formats/ora/CMakeLists.txt \
 		${PATCH_WRKSRC}/plugins/vectorshape/CMakeLists.txt
+# Enteigen krita: Do not use the complete 'Eigen' namespace, as it conflicts
+# with opencv now, but only include the qualified class names.
+# This is a simplified version of upstreams:
+#       https://phabricator.kde.org/R37:2db4438671e17002c7b02e3ad3a5208930765e4f
+	@${REINPLACE_CMD} -e 's|using namespace Eigen;|using Eigen::Matrix;using Eigen::Dynamic;using Eigen::Vector2i;|' \
+		${PATCH_WRKSRC}/krita/plugins/extensions/dockers/advancedcolorselector/kis_color_selector_ring.cpp \
+		${PATCH_WRKSRC}/krita/plugins/filters/blur/kis_gaussian_blur_filter.h \
+		${PATCH_WRKSRC}/krita/plugins/filters/blur/kis_motion_blur_filter.h \
+		${PATCH_WRKSRC}/krita/plugins/filters/blur/kis_lens_blur_filter.h \
+		${PATCH_WRKSRC}/krita/plugins/filters/convolutionfilters/convolutionfilters.cpp \
+		${PATCH_WRKSRC}/krita/image/kis_convolution_kernel.h \
+		${PATCH_WRKSRC}/krita/image/kis_gaussian_kernel.h
 
 .include <bsd.port.mk>