Move security/qtkeychain-qt[45] to security/qtkeychain and create flavors

Reviewed by:	Gleb Popov <6yearold_gmail.com>
Approved by:	portmgr (mat)

MOVED

@@ -7523,7 +7523,6 @@ net-mgmt/glpi-plugins-tracker-server|net-mgmt/glpi-plugins-fusioninventory-serve
 science/rubygem-netcdf|science/rubygem-ruby-netcdf|2015-05-24|Rename to match our rubygem- port naming
 security/rubygem-rc4|security/rubygem-ruby-rc4|2015-05-24|Rename to match our rubygem- port naming
 print/rubygem-colortools|print/rubygem-color-tools|2015-05-24|Rename to match our rubygem- port naming
-security/qtkeychain|security/qtkeychain-qt5|2015-05-24|Renamed to indicate supported QT version
 www/rubygem-layout-yullio|www/rubygem-layout_yullio_generator|2015-05-27|Rename to match our rubygem- port naming
 net/rubygem-rightaws|net/rubygem-right_aws|2015-05-27|Rename to match our rubygem- port naming
 net/rubygem-rightflexiscale|net/rubygem-right_flexiscale|2015-05-27|Rename to match our rubygem- port naming
@@ -10198,3 +10197,5 @@ databases/php-memcached|databases/pecl-memcached|2018-03-10|Remove duplicate por
 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
 devel/go-json-rest||2018-03-11|Go libraries aren't allowed (GH/ant0ine/go-json-rest)
+security/qtkeychain-qt4|security/qtkeychain@qt4|2018-03-12|Moved to a flavoured version
+security/qtkeychain-qt5|security/qtkeychain@qt5|2018-03-12|Moved to a flavoured version

deskutils/owncloudclient/Makefile

@@ -4,6 +4,7 @@
 PORTNAME=	owncloudclient
 PORTVERSION=	2.4.0
 DISTVERSIONPREFIX=	v
+PORTREVISION=	1
 CATEGORIES=	deskutils
 
 MAINTAINER=	yonas@fizk.net
@@ -12,7 +13,7 @@ COMMENT=	OwnCloud Desktop Syncing Client
 LICENSE=	GPLv2
 
 LIB_DEPENDS=	libinotify.so:devel/libinotify \
-		libqt5keychain.so:security/qtkeychain-qt5
+		libqt5keychain.so:security/qtkeychain@qt5
 
 USES=		cmake:outsource,noninja compiler:c++11-lib gmake iconv \
 		localbase:ldflags pkgconfig sqlite ssl

mail/trojita/Makefile

@@ -3,7 +3,7 @@
 
 PORTNAME=	trojita
 PORTVERSION=	0.7
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	mail
 MASTER_SITES=	SF/${PORTNAME}/src/
 
@@ -13,7 +13,7 @@ COMMENT=	Fast cross-platform IMAP e-mail client using Qt 5 toolkit
 LICENSE=	GPLv2 GPLv3
 LICENSE_COMB=	dual
 
-LIB_DEPENDS=	libqt5keychain.so:security/qtkeychain-qt5
+LIB_DEPENDS=	libqt5keychain.so:security/qtkeychain@qt5
 
 CONFLICTS_INSTALL=	trojita-qt4-[0-9]*
 INSTALLS_ICONS=	yes

security/Makefile

@@ -1026,8 +1026,7 @@
     SUBDIR += py-zope.securitypolicy
     SUBDIR += py-zope.session
     SUBDIR += py-zxcvbn-python
-    SUBDIR += qtkeychain-qt4
-    SUBDIR += qtkeychain-qt5
+    SUBDIR += qtkeychain
     SUBDIR += quantis
     SUBDIR += quantis-kmod
     SUBDIR += racoon2

security/qtkeychain-qt4/Makefile

@@ -1,7 +0,0 @@
-# $FreeBSD$
-
-PKGNAMESUFFIX=	-qt4
-
-MASTERDIR=	${.CURDIR}/../qtkeychain-qt5
-
-.include "${MASTERDIR}/Makefile"

security/qtkeychain/Makefile

@@ -1,10 +1,11 @@
 # $FreeBSD$
 
 PORTNAME=	qtkeychain
-PORTVERSION=	0.8.0
 DISTVERSIONPREFIX=	v
+DISTVERSION=	0.8.0
+PORTREVISION=	1
 CATEGORIES=	security
-PKGNAMESUFFIX?=	-qt5
+PKGNAMESUFFIX=	-${FLAVOR}
 
 MAINTAINER=	6yearold@gmail.com
 COMMENT=	Platform independent Qt API for storing passwords
@@ -12,23 +13,26 @@ COMMENT=	Platform independent Qt API for storing passwords
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USE_GITHUB=	yes
-GH_ACCOUNT=	frankosterfeld
+FLAVORS=	qt4 qt5
+FLAVOR?=	${FLAVORS:[1]}
 
 USES=		cmake
+USE_GITHUB=	yes
+GH_ACCOUNT=	frankosterfeld
 USE_LDCONFIG=	yes
 USE_KDE=	ecm
 PLIST_SUB+=	VERSION=${PORTVERSION}
 
-.if defined(PKGNAMESUFFIX) && ${PKGNAMESUFFIX} == "-qt4"
-CMAKE_ARGS+=	-DBUILD_WITH_QT4=YES
+.  if ${FLAVOR} == qt4
+CMAKE_ON=	BUILD_WITH_QT4
 USE_QT4=	corelib dbus linguisttools_build moc_build rcc_build qmake_build
-PLIST=		${PKGDIR}/pkg-plist.qt4
 PLIST_SUB+=	PLIST_QT_PREFIX_UPCASE=Qt PLIST_QT_PREFIX=qt
-.else
+PLIST=		${PKGDIR}/pkg-plist.${FLAVOR}
+.  else
 USE_QT5=	core dbus linguisttools_build buildtools_build qmake_build
-PLIST=		${PKGDIR}/pkg-plist.qt5
 PLIST_SUB+=	PLIST_QT_PREFIX_UPCASE=Qt5 PLIST_QT_PREFIX=qt5
-.endif
+PLIST=		${PKGDIR}/pkg-plist.${FLAVOR}
+.  endif
+
 
 .include <bsd.port.mk>