Date: Mon, 12 Jan 2015 16:33:17 +0000 (UTC) From: Tijl Coosemans <tijl@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r376838 - in head: . audio/tomahawk devel/qca devel/qca/files net-im/kmess-kde4 net-im/kopete-kde4 net-im/psi net/qoauth polish/kadu security security/qca-cyrus-sasl security/qca-gnupg ... Message-ID: <201501121633.t0CGXHKl000873@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tijl Date: Mon Jan 12 16:33:16 2015 New Revision: 376838 URL: https://svnweb.freebsd.org/changeset/ports/376838 QAT: https://qat.redports.org/buildarchive/r376838/ Log: - Update devel/qca to version 2.1.0 - Plugins are no longer available separately so remove security/qca-* and replace them with options in devel/qca - Adjust all ports that depended on security/qca-* - This also fixes the build of the OpenSSL plugin when OpenSSL doesn't support SSLv2 Approved by: kde (rakuco) Added: head/devel/qca/files/patch-CMakeLists.txt (contents, props changed) Deleted: head/devel/qca/files/patch-configure head/devel/qca/files/patch-r1273508 head/devel/qca/files/patch-src__src.pro head/security/qca-cyrus-sasl/ head/security/qca-gnupg/ head/security/qca-ossl/ Modified: head/MOVED head/audio/tomahawk/Makefile head/devel/qca/Makefile head/devel/qca/distinfo head/devel/qca/pkg-plist head/net-im/kmess-kde4/Makefile head/net-im/kopete-kde4/Makefile head/net-im/psi/Makefile head/net/qoauth/Makefile head/polish/kadu/Makefile head/security/Makefile Modified: head/MOVED ============================================================================== --- head/MOVED Mon Jan 12 16:22:16 2015 (r376837) +++ head/MOVED Mon Jan 12 16:33:16 2015 (r376838) @@ -7396,3 +7396,6 @@ ports-mgmt/p5-FreeBSD-Pkgs||2015-01-06|H ports-mgmt/p5-App-Pm2Port||2015-01-06|Has expired: Does not know about USES=perl, generates incorrect pkg-plist ports-mgmt/bpkg||2015-01-06|Has expired: Does not support pkgng multimedia/mplayer-fonts||2015-01-11|Obsolete port +security/qca-cyrus-sasl|devel/qca|2015-01-12|Part of devel/qca now +security/qca-gnupg|devel/qca|2015-01-12|Part of devel/qca now +security/qca-ossl|devel/qca|2015-01-12|Part of devel/qca now Modified: head/audio/tomahawk/Makefile ============================================================================== --- head/audio/tomahawk/Makefile Mon Jan 12 16:22:16 2015 (r376837) +++ head/audio/tomahawk/Makefile Mon Jan 12 16:33:16 2015 (r376838) @@ -3,7 +3,7 @@ PORTNAME= tomahawk PORTVERSION= 0.7.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= audio MAINTAINER= arved@FreeBSD.org @@ -21,7 +21,6 @@ LIB_DEPENDS= libattica.so:${PORTSDIR}/x1 libqjson.so:${PORTSDIR}/devel/qjson \ libquazip.so:${PORTSDIR}/archivers/quazip \ libtag.so:${PORTSDIR}/audio/taglib -RUN_DEPENDS= qca-ossl>=2.0.0.b3_4:${PORTSDIR}/security/qca-ossl CMAKE_ARGS+= -DWITH_BREAKPAD:BOOL="OFF" \ -DCLUCENE_CONFIG_PATH:PATH="${LOCALBASE}/share/clucene" Modified: head/devel/qca/Makefile ============================================================================== --- head/devel/qca/Makefile Mon Jan 12 16:22:16 2015 (r376837) +++ head/devel/qca/Makefile Mon Jan 12 16:33:16 2015 (r376838) @@ -2,38 +2,36 @@ # $FreeBSD$ PORTNAME= qca -PORTVERSION= 2.0.3 -PORTREVISION= 1 +PORTVERSION= 2.1.0 CATEGORIES= devel MASTER_SITES= http://delta.affinix.com/download/qca/2.0/ -DISTNAME= qca-${PORTVERSION} MAINTAINER= kde@FreeBSD.org COMMENT= Cross-platform crypto API for Qt -USES= tar:bzip2 -USE_QT4= corelib qmake_build moc_build -HAS_CONFIGURE= yes -QT_NONSTANDARD= yes -CONFIGURE_ARGS+=--prefix=${PREFIX} \ - --disable-tests -CONFIGURE_ENV+= QMAKESPEC=${QMAKESPEC} -USE_OPENSSL= yes -USE_LDCONFIG= yes -DESTDIRNAME= INSTALL_ROOT +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 -.if defined(PACKAGE_BUILDING) -CONFIGURE_ENV+= QC_VERBOSE=Y -.endif +USES= cmake:outsource +CMAKE_ARGS= -DBUILD_PLUGINS=none -DBUILD_TESTS=no -DQT4_BUILD=yes \ + -DPKGCONFIG_INSTALL_PREFIX=${PREFIX}/libdata/pkgconfig \ + -DQCA_FEATURE_INSTALL_DIR=${QT_MKSPECDIR}/features \ + -DQCA_MAN_INSTALL_DIR=${MANPREFIX}/man +CMAKE_ENV= QC_CERTSTORE_PATH=${LOCALBASE}/share/certs/ca-root-nss.crt +USE_LDCONFIG= yes +USE_QT4= corelib moc_build rcc_build -OPTIONS_DEFINE= DEBUG +OPTIONS_DEFINE= GNUPG OPENSSL SASL +OPTIONS_DEFAULT=GNUPG OPENSSL OPTIONS_SUB= yes -DEBUG_CONFIGURE_ON= --debug -DEBUG_CONFIGURE_OFF= --release --no-separate-debug-info +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 -pre-configure: - ${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/configure - ${MKDIR} ${WRKSRC}/libdata/pkgconfig +SASL_CMAKE_ON= -DWITH_cyrus-sasl_PLUGIN=yes +SASL_LIB_DEPENDS= libsasl2.so:${PORTSDIR}/security/cyrus-sasl2 .include <bsd.port.mk> Modified: head/devel/qca/distinfo ============================================================================== --- head/devel/qca/distinfo Mon Jan 12 16:22:16 2015 (r376837) +++ head/devel/qca/distinfo Mon Jan 12 16:33:16 2015 (r376838) @@ -1,2 +1,2 @@ -SHA256 (qca-2.0.3.tar.bz2) = 8da20c89f390954fdcfcd3c4deef379213ddb5ae9d6b5e0c917d23f5e474895f -SIZE (qca-2.0.3.tar.bz2) = 4530731 +SHA256 (qca-2.1.0.tar.gz) = 226dcd76138c3738cdc15863607a96b3758a4c3efd3c47295939bcea4e7a9284 +SIZE (qca-2.1.0.tar.gz) = 978473 Added: head/devel/qca/files/patch-CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/qca/files/patch-CMakeLists.txt Mon Jan 12 16:33:16 2015 (r376838) @@ -0,0 +1,33 @@ +Fix a few syntax errors such that the QC_CERTSTORE_PATH environment +variable is used correctly. + +--- CMakeLists.txt.orig 2014-11-06 08:15:45 UTC ++++ CMakeLists.txt +@@ -262,13 +262,13 @@ message(STATUS "Checking for certstore.. + if( WIN32 ) + # USE BUILTIN + else ( WIN32 ) +- if ( ENV{QC_CERTSTORE_PATH} ) +- if(EXISTS ENV{QC_CERTSTORE_PATH}) ++ if ( DEFINED ENV{QC_CERTSTORE_PATH} ) ++ if(EXISTS $ENV{QC_CERTSTORE_PATH}) + set( qca_CERTSTORE $ENV{QC_CERTSTORE_PATH}) +- else(EXISTS ENV{QC_CERTSTORE_PATH}) ++ else(EXISTS $ENV{QC_CERTSTORE_PATH}) + # path to try +- endif(EXISTS ENV{QC_CERTSTORE_PATH}) +- else( ENV{QC_CERTSTORE_PATH} ) ++ endif(EXISTS $ENV{QC_CERTSTORE_PATH}) ++ else( DEFINED ENV{QC_CERTSTORE_PATH} ) + set( toTry + "/etc/ssl/certs/ca-certificates.crt" + "/usr/share/ssl/cert.pem" +@@ -282,7 +282,7 @@ else ( WIN32 ) + set( qca_CERTSTORE ${_current_try}) + endif(EXISTS ${_current_try}) + endforeach (_current_try) +- endif( ENV{QC_CERTSTORE_PATH} ) ++ endif( DEFINED ENV{QC_CERTSTORE_PATH} ) + endif(WIN32) + + if (qca_CERTSTORE) Modified: head/devel/qca/pkg-plist ============================================================================== --- head/devel/qca/pkg-plist Mon Jan 12 16:22:16 2015 (r376837) +++ head/devel/qca/pkg-plist Mon Jan 12 16:33:16 2015 (r376838) @@ -1,5 +1,5 @@ -bin/qcatool2 -%%DEBUG%%bin/qcatool2.debug +bin/mozcerts +bin/qcatool include/QtCrypto/QtCrypto include/QtCrypto/qca.h include/QtCrypto/qca_basic.h @@ -8,21 +8,25 @@ include/QtCrypto/qca_core.h include/QtCrypto/qca_export.h include/QtCrypto/qca_keystore.h include/QtCrypto/qca_publickey.h +include/QtCrypto/qca_safetimer.h include/QtCrypto/qca_securelayer.h include/QtCrypto/qca_securemessage.h include/QtCrypto/qca_support.h include/QtCrypto/qca_textfilter.h include/QtCrypto/qca_tools.h +include/QtCrypto/qca_version.h include/QtCrypto/qcaprovider.h include/QtCrypto/qpipe.h -lib/libqca.prl +lib/cmake/Qca/QcaConfig.cmake +lib/cmake/Qca/QcaConfigVersion.cmake +lib/cmake/Qca/QcaTargets-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/Qca/QcaTargets.cmake lib/libqca.so lib/libqca.so.2 -lib/libqca.so.2.0 -lib/libqca.so.2.0.3 -%%DEBUG%%lib/libqca.so.2.0.3.debug +lib/libqca.so.2.1.0 +%%SASL%%lib/qca/crypto/libqca-cyrus-sasl.so +%%GNUPG%%lib/qca/crypto/libqca-gnupg.so +%%OPENSSL%%lib/qca/crypto/libqca-ossl.so libdata/pkgconfig/qca2.pc -man/man1/qcatool2.1.gz -share/qca/certs/README -share/qca/certs/rootcerts.pem -share/qt4/mkspecs/features/crypto.prf +man/man1/qcatool.1.gz +%%QT_MKSPECDIR%%/features/crypto.prf Modified: head/net-im/kmess-kde4/Makefile ============================================================================== --- head/net-im/kmess-kde4/Makefile Mon Jan 12 16:22:16 2015 (r376837) +++ head/net-im/kmess-kde4/Makefile Mon Jan 12 16:33:16 2015 (r376838) @@ -3,7 +3,7 @@ PORTNAME= kmess PORTVERSION= 2.0.6.2 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= net-im kde MASTER_SITES= SF/${PORTNAME}/Latest%20versions/${PORTVERSION}/ @@ -11,7 +11,6 @@ MAINTAINER= syncer@gmail.com COMMENT= MSN Messenger client for KDE LIB_DEPENDS= libqca.so:${PORTSDIR}/devel/qca -RUN_DEPENDS= qca-ossl>=2.0.0.b3:${PORTSDIR}/security/qca-ossl LATEST_LINK= ${PORTNAME}-kde4 Modified: head/net-im/kopete-kde4/Makefile ============================================================================== --- head/net-im/kopete-kde4/Makefile Mon Jan 12 16:22:16 2015 (r376837) +++ head/net-im/kopete-kde4/Makefile Mon Jan 12 16:33:16 2015 (r376838) @@ -2,7 +2,7 @@ PORTNAME= kopete PORTVERSION= ${KDE4_VERSION} -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net-im kde MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src DIST_SUBDIR= KDE/${PORTVERSION} @@ -26,8 +26,7 @@ LIB_DEPENDS= libidn.so:${PORTSDIR}/dns/l libjsoncpp.so:${PORTSDIR}/devel/jsoncpp BUILD_DEPENDS= ${LOCALBASE}/include/linux/videodev2.h:${PORTSDIR}/multimedia/v4l_compat \ ${LOCALBASE}/lib/mediastreamer/plugins/libmsilbc.so:${PORTSDIR}/audio/msilbc -RUN_DEPENDS= qca-ossl>=2.0.0.b3:${PORTSDIR}/security/qca-ossl \ - ${LOCALBASE}/lib/mediastreamer/plugins/libmsilbc.so:${PORTSDIR}/audio/msilbc +RUN_DEPENDS= ${LOCALBASE}/lib/mediastreamer/plugins/libmsilbc.so:${PORTSDIR}/audio/msilbc USES= cmake:outsource pkgconfig shebangfix tar:xz webplugin:native USE_GNOME= libxml2 libxslt Modified: head/net-im/psi/Makefile ============================================================================== --- head/net-im/psi/Makefile Mon Jan 12 16:22:16 2015 (r376837) +++ head/net-im/psi/Makefile Mon Jan 12 16:33:16 2015 (r376838) @@ -3,7 +3,7 @@ PORTNAME= psi PORTVERSION= 0.15 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= net-im MASTER_SITES= SF/${PORTNAME}/Psi/${PORTVERSION} @@ -12,8 +12,6 @@ COMMENT= Qt 4 based Jabber client LIB_DEPENDS= libqca.so:${PORTSDIR}/devel/qca \ libminizip.so:${PORTSDIR}/archivers/minizip -RUN_DEPENDS= qca-ossl>=2.0.0.b3:${PORTSDIR}/security/qca-ossl \ - qca-gnupg>=2.0.0.b3:${PORTSDIR}/security/qca-gnupg HAS_CONFIGURE= yes QT_NONSTANDARD= yes Modified: head/net/qoauth/Makefile ============================================================================== --- head/net/qoauth/Makefile Mon Jan 12 16:22:16 2015 (r376837) +++ head/net/qoauth/Makefile Mon Jan 12 16:33:16 2015 (r376838) @@ -3,6 +3,7 @@ PORTNAME= qoauth PORTVERSION= 1.0.1 +PORTREVISION= 1 CATEGORIES= net devel security MASTER_SITES= http://files.ayoy.net/qoauth/release/${PORTVERSION}/src/ DISTNAME= ${PORTNAME}-${PORTVERSION}-src @@ -10,9 +11,7 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-src MAINTAINER= kde@FreeBSD.org COMMENT= Qt 4 support for OAuth-powered network services -BUILD_DEPENDS= qca-ossl>=2.0.0.b3:${PORTSDIR}/security/qca-ossl LIB_DEPENDS= libqca.so:${PORTSDIR}/devel/qca -RUN_DEPENDS= qca-ossl>=2.0.0.b3:${PORTSDIR}/security/qca-ossl USES= qmake tar:bzip2 USE_LDCONFIG= yes Modified: head/polish/kadu/Makefile ============================================================================== --- head/polish/kadu/Makefile Mon Jan 12 16:22:16 2015 (r376837) +++ head/polish/kadu/Makefile Mon Jan 12 16:33:16 2015 (r376838) @@ -3,6 +3,7 @@ PORTNAME= kadu PORTVERSION= 1.4 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= polish net-im MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}/:kadu \ @@ -27,7 +28,6 @@ LIB_DEPENDS= libmpdclient.so:${PORTSDIR} libgadu.so:${PORTSDIR}/polish/libgadu \ libotr.so:${PORTSDIR}/security/libotr \ libenchant.so:${PORTSDIR}/textproc/enchant -RUN_DEPENDS= qca-ossl>=2.0.0.b3:${PORTSDIR}/security/qca-ossl # TODO ntrack and ntrack-qt (needs porting) ? # TODO separate ports for plugins and themes (possible starting with 0.10) Modified: head/security/Makefile ============================================================================== --- head/security/Makefile Mon Jan 12 16:22:16 2015 (r376837) +++ head/security/Makefile Mon Jan 12 16:33:16 2015 (r376838) @@ -839,9 +839,6 @@ SUBDIR += py-zope.security SUBDIR += py-zope.securitypolicy SUBDIR += py-zope.session - SUBDIR += qca-cyrus-sasl - SUBDIR += qca-gnupg - SUBDIR += qca-ossl SUBDIR += qtkeychain SUBDIR += quantis SUBDIR += quantis-kmod
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201501121633.t0CGXHKl000873>