Index: cad/qcad/Makefile
===================================================================
--- cad/qcad/Makefile
+++ cad/qcad/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	qcad
 PORTVERSION=	3.21.3.15
 DISTVERSIONPREFIX=	v
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	cad
 DIST_SUBDIR=	${PORTNAME}
 
@@ -17,8 +17,6 @@
 		${LOCALBASE}/lib/libopenNURBS.a:graphics/opennurbs
 LIB_DEPENDS=	libquazip5.so:archivers/quazip@qt5
 
-MAKE_JOBS_UNSAFE=yes
-
 USES=		compiler:c++11-lang gmake qmake qt:5
 USE_GITHUB=	yes
 USE_LDCONFIG=	yes
@@ -35,8 +33,12 @@
 		true
 
 .if defined(WITH_DEBUG)
+ALL_TARGET=	debug
+PLIST_SUB+=	RELEASE="@comment "
 RESDIR=		${WRKSRC}/debug
 .else
+ALL_TARGET=	release
+PLIST_SUB+=	RELEASE=""
 RESDIR=		${WRKSRC}/release
 .endif
 
Index: cad/qcad/pkg-plist
===================================================================
--- cad/qcad/pkg-plist
+++ cad/qcad/pkg-plist
@@ -24,7 +24,6 @@
 lib/libspatialindexnavel.so
 lib/libspatialindexnavel.so.0
 lib/libstemmer.a
-share/applications/usr_local_bin_qcadbin.desktop
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/calibration.dxf
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/colors.dxf
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/entities.dxf
@@ -481,8 +480,8 @@
 %%DATADIR%%/patterns/metric/triang.pat
 %%DATADIR%%/patterns/metric/zigzag.pat
 %%DATADIR%%/plugins/codecs/readme.txt
-%%DATADIR%%/plugins/designer/libqcadcustomwidgets.so
-%%DATADIR%%/plugins/designer/libqcadcustomwidgets_debug.so
+%%RELEASE%%%%DATADIR%%/plugins/designer/libqcadcustomwidgets.so
+%%DEBUG%%%%DATADIR%%/plugins/designer/libqcadcustomwidgets_debug.so
 %%DATADIR%%/plugins/designer/readme.txt
 %%DATADIR%%/plugins/imageformats/libqgif.so
 %%DATADIR%%/plugins/imageformats/libqico.so
@@ -491,10 +490,10 @@
 %%DATADIR%%/plugins/imageformats/libqtga.so
 %%DATADIR%%/plugins/imageformats/libqtiff.so
 %%DATADIR%%/plugins/imageformats/readme.txt
-%%DATADIR%%/plugins/libqcaddxf.so
-%%DATADIR%%/plugins/libqcaddxf_debug.so
-%%DATADIR%%/plugins/libqcadscripts.so
-%%DATADIR%%/plugins/libqcadscripts_debug.so
+%%RELEASE%%%%DATADIR%%/plugins/libqcaddxf.so
+%%DEBUG%%%%DATADIR%%/plugins/libqcaddxf_debug.so
+%%RELEASE%%%%DATADIR%%/plugins/libqcadscripts.so
+%%DEBUG%%%%DATADIR%%/plugins/libqcadscripts_debug.so
 %%DATADIR%%/plugins/printsupport/libcupsprintersupport.so
 %%DATADIR%%/plugins/printsupport/readme.txt
 %%DATADIR%%/plugins/script/libqtscript_core.so