Index: MOVED =================================================================== --- MOVED +++ MOVED @@ -7523,7 +7523,6 @@ 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 @@ -10197,3 +10196,5 @@ 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 +security/qtkeychain-qt4|security/qtkeychain@qt4|2018-03-11|Moved to a flavoured version +security/qtkeychain-qt5|security/qtkeychain@qt5|2018-03-11|Moved to a flavoured version Index: deskutils/owncloudclient/Makefile =================================================================== --- deskutils/owncloudclient/Makefile +++ 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 @@ 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 Index: mail/trojita/Makefile =================================================================== --- mail/trojita/Makefile +++ 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 @@ 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 Index: security/Makefile =================================================================== --- security/Makefile +++ 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 Index: security/qtkeychain-qt4/Makefile =================================================================== --- security/qtkeychain-qt4/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -# $FreeBSD$ - -PKGNAMESUFFIX= -qt4 - -MASTERDIR= ${.CURDIR}/../qtkeychain-qt5 - -.include "${MASTERDIR}/Makefile" Index: security/qtkeychain-qt5/Makefile =================================================================== --- security/qtkeychain-qt5/Makefile +++ /dev/null @@ -1,34 +0,0 @@ -# $FreeBSD$ - -PORTNAME= qtkeychain -PORTVERSION= 0.8.0 -DISTVERSIONPREFIX= v -CATEGORIES= security -PKGNAMESUFFIX?= -qt5 - -MAINTAINER= 6yearold@gmail.com -COMMENT= Platform independent Qt API for storing passwords - -LICENSE= BSD2CLAUSE -LICENSE_FILE= ${WRKSRC}/COPYING - -USE_GITHUB= yes -GH_ACCOUNT= frankosterfeld - -USES= cmake -USE_LDCONFIG= yes -USE_KDE= ecm -PLIST_SUB+= VERSION=${PORTVERSION} - -.if defined(PKGNAMESUFFIX) && ${PKGNAMESUFFIX} == "-qt4" -CMAKE_ARGS+= -DBUILD_WITH_QT4=YES -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 -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 - -.include Index: security/qtkeychain-qt5/distinfo =================================================================== --- security/qtkeychain-qt5/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1492678876 -SHA256 (frankosterfeld-qtkeychain-v0.8.0_GH0.tar.gz) = b492f603197538bc04b2714105b1ab2b327a9a98d400d53d9a7cb70edd2db12f -SIZE (frankosterfeld-qtkeychain-v0.8.0_GH0.tar.gz) = 34686 Index: security/qtkeychain-qt5/files/patch-CMakeLists.txt =================================================================== --- security/qtkeychain-qt5/files/patch-CMakeLists.txt +++ /dev/null @@ -1,23 +0,0 @@ ---- CMakeLists.txt.orig 2017-04-19 13:09:34 UTC -+++ CMakeLists.txt -@@ -38,7 +38,7 @@ if( NOT BUILD_WITH_QT4 ) - find_package(Qt5Core QUIET) - endif() - --if (Qt5Core_FOUND) -+if (NOT BUILD_WITH_QT4) - set(QTKEYCHAIN_VERSION_INFIX 5) - - if(UNIX AND NOT APPLE AND NOT ANDROID) -@@ -249,8 +249,9 @@ ecm_generate_pri_file(BASE_NAME Qt${QTKE - INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_INCLUDEDIR} - FILENAME_VAR pri_filename) - --install(FILES ${pri_filename} DESTINATION ${ECM_MKSPECS_INSTALL_DIR}) -- -+if( NOT BUILD_WITH_QT4 ) -+ install(FILES ${pri_filename} DESTINATION ${ECM_MKSPECS_INSTALL_DIR}) -+endif() - - install(EXPORT Qt${QTKEYCHAIN_VERSION_INFIX}KeychainLibraryDepends - DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/Qt${QTKEYCHAIN_VERSION_INFIX}Keychain" Index: security/qtkeychain-qt5/pkg-descr =================================================================== --- security/qtkeychain-qt5/pkg-descr +++ /dev/null @@ -1,7 +0,0 @@ -QtKeychain is a Qt API to store passwords and other secret data securely. How -the data is stored depends on the platform. -For Linux/Unix, KWallet (via D-Bus) is used. Support for the GNOME Keyring -via freedesktop.org's Secret Storage D-Bus specification is planned -but not yet implemented. - -WWW: https://github.com/frankosterfeld/qtkeychain Index: security/qtkeychain-qt5/pkg-plist.qt4 =================================================================== --- security/qtkeychain-qt5/pkg-plist.qt4 +++ /dev/null @@ -1,11 +0,0 @@ -include/qtkeychain/keychain.h -include/qtkeychain/qkeychain_export.h -lib/cmake/QtKeychain/QtKeychainConfig.cmake -lib/cmake/QtKeychain/QtKeychainConfigVersion.cmake -lib/cmake/QtKeychain/QtKeychainLibraryDepends-%%CMAKE_BUILD_TYPE%%.cmake -lib/cmake/QtKeychain/QtKeychainLibraryDepends.cmake -lib/libqtkeychain.so -lib/libqtkeychain.so.%%VERSION%% -lib/libqtkeychain.so.1 -%%QT_L10NDIR%%/qtkeychain_de.qm -%%QT_L10NDIR%%/qtkeychain_ro.qm Index: security/qtkeychain-qt5/pkg-plist.qt5 =================================================================== --- security/qtkeychain-qt5/pkg-plist.qt5 +++ /dev/null @@ -1,12 +0,0 @@ -include/qt5keychain/keychain.h -include/qt5keychain/qkeychain_export.h -%%QT_MKSPECDIR%%/modules/qt_Qt5Keychain.pri -lib/cmake/Qt5Keychain/Qt5KeychainConfig.cmake -lib/cmake/Qt5Keychain/Qt5KeychainConfigVersion.cmake -lib/cmake/Qt5Keychain/Qt5KeychainLibraryDepends-%%CMAKE_BUILD_TYPE%%.cmake -lib/cmake/Qt5Keychain/Qt5KeychainLibraryDepends.cmake -lib/libqt5keychain.so -lib/libqt5keychain.so.%%VERSION%% -lib/libqt5keychain.so.1 -%%QT_L10NDIR%%/qtkeychain_de.qm -%%QT_L10NDIR%%/qtkeychain_ro.qm Index: security/qtkeychain/Makefile =================================================================== --- security/qtkeychain/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,25 @@ 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 +. 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 +. endif + +${FLAVOR}_PLIST= ${PKGDIR}/pkg-plist.${FLAVOR} .include