Index: head/MOVED
===================================================================
--- head/MOVED
+++ head/MOVED
@@ -10196,3 +10196,4 @@
 www/lionwiki||2018-03-08|Has expired: Unmaintained, all www files wrongly belongs to www user
 databases/php-memcached|databases/pecl-memcached|2018-03-10|Remove duplicate port, use databases/pecl-memcached instead
 emulators/i386-wine-staging|emulators/i386-wine-devel|2018-03-10|Broken for months, abandoned upstream
+archivers/quazip-qt5|archivers/quazip@qt5|2018-03-11|Moved to a flavoured version
Index: head/archivers/Makefile
===================================================================
--- head/archivers/Makefile
+++ head/archivers/Makefile
@@ -196,7 +196,6 @@
     SUBDIR += py-zstd
     SUBDIR += qpress
     SUBDIR += quazip
-    SUBDIR += quazip-qt5
     SUBDIR += rar
     SUBDIR += rox-archive
     SUBDIR += rpm2cpio
Index: head/archivers/quazip-qt5/Makefile
===================================================================
--- head/archivers/quazip-qt5/Makefile
+++ head/archivers/quazip-qt5/Makefile
@@ -1,9 +0,0 @@
-# $FreeBSD$
-
-PORTNAME=	quazip
-PORTREVISION=	0
-PKGNAMESUFFIX=	-qt5
-
-MASTERDIR=	${.CURDIR:H}/quazip
-
-.include "${MASTERDIR}/Makefile"
Index: head/archivers/quazip/Makefile
===================================================================
--- head/archivers/quazip/Makefile
+++ head/archivers/quazip/Makefile
@@ -2,20 +2,24 @@
 # $FreeBSD$
 
 PORTNAME=	quazip
-PORTVERSION=	0.7.3
-PORTREVISION?=	0
+DISTVERSION=	0.7.3
+PORTREVISION=	1
 CATEGORIES=	archivers
 MASTER_SITES=	SF
+PKGNAMESUFFIX=	-${FLAVOR}
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Qt/C++ wrapper for ZIP/UNZIP package
 
 LICENSE=	LGPL21
 
+FLAVORS=	qt4 qt5
+FLAVOR?=	${FLAVORS:[1]}
+
 USES=		cmake:outsource
 USE_LDCONFIG=	yes
 
-.  if empty(PKGNAMESUFFIX)
+.  if ${FLAVOR} == qt4
 USE_QT4=	corelib moc_build network_build qmake_build rcc_build uic_build
 CMAKE_ARGS=	-DBUILD_WITH_QT4:BOOL=TRUE
 .  else
Index: head/astro/marble-kde4/Makefile
===================================================================
--- head/astro/marble-kde4/Makefile
+++ head/astro/marble-kde4/Makefile
@@ -2,13 +2,13 @@
 
 PORTNAME=	marble
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	astro kde kde-kde4
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Virtual globe and world atlas for KDE
 
-LIB_DEPENDS=	libquazip.so:archivers/quazip
+LIB_DEPENDS=	libquazip.so:archivers/quazip@qt4
 
 USES=		cmake:outsource kde:4 shared-mime-info tar:xz
 USE_KDE=	kdelibs automoc4
Index: head/astro/merkaartor/Makefile
===================================================================
--- head/astro/merkaartor/Makefile
+++ head/astro/merkaartor/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	merkaartor
 PORTVERSION=	0.18.2
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	astro
 
 MAINTAINER=	dev2@heesakkers.info
@@ -14,7 +14,7 @@
 
 LIB_DEPENDS=	libgdal.so:graphics/gdal \
 		libproj.so:graphics/proj \
-		libquazip5.so:archivers/quazip-qt5
+		libquazip5.so:archivers/quazip@qt5
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	openstreetmap
Index: head/astro/qmapshack/Makefile
===================================================================
--- head/astro/qmapshack/Makefile
+++ head/astro/qmapshack/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	qmapshack
 PORTVERSION=	1.10.0
+PORTREVISION=	1
 CATEGORIES=	astro
 MASTER_SITES=	https://bitbucket.org/maproom/qmapshack/downloads/
 
@@ -14,7 +15,7 @@
 
 LIB_DEPENDS=	libgdal.so:graphics/gdal \
 		libproj.so:graphics/proj \
-		libquazip5.so:archivers/quazip-qt5 \
+		libquazip5.so:archivers/quazip@qt5 \
 		libroutino.so:astro/routino
 RUN_DEPENDS=	${LOCALBASE}/bin/bsdisks:sysutils/bsdisks
 
Index: head/cad/qcad/Makefile
===================================================================
--- head/cad/qcad/Makefile
+++ head/cad/qcad/Makefile
@@ -4,6 +4,7 @@
 PORTNAME=	qcad
 PORTVERSION=	3.19.0.0
 DISTVERSIONPREFIX=	v
+PORTREVISION=	1
 #PORTREVISION=	1
 CATEGORIES=	cad
 DIST_SUBDIR=	${PORTNAME}
@@ -15,7 +16,7 @@
 
 BUILD_DEPENDS=	bash:shells/bash	\
 		${LOCALBASE}/lib/libopenNURBS.a:graphics/opennurbs
-LIB_DEPENDS=	libquazip.so:archivers/quazip
+LIB_DEPENDS=	libquazip.so:archivers/quazip@qt4
 
 MAKE_JOBS_UNSAFE=yes
 
Index: head/editors/texstudio/Makefile
===================================================================
--- head/editors/texstudio/Makefile
+++ head/editors/texstudio/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	texstudio
 PORTVERSION=	2.11.0
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	editors
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/TeXstudio%20${PORTVERSION}
 
@@ -39,12 +39,12 @@
 TOOLKIT_DESC=	Qt toolkit
 QT4_USE=	${_USE_QT4:S/^/QT4=/}
 QT4_LIB_DEPENDS=libpoppler-qt4.so:graphics/poppler-qt4 \
-		libquazip.so:archivers/quazip
+		libquazip.so:archivers/quazip@qt4
 QT4_QMAKE_ON=	QUAZIP_INCLUDE="${LOCALBASE}/include/quazip" \
 		QUAZIP_LIB="-lquazip"
 QT5_USE=	${_USE_QT5:S/^/QT5=/}
 QT5_LIB_DEPENDS=libpoppler-qt5.so:graphics/poppler-qt5 \
-		libquazip5.so:archivers/quazip-qt5
+		libquazip5.so:archivers/quazip@qt5
 QT5_QMAKE_ON=	QUAZIP_INCLUDE="${LOCALBASE}/include/quazip5" \
 		QUAZIP_LIB="-lquazip5"
 
Index: head/emulators/mupen64plus-qt/Makefile
===================================================================
--- head/emulators/mupen64plus-qt/Makefile
+++ head/emulators/mupen64plus-qt/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	mupen64plus-qt
 PORTVERSION=	1.10
+PORTREVISION=	1
 CATEGORIES=	emulators
 
 MAINTAINER=	maintainer@hasting.email
@@ -13,7 +14,7 @@
 DEPRECATED=	Broken for more than 6 months
 EXPIRATION_DATE=	2018-05-19
 
-LIB_DEPENDS=	libquazip.so:archivers/quazip
+LIB_DEPENDS=	libquazip.so:archivers/quazip@qt4
 RUN_DEPENDS=	mupen64plus:emulators/mupen64plus
 
 USES=		qmake
Index: head/graphics/tulip/Makefile
===================================================================
--- head/graphics/tulip/Makefile
+++ head/graphics/tulip/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	tulip
 PORTVERSION=	4.10.0
-PORTREVISION=	3
+PORTREVISION=	4
 DISTVERSIONSUFFIX=	_src
 CATEGORIES=	graphics
 MASTER_SITES=	SF/auber/${PORTNAME}/${PORTNAME}-${PORTVERSION}
@@ -13,7 +13,7 @@
 
 LICENSE=	LGPL3
 
-LIB_DEPENDS=	libquazip.so:archivers/quazip \
+LIB_DEPENDS=	libquazip.so:archivers/quazip@qt4 \
 		libpng.so:graphics/png \
 		libOGDF.so:math/ogdf \
 		libfreetype.so:print/freetype2