From owner-svn-ports-head@freebsd.org Tue Aug 1 18:07:47 2017 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1B790DB5ACB; Tue, 1 Aug 2017 18:07:47 +0000 (UTC) (envelope-from rakuco@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 mx1.freebsd.org (Postfix) with ESMTPS id E919C3E8E; Tue, 1 Aug 2017 18:07:46 +0000 (UTC) (envelope-from rakuco@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v71I7kPM064241; Tue, 1 Aug 2017 18:07:46 GMT (envelope-from rakuco@FreeBSD.org) Received: (from rakuco@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v71I7jgI064237; Tue, 1 Aug 2017 18:07:45 GMT (envelope-from rakuco@FreeBSD.org) Message-Id: <201708011807.v71I7jgI064237@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rakuco set sender to rakuco@FreeBSD.org using -f From: Raphael Kubo da Costa Date: Tue, 1 Aug 2017 18:07:45 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r447066 - in head/security/qtkeychain-qt5: . files X-SVN-Group: ports-head X-SVN-Commit-Author: rakuco X-SVN-Commit-Paths: in head/security/qtkeychain-qt5: . files X-SVN-Commit-Revision: 447066 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Aug 2017 18:07:47 -0000 Author: rakuco Date: Tue Aug 1 18:07:45 2017 New Revision: 447066 URL: https://svnweb.freebsd.org/changeset/ports/447066 Log: Update to 0.8.0. PR: 218772 Submitted by: arrowd <6yearold@gmail.com> (maintainer) Added: head/security/qtkeychain-qt5/files/ head/security/qtkeychain-qt5/files/patch-CMakeLists.txt (contents, props changed) Modified: head/security/qtkeychain-qt5/Makefile head/security/qtkeychain-qt5/distinfo head/security/qtkeychain-qt5/pkg-plist.qt5 Modified: head/security/qtkeychain-qt5/Makefile ============================================================================== --- head/security/qtkeychain-qt5/Makefile Tue Aug 1 18:03:52 2017 (r447065) +++ head/security/qtkeychain-qt5/Makefile Tue Aug 1 18:07:45 2017 (r447066) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= qtkeychain -PORTVERSION= 0.7.0 +PORTVERSION= 0.8.0 DISTVERSIONPREFIX= v CATEGORIES= security PKGNAMESUFFIX?= -qt5 @@ -17,16 +17,15 @@ 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 Modified: head/security/qtkeychain-qt5/distinfo ============================================================================== --- head/security/qtkeychain-qt5/distinfo Tue Aug 1 18:03:52 2017 (r447065) +++ head/security/qtkeychain-qt5/distinfo Tue Aug 1 18:07:45 2017 (r447066) @@ -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 Added: head/security/qtkeychain-qt5/files/patch-CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/qtkeychain-qt5/files/patch-CMakeLists.txt Tue Aug 1 18:07:45 2017 (r447066) @@ -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" Modified: head/security/qtkeychain-qt5/pkg-plist.qt5 ============================================================================== --- head/security/qtkeychain-qt5/pkg-plist.qt5 Tue Aug 1 18:03:52 2017 (r447065) +++ head/security/qtkeychain-qt5/pkg-plist.qt5 Tue Aug 1 18:07:45 2017 (r447066) @@ -1,5 +1,6 @@ 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