3 files changed, 59 insertions, 9 deletions
diff --git a/x11/qt5-qev/Makefile b/x11/qt5-qev/Makefile
index 973be4d3cfde..dfd1eb0ba620 100644
--- a/x11/qt5-qev/Makefile
+++ b/x11/qt5-qev/Makefile
@@ -11,15 +11,6 @@ COMMENT=	Qt QWidget events introspection tool
 USES=		compiler:c++11-lang qmake qt-dist:5,tools
 USE_QT=		core widgets
 
-WRKSRC_SUBDIR=	src/${PORTNAME}
-
 QT_BINARIES=	yes
 
-# qev is not connected to qttool's build system, so we cannot just run qmake qt-dist:5,tools
-# and set {BUILD,INSTALL}_WRKSRC.
-# Instead, we run qmake qt-dist:5,tools from src/${PORTNAME} but need to copy .qmake qt-dist:5,tools.conf to
-# it for all required variables to be set (MODULE_VERSION etc).
-post-patch:
-	${CP} ${WRKSRC}/../../.qmake.conf ${WRKSRC}
-
 .include <bsd.port.mk>
diff --git a/x11/qt5-qev/files/patch-src_src.pro b/x11/qt5-qev/files/patch-src_src.pro
new file mode 100644
index 000000000000..50751bb518e9
--- /dev/null
+++ b/x11/qt5-qev/files/patch-src_src.pro
@@ -0,0 +1,58 @@
+--- src/src.pro.orig	2020-04-12 19:54:33 UTC
++++ src/src.pro
+@@ -1,54 +1,3 @@
+ TEMPLATE = subdirs
+ 
+-qtHaveModule(widgets) {
+-    no-png {
+-        message("Some graphics-related tools are unavailable without PNG support")
+-    } else {
+-        QT_FOR_CONFIG += widgets
+-        qtConfig(pushbutton):qtConfig(toolbutton) {
+-            SUBDIRS = assistant \
+-                      designer \
+-                      pixeltool
+-
+-            linguist.depends = designer
+-        }
+-        qtHaveModule(quick):qtConfig(thread):qtConfig(toolbutton): SUBDIRS += distancefieldgenerator
+-    }
+-}
+-
+-SUBDIRS += linguist \
+-    qtattributionsscanner
+-
+-qtConfig(library) {
+-    !android|android_app: SUBDIRS += qtplugininfo
+-}
+-
+-include($$OUT_PWD/qdoc/qtqdoc-config.pri)
+-QT_FOR_CONFIG += qdoc-private
+-qtConfig(qdoc): qtConfig(thread): SUBDIRS += qdoc
+-
+-!android|android_app: SUBDIRS += qtpaths
+-
+-macos {
+-    SUBDIRS += macdeployqt
+-}
+-
+-qtHaveModule(dbus): SUBDIRS += qdbus
+-
+-win32|winrt:SUBDIRS += windeployqt
+-winrt:SUBDIRS += winrtrunner
+-qtHaveModule(gui):!wasm:!android:!uikit:!qnx:!winrt: SUBDIRS += qtdiag
+-
+-qtNomakeTools( \
+-    distancefieldgenerator \
+-    pixeltool \
+-)
+-
+-# This is necessary to avoid a race condition between toolchain.prf
+-# invocations in a module-by-module cross-build.
+-cross_compile:isEmpty(QMAKE_HOST_CXX.INCDIRS) {
+-    qdoc.depends += qtattributionsscanner
+-    windeployqt.depends += qtattributionsscanner
+-    winrtrunner.depends += qtattributionsscanner
+-    linguist.depends += qtattributionsscanner
+-}
++SUBDIRS = qev
diff --git a/x11/qt5-qev/pkg-plist b/x11/qt5-qev/pkg-plist
index 122603d1a0d0..1b3e89084109 100644
--- a/x11/qt5-qev/pkg-plist
+++ b/x11/qt5-qev/pkg-plist
@@ -1 +1,2 @@
 %%QT_BINDIR%%/qev
+%%DEBUG%%%%QT_BINDIR%%/qev.debug