Date: Sun, 24 May 2015 21:03:19 +0000 (UTC) From: Guido Falsi <madpilot@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r387341 - in head: . deskutils/owncloudclient security security/qtkeychain security/qtkeychain-qt4 security/qtkeychain-qt5 security/qtkeychain-qt5/files Message-ID: <201505242103.t4OL3JmP038721@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: madpilot Date: Sun May 24 21:03:19 2015 New Revision: 387341 URL: https://svnweb.freebsd.org/changeset/ports/387341 Log: - Rename security/qtkeychain to qtkeychain-qt5, update to 0.5.0 and make it use Qt5 - Add slave port qtkeychain-qt4 - Make deskutils/owncloudclient link against qtkeychain-qt5 - Update owncloudclient comment and pkg-descr PR: 198785 Submitted by: 6yearold at gmail.com (security/qtkeychain maintainer) Added: head/security/qtkeychain-qt4/ head/security/qtkeychain-qt4/Makefile (contents, props changed) head/security/qtkeychain-qt5/ - copied from r387340, head/security/qtkeychain/ head/security/qtkeychain-qt5/pkg-plist.qt4 (contents, props changed) head/security/qtkeychain-qt5/pkg-plist.qt5 - copied, changed from r387340, head/security/qtkeychain/pkg-plist Deleted: head/security/qtkeychain/ head/security/qtkeychain-qt5/files/ head/security/qtkeychain-qt5/pkg-plist Modified: head/MOVED head/deskutils/owncloudclient/Makefile head/deskutils/owncloudclient/pkg-descr head/deskutils/owncloudclient/pkg-plist head/security/Makefile head/security/qtkeychain-qt5/Makefile head/security/qtkeychain-qt5/distinfo Modified: head/MOVED ============================================================================== --- head/MOVED Sun May 24 20:59:52 2015 (r387340) +++ head/MOVED Sun May 24 21:03:19 2015 (r387341) @@ -7593,3 +7593,4 @@ net-mgmt/glpi-plugins-tracker-server|net science/rubygem-netcdf|science/rubygem-ruby-netcdf|2015-05-24|Rename to match our rubygems naming security/rubygem-rc4|security/rubygem-ruby-rc4|2015-05-24|Rename to match our rubygems naming print/rubygem-colortools|print/rubygem-color-tools|2015-05-24|Rename to match our rubygems naming +security/qtkeychain|security/qtkeychain-qt5|2015-05-24|Renamed to indicate supported QT version Modified: head/deskutils/owncloudclient/Makefile ============================================================================== --- head/deskutils/owncloudclient/Makefile Sun May 24 20:59:52 2015 (r387340) +++ head/deskutils/owncloudclient/Makefile Sun May 24 21:03:19 2015 (r387341) @@ -3,31 +3,28 @@ PORTNAME= owncloudclient PORTVERSION= 1.8.0 +PORTREVISION= 1 CATEGORIES= deskutils MASTER_SITES= http://download.owncloud.com/desktop/stable/ MAINTAINER= ports@FreeBSD.org -COMMENT= Qt based sync client for OwnCloud +COMMENT= OwnCloud Desktop Syncing Client LICENSE= GPLv2 LIB_DEPENDS= libinotify.so:${PORTSDIR}/devel/libinotify \ - libqtkeychain.so:${PORTSDIR}/security/qtkeychain \ - libneon.so:${PORTSDIR}/www/neon + libqt5keychain.so:${PORTSDIR}/security/qtkeychain-qt5 USES= cmake:outsource compiler:c++11-lib gmake pkgconfig tar:bzip2 -USE_QT4= corelib dbus gui network qtestlib webkit xml \ - linguisttools_build moc_build qmake_build rcc_build uic_build \ - sql-sqlite3_run +USE_QT5= buildtools_build core dbus gui linguist_build network qmake_build webkit xml USE_OPENSSL= yes USE_SQLITE= 3 -CMAKE_ARGS= -DBUILD_WITH_QT4:BOOL=ON \ +CMAKE_ARGS= -DBUILD_WITH_QT4:BOOL=OFF \ -DCMAKE_INSTALL_MANDIR:STRING=man \ -DWITH_STACK_PROTECTOR:BOOL=OFF USE_LDCONFIG= yes INSTALLS_ICONS= yes -CFLAGS+= -I${WRKSRC}/csync/src/httpbf/src -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib OPTIONS_DEFINE= DOCS @@ -36,6 +33,8 @@ DOCS_BUILD_DEPENDS= sphinx-build:${PORTS DOCS_USE= tex=dvipsk:build,latex:build DOCS_CMAKE_ON= -DWITH_DOC:BOOL=ON +PLIST_SUB= VERSION=${PORTVERSION} + .include <bsd.port.options.mk> .if ${OPSYS} != FreeBSD || ${OSVERSION} < 1000015 Modified: head/deskutils/owncloudclient/pkg-descr ============================================================================== --- head/deskutils/owncloudclient/pkg-descr Sun May 24 20:59:52 2015 (r387340) +++ head/deskutils/owncloudclient/pkg-descr Sun May 24 21:03:19 2015 (r387341) @@ -1,4 +1,4 @@ -Owncloudclient is a tool to synchronize files from ownCloud Server with your -computer. It uses OCSync as its syncing backend. +The ownCloud Desktop Client is a tool to synchronize files +from ownCloud Server with your computer. WWW: https://github.com/owncloud/client Modified: head/deskutils/owncloudclient/pkg-plist ============================================================================== --- head/deskutils/owncloudclient/pkg-plist Sun May 24 20:59:52 2015 (r387340) +++ head/deskutils/owncloudclient/pkg-plist Sun May 24 21:03:19 2015 (r387341) @@ -1,7 +1,6 @@ bin/owncloud bin/owncloudcmd @sample etc/ownCloud/sync-exclude.lst.sample -include/httpbf.h include/owncloudsync/creds/abstractcredentials.h include/owncloudsync/creds/httpcredentials.h include/owncloudsync/mirall/account.h @@ -12,10 +11,9 @@ include/owncloudsync/mirall/syncengine.h include/owncloudsync/mirall/syncfileitem.h include/owncloudsync/mirall/syncjournaldb.h include/owncloudsync/mirall/syncresult.h -lib/libhttpbf.a lib/libowncloudsync.so lib/libowncloudsync.so.0 -lib/libowncloudsync.so.1.8.0 +lib/libowncloudsync.so.%%VERSION%% lib/owncloud/libocsync.so lib/owncloud/libocsync.so.0 lib/owncloud/libocsync.so.0.2.1 Modified: head/security/Makefile ============================================================================== --- head/security/Makefile Sun May 24 20:59:52 2015 (r387340) +++ head/security/Makefile Sun May 24 21:03:19 2015 (r387341) @@ -858,7 +858,8 @@ SUBDIR += py-zope.security SUBDIR += py-zope.securitypolicy SUBDIR += py-zope.session - SUBDIR += qtkeychain + SUBDIR += qtkeychain-qt4 + SUBDIR += qtkeychain-qt5 SUBDIR += quantis SUBDIR += quantis-kmod SUBDIR += racoon2 Added: head/security/qtkeychain-qt4/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/qtkeychain-qt4/Makefile Sun May 24 21:03:19 2015 (r387341) @@ -0,0 +1,7 @@ +# $FreeBSD$ + +PKGNAMESUFFIX= -qt4 + +MASTERDIR= ${.CURDIR}/../qtkeychain-qt5 + +.include "${MASTERDIR}/Makefile" Modified: head/security/qtkeychain-qt5/Makefile ============================================================================== --- head/security/qtkeychain/Makefile Sun May 24 20:59:52 2015 (r387340) +++ head/security/qtkeychain-qt5/Makefile Sun May 24 21:03:19 2015 (r387341) @@ -1,22 +1,34 @@ # $FreeBSD$ PORTNAME= qtkeychain -PORTVERSION= 0.1.0 +PORTVERSION= 0.5.0 DISTVERSIONPREFIX= v -PORTREVISION= 1 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_QT4= corelib dbus moc_build qmake_build rcc_build +USES= cmake USE_LDCONFIG= yes +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 <bsd.port.mk> Modified: head/security/qtkeychain-qt5/distinfo ============================================================================== --- head/security/qtkeychain/distinfo Sun May 24 20:59:52 2015 (r387340) +++ head/security/qtkeychain-qt5/distinfo Sun May 24 21:03:19 2015 (r387341) @@ -1,2 +1,2 @@ -SHA256 (frankosterfeld-qtkeychain-v0.1.0_GH0.tar.gz) = 1a9a8906792a500586c3119865786664474ee42d0b10295d4d6b505e764ae192 -SIZE (frankosterfeld-qtkeychain-v0.1.0_GH0.tar.gz) = 12826 +SHA256 (frankosterfeld-qtkeychain-v0.5.0_GH0.tar.gz) = e62d7ae9c8ae04784d8a5d0f213aaa22f1c02427e800ce88739e997f499bb514 +SIZE (frankosterfeld-qtkeychain-v0.5.0_GH0.tar.gz) = 18422 Added: head/security/qtkeychain-qt5/pkg-plist.qt4 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/qtkeychain-qt5/pkg-plist.qt4 Sun May 24 21:03:19 2015 (r387341) @@ -0,0 +1,11 @@ +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.0 +lib/libqtkeychain.so.%%VERSION%% +%%QT_L10NDIR%%/qtkeychain_de.qm +%%QT_L10NDIR%%/qtkeychain_ro.qm Copied and modified: head/security/qtkeychain-qt5/pkg-plist.qt5 (from r387340, head/security/qtkeychain/pkg-plist) ============================================================================== --- head/security/qtkeychain/pkg-plist Sun May 24 20:59:52 2015 (r387340, copy source) +++ head/security/qtkeychain-qt5/pkg-plist.qt5 Sun May 24 21:03:19 2015 (r387341) @@ -1,12 +1,11 @@ -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.0 -lib/libqtkeychain.so.0.1.0 -@dirrm lib/cmake/QtKeychain -@dirrmtry lib/cmake -@dirrm include/qtkeychain +include/qt5keychain/keychain.h +include/qt5keychain/qkeychain_export.h +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.0 +lib/libqt5keychain.so.%%VERSION%% +%%QT_L10NDIR%%/qtkeychain_de.qm +%%QT_L10NDIR%%/qtkeychain_ro.qm
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201505242103.t4OL3JmP038721>