From owner-svn-ports-all@freebsd.org Mon Mar 12 18:21:10 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 93289F3309A; Mon, 12 Mar 2018 18:21:10 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 43EE36A003; Mon, 12 Mar 2018 18:21:10 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3EE6E7477; Mon, 12 Mar 2018 18:21:10 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2CILAYr031131; Mon, 12 Mar 2018 18:21:10 GMT (envelope-from tcberner@FreeBSD.org) Received: (from tcberner@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2CIL9iP031126; Mon, 12 Mar 2018 18:21:09 GMT (envelope-from tcberner@FreeBSD.org) Message-Id: <201803121821.w2CIL9iP031126@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tcberner set sender to tcberner@FreeBSD.org using -f From: "Tobias C. Berner" Date: Mon, 12 Mar 2018 18:21:09 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r464268 - in head: . deskutils/owncloudclient mail/trojita security security/qtkeychain security/qtkeychain-qt4 security/qtkeychain-qt5 X-SVN-Group: ports-head X-SVN-Commit-Author: tcberner X-SVN-Commit-Paths: in head: . deskutils/owncloudclient mail/trojita security security/qtkeychain security/qtkeychain-qt4 security/qtkeychain-qt5 X-SVN-Commit-Revision: 464268 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 12 Mar 2018 18:21:10 -0000 Author: tcberner Date: Mon Mar 12 18:21:09 2018 New Revision: 464268 URL: https://svnweb.freebsd.org/changeset/ports/464268 Log: Move security/qtkeychain-qt[45] to security/qtkeychain and create flavors Reviewed by: Gleb Popov <6yearold_gmail.com> Approved by: portmgr (mat) Added: head/security/qtkeychain/ - copied from r464267, head/security/qtkeychain-qt5/ Deleted: head/security/qtkeychain-qt4/ head/security/qtkeychain-qt5/ Modified: head/MOVED head/deskutils/owncloudclient/Makefile head/mail/trojita/Makefile head/security/Makefile head/security/qtkeychain/Makefile Modified: head/MOVED ============================================================================== --- head/MOVED Mon Mar 12 18:19:29 2018 (r464267) +++ head/MOVED Mon Mar 12 18:21:09 2018 (r464268) @@ -7523,7 +7523,6 @@ net-mgmt/glpi-plugins-tracker-server|net-mgmt/glpi-plu 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- 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 Modified: head/deskutils/owncloudclient/Makefile ============================================================================== --- head/deskutils/owncloudclient/Makefile Mon Mar 12 18:19:29 2018 (r464267) +++ head/deskutils/owncloudclient/Makefile Mon Mar 12 18:21:09 2018 (r464268) @@ -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 Modified: head/mail/trojita/Makefile ============================================================================== --- head/mail/trojita/Makefile Mon Mar 12 18:19:29 2018 (r464267) +++ head/mail/trojita/Makefile Mon Mar 12 18:21:09 2018 (r464268) @@ -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 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 Modified: head/security/Makefile ============================================================================== --- head/security/Makefile Mon Mar 12 18:19:29 2018 (r464267) +++ head/security/Makefile Mon Mar 12 18:21:09 2018 (r464268) @@ -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 Modified: head/security/qtkeychain/Makefile ============================================================================== --- head/security/qtkeychain-qt5/Makefile Mon Mar 12 18:19:29 2018 (r464267) +++ head/security/qtkeychain/Makefile Mon Mar 12 18:21:09 2018 (r464268) @@ -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 passw 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