From owner-svn-ports-all@freebsd.org Fri Nov 6 12:56:38 2015 Return-Path: Delivered-To: svn-ports-all@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 A513BA26556; Fri, 6 Nov 2015 12:56:38 +0000 (UTC) (envelope-from makc@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 617581F83; Fri, 6 Nov 2015 12:56:38 +0000 (UTC) (envelope-from makc@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tA6CubN9008277; Fri, 6 Nov 2015 12:56:37 GMT (envelope-from makc@FreeBSD.org) Received: (from makc@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tA6CuavH008272; Fri, 6 Nov 2015 12:56:36 GMT (envelope-from makc@FreeBSD.org) Message-Id: <201511061256.tA6CuavH008272@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: makc set sender to makc@FreeBSD.org using -f From: Max Brazhnikov Date: Fri, 6 Nov 2015 12:56:36 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r400930 - in head/devel: qca qca-qt5 qca-qt5/files qca/files X-SVN-Group: ports-head 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.20 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: Fri, 06 Nov 2015 12:56:38 -0000 Author: makc Date: Fri Nov 6 12:56:36 2015 New Revision: 400930 URL: https://svnweb.freebsd.org/changeset/ports/400930 Log: devel/qca: - Update to 2.1.1 - Remove patches integrated upstream - Amend COMMENT - tarballs are now hosted by KDE Project devel/qca-qt5: - Use build switch to avoid conflict with QCA Qt4 instead of patching library name and install path for headers - Make port a slave of devel/qca - Pass maintainership to kde@ PR: 204305 Approved by: pawel Added: head/devel/qca/pkg-plist.qt5 - copied, changed from r400929, head/devel/qca-qt5/pkg-plist Deleted: head/devel/qca-qt5/distinfo head/devel/qca-qt5/files/ head/devel/qca-qt5/pkg-descr head/devel/qca-qt5/pkg-plist head/devel/qca/files/ Modified: head/devel/qca-qt5/Makefile head/devel/qca/Makefile head/devel/qca/distinfo head/devel/qca/pkg-plist Modified: head/devel/qca-qt5/Makefile ============================================================================== --- head/devel/qca-qt5/Makefile Fri Nov 6 12:51:25 2015 (r400929) +++ head/devel/qca-qt5/Makefile Fri Nov 6 12:56:36 2015 (r400930) @@ -1,39 +1,10 @@ -# Created by: Vsevolod Stakhov # $FreeBSD$ -PORTNAME= qca -PORTVERSION= 2.1.0 -CATEGORIES= devel -MASTER_SITES= http://delta.affinix.com/download/qca/2.0/ PKGNAMESUFFIX= -qt5 -MAINTAINER= pawel@FreeBSD.org -COMMENT= Cross-platform crypto API for Qt5 +COMMENT= Cross-platform crypto API for Qt 5 -BUILD_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss -RUN_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss +PLIST= ${PKGDIR}/pkg-plist.qt5 -USES= cmake:outsource -CMAKE_ARGS= -DBUILD_PLUGINS=none -DBUILD_TESTS=no -DQT5_BUILD=yes \ - -DPKGCONFIG_INSTALL_PREFIX=${PREFIX}/libdata/pkgconfig \ - -DQCA_FEATURE_INSTALL_DIR=${QT_MKSPECDIR}/features \ - -DQCA_MAN_INSTALL_DIR=${MANPREFIX}/man \ - -DQCA_SUFFIX=qt5 -CONFIGURE_ENV= QC_CERTSTORE_PATH=${LOCALBASE}/share/certs/ca-root-nss.crt -USE_LDCONFIG= yes -USE_QT5= buildtools_build core network qmake_build - -OPTIONS_DEFINE= GNUPG OPENSSL SASL -OPTIONS_DEFAULT=GNUPG OPENSSL -OPTIONS_SUB= yes - -GNUPG_CMAKE_ON= -DWITH_gnupg_PLUGIN=yes -GNUPG_RUN_DEPENDS= gpg2:${PORTSDIR}/security/gnupg - -OPENSSL_CMAKE_ON= -DWITH_ossl_PLUGIN=yes -OPENSSL_USE= OPENSSL=yes - -SASL_CMAKE_ON= -DWITH_cyrus-sasl_PLUGIN=yes -SASL_LIB_DEPENDS= libsasl2.so:${PORTSDIR}/security/cyrus-sasl2 - -.include +MASTERDIR= ${.CURDIR}/../qca +.include "${MASTERDIR}/Makefile" Modified: head/devel/qca/Makefile ============================================================================== --- head/devel/qca/Makefile Fri Nov 6 12:51:25 2015 (r400929) +++ head/devel/qca/Makefile Fri Nov 6 12:56:36 2015 (r400930) @@ -2,25 +2,33 @@ # $FreeBSD$ PORTNAME= qca -PORTVERSION= 2.1.0 -PORTREVISION= 3 +PORTVERSION= 2.1.1 CATEGORIES= devel -MASTER_SITES= http://delta.affinix.com/download/qca/2.0/ +MASTER_SITES= KDE/stable/qca/${PORTVERSION}/src MAINTAINER= kde@FreeBSD.org -COMMENT= Cross-platform crypto API for Qt +COMMENT= Cross-platform crypto API for Qt 4 BUILD_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss RUN_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss -USES= cmake:outsource -CMAKE_ARGS= -DBUILD_PLUGINS=none -DBUILD_TESTS=no -DQT4_BUILD=yes \ +USES= cmake:outsource tar:xz +CMAKE_ARGS= -DBUILD_PLUGINS=none -DBUILD_TESTS=no \ -DPKGCONFIG_INSTALL_PREFIX=${PREFIX}/libdata/pkgconfig \ -DQCA_FEATURE_INSTALL_DIR=${QT_MKSPECDIR}/features \ - -DQCA_MAN_INSTALL_DIR=${MANPREFIX}/man + -DQCA_MAN_INSTALL_DIR=${PREFIX}/man CONFIGURE_ENV= QC_CERTSTORE_PATH=${LOCALBASE}/share/certs/ca-root-nss.crt USE_LDCONFIG= yes + +.if defined(PKGNAMESUFFIX) +CMAKE_ARGS+= -DQCA_SUFFIX=qt5 +USE_QT5= core buildtools_build qmake_build +.else USE_QT4= corelib moc_build qmake_build rcc_build +CMAKE_ARGS+= -DQT4_BUILD=yes +.endif + +PLIST_SUB= SHLIB_VER=${PORTVERSION} OPTIONS_DEFINE= GNUPG OPENSSL SASL OPTIONS_DEFAULT=GNUPG OPENSSL @@ -35,4 +43,8 @@ OPENSSL_USE= OPENSSL=yes SASL_CMAKE_ON= -DWITH_cyrus-sasl_PLUGIN=yes SASL_LIB_DEPENDS= libsasl2.so:${PORTSDIR}/security/cyrus-sasl2 +post-patch: +# Qt Network module is used for tests only + ${REINPLACE_CMD} 's,Core Network,Core,' ${WRKSRC}/CMakeLists.txt + .include Modified: head/devel/qca/distinfo ============================================================================== --- head/devel/qca/distinfo Fri Nov 6 12:51:25 2015 (r400929) +++ head/devel/qca/distinfo Fri Nov 6 12:56:36 2015 (r400930) @@ -1,2 +1,2 @@ -SHA256 (qca-2.1.0.tar.gz) = 226dcd76138c3738cdc15863607a96b3758a4c3efd3c47295939bcea4e7a9284 -SIZE (qca-2.1.0.tar.gz) = 978473 +SHA256 (qca-2.1.1.tar.xz) = 95de3e7910b5f9ec7084169989c9d98bfb527e6a4865fe17269c3b24308be983 +SIZE (qca-2.1.1.tar.xz) = 688460 Modified: head/devel/qca/pkg-plist ============================================================================== --- head/devel/qca/pkg-plist Fri Nov 6 12:51:25 2015 (r400929) +++ head/devel/qca/pkg-plist Fri Nov 6 12:56:36 2015 (r400930) @@ -23,7 +23,7 @@ lib/cmake/Qca/QcaTargets-%%CMAKE_BUILD_T lib/cmake/Qca/QcaTargets.cmake lib/libqca.so lib/libqca.so.2 -lib/libqca.so.2.1.0 +lib/libqca.so.%%SHLIB_VER%% %%SASL%%lib/qca/crypto/libqca-cyrus-sasl.so %%GNUPG%%lib/qca/crypto/libqca-gnupg.so %%OPENSSL%%lib/qca/crypto/libqca-ossl.so Copied and modified: head/devel/qca/pkg-plist.qt5 (from r400929, head/devel/qca-qt5/pkg-plist) ============================================================================== --- head/devel/qca-qt5/pkg-plist Fri Nov 6 12:51:25 2015 (r400929, copy source) +++ head/devel/qca/pkg-plist.qt5 Fri Nov 6 12:56:36 2015 (r400930) @@ -1,32 +1,32 @@ bin/mozcerts-qt5 bin/qcatool-qt5 -include/qca-qt5/QtCrypto/QtCrypto -include/qca-qt5/QtCrypto/qca.h -include/qca-qt5/QtCrypto/qca_basic.h -include/qca-qt5/QtCrypto/qca_cert.h -include/qca-qt5/QtCrypto/qca_core.h -include/qca-qt5/QtCrypto/qca_export.h -include/qca-qt5/QtCrypto/qca_keystore.h -include/qca-qt5/QtCrypto/qca_publickey.h -include/qca-qt5/QtCrypto/qca_safetimer.h -include/qca-qt5/QtCrypto/qca_securelayer.h -include/qca-qt5/QtCrypto/qca_securemessage.h -include/qca-qt5/QtCrypto/qca_support.h -include/qca-qt5/QtCrypto/qca_textfilter.h -include/qca-qt5/QtCrypto/qca_tools.h -include/qca-qt5/QtCrypto/qca_version.h -include/qca-qt5/QtCrypto/qcaprovider.h -include/qca-qt5/QtCrypto/qpipe.h -lib/cmake/Qca-qt5/QcaConfig.cmake -lib/cmake/Qca-qt5/QcaConfigVersion.cmake -lib/cmake/Qca-qt5/QcaTargets-%%CMAKE_BUILD_TYPE%%.cmake -lib/cmake/Qca-qt5/QcaTargets.cmake -lib/libqca-qt5.so -lib/libqca-qt5.so.2 -lib/libqca-qt5.so.2.1.0 -%%SASL%%lib/qca-qt5/crypto/libqca-cyrus-sasl.so -%%GNUPG%%lib/qca-qt5/crypto/libqca-gnupg.so -%%OPENSSL%%lib/qca-qt5/crypto/libqca-ossl.so +include/Qca-qt5/QtCrypto/QtCrypto +include/Qca-qt5/QtCrypto/qca.h +include/Qca-qt5/QtCrypto/qca_basic.h +include/Qca-qt5/QtCrypto/qca_cert.h +include/Qca-qt5/QtCrypto/qca_core.h +include/Qca-qt5/QtCrypto/qca_export.h +include/Qca-qt5/QtCrypto/qca_keystore.h +include/Qca-qt5/QtCrypto/qca_publickey.h +include/Qca-qt5/QtCrypto/qca_safetimer.h +include/Qca-qt5/QtCrypto/qca_securelayer.h +include/Qca-qt5/QtCrypto/qca_securemessage.h +include/Qca-qt5/QtCrypto/qca_support.h +include/Qca-qt5/QtCrypto/qca_textfilter.h +include/Qca-qt5/QtCrypto/qca_tools.h +include/Qca-qt5/QtCrypto/qca_version.h +include/Qca-qt5/QtCrypto/qcaprovider.h +include/Qca-qt5/QtCrypto/qpipe.h +%%QT_LIBDIR%%/cmake/Qca-qt5/Qca-qt5Config.cmake +%%QT_LIBDIR%%/cmake/Qca-qt5/Qca-qt5ConfigVersion.cmake +%%QT_LIBDIR%%/cmake/Qca-qt5/Qca-qt5Targets-%%CMAKE_BUILD_TYPE%%.cmake +%%QT_LIBDIR%%/cmake/Qca-qt5/Qca-qt5Targets.cmake +%%QT_LIBDIR%%/libqca-qt5.so +%%QT_LIBDIR%%/libqca-qt5.so.2 +%%QT_LIBDIR%%/libqca-qt5.so.%%SHLIB_VER%% +%%SASL%%%%QT_LIBDIR%%/qca-qt5/crypto/libqca-cyrus-sasl.so +%%GNUPG%%%%QT_LIBDIR%%/qca-qt5/crypto/libqca-gnupg.so +%%OPENSSL%%%%QT_LIBDIR%%/qca-qt5/crypto/libqca-ossl.so %%QT_MKSPECDIR%%/features/crypto.prf libdata/pkgconfig/qca2-qt5.pc man/man1/qcatool-qt5.1.gz