14 files changed, 182 insertions, 184 deletions

diff --git a/MOVED b/MOVED
index 588ddcfe6f33..4f74dc2784d8 100644
--- a/MOVED
+++ b/MOVED
@@ -10180,3 +10180,4 @@ devel/subversion18|devel/subversion|2018-04-19|Has expired: EoL, use devel/subve
 math/rkward-kde4|math/rkward-kde|2018-04-21|No more specific to KDE4
 devel/py-msgpack-python|devel/py-msgpack|2018-04-22|Upstream renamed package name on PyPI from msgpack-python to msgpack since 0.5
 deskutils/py-pycarddav|www/pycarddav|2018-04-23|Remove dupplicate port
+x11-toolkits/qwt6-designerplugin||2018-04-25|Merged with x11-toolkits/qwt6
diff --git a/audio/simon/Makefile b/audio/simon/Makefile
index 9674cd30a509..49faf22cc72f 100644
--- a/audio/simon/Makefile
+++ b/audio/simon/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	simon
 PORTVERSION=	0.4.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	audio kde
 MASTER_SITES=	KDE/stable/${PORTNAME}/${PORTVERSION}/src
 DIST_SUBDIR=	KDE
@@ -15,7 +15,7 @@ LIB_DEPENDS=	libasound.so:audio/alsa-lib \
 		libsamplerate.so:audio/libsamplerate \
 		libpocketsphinx.so:audio/pocketsphinx \
 		libsphinxad.so:audio/sphinxbase \
-		libqwt6.so:x11-toolkits/qwt6
+		libqwt6.so:x11-toolkits/qwt6@qt4
 
 USES=		cmake:outsource gettext kde:4 tar:bz2
 USE_KDE=	kdelibs automoc4 pimlibs
diff --git a/finance/qhacc/Makefile b/finance/qhacc/Makefile
index d4fed19b5c9b..e85a0662445b 100644
--- a/finance/qhacc/Makefile
+++ b/finance/qhacc/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	qhacc
 PORTVERSION=	4.3
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	finance
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
@@ -14,7 +14,7 @@ LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libgpgme.so:security/gpgme \
-		libqwt6.so:x11-toolkits/qwt6
+		libqwt6.so:x11-toolkits/qwt6@qt4
 
 USES=		compiler:c++11-lib qmake:norecursive tar:tgz
 USE_QT4=	corelib gui sql moc_build rcc_build uic_build
@@ -28,8 +28,8 @@ OPTIONS_DEFINE=	DOCS
 post-patch:
 	@${REINPLACE_CMD} -e \
 		'/^INSTALLDIR/s|=.*|=${DATADIR}| ; \
-		 /^QWTINCS/s|=.*|=${LOCALBASE}/include/qwt6| ; \
-		 /^QWTLIBS/s|=.*|=${LOCALBASE}/lib -lqwt6| ; \
+		 /^QWTINCS/s|=.*|=${QT_INCDIR}/qwt6| ; \
+		 /^QWTLIBS/s|=.*|=${QT_LIBDIR} -lqwt6| ; \
 		 /+= debug/s|^|#| ; \
 		 /^QMAKE_CFLAGS/s|=.*|= $$$${GPGMEINCS}| ; \
 		 /^QMAKE_CXXFLAGS/s|=.*|= $$$${GPGMEINCS}| ; \
diff --git a/x11-toolkits/Makefile b/x11-toolkits/Makefile
index 767c18c5fe99..0afcc1208027 100644
--- a/x11-toolkits/Makefile
+++ b/x11-toolkits/Makefile
@@ -242,7 +242,6 @@
     SUBDIR += qwt5
     SUBDIR += qwt5-designerplugin
     SUBDIR += qwt6
-    SUBDIR += qwt6-designerplugin
     SUBDIR += rep-gtk2
     SUBDIR += rubygem-gdk3
     SUBDIR += rubygem-gtk2
diff --git a/x11-toolkits/qwt6-designerplugin/Makefile b/x11-toolkits/qwt6-designerplugin/Makefile
deleted file mode 100644
index a3926e77fd6e..000000000000
--- a/x11-toolkits/qwt6-designerplugin/Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
-# $FreeBSD$
-
-PORTNAME=	qwt
-PORTVERSION=	6.1.3
-CATEGORIES=	x11-toolkits devel
-MASTER_SITES=	SF
-PKGNAMESUFFIX=	6-designerplugin
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Qt Designer plugin for Qwt
-
-LIB_DEPENDS=	libqwt6.so:x11-toolkits/qwt6
-
-USES=		gmake qmake tar:bzip2
-USE_QT4=	designer moc_build rcc_build
-QMAKE_ARGS+=	CONFIG+=QwtDesigner \
-		PLUGINDIR=${PREFIX}/${QT_PLUGINDIR_REL}
-
-PLIST_FILES=	${QT_PLUGINDIR_REL}/designer/libqwt6_designer_plugin.so
-
-STRIP_FILES=	${QT_PLUGINDIR_REL}/designer/libqwt6_designer_plugin.so
-
-CONFIGURE_WRKSRC=	${WRKSRC}/designer
-BUILD_WRKSRC=	${CONFIGURE_WRKSRC}
-INSTALL_WRKSRC=	${CONFIGURE_WRKSRC}
-
-post-install:
-	${STRIP_CMD} ${STRIP_FILES:S,^,${STAGEDIR}${PREFIX}/,}
-
-.include <bsd.port.mk>
diff --git a/x11-toolkits/qwt6-designerplugin/distinfo b/x11-toolkits/qwt6-designerplugin/distinfo
deleted file mode 100644
index 0f36838ec9f0..000000000000
--- a/x11-toolkits/qwt6-designerplugin/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1507301892
-SHA256 (qwt-6.1.3.tar.bz2) = f3ecd34e72a9a2b08422fb6c8e909ca76f4ce5fa77acad7a2883b701f4309733
-SIZE (qwt-6.1.3.tar.bz2) = 4245614
diff --git a/x11-toolkits/qwt6-designerplugin/pkg-descr b/x11-toolkits/qwt6-designerplugin/pkg-descr
deleted file mode 100644
index d8032e6edcdc..000000000000
--- a/x11-toolkits/qwt6-designerplugin/pkg-descr
+++ /dev/null
@@ -1,9 +0,0 @@
-The Qwt library contains GUI Components and utility classes which
-are primarily useful for programs with a technical background.
-Beside a 2D plot widget it provides scales, sliders, dials, compasses,
-thermometers, wheels and knobs to control or display values, arrays,
-or ranges of type double.
-
-This port installs Qt Designer plugin for Qwt library version 6.
-
-WWW: http://qwt.sourceforge.net
diff --git a/x11-toolkits/qwt6/Makefile b/x11-toolkits/qwt6/Makefile
index 25789f5e2723..eed2229f61ae 100644
--- a/x11-toolkits/qwt6/Makefile
+++ b/x11-toolkits/qwt6/Makefile
@@ -2,29 +2,42 @@
 
 PORTNAME=	qwt
 PORTVERSION=	6.1.3
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	SF
-PKGNAMESUFFIX=	6
+PKGNAMESUFFIX=	6-${FLAVOR}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	lbartoletti@tuxfamily.org
 COMMENT=	Qt Widgets for Technical Applications
 
-USES=		gmake qmake tar:bzip2
-USE_QT4=	corelib gui opengl svg xml moc_build
+FLAVORS=	qt4 qt5
+FLAVOR?=	${FLAVORS:[1]}
+
+USES=		gmake qmake tar:bzip2 uniquefiles:dirs
 USE_GL=		gl
 USE_LDCONFIG=	yes
-DOCSDIR=	${PREFIX}/share/doc/qwt6
 
 PORTDOCS=	*
-PLIST_SUB=	INCLUDEDIR=include/qwt6 \
-		SHLIB_VER=${PORTVERSION} \
-		SHLIB_SHVER=${PORTVERSION:R} \
-		QT_MKSPECDIR=share/qt4/mkspecs
+PLIST_SUB=	SHLIB_VER=${PORTVERSION} \
+		SHLIB_SHVER=${PORTVERSION:R}
+
+QMAKE_ARGS+=	PLUGINDIR=${PREFIX}/${QT_PLUGINDIR_REL}
+
+.if ${FLAVOR} == qt4
+USE_QT4=	corelib designer gui opengl svg xml moc_build rcc_build script
+.else
+USE_QT5=	buildtools_build widgets gui core designer gui opengl svg xml printsupport concurrent
+.endif
 
 OPTIONS_DEFINE=	DOCS
 
 post-patch:
 	@${REINPLACE_CMD} -e '/INSTALLS.*doc/d' ${WRKSRC}/doc/doc.pro
+	@${REINPLACE_CMD} -e 's/%%QT_VERSION%%/${FLAVOR:S/qt//}/g' \
+			-e 's|%%QT_INCDIR%%|${QT_INCDIR}|g' \
+			-e 's|%%QT_LIBDIR%%|${QT_LIBDIR}|g' \
+			-e 's|%%QT_MKSPECDIR%%|${QT_MKSPECDIR}|g' \
+			${WRKSRC}/qwtconfig.pri
 
 post-install-DOCS-on:
 	@(cd ${WRKSRC}/doc/html/ && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
diff --git a/x11-toolkits/qwt6-designerplugin/files/patch-designer__designer.pro b/x11-toolkits/qwt6/files/patch-designer_designer.pro
index ac9359c9d67c..6cf527d030d4 100644
--- a/x11-toolkits/qwt6-designerplugin/files/patch-designer__designer.pro
+++ b/x11-toolkits/qwt6/files/patch-designer_designer.pro
@@ -1,4 +1,4 @@
---- designer/designer.pro.orig	2016-06-13 07:14:23 UTC
+--- designer/designer.pro.orig	2018-03-06 14:52:45 UTC
 +++ designer/designer.pro
 @@ -42,7 +42,7 @@ contains(QWT_CONFIG, QwtDesigner) {
  
diff --git a/x11-toolkits/qwt6/files/patch-qwtconfig.pri b/x11-toolkits/qwt6/files/patch-qwtconfig.pri
index e9cb11826922..7de0c385cbbe 100644
--- a/x11-toolkits/qwt6/files/patch-qwtconfig.pri
+++ b/x11-toolkits/qwt6/files/patch-qwtconfig.pri
@@ -1,4 +1,4 @@
---- qwtconfig.pri.orig	2016-06-13 07:14:23 UTC
+--- qwtconfig.pri.orig	2018-03-06 14:23:36 UTC
 +++ qwtconfig.pri
 @@ -19,7 +19,7 @@ QWT_VERSION      = $${QWT_VER_MAJ}.$${QW
  QWT_INSTALL_PREFIX = $$[QT_INSTALL_PREFIX]
@@ -9,21 +9,34 @@
      # QWT_INSTALL_PREFIX = /usr/local/qwt-$$QWT_VERSION-qt-$$QT_VERSION
  }
  
-@@ -29,7 +29,7 @@ win32 {
+@@ -28,9 +28,9 @@ win32 {
+     # QWT_INSTALL_PREFIX = C:/Qwt-$$QWT_VERSION-qt-$$QT_VERSION
  }
  
- QWT_INSTALL_DOCS      = $${QWT_INSTALL_PREFIX}/doc
+-QWT_INSTALL_DOCS      = $${QWT_INSTALL_PREFIX}/doc
 -QWT_INSTALL_HEADERS   = $${QWT_INSTALL_PREFIX}/include
-+QWT_INSTALL_HEADERS   = $${QWT_INSTALL_PREFIX}/include/qwt6
- QWT_INSTALL_LIBS      = $${QWT_INSTALL_PREFIX}/lib
+-QWT_INSTALL_LIBS      = $${QWT_INSTALL_PREFIX}/lib
++QWT_INSTALL_DOCS      = $${QWT_INSTALL_PREFIX}/share/doc/qwt6-qt%%QT_VERSION%%
++QWT_INSTALL_HEADERS   = %%QT_INCDIR%%/qwt6
++QWT_INSTALL_LIBS      = %%QT_LIBDIR%%
  
  ######################################################################
+ # Designer plugin
+@@ -42,7 +42,7 @@ QWT_INSTALL_LIBS      = $${QWT_INSTALL_P
+ # runtime environment of designer/creator.
+ ######################################################################
+ 
+-QWT_INSTALL_PLUGINS   = $${QWT_INSTALL_PREFIX}/plugins/designer
++QWT_INSTALL_PLUGINS   = %%QT_LIBDIR%%/plugins/designer
+ 
+ # linux distributors often organize the Qt installation
+ # their way and QT_INSTALL_PREFIX doesn't offer a good
 @@ -63,7 +63,7 @@ QWT_INSTALL_PLUGINS   = $${QWT_INSTALL_P
  # with every Qt upgrade. 
  ######################################################################
  
 -QWT_INSTALL_FEATURES  = $${QWT_INSTALL_PREFIX}/features
-+QWT_INSTALL_FEATURES  = $${QWT_INSTALL_PREFIX}/share/qt4/mkspecs/features
++QWT_INSTALL_FEATURES  = %%QT_MKSPECDIR%%/features
  # QWT_INSTALL_FEATURES  = $$[QT_INSTALL_PREFIX]/features
  
  ######################################################################
@@ -36,12 +49,3 @@
  
  ######################################################################
  # If you want to build the Qwt designer plugin, 
-@@ -118,7 +118,7 @@ QWT_CONFIG     += QwtOpenGL
- # Otherwise you have to build it from the designer directory.
- ######################################################################
- 
--QWT_CONFIG     += QwtDesigner
-+#QWT_CONFIG     += QwtDesigner
- 
- ######################################################################
- # Compile all Qwt classes into the designer plugin instead
diff --git a/x11-toolkits/qwt6/pkg-descr b/x11-toolkits/qwt6/pkg-descr
index bb014d78265b..d787775a988b 100644
--- a/x11-toolkits/qwt6/pkg-descr
+++ b/x11-toolkits/qwt6/pkg-descr
@@ -1,4 +1,4 @@
-This is Qt4 port of Qwt library version 6.  The Qwt library contains
+This is the port of Qwt library version 6. The Qwt library contains
 GUI Components and utility classes which are primarily useful for
 programs with a technical background.  Beside a 2D plot widget it
 provides scales, sliders, dials, compasses, thermometers, wheels
diff --git a/x11-toolkits/qwt6/pkg-plist b/x11-toolkits/qwt6/pkg-plist
index 0e1799599120..45f419aedae9 100644
--- a/x11-toolkits/qwt6/pkg-plist
+++ b/x11-toolkits/qwt6/pkg-plist
@@ -1,111 +1,112 @@
-%%INCLUDEDIR%%/qwt.h
-%%INCLUDEDIR%%/qwt_abstract_legend.h
-%%INCLUDEDIR%%/qwt_abstract_scale.h
-%%INCLUDEDIR%%/qwt_abstract_scale_draw.h
-%%INCLUDEDIR%%/qwt_abstract_slider.h
-%%INCLUDEDIR%%/qwt_analog_clock.h
-%%INCLUDEDIR%%/qwt_arrow_button.h
-%%INCLUDEDIR%%/qwt_clipper.h
-%%INCLUDEDIR%%/qwt_color_map.h
-%%INCLUDEDIR%%/qwt_column_symbol.h
-%%INCLUDEDIR%%/qwt_compass.h
-%%INCLUDEDIR%%/qwt_compass_rose.h
-%%INCLUDEDIR%%/qwt_compat.h
-%%INCLUDEDIR%%/qwt_counter.h
-%%INCLUDEDIR%%/qwt_curve_fitter.h
-%%INCLUDEDIR%%/qwt_date.h
-%%INCLUDEDIR%%/qwt_date_scale_draw.h
-%%INCLUDEDIR%%/qwt_date_scale_engine.h
-%%INCLUDEDIR%%/qwt_dial.h
-%%INCLUDEDIR%%/qwt_dial_needle.h
-%%INCLUDEDIR%%/qwt_dyngrid_layout.h
-%%INCLUDEDIR%%/qwt_event_pattern.h
-%%INCLUDEDIR%%/qwt_global.h
-%%INCLUDEDIR%%/qwt_graphic.h
-%%INCLUDEDIR%%/qwt_interval.h
-%%INCLUDEDIR%%/qwt_interval_symbol.h
-%%INCLUDEDIR%%/qwt_knob.h
-%%INCLUDEDIR%%/qwt_legend.h
-%%INCLUDEDIR%%/qwt_legend_data.h
-%%INCLUDEDIR%%/qwt_legend_label.h
-%%INCLUDEDIR%%/qwt_magnifier.h
-%%INCLUDEDIR%%/qwt_math.h
-%%INCLUDEDIR%%/qwt_mathml_text_engine.h
-%%INCLUDEDIR%%/qwt_matrix_raster_data.h
-%%INCLUDEDIR%%/qwt_null_paintdevice.h
-%%INCLUDEDIR%%/qwt_painter.h
-%%INCLUDEDIR%%/qwt_painter_command.h
-%%INCLUDEDIR%%/qwt_panner.h
-%%INCLUDEDIR%%/qwt_picker.h
-%%INCLUDEDIR%%/qwt_picker_machine.h
-%%INCLUDEDIR%%/qwt_pixel_matrix.h
-%%INCLUDEDIR%%/qwt_plot.h
-%%INCLUDEDIR%%/qwt_plot_abstract_barchart.h
-%%INCLUDEDIR%%/qwt_plot_barchart.h
-%%INCLUDEDIR%%/qwt_plot_canvas.h
-%%INCLUDEDIR%%/qwt_plot_curve.h
-%%INCLUDEDIR%%/qwt_plot_dict.h
-%%INCLUDEDIR%%/qwt_plot_directpainter.h
-%%INCLUDEDIR%%/qwt_plot_glcanvas.h
-%%INCLUDEDIR%%/qwt_plot_grid.h
-%%INCLUDEDIR%%/qwt_plot_histogram.h
-%%INCLUDEDIR%%/qwt_plot_intervalcurve.h
-%%INCLUDEDIR%%/qwt_plot_item.h
-%%INCLUDEDIR%%/qwt_plot_layout.h
-%%INCLUDEDIR%%/qwt_plot_legenditem.h
-%%INCLUDEDIR%%/qwt_plot_magnifier.h
-%%INCLUDEDIR%%/qwt_plot_marker.h
-%%INCLUDEDIR%%/qwt_plot_multi_barchart.h
-%%INCLUDEDIR%%/qwt_plot_panner.h
-%%INCLUDEDIR%%/qwt_plot_picker.h
-%%INCLUDEDIR%%/qwt_plot_rasteritem.h
-%%INCLUDEDIR%%/qwt_plot_renderer.h
-%%INCLUDEDIR%%/qwt_plot_rescaler.h
-%%INCLUDEDIR%%/qwt_plot_scaleitem.h
-%%INCLUDEDIR%%/qwt_plot_seriesitem.h
-%%INCLUDEDIR%%/qwt_plot_shapeitem.h
-%%INCLUDEDIR%%/qwt_plot_spectrocurve.h
-%%INCLUDEDIR%%/qwt_plot_spectrogram.h
-%%INCLUDEDIR%%/qwt_plot_svgitem.h
-%%INCLUDEDIR%%/qwt_plot_textlabel.h
-%%INCLUDEDIR%%/qwt_plot_tradingcurve.h
-%%INCLUDEDIR%%/qwt_plot_zoneitem.h
-%%INCLUDEDIR%%/qwt_plot_zoomer.h
-%%INCLUDEDIR%%/qwt_point_3d.h
-%%INCLUDEDIR%%/qwt_point_data.h
-%%INCLUDEDIR%%/qwt_point_mapper.h
-%%INCLUDEDIR%%/qwt_point_polar.h
-%%INCLUDEDIR%%/qwt_raster_data.h
-%%INCLUDEDIR%%/qwt_round_scale_draw.h
-%%INCLUDEDIR%%/qwt_samples.h
-%%INCLUDEDIR%%/qwt_sampling_thread.h
-%%INCLUDEDIR%%/qwt_scale_div.h
-%%INCLUDEDIR%%/qwt_scale_draw.h
-%%INCLUDEDIR%%/qwt_scale_engine.h
-%%INCLUDEDIR%%/qwt_scale_map.h
-%%INCLUDEDIR%%/qwt_scale_widget.h
-%%INCLUDEDIR%%/qwt_series_data.h
-%%INCLUDEDIR%%/qwt_series_store.h
-%%INCLUDEDIR%%/qwt_slider.h
-%%INCLUDEDIR%%/qwt_spline.h
-%%INCLUDEDIR%%/qwt_symbol.h
-%%INCLUDEDIR%%/qwt_system_clock.h
-%%INCLUDEDIR%%/qwt_text.h
-%%INCLUDEDIR%%/qwt_text_engine.h
-%%INCLUDEDIR%%/qwt_text_label.h
-%%INCLUDEDIR%%/qwt_thermo.h
-%%INCLUDEDIR%%/qwt_transform.h
-%%INCLUDEDIR%%/qwt_wheel.h
-%%INCLUDEDIR%%/qwt_widget_overlay.h
-lib/libqwt6.so
-lib/libqwt6.so.6
-lib/libqwt6.so.%%SHLIB_VER%%
-lib/libqwt6.so.%%SHLIB_SHVER%%
-lib/libqwtmathml.so
-lib/libqwtmathml.so.6
-lib/libqwtmathml.so.%%SHLIB_VER%%
-lib/libqwtmathml.so.%%SHLIB_SHVER%%
+%%QT_INCDIR%%/qwt6/qwt.h
+%%QT_INCDIR%%/qwt6/qwt_abstract_legend.h
+%%QT_INCDIR%%/qwt6/qwt_abstract_scale.h
+%%QT_INCDIR%%/qwt6/qwt_abstract_scale_draw.h
+%%QT_INCDIR%%/qwt6/qwt_abstract_slider.h
+%%QT_INCDIR%%/qwt6/qwt_analog_clock.h
+%%QT_INCDIR%%/qwt6/qwt_arrow_button.h
+%%QT_INCDIR%%/qwt6/qwt_clipper.h
+%%QT_INCDIR%%/qwt6/qwt_color_map.h
+%%QT_INCDIR%%/qwt6/qwt_column_symbol.h
+%%QT_INCDIR%%/qwt6/qwt_compass.h
+%%QT_INCDIR%%/qwt6/qwt_compass_rose.h
+%%QT_INCDIR%%/qwt6/qwt_compat.h
+%%QT_INCDIR%%/qwt6/qwt_counter.h
+%%QT_INCDIR%%/qwt6/qwt_curve_fitter.h
+%%QT_INCDIR%%/qwt6/qwt_date.h
+%%QT_INCDIR%%/qwt6/qwt_date_scale_draw.h
+%%QT_INCDIR%%/qwt6/qwt_date_scale_engine.h
+%%QT_INCDIR%%/qwt6/qwt_dial.h
+%%QT_INCDIR%%/qwt6/qwt_dial_needle.h
+%%QT_INCDIR%%/qwt6/qwt_dyngrid_layout.h
+%%QT_INCDIR%%/qwt6/qwt_event_pattern.h
+%%QT_INCDIR%%/qwt6/qwt_global.h
+%%QT_INCDIR%%/qwt6/qwt_graphic.h
+%%QT_INCDIR%%/qwt6/qwt_interval.h
+%%QT_INCDIR%%/qwt6/qwt_interval_symbol.h
+%%QT_INCDIR%%/qwt6/qwt_knob.h
+%%QT_INCDIR%%/qwt6/qwt_legend.h
+%%QT_INCDIR%%/qwt6/qwt_legend_data.h
+%%QT_INCDIR%%/qwt6/qwt_legend_label.h
+%%QT_INCDIR%%/qwt6/qwt_magnifier.h
+%%QT_INCDIR%%/qwt6/qwt_math.h
+%%QT_INCDIR%%/qwt6/qwt_mathml_text_engine.h
+%%QT_INCDIR%%/qwt6/qwt_matrix_raster_data.h
+%%QT_INCDIR%%/qwt6/qwt_null_paintdevice.h
+%%QT_INCDIR%%/qwt6/qwt_painter.h
+%%QT_INCDIR%%/qwt6/qwt_painter_command.h
+%%QT_INCDIR%%/qwt6/qwt_panner.h
+%%QT_INCDIR%%/qwt6/qwt_picker.h
+%%QT_INCDIR%%/qwt6/qwt_picker_machine.h
+%%QT_INCDIR%%/qwt6/qwt_pixel_matrix.h
+%%QT_INCDIR%%/qwt6/qwt_plot.h
+%%QT_INCDIR%%/qwt6/qwt_plot_abstract_barchart.h
+%%QT_INCDIR%%/qwt6/qwt_plot_barchart.h
+%%QT_INCDIR%%/qwt6/qwt_plot_canvas.h
+%%QT_INCDIR%%/qwt6/qwt_plot_curve.h
+%%QT_INCDIR%%/qwt6/qwt_plot_dict.h
+%%QT_INCDIR%%/qwt6/qwt_plot_directpainter.h
+%%QT_INCDIR%%/qwt6/qwt_plot_glcanvas.h
+%%QT_INCDIR%%/qwt6/qwt_plot_grid.h
+%%QT_INCDIR%%/qwt6/qwt_plot_histogram.h
+%%QT_INCDIR%%/qwt6/qwt_plot_intervalcurve.h
+%%QT_INCDIR%%/qwt6/qwt_plot_item.h
+%%QT_INCDIR%%/qwt6/qwt_plot_layout.h
+%%QT_INCDIR%%/qwt6/qwt_plot_legenditem.h
+%%QT_INCDIR%%/qwt6/qwt_plot_magnifier.h
+%%QT_INCDIR%%/qwt6/qwt_plot_marker.h
+%%QT_INCDIR%%/qwt6/qwt_plot_multi_barchart.h
+%%QT_INCDIR%%/qwt6/qwt_plot_panner.h
+%%QT_INCDIR%%/qwt6/qwt_plot_picker.h
+%%QT_INCDIR%%/qwt6/qwt_plot_rasteritem.h
+%%QT_INCDIR%%/qwt6/qwt_plot_renderer.h
+%%QT_INCDIR%%/qwt6/qwt_plot_rescaler.h
+%%QT_INCDIR%%/qwt6/qwt_plot_scaleitem.h
+%%QT_INCDIR%%/qwt6/qwt_plot_seriesitem.h
+%%QT_INCDIR%%/qwt6/qwt_plot_shapeitem.h
+%%QT_INCDIR%%/qwt6/qwt_plot_spectrocurve.h
+%%QT_INCDIR%%/qwt6/qwt_plot_spectrogram.h
+%%QT_INCDIR%%/qwt6/qwt_plot_svgitem.h
+%%QT_INCDIR%%/qwt6/qwt_plot_textlabel.h
+%%QT_INCDIR%%/qwt6/qwt_plot_tradingcurve.h
+%%QT_INCDIR%%/qwt6/qwt_plot_zoneitem.h
+%%QT_INCDIR%%/qwt6/qwt_plot_zoomer.h
+%%QT_INCDIR%%/qwt6/qwt_point_3d.h
+%%QT_INCDIR%%/qwt6/qwt_point_data.h
+%%QT_INCDIR%%/qwt6/qwt_point_mapper.h
+%%QT_INCDIR%%/qwt6/qwt_point_polar.h
+%%QT_INCDIR%%/qwt6/qwt_raster_data.h
+%%QT_INCDIR%%/qwt6/qwt_round_scale_draw.h
+%%QT_INCDIR%%/qwt6/qwt_samples.h
+%%QT_INCDIR%%/qwt6/qwt_sampling_thread.h
+%%QT_INCDIR%%/qwt6/qwt_scale_div.h
+%%QT_INCDIR%%/qwt6/qwt_scale_draw.h
+%%QT_INCDIR%%/qwt6/qwt_scale_engine.h
+%%QT_INCDIR%%/qwt6/qwt_scale_map.h
+%%QT_INCDIR%%/qwt6/qwt_scale_widget.h
+%%QT_INCDIR%%/qwt6/qwt_series_data.h
+%%QT_INCDIR%%/qwt6/qwt_series_store.h
+%%QT_INCDIR%%/qwt6/qwt_slider.h
+%%QT_INCDIR%%/qwt6/qwt_spline.h
+%%QT_INCDIR%%/qwt6/qwt_symbol.h
+%%QT_INCDIR%%/qwt6/qwt_system_clock.h
+%%QT_INCDIR%%/qwt6/qwt_text.h
+%%QT_INCDIR%%/qwt6/qwt_text_engine.h
+%%QT_INCDIR%%/qwt6/qwt_text_label.h
+%%QT_INCDIR%%/qwt6/qwt_thermo.h
+%%QT_INCDIR%%/qwt6/qwt_transform.h
+%%QT_INCDIR%%/qwt6/qwt_wheel.h
+%%QT_INCDIR%%/qwt6/qwt_widget_overlay.h
+%%QT_LIBDIR%%/libqwt6.so
+%%QT_LIBDIR%%/libqwt6.so.6
+%%QT_LIBDIR%%/libqwt6.so.%%SHLIB_SHVER%%
+%%QT_LIBDIR%%/libqwt6.so.%%SHLIB_VER%%
+%%QT_LIBDIR%%/libqwtmathml.so
+%%QT_LIBDIR%%/libqwtmathml.so.6
+%%QT_LIBDIR%%/libqwtmathml.so.%%SHLIB_SHVER%%
+%%QT_LIBDIR%%/libqwtmathml.so.%%SHLIB_VER%%
 %%QT_MKSPECDIR%%/features/qwt.prf
 %%QT_MKSPECDIR%%/features/qwtconfig.pri
 %%QT_MKSPECDIR%%/features/qwtfunctions.pri
 %%QT_MKSPECDIR%%/features/qwtmathml.prf
+%%QT_PLUGINDIR%%/designer/libqwt6_designer_plugin.so
diff --git a/x11/leechcraft/Makefile b/x11/leechcraft/Makefile
index c06bb44b7133..ffc947a6c5e9 100644
--- a/x11/leechcraft/Makefile
+++ b/x11/leechcraft/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	leechcraft
 PORTVERSION=	0.6.70
-PORTREVISION=	30
+PORTREVISION=	31
 CATEGORIES=	x11
 MASTER_SITES=	http://dist.leechcraft.org/LeechCraft/0.6.70/
 
@@ -13,7 +13,7 @@ COMMENT=	Cross-platform modular live environment
 LICENSE=	BSL
 LICENSE_FILE=	${WRKDIR}/${DISTNAME}/LICENSE
 
-LIB_DEPENDS=	libqwt6.so:x11-toolkits/qwt6 \
+LIB_DEPENDS=	libqwt6.so:x11-toolkits/qwt6@qt4 \
 		libpcre.so:devel/pcre \
 		libboost_program_options.so:devel/boost-libs
 
@@ -406,6 +406,10 @@ BROKEN=		Lemon has not supported yet because depended by libnl
 BROKEN=		Otlozhu has not supported yet (not ported liblaretz)
 .endif
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|%%QT_INCDIR%%|${QT_INCDIR}|g' \
+                        -e 's|%%QT_LIBDIR%%|${QT_LIBDIR}|g' \
+                        ${WRKSRC}/cmake/FindQwt.cmake
 post-install:
 	@${FIND} -d ${STAGEDIR}${PREFIX}/include/leechcraft \
 		-type d -empty -exec ${RMDIR} {} \;
diff --git a/x11/leechcraft/files/patch-cmake_FindQwt.cmake b/x11/leechcraft/files/patch-cmake_FindQwt.cmake
new file mode 100644
index 000000000000..a21842fa077b
--- /dev/null
+++ b/x11/leechcraft/files/patch-cmake_FindQwt.cmake
@@ -0,0 +1,18 @@
+--- cmake/FindQwt.cmake.orig	2018-03-09 18:41:44 UTC
++++ cmake/FindQwt.cmake
+@@ -6,6 +6,7 @@
+ find_path (QWT_INCLUDE_DIRS
+ 	NAMES qwt_plot.h
+ 	PATHS
++	%%QT_INCDIR%%/qwt6
+ 	/usr/local/include/qwt-qt4
+ 	/usr/local/include/qwt6
+ 	/usr/local/include/qwt
+@@ -18,6 +19,7 @@ find_path (QWT_INCLUDE_DIRS
+ find_library (QWT_LIBRARIES
+ 	NAMES qwt-qt4 qwt6 qwt
+ 	PATHS
++	%%QT_LIBDIR%%
+ 	/usr/local/lib
+ 	/usr/lib
+ 	/usr/local/lib/qwt.framework