Index: head/security/qtkeychain-qt5/Makefile =================================================================== --- head/security/qtkeychain-qt5/Makefile (revision 447065) +++ head/security/qtkeychain-qt5/Makefile (revision 447066) @@ -1,35 +1,34 @@ # $FreeBSD$ PORTNAME= qtkeychain -PORTVERSION= 0.7.0 +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" -CONFLICTS_INSTALL= qtkeychain-qt5-[0-9]* 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 -CONFLICTS_INSTALL= qtkeychain-qt4-[0-9]* 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: head/security/qtkeychain-qt5/distinfo =================================================================== --- head/security/qtkeychain-qt5/distinfo (revision 447065) +++ head/security/qtkeychain-qt5/distinfo (revision 447066) @@ -1,3 +1,3 @@ -TIMESTAMP = 1469621401 -SHA256 (frankosterfeld-qtkeychain-v0.7.0_GH0.tar.gz) = 9f9afaae8e909391d7fc932bac95e38befaac5b2eb49f6623a8efec60a2e6a3a -SIZE (frankosterfeld-qtkeychain-v0.7.0_GH0.tar.gz) = 18913 +TIMESTAMP = 1492678876 +SHA256 (frankosterfeld-qtkeychain-v0.8.0_GH0.tar.gz) = b492f603197538bc04b2714105b1ab2b327a9a98d400d53d9a7cb70edd2db12f +SIZE (frankosterfeld-qtkeychain-v0.8.0_GH0.tar.gz) = 34686 Index: head/security/qtkeychain-qt5/files/patch-CMakeLists.txt =================================================================== --- head/security/qtkeychain-qt5/files/patch-CMakeLists.txt (nonexistent) +++ head/security/qtkeychain-qt5/files/patch-CMakeLists.txt (revision 447066) @@ -0,0 +1,23 @@ +--- 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" Property changes on: head/security/qtkeychain-qt5/files/patch-CMakeLists.txt ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/security/qtkeychain-qt5/pkg-plist.qt5 =================================================================== --- head/security/qtkeychain-qt5/pkg-plist.qt5 (revision 447065) +++ head/security/qtkeychain-qt5/pkg-plist.qt5 (revision 447066) @@ -1,11 +1,12 @@ 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