Attachment 212404 Details for Bug 244682 – v2

[patch] v2

qca-2.3.0.v2.diff (text/plain), 38.83 KB, created by Tobias C. Berner on 2020-03-14 14:55:45 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tobias C. Berner

Created: 2020-03-14 14:55:45 UTC

Size: 38.83 KB

patch

obsolete

>Index: Mk/Uses/qca.mk
>===================================================================
>--- Mk/Uses/qca.mk	(nonexistent)
>+++ Mk/Uses/qca.mk	(working copy)
>@@ -0,0 +1,31 @@
>+# $FreeBSD$
>+#
>+# Handle dependency on qca
>+#
>+# Feature:		qca
>+# Usage:		USES=qca
>+# Valid ARGS		none
>+#
>+# MAINTAINER:		kde@FreeBSD.org
>+
>+.if ! defined(_INCLUDE_QCA_MK)
>+_INCLUDE_QCA_MK=	yes
>+
>+.  if !empty(qca_ARGS)
>+IGNORE+=		USES=qca takes no arguments
>+.  endif
>+
>+_QCA_LIB=		libqca-qt5.so
>+
>+_QCA_DEFAULT_PORT=	devel/qca
>+_QCA_LEGACY_PORT=	devel/qca-legacy
>+
>+.  if ${OPSYS} == FreeBSD && ${OSVERSION} < 1200085 && ${SSL_DEFAULT} == base
>+_QCA_CHOSEN_PORT=	LEGACY
>+.  else
>+_QCA_CHOSEN_PORT=	DEFAULT
>+.  endif
>+
>+LIB_DEPENDS+=		${_QCA_LIB}:${_QCA_${_QCA_CHOSEN_PORT}_PORT}
>+
>+.endif
>
>Property changes on: Mk/Uses/qca.mk
>___________________________________________________________________
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:keywords
>## -0,0 +1 ##
>+FreeBSD=%H
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: audio/amarok/Makefile
>===================================================================
>--- audio/amarok/Makefile	(revision 528413)
>+++ audio/amarok/Makefile	(working copy)
>@@ -4,7 +4,7 @@
> DISTVERSIONPREFIX=	v
> DISTVERSION=	2.9.70
> PKGVERSIONSUFFIX=	-g${GH_TAGNAME}
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	audio kde
> 
> MAINTAINER=	kde@FreeBSD.org
>@@ -17,13 +17,12 @@
> 		libfftw3.so:math/fftw3 \
> 		liblastfm5.so:audio/liblastfm-qt5 \
> 		libqjson-qt5.so:devel/qjson \
>-		libqca-qt5.so:devel/qca \
> 		libtag.so:audio/taglib \
> 		libtag-extras.so:audio/taglib-extras \
> 		liblz4.so:archivers/liblz4
> 
> USES=		cmake compiler:c++11-lang desktop-file-utils \
>-		kde:5 mysql:client,embedded pkgconfig qt:5 shebangfix ssl xorg
>+		kde:5 mysql:client,embedded pkgconfig qca qt:5 shebangfix ssl xorg
> 
> USE_QT=		core concurrent declarative dbus gui location network phonon4 \
> 		quickcontrols2 script scripttools sql svg webchannel \
>Index: audio/clementine-player/Makefile
>===================================================================
>--- audio/clementine-player/Makefile	(revision 528413)
>+++ audio/clementine-player/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	clementine
> DISTVERSION=	1.4.0
>+PORTREVISION=	1
> CATEGORIES=	audio
> PKGNAMESUFFIX=	-player
> 
>@@ -16,7 +17,6 @@
> LIB_DEPENDS=	libtag.so:audio/taglib \
> 		libchromaprint.so:audio/chromaprint \
> 		libprotobuf.so:devel/protobuf \
>-		libqca-qt5.so:devel/qca \
> 		libqjson-qt5.so:devel/qjson \
> 		libfftw3.so:math/fftw3 \
> 		libechonest5.so:audio/libechonest \
>@@ -27,6 +27,7 @@
> 		desktop-file-utils \
> 		gettext-tools \
> 		pkgconfig \
>+		qca \
> 		qt:5 \
> 		sqlite \
> 		gl \
>Index: databases/kbibtex/Makefile
>===================================================================
>--- databases/kbibtex/Makefile	(revision 528413)
>+++ databases/kbibtex/Makefile	(working copy)
>@@ -11,13 +11,12 @@
> COMMENT=	Bibliography editor for KDE
> 
> LIB_DEPENDS=	libicuuc.so:devel/icu \
>-		libqca-qt5.so:devel/qca \
> 		libpoppler.so:graphics/poppler \
> 		libpoppler-qt5.so:graphics/poppler-qt5 \
> 		libqoauth-qt5.so:net/qoauth-qt5
> 
> USES=		cmake compiler:c++11-lang desktop-file-utils gettext gnome \
>-		iconv kde:5 qt:5 shared-mime-info tar:xz
>+		iconv kde:5 qca qt:5 shared-mime-info tar:xz
> USE_GNOME=	libxml2 libxslt
> USE_KDE=	auth bookmarks codecs completion config configwidgets \
> 		coreaddons crash ecm i18n iconthemes itemviews jobwidgets \
>Index: deskutils/kdeconnect-kde/Makefile
>===================================================================
>--- deskutils/kdeconnect-kde/Makefile	(revision 528413)
>+++ deskutils/kdeconnect-kde/Makefile	(working copy)
>@@ -2,6 +2,7 @@
> 
> PORTNAME=	kdeconnect-kde
> DISTVERSION=	1.3.5
>+PORTREVISION=	1
> CATEGORIES=	deskutils kde
> MASTER_SITES=	KDE/stable/kdeconnect/${DISTVERSION}
> DIST_SUBDIR=	KDE
>@@ -12,8 +13,7 @@
> LICENSE=	GPLv2
> LICENSE_FILE=	${WRKSRC}/COPYING
> 
>-LIB_DEPENDS=	libfakekey.so:x11/libfakekey \
>-		libqca-qt5.so:devel/qca
>+LIB_DEPENDS=	libfakekey.so:x11/libfakekey
> RUN_DEPENDS=	sshpass:security/sshpass \
> 		sshfs:sysutils/fusefs-sshfs
> 
>@@ -20,7 +20,7 @@
> CONFLICTS_INSTALL=	kdeconnect-kde-0.7* kdeconnect-kde-kde4-0.7.*
> 
> USES=		cmake compiler:c++11-lang desktop-file-utils gettext kde:5 \
>-		pkgconfig qt:5 tar:xz xorg
>+		pkgconfig qca qt:5 tar:xz xorg
> USE_KDE=	auth bookmarks codecs completion config configwidgets \
> 		coreaddons dbusaddons doctools ecm i18n iconthemes \
> 		itemviews jobwidgets kcmutils kio notifications service \
>Index: deskutils/kdepim-runtime/Makefile
>===================================================================
>--- deskutils/kdepim-runtime/Makefile	(revision 528413)
>+++ deskutils/kdepim-runtime/Makefile	(working copy)
>@@ -2,6 +2,7 @@
> 
> PORTNAME=	kdepim-runtime
> DISTVERSION=	${KDE_APPLICATIONS_VERSION}
>+PORTREVISION=	1
> CATEGORIES=	deskutils kde kde-applications
> 
> MAINTAINER=	kde@FreeBSD.org
>@@ -12,11 +13,10 @@
> LIB_DEPENDS=	libboost_date_time.so:devel/boost-libs \
> 		libcurl.so:ftp/curl \
> 		libkolabxml.so:textproc/libkolabxml \
>-		libqca-qt5.so:devel/qca \
> 		libsasl2.so:security/cyrus-sasl2 \
> 		libxerces-c-3.2.so:textproc/xerces-c3
> 
>-USES=		cmake:noninja compiler:c++11-lib gettext kde:5 qt:5 \
>+USES=		cmake:noninja compiler:c++11-lib gettext kde:5 qca qt:5 \
> 		shared-mime-info tar:xz
> USE_KDE=	auth bookmarks codecs completion config configwidgets \
> 		coreaddons crash dbusaddons guiaddons holidays i18n iconthemes \
>Index: devel/Makefile
>===================================================================
>--- devel/Makefile	(revision 528413)
>+++ devel/Makefile	(working copy)
>@@ -5232,6 +5232,7 @@
>     SUBDIR += pythontidy
>     SUBDIR += qbs
>     SUBDIR += qca
>+    SUBDIR += qca-legacy
>     SUBDIR += qconf
>     SUBDIR += qgit
>     SUBDIR += qjson
>Index: devel/okteta/Makefile
>===================================================================
>--- devel/okteta/Makefile	(revision 528413)
>+++ devel/okteta/Makefile	(working copy)
>@@ -2,6 +2,7 @@
> 
> PORTNAME=	okteta
> DISTVERSION=	0.26.3
>+PORTREVISION=	1
> PORTEPOCH=	1
> CATEGORIES=	devel kde
> MASTER_SITES=	KDE/stable/${PORTNAME}/${DISTVERSION}/src
>@@ -9,9 +10,7 @@
> MAINTAINER=	kde@FreeBSD.org
> COMMENT=	KDE hex editor
> 
>-LIB_DEPENDS=	libqca-qt5.so:devel/qca
>-
>-USES=		cmake compiler:c++11-lang gettext kde:5 qt:5 \
>+USES=		cmake compiler:c++11-lang gettext kde:5 qca qt:5 \
> 		shared-mime-info tar:xz
> USE_KDE=	attica auth bookmarks codecs completion crash \
> 		config configwidgets coreaddons dbusaddons doctools \
>Index: devel/qca/Makefile
>===================================================================
>--- devel/qca/Makefile	(revision 528413)
>+++ devel/qca/Makefile	(working copy)
>@@ -2,8 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	qca
>-PORTVERSION=	2.2.1
>-PORTREVISION=	4
>+DISTVERSION=	2.3.0
> CATEGORIES=	devel
> MASTER_SITES=	KDE/stable/qca/${PORTVERSION}
> PKGNAMESUFFIX=	-qt5
>@@ -52,4 +51,10 @@
> TEST_TEST_TARGET=	test
> TEST_USE=		QT=network,testlib
> 
>-.include <bsd.port.mk>
>+.include <bsd.port.pre.mk>
>+
>+.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1200085 && ${SSL_DEFAULT} == base
>+IGNORE=			Does not support OpenSSL < 1.1
>+.endif
>+
>+.include <bsd.port.post.mk>
>Index: devel/qca/distinfo
>===================================================================
>--- devel/qca/distinfo	(revision 528413)
>+++ devel/qca/distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1556314674
>-SHA256 (qca-2.2.1.tar.xz) = d716d2d8e3ed8d95bbdb061f03081d7d032206f746a30a4d29d72196f50e7b02
>-SIZE (qca-2.2.1.tar.xz) = 691676
>+TIMESTAMP = 1583676075
>+SHA256 (qca-2.3.0.tar.xz) = 1d68ef41a1b61dc9786beb923a68902a6276a77cced5e5ea7ff985ef113932d7
>+SIZE (qca-2.3.0.tar.xz) = 729504
>Index: devel/qca/files/patch-plugins_qca-botan_CMakeLists.txt
>===================================================================
>--- devel/qca/files/patch-plugins_qca-botan_CMakeLists.txt	(revision 528413)
>+++ devel/qca/files/patch-plugins_qca-botan_CMakeLists.txt	(nonexistent)
>@@ -1,10 +0,0 @@
>---- plugins/qca-botan/CMakeLists.txt.orig	2019-04-24 12:58:14 UTC
>-+++ plugins/qca-botan/CMakeLists.txt
>-@@ -16,6 +16,7 @@ if(BOTAN_FOUND)
>-     set_property(TARGET qca-botan  PROPERTY SUFFIX ".dylib")
>-   endif()
>- 
>-+  target_link_directories(qca-botan PRIVATE ${BOTAN_LIBRARY_DIRS})
>-   target_link_libraries(qca-botan ${QT_QTCORE_LIBRARY} ${QCA_LIB_NAME} ${BOTAN_LIBRARIES})
>- 
>-   if(NOT DEVELOPER_MODE)
>
>Property changes on: devel/qca/files/patch-plugins_qca-botan_CMakeLists.txt
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: devel/qca/files/patch-plugins_qca-ossl_ossl110-compat.h
>===================================================================
>--- devel/qca/files/patch-plugins_qca-ossl_ossl110-compat.h	(revision 528413)
>+++ devel/qca/files/patch-plugins_qca-ossl_ossl110-compat.h	(nonexistent)
>@@ -1,49 +0,0 @@
>---- plugins/qca-ossl/ossl110-compat.h.orig	2019-04-24 12:58:14 UTC
>-+++ plugins/qca-ossl/ossl110-compat.h
>-@@ -205,22 +205,6 @@ static int RSA_meth_set_priv_dec(RSA_METHOD *rsa, int 
>-     return 1;
>- }
>- 
>--static int RSA_meth_set_sign(RSA_METHOD *meth, int (*sign) (int type, const unsigned char *m,
>--    unsigned int m_length, unsigned char *sigret, unsigned int *siglen, const RSA *rsa))
>--{
>--    if (!meth) return 0;
>--    meth->rsa_sign = sign;
>--    return 1;
>--}
>--
>--static int RSA_meth_set_verify(RSA_METHOD *meth, int (*verify) (int dtype, const unsigned char *m,
>--    unsigned int m_length, const unsigned char *sigbuf, unsigned int siglen, const RSA *rsa))
>--{
>--    if (!meth) return 0;
>--    meth->rsa_verify = verify;
>--    return 1;
>--}
>--
>- static int RSA_meth_set_finish(RSA_METHOD *meth, int (*finish) (RSA *rsa))
>- {
>-     if (!meth) return 0;
>-@@ -271,5 +255,23 @@ static void HMAC_CTX_free(HMAC_CTX *ctx)
>- #define X509_REVOKED_get0_revocationDate(rev) (rev)->revocationDate
>- 
>- #endif // OPENSSL_VERSION_NUMBER < 0x10100000L
>-+
>-+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)
>-+static int RSA_meth_set_sign(RSA_METHOD *meth, int (*sign) (int type, const unsigned char *m,
>-+    unsigned int m_length, unsigned char *sigret, unsigned int *siglen, const RSA *rsa))
>-+{
>-+    if (!meth) return 0;
>-+    meth->rsa_sign = sign;
>-+    return 1;
>-+}
>-+
>-+static int RSA_meth_set_verify(RSA_METHOD *meth, int (*verify) (int dtype, const unsigned char *m,
>-+    unsigned int m_length, const unsigned char *sigbuf, unsigned int siglen, const RSA *rsa))
>-+{
>-+    if (!meth) return 0;
>-+    meth->rsa_verify = verify;
>-+    return 1;
>-+}
>-+#endif // (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)
>- 
>- #endif // OSSL110COMPAT_H
>
>Property changes on: devel/qca/files/patch-plugins_qca-ossl_ossl110-compat.h
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: devel/qca/files/patch-plugins_qca-ossl_qca-ossl.cpp
>===================================================================
>--- devel/qca/files/patch-plugins_qca-ossl_qca-ossl.cpp	(revision 528413)
>+++ devel/qca/files/patch-plugins_qca-ossl_qca-ossl.cpp	(nonexistent)
>@@ -1,44 +0,0 @@
>---- plugins/qca-ossl/qca-ossl.cpp.orig	2019-04-24 12:58:14 UTC
>-+++ plugins/qca-ossl/qca-ossl.cpp
>-@@ -62,12 +62,12 @@
>- #endif
>- 
>- // OpenSSL 1.1.0 compatibility macros
>--#ifdef OSSL_110
>-+#if defined(OSSL_110) && !defined(LIBRESSL_VERSION_NUMBER)
>- #define M_ASN1_IA5STRING_new() ASN1_IA5STRING_new()
>- #define RSA_F_RSA_EAY_PRIVATE_DECRYPT RSA_F_RSA_OSSL_PRIVATE_DECRYPT
>- #endif
>- 
>--#ifdef OSSL_110
>-+#if defined(OSSL_110) && !defined(LIBRESSL_VERSION_NUMBER)
>- #include <openssl/kdf.h>
>- #endif
>- 
>-@@ -1280,7 +1280,7 @@ class opensslPbkdf2Context : public KDFContext (public
>- protected:
>- };
>- 
>--#ifdef OSSL_110
>-+#if defined(OSSL_110) && !defined(LIBRESSL_VERSION_NUMBER)
>- class opensslHkdfContext : public HKDFContext
>- {
>- public:
>-@@ -7416,7 +7416,7 @@ class opensslProvider : public Provider (public)
>- #endif
>- 		list += "pbkdf1(sha1)";
>- 		list += "pbkdf2(sha1)";
>--#ifdef OSSL_110
>-+#if defined(OSSL_110) && !defined(LIBRESSL_VERSION_NUMBER)
>- 		list += "hkdf(sha256)";
>- #endif
>- 		list += "pkey";
>-@@ -7489,7 +7489,7 @@ class opensslProvider : public Provider (public)
>- #endif
>- 		else if ( type == "pbkdf2(sha1)" )
>- 			return new opensslPbkdf2Context( this, type );
>--#ifdef OSSL_110
>-+#if defined(OSSL_110) && !defined(LIBRESSL_VERSION_NUMBER)
>- 		else if ( type == "hkdf(sha256)" )
>- 			return new opensslHkdfContext( this, type );
>- #endif
>
>Property changes on: devel/qca/files/patch-plugins_qca-ossl_qca-ossl.cpp
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: devel/qca-legacy/Makefile
>===================================================================
>--- devel/qca-legacy/Makefile	(nonexistent)
>+++ devel/qca-legacy/Makefile	(working copy)
>@@ -0,0 +1,57 @@
>+# Created by: Vsevolod Stakhov <vsevolod@highsecure.ru>
>+# $FreeBSD$
>+
>+PORTNAME=	qca
>+PORTVERSION=	2.2.1
>+PORTREVISION=	4
>+CATEGORIES=	devel
>+MASTER_SITES=	KDE/stable/qca/${PORTVERSION}
>+PKGNAMESUFFIX=	legacy-qt5
>+
>+MAINTAINER=	kde@FreeBSD.org
>+COMMENT=	Cross-platform crypto API for Qt ${FLAVOR:C/qt//} -- for FreeBSD 11
>+
>+LICENSE=	LGPL21
>+LICENSE_FILE=	${WRKSRC}/COPYING
>+
>+CONFLICTS_INSTALL=	qca-qt5-*
>+
>+BUILD_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
>+RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
>+
>+USES=		cmake compiler:c++11-lang qt:5 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=${PREFIX}/man
>+CONFIGURE_ENV=	QC_CERTSTORE_PATH=${LOCALBASE}/share/certs/ca-root-nss.crt
>+USE_LDCONFIG=	yes
>+
>+CMAKE_ARGS+=	-DQCA_SUFFIX=qt5
>+USE_QT=	core buildtools_build qmake_build
>+
>+PLIST_SUB=	SHLIB_VER=${PORTVERSION}
>+
>+OPTIONS_DEFINE=	BOTAN GNUPG OPENSSL SASL TEST
>+OPTIONS_DEFAULT=GNUPG OPENSSL
>+OPTIONS_SUB=	yes
>+
>+BOTAN_CMAKE_ON=		-DWITH_botan_PLUGIN=yes
>+BOTAN_DESC=		Build with Botan crypto library
>+BOTAN_LIB_DEPENDS=	libbotan-2.so:security/botan2
>+BOTAN_USES=		pkgconfig
>+
>+GNUPG_CMAKE_ON=		-DWITH_gnupg_PLUGIN=yes
>+GNUPG_RUN_DEPENDS=	gpg2:security/gnupg
>+
>+OPENSSL_CMAKE_ON=	-DWITH_ossl_PLUGIN=yes
>+OPENSSL_USES=		ssl
>+
>+SASL_CMAKE_ON=		-DWITH_cyrus-sasl_PLUGIN=yes
>+SASL_LIB_DEPENDS=	libsasl2.so:security/cyrus-sasl2
>+
>+TEST_CMAKE_BOOL=	BUILD_TESTS
>+TEST_TEST_TARGET=	test
>+TEST_USE=		QT=network,testlib
>+
>+.include <bsd.port.mk>
>
>Property changes on: devel/qca-legacy/Makefile
>___________________________________________________________________
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:keywords
>## -0,0 +1 ##
>+FreeBSD=%H
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: devel/qca-legacy/distinfo
>===================================================================
>--- devel/qca-legacy/distinfo	(nonexistent)
>+++ devel/qca-legacy/distinfo	(working copy)
>@@ -0,0 +1,3 @@
>+TIMESTAMP = 1556314674
>+SHA256 (qca-2.2.1.tar.xz) = d716d2d8e3ed8d95bbdb061f03081d7d032206f746a30a4d29d72196f50e7b02
>+SIZE (qca-2.2.1.tar.xz) = 691676
>
>Property changes on: devel/qca-legacy/distinfo
>___________________________________________________________________
>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: devel/qca-legacy/files/patch-plugins_qca-botan_CMakeLists.txt
>===================================================================
>--- devel/qca-legacy/files/patch-plugins_qca-botan_CMakeLists.txt	(nonexistent)
>+++ devel/qca-legacy/files/patch-plugins_qca-botan_CMakeLists.txt	(working copy)
>@@ -0,0 +1,10 @@
>+--- plugins/qca-botan/CMakeLists.txt.orig	2019-04-24 12:58:14 UTC
>++++ plugins/qca-botan/CMakeLists.txt
>+@@ -16,6 +16,7 @@ if(BOTAN_FOUND)
>+     set_property(TARGET qca-botan  PROPERTY SUFFIX ".dylib")
>+   endif()
>+ 
>++  target_link_directories(qca-botan PRIVATE ${BOTAN_LIBRARY_DIRS})
>+   target_link_libraries(qca-botan ${QT_QTCORE_LIBRARY} ${QCA_LIB_NAME} ${BOTAN_LIBRARIES})
>+ 
>+   if(NOT DEVELOPER_MODE)
>
>Property changes on: devel/qca-legacy/files/patch-plugins_qca-botan_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: devel/qca-legacy/files/patch-plugins_qca-ossl_ossl110-compat.h
>===================================================================
>--- devel/qca-legacy/files/patch-plugins_qca-ossl_ossl110-compat.h	(nonexistent)
>+++ devel/qca-legacy/files/patch-plugins_qca-ossl_ossl110-compat.h	(working copy)
>@@ -0,0 +1,49 @@
>+--- plugins/qca-ossl/ossl110-compat.h.orig	2019-04-24 12:58:14 UTC
>++++ plugins/qca-ossl/ossl110-compat.h
>+@@ -205,22 +205,6 @@ static int RSA_meth_set_priv_dec(RSA_METHOD *rsa, int 
>+     return 1;
>+ }
>+ 
>+-static int RSA_meth_set_sign(RSA_METHOD *meth, int (*sign) (int type, const unsigned char *m,
>+-    unsigned int m_length, unsigned char *sigret, unsigned int *siglen, const RSA *rsa))
>+-{
>+-    if (!meth) return 0;
>+-    meth->rsa_sign = sign;
>+-    return 1;
>+-}
>+-
>+-static int RSA_meth_set_verify(RSA_METHOD *meth, int (*verify) (int dtype, const unsigned char *m,
>+-    unsigned int m_length, const unsigned char *sigbuf, unsigned int siglen, const RSA *rsa))
>+-{
>+-    if (!meth) return 0;
>+-    meth->rsa_verify = verify;
>+-    return 1;
>+-}
>+-
>+ static int RSA_meth_set_finish(RSA_METHOD *meth, int (*finish) (RSA *rsa))
>+ {
>+     if (!meth) return 0;
>+@@ -271,5 +255,23 @@ static void HMAC_CTX_free(HMAC_CTX *ctx)
>+ #define X509_REVOKED_get0_revocationDate(rev) (rev)->revocationDate
>+ 
>+ #endif // OPENSSL_VERSION_NUMBER < 0x10100000L
>++
>++#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)
>++static int RSA_meth_set_sign(RSA_METHOD *meth, int (*sign) (int type, const unsigned char *m,
>++    unsigned int m_length, unsigned char *sigret, unsigned int *siglen, const RSA *rsa))
>++{
>++    if (!meth) return 0;
>++    meth->rsa_sign = sign;
>++    return 1;
>++}
>++
>++static int RSA_meth_set_verify(RSA_METHOD *meth, int (*verify) (int dtype, const unsigned char *m,
>++    unsigned int m_length, const unsigned char *sigbuf, unsigned int siglen, const RSA *rsa))
>++{
>++    if (!meth) return 0;
>++    meth->rsa_verify = verify;
>++    return 1;
>++}
>++#endif // (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)
>+ 
>+ #endif // OSSL110COMPAT_H
>
>Property changes on: devel/qca-legacy/files/patch-plugins_qca-ossl_ossl110-compat.h
>___________________________________________________________________
>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: devel/qca-legacy/files/patch-plugins_qca-ossl_qca-ossl.cpp
>===================================================================
>--- devel/qca-legacy/files/patch-plugins_qca-ossl_qca-ossl.cpp	(nonexistent)
>+++ devel/qca-legacy/files/patch-plugins_qca-ossl_qca-ossl.cpp	(working copy)
>@@ -0,0 +1,44 @@
>+--- plugins/qca-ossl/qca-ossl.cpp.orig	2019-04-24 12:58:14 UTC
>++++ plugins/qca-ossl/qca-ossl.cpp
>+@@ -62,12 +62,12 @@
>+ #endif
>+ 
>+ // OpenSSL 1.1.0 compatibility macros
>+-#ifdef OSSL_110
>++#if defined(OSSL_110) && !defined(LIBRESSL_VERSION_NUMBER)
>+ #define M_ASN1_IA5STRING_new() ASN1_IA5STRING_new()
>+ #define RSA_F_RSA_EAY_PRIVATE_DECRYPT RSA_F_RSA_OSSL_PRIVATE_DECRYPT
>+ #endif
>+ 
>+-#ifdef OSSL_110
>++#if defined(OSSL_110) && !defined(LIBRESSL_VERSION_NUMBER)
>+ #include <openssl/kdf.h>
>+ #endif
>+ 
>+@@ -1280,7 +1280,7 @@ class opensslPbkdf2Context : public KDFContext (public
>+ protected:
>+ };
>+ 
>+-#ifdef OSSL_110
>++#if defined(OSSL_110) && !defined(LIBRESSL_VERSION_NUMBER)
>+ class opensslHkdfContext : public HKDFContext
>+ {
>+ public:
>+@@ -7416,7 +7416,7 @@ class opensslProvider : public Provider (public)
>+ #endif
>+ 		list += "pbkdf1(sha1)";
>+ 		list += "pbkdf2(sha1)";
>+-#ifdef OSSL_110
>++#if defined(OSSL_110) && !defined(LIBRESSL_VERSION_NUMBER)
>+ 		list += "hkdf(sha256)";
>+ #endif
>+ 		list += "pkey";
>+@@ -7489,7 +7489,7 @@ class opensslProvider : public Provider (public)
>+ #endif
>+ 		else if ( type == "pbkdf2(sha1)" )
>+ 			return new opensslPbkdf2Context( this, type );
>+-#ifdef OSSL_110
>++#if defined(OSSL_110) && !defined(LIBRESSL_VERSION_NUMBER)
>+ 		else if ( type == "hkdf(sha256)" )
>+ 			return new opensslHkdfContext( this, type );
>+ #endif
>
>Property changes on: devel/qca-legacy/files/patch-plugins_qca-ossl_qca-ossl.cpp
>___________________________________________________________________
>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: devel/qca-legacy/pkg-descr
>===================================================================
>--- devel/qca-legacy/pkg-descr	(nonexistent)
>+++ devel/qca-legacy/pkg-descr	(working copy)
>@@ -0,0 +1,13 @@
>+QCA aims to provide a straightforward and cross-platform crypto API,
>+using Qt datatypes and conventions.
>+
>+Supported features:
>+
>+  * SSL/TLS
>+  * X509
>+  * SASL
>+  * RSA
>+  * Hashing (SHA1, MD5)
>+  * Ciphers (Blowfish, 3DES, AES)
>+
>+WWW: http://delta.affinix.com/qca/
>
>Property changes on: devel/qca-legacy/pkg-descr
>___________________________________________________________________
>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: devel/qca-legacy/pkg-plist
>===================================================================
>--- devel/qca-legacy/pkg-plist	(nonexistent)
>+++ devel/qca-legacy/pkg-plist	(working copy)
>@@ -0,0 +1,33 @@
>+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/Qca-qt5Config.cmake
>+lib/cmake/Qca-qt5/Qca-qt5ConfigVersion.cmake
>+lib/cmake/Qca-qt5/Qca-qt5Targets-%%CMAKE_BUILD_TYPE%%.cmake
>+lib/cmake/Qca-qt5/Qca-qt5Targets.cmake
>+lib/libqca-qt5.so
>+lib/libqca-qt5.so.2
>+lib/libqca-qt5.so.%%SHLIB_VER%%
>+%%BOTAN%%lib/qca-qt5/crypto/libqca-botan.so
>+%%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
>+%%QT_MKSPECDIR%%/features/crypto.prf
>+libdata/pkgconfig/qca2-qt5.pc
>+man/man1/qcatool-qt5.1.gz
>
>Property changes on: devel/qca-legacy/pkg-plist
>___________________________________________________________________
>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: editors/calligra/Makefile
>===================================================================
>--- editors/calligra/Makefile	(revision 528413)
>+++ editors/calligra/Makefile	(working copy)
>@@ -2,7 +2,7 @@
> 
> PORTNAME=	calligra
> DISTVERSION=	3.1.0
>-PORTREVISION=	32
>+PORTREVISION=	33
> CATEGORIES=	editors kde
> MASTER_SITES=	KDE/stable/${PORTNAME}/${PORTVERSION}
> DIST_SUBDIR=	KDE/${PORTNAME}
>@@ -25,7 +25,6 @@
> 		libpng.so:graphics/png \
> 		libpoppler-qt5.so:graphics/poppler-qt5 \
> 		libpoppler.so:graphics/poppler \
>-		libqca-qt5.so:devel/qca \
> 		librevenge-0.0.so:textproc/librevenge \
> 		libtiff.so:graphics/tiff \
> 		libvisio-0.1.so:textproc/libvisio01 \
>@@ -38,7 +37,7 @@
> 
> USES=		cmake cpe compiler:c++11-lib desktop-file-utils eigen:3 \
> 		gettext iconv:translit jpeg kde:5 localbase:ldflags perl5 \
>-		pkgconfig qt:5 shared-mime-info sqlite tar:xz xorg
>+		pkgconfig qca qt:5 shared-mime-info sqlite tar:xz xorg
> USE_KDE=	akonadicontacts activities archive auth bookmarks codecs completion \
> 		config configwidgets contacts coreaddons crash dbusaddons doctools ecm \
> 		emoticons guiaddons holidays i18n iconthemes init itemmodels itemviews \
>Index: finance/skrooge/Makefile
>===================================================================
>--- finance/skrooge/Makefile	(revision 528413)
>+++ finance/skrooge/Makefile	(working copy)
>@@ -2,7 +2,7 @@
> 
> PORTNAME=	skrooge
> DISTVERSION=	2.21.1
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	finance kde
> MASTER_SITES=	KDE/stable/${PORTNAME}
> DIST_SUBDIR=	KDE/${PORTNAME}
>@@ -15,11 +15,10 @@
> 
> BUILD_DEPENDS=	xsltproc:textproc/libxslt
> LIB_DEPENDS=	libofx.so:finance/libofx \
>-		libqca-qt5.so:devel/qca \
> 		libsqlcipher.so:databases/sqlcipher
> 
> USES=		cmake compiler:c++11-lib desktop-file-utils \
>-		gettext grantlee:5 kde:5 pkgconfig python:3.4+ qt:5 shared-mime-info \
>+		gettext grantlee:5 kde:5 pkgconfig python:3.4+ qca qt:5 shared-mime-info \
> 		shebangfix sqlite:3 tar:xz
> USE_KDE=	activities archive attica5 auth bookmarks codecs completion \
> 		config configwidgets coreaddons crash dbusaddons \
>Index: games/ksirk/Makefile
>===================================================================
>--- games/ksirk/Makefile	(revision 528413)
>+++ games/ksirk/Makefile	(working copy)
>@@ -2,14 +2,13 @@
> 
> PORTNAME=	ksirk
> DISTVERSION=	${KDE_APPLICATIONS_VERSION}
>+PORTREVISION=	1
> CATEGORIES=	games kde kde-applications
> 
> MAINTAINER=	kde@FreeBSD.org
> COMMENT=	${${PORTNAME:tu}_DESC}
> 
>-LIB_DEPENDS=	libqca-qt5.so:devel/qca
>-
>-USES=		cmake compiler:c++11-lang kde:5 qt:5 tar:xz
>+USES=		cmake compiler:c++11-lang kde:5 qca qt:5 tar:xz
> USE_KDE=	attica auth codecs completion config configwidgets \
> 		coreaddons crash i18n iconthemes kio libkdegames newstuff \
> 		service wallet widgetsaddons xmlgui
>Index: graphics/okular/Makefile
>===================================================================
>--- graphics/okular/Makefile	(revision 528413)
>+++ graphics/okular/Makefile	(working copy)
>@@ -23,13 +23,12 @@
> 		libqmobipocket.so:graphics/kdegraphics-mobipocket \
> 		libpoppler.so:graphics/poppler \
> 		libpoppler-qt5.so:graphics/poppler-qt5 \
>-		libqca-qt5.so:devel/qca \
> 		libspectre.so:print/libspectre \
> 		libtiff.so:graphics/tiff \
> 		libzip.so:archivers/libzip
> 
> USES=		cmake compiler:c++11-lib desktop-file-utils \
>-		gettext jpeg kde:5 pkgconfig qt:5 tar:xz
>+		gettext jpeg kde:5 pkgconfig qca qt:5 tar:xz
> USE_KDE=	activities archive auth bookmarks codecs completion config \
> 		configwidgets coreaddons crash dbusaddons ecm emoticons i18n \
> 		iconthemes init itemmodels itemviews jobwidgets js \
>Index: graphics/qgis/Makefile
>===================================================================
>--- graphics/qgis/Makefile	(revision 528413)
>+++ graphics/qgis/Makefile	(working copy)
>@@ -4,7 +4,7 @@
> PORTNAME=	qgis
> DISTVERSIONPREFIX=	final-
> DISTVERSION=	3_10_1
>-PORTREVISION=	2
>+PORTREVISION=	3
> CATEGORIES=	graphics geography
> 
> MAINTAINER=	rhurlin@gwdg.de
>@@ -76,7 +76,6 @@
> 		libhdf5.so:science/hdf5 \
> 		libnetcdf.so:science/netcdf \
> 		libproj.so:graphics/proj \
>-		libqca-qt5.so:devel/qca \
> 		libqjson-qt5.so:devel/qjson \
> 		libqscintilla2_qt5.so:devel/qscintilla2-qt5 \
> 		libqt5keychain.so:security/qtkeychain \
>@@ -89,7 +88,7 @@
> 
> ### Fortran is needed by numpy, GRASS, etc.
> USES=		bison cmake compiler:features cpe desktop-file-utils \
>-		fortran gl gmake gnome pgsql pyqt:5 python:3.6+ qt:5 \
>+		fortran gl gmake gnome pgsql pyqt:5 python:3.6+ qca qt:5 \
> 		shebangfix sqlite:3
> USE_GNOME=	libxml2
> USE_GL=		gl
>Index: graphics/qgis-ltr/Makefile
>===================================================================
>--- graphics/qgis-ltr/Makefile	(revision 528413)
>+++ graphics/qgis-ltr/Makefile	(working copy)
>@@ -4,7 +4,7 @@
> PORTNAME=	qgis
> DISTVERSIONPREFIX=	final-
> DISTVERSION=	3_4_11
>-PORTREVISION=	4
>+PORTREVISION=	5
> CATEGORIES=	graphics geography
> PKGNAMESUFFIX=	-ltr
> 
>@@ -73,7 +73,6 @@
> 		libhdf5.so:science/hdf5 \
> 		libnetcdf.so:science/netcdf \
> 		libproj.so:graphics/proj \
>-		libqca-qt5.so:devel/qca \
> 		libqjson-qt5.so:devel/qjson \
> 		libqscintilla2_qt5.so:devel/qscintilla2-qt5 \
> 		libqt5keychain.so:security/qtkeychain \
>@@ -86,7 +85,7 @@
> 
> ### Fortran is needed by numpy, GRASS, etc.
> USES=		bison cmake compiler:features cpe desktop-file-utils \
>-		fortran gmake gnome pgsql pyqt:5 python:3.6+ qt:5 \
>+		fortran gmake gnome pgsql pyqt:5 python:3.6+ qca qt:5 \
> 		shebangfix sqlite:3
> USE_GNOME=	libxml2
> USE_QT=		3d buildtools_build core concurrent dbus declarative \
>Index: irc/konversation/Makefile
>===================================================================
>--- irc/konversation/Makefile	(revision 528413)
>+++ irc/konversation/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	konversation
> PORTVERSION=	1.7.5
>-PORTREVISION=	4
>+PORTREVISION=	5
> CATEGORIES=	irc kde
> MASTER_SITES=	KDE/stable/${PORTNAME}/${DISTVERSION}/src
> 
>@@ -13,10 +13,8 @@
> LICENSE=	GPLv2+
> LICENSE_FILE=	${WRKSRC}/COPYING
> 
>-LIB_DEPENDS=	libqca-qt5.so:devel/qca
>-
> USES=		cmake compiler:c++11-lang desktop-file-utils gettext kde:5 \
>-		python:run qt:5 shebangfix tar:xz
>+		python:run qca qt:5 shebangfix tar:xz
> USE_KDE=	archive auth bookmarks codecs completion config \
> 		configwidgets coreaddons crash dbusaddons doctools ecm \
> 		emoticons globalaccel i18n iconthemes idletime itemviews \
>Index: irc/quassel/Makefile
>===================================================================
>--- irc/quassel/Makefile	(revision 528413)
>+++ irc/quassel/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	quassel
> PORTVERSION=	0.13.1
>-PORTREVISION=	1
>+PORTREVISION=	3
> CATEGORIES=	irc
> 
> MAINTAINER=	woodsb02@FreeBSD.org
>@@ -39,7 +39,7 @@
> CORE_DESC=		Quassel core server (for use with client)
> CORE_CMAKE_BOOL=	WANT_CORE
> CORE_USE=		qt=script,sql
>-CORE_LIB_DEPENDS=	libqca-qt5.so:devel/qca
>+CORE_USES=		qca
> CORE_SUB_FILES=		pkg-message
> CORE_VARS=		use_rc_subr=quasselcore \
> 			users=quasselcore \
>@@ -50,7 +50,7 @@
> MONO_DESC=		Quassel standalone (monolithic binary: core+client combined)
> MONO_CMAKE_BOOL=	WANT_MONO
> MONO_USE=		qt=script,sql
>-MONO_LIB_DEPENDS=	libqca-qt5.so:devel/qca
>+MONO_USES=		qca
> 
> NLS_USE=		QT=linguisttools_build
> 
>Index: net/kget/Makefile
>===================================================================
>--- net/kget/Makefile	(revision 528413)
>+++ net/kget/Makefile	(working copy)
>@@ -2,6 +2,7 @@
> 
> PORTNAME=	kget
> DISTVERSION=	${KDE_APPLICATIONS_VERSION}
>+PORTREVISION=	1
> CATEGORIES=	net kde kde-applications
> 
> MAINTAINER=	kde@FreeBSD.org
>@@ -14,10 +15,9 @@
> 		libgpg-error.so:security/libgpg-error \
> 		libgpgme.so:security/gpgme \
> 		libgpgmepp.so:security/gpgme-cpp \
>-		libqca-qt5.so:devel/qca \
> 		libqgpgme.so:security/gpgme-qt5
> 
>-USES=		cmake compiler:c++11-lang desktop-file-utils kde:5 qt:5 \
>+USES=		cmake compiler:c++11-lang desktop-file-utils kde:5 qca qt:5 \
> 		shebangfix sqlite tar:xz
> 
> USE_KDE=	archive auth bookmarks codecs completion config configwidgets \
>Index: net/messagelib/Makefile
>===================================================================
>--- net/messagelib/Makefile	(revision 528413)
>+++ net/messagelib/Makefile	(working copy)
>@@ -2,7 +2,7 @@
> 
> PORTNAME=	messagelib
> DISTVERSION=	${KDE_APPLICATIONS_VERSION}
>-PORTREVISION=	2
>+PORTREVISION=	3
> CATEGORIES=	net kde kde-applications
> 
> PATCH_SITES=	https://github.com/KDE/messagelib/commit/
>@@ -18,10 +18,9 @@
> 		libgpg-error.so:security/libgpg-error \
> 		libgpgme.so:security/gpgme \
> 		libgpgmepp.so:security/gpgme-cpp \
>-		libqgpgme.so:security/gpgme-qt5 \
>-		libqca-qt5.so:devel/qca
>+		libqgpgme.so:security/gpgme-qt5
> 
>-USES=		cmake compiler:c++11-lib gettext grantlee:5 kde:5 qt:5 tar:xz
>+USES=		cmake compiler:c++11-lib gettext grantlee:5 kde:5 qca qt:5 tar:xz
> USE_KDE=	archive auth bookmarks codecs completion config configwidgets \
> 		coreaddons ecm i18n iconthemes imap itemmodels itemviews jobwidgets \
> 		kdewebkit kio service solid sonnet syntaxhighlighting \
>Index: net/qoauth-qt5/Makefile
>===================================================================
>--- net/qoauth-qt5/Makefile	(revision 528413)
>+++ net/qoauth-qt5/Makefile	(working copy)
>@@ -4,7 +4,7 @@
> PORTNAME=	qoauth
> PORTVERSION=	2.0.0
> DISTVERSIONPREFIX=	v
>-PORTREVISION=	5
>+PORTREVISION=	6
> CATEGORIES=	net devel security
> PKGNAMESUFFIX=	-qt5
> 
>@@ -14,9 +14,7 @@
> LICENSE=	LGPL21+
> LICENSE_FILE=	${WRKSRC}/LICENSE
> 
>-LIB_DEPENDS=	libqca-qt5.so:devel/qca
>-
>-USES=		compiler:c++11-lang qmake:outsource qt:5
>+USES=		compiler:c++11-lang qmake:outsource qca qt:5
> USE_LDCONFIG=	yes
> USE_QT=		core network testlib buildtools_build qmake_build
> 
>Index: net-im/kopete/Makefile
>===================================================================
>--- net-im/kopete/Makefile	(revision 528413)
>+++ net-im/kopete/Makefile	(working copy)
>@@ -2,7 +2,7 @@
> 
> PORTNAME=	kopete
> PORTVERSION=	${KDE_APPLICATIONS_VERSION}
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	net-im kde kde-applications
> 
> MAINTAINER=	kde@FreeBSD.org
>@@ -12,11 +12,10 @@
> LIB_DEPENDS=    libidn.so:dns/libidn \
> 		libjasper.so:graphics/jasper \
> 		libotr.so:security/libotr \
>-		libqca-qt5.so:devel/qca \
> 		libv4l2.so:multimedia/libv4l
> 
> USES=		cmake compiler:c++11-lang desktop-file-utils gnome jpeg kde:5 \
>-		qt:5 shebangfix tar:xz
>+		qca qt:5 shebangfix tar:xz
> USE_GNOME=	libxml2 libxslt
> USE_KDE=	archive auth bookmarks codecs completion config configwidgets \
> 		coreaddons crash dbusaddons dnssd ecm emoticons guiaddons i18n \
>Index: net-im/ktp-auth-handler/Makefile
>===================================================================
>--- net-im/ktp-auth-handler/Makefile	(revision 528413)
>+++ net-im/ktp-auth-handler/Makefile	(working copy)
>@@ -2,6 +2,7 @@
> 
> PORTNAME=	ktp-auth-handler
> DISTVERSION=	${KDE_APPLICATIONS_VERSION}
>+PORTREVISION=	1
> CATEGORIES=	net-im kde kde-applications
> 
> MAINTAINER=	kde@FreeBSD.org
>@@ -10,8 +11,7 @@
> LICENSE=	LGPL21+
> LICENSE_FILE=	${WRKSRC}/COPYING
> 
>-LIB_DEPENDS=	libqca-qt5.so:devel/qca \
>-		libtelepathy-qt5.so:net-im/telepathy-qt \
>+LIB_DEPENDS=	libtelepathy-qt5.so:net-im/telepathy-qt \
> 		libKTpCommonInternals.so:net-im/ktp-common-internals  \
> 		libaccounts-qt5.so:net-im/libaccounts-qt5 \
> 		libkaccounts.so:net-im/kaccounts-integration \
>@@ -18,7 +18,7 @@
> 		libsignon-qt5.so:sysutils/signon-qt5
> 
> USES=		compiler:c++11-lang cmake gettext kde:5 pkgconfig \
>-		qt:5 tar:xz
>+		qca qt:5 tar:xz
> USE_KDE=	completion config coreaddons ecm i18n jobwidgets kdewebkit \
> 		kio wallet service widgetsaddons
> USE_QT=		concurrent core dbus gui network webkit widgets xml \
>Index: net-im/psi/Makefile
>===================================================================
>--- net-im/psi/Makefile	(revision 528413)
>+++ net-im/psi/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	psi
> PORTVERSION=	1.4
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	net-im
> MASTER_SITES=	SF/${PORTNAME}/Psi/${PORTVERSION}
> 
>@@ -13,11 +13,10 @@
> LICENSE=	GPLv2
> 
> LIB_DEPENDS=	libidn.so:dns/libidn \
>-		libminizip.so:archivers/minizip \
>-		libqca-qt5.so:devel/qca
>+		libminizip.so:archivers/minizip
> 
> USES=		cmake compiler:c++11-lang desktop-file-utils pkgconfig \
>-		qt:5 tar:xz xorg
>+		qca qt:5 tar:xz xorg
> USE_QT=		concurrent core dbus gui multimedia network svg widgets \
> 		x11extras xml buildtools_build qmake_build imageformats_run
> USE_XORG=	ice sm x11 xcb xext xscrnsaver
>Index: net-p2p/libktorrent/Makefile
>===================================================================
>--- net-p2p/libktorrent/Makefile	(revision 528413)
>+++ net-p2p/libktorrent/Makefile	(working copy)
>@@ -2,7 +2,7 @@
> 
> PORTNAME=	libktorrent
> DISTVERSION=	2.1.1
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	net-p2p kde
> MASTER_SITES=	KDE/stable/ktorrent/5.1.2/
> 
>@@ -15,10 +15,9 @@
> BUILD_DEPENDS=	${LOCALBASE}/include/boost/concept_check.hpp:devel/boost-libs
> 
> LIB_DEPENDS=	libgcrypt.so:security/libgcrypt \
>-		libgmp.so:math/gmp \
>-		libqca-qt5.so:devel/qca
>+		libgmp.so:math/gmp
> 
>-USES=		cmake compiler:c++11-lang gettext kde:5 qt:5 tar:xz
>+USES=		cmake compiler:c++11-lang gettext kde:5 qca qt:5 tar:xz
> USE_KDE=	archive completion config coreaddons crash ecm i18n \
> 		jobwidgets kio service solid widgetsaddons
> USE_QT=		core gui network testlib xml \
>Index: polish/kadu/Makefile
>===================================================================
>--- polish/kadu/Makefile	(revision 528413)
>+++ polish/kadu/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	kadu
> PORTVERSION=	4.3
>-PORTREVISION=	18
>+PORTREVISION=	19
> PORTEPOCH=	1
> CATEGORIES=	polish net-im
> MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}/:kadu \
>@@ -23,7 +23,6 @@
> LIB_DEPENDS=	libmpdclient.so:audio/libmpdclient \
> 		libsndfile.so:audio/libsndfile \
> 		libinjeqt.so:devel/injeqt \
>-		libqca-qt5.so:devel/qca \
> 		libidn.so:dns/libidn \
> 		libqxmpp.so:net-im/qxmpp-qt5 \
> 		libgadu.so:polish/libgadu \
>@@ -37,7 +36,7 @@
> GG7_EMOTS_DISTFILE=	dodatkowe_emoty_GG7.tar.gz
> 
> USES=		cmake:insource compiler:c++11-lib gettext-runtime gnome \
>-		libarchive pkgconfig qt:5 readline tar:bzip2 xorg
>+		libarchive pkgconfig qca qt:5 readline tar:bzip2 xorg
> USE_XORG=	x11 xext xfixes xscrnsaver
> USE_GNOME=	glib20
> USE_QT=		concurrent core dbus declarative gui multimedia network \
>Index: www/choqok/Makefile
>===================================================================
>--- www/choqok/Makefile	(revision 528413)
>+++ www/choqok/Makefile	(working copy)
>@@ -2,7 +2,7 @@
> 
> PORTNAME=	choqok
> DISTVERSION=	1.6.0
>-PORTREVISION=	7
>+PORTREVISION=	8
> CATEGORIES=	www kde
> MASTER_SITES=	KDE/stable/${PORTNAME}/${PORTVERSION:R}/src
> DIST_SUBDIR=	KDE/${PORTNAME}
>@@ -14,11 +14,10 @@
> LICENSE_FILE=	${WRKSRC}/COPYING
> 
> LIB_DEPENDS=	libqjson-qt5.so:devel/qjson \
>-		libqca-qt5.so:devel/qca \
> 		libqoauth-qt5.so:net/qoauth-qt5 \
> 		libtelepathy-qt5.so:net-im/telepathy-qt
> 
>-USES=		cmake compiler:c++11-lib gettext kde:5 pkgconfig qt:5 tar:xz
>+USES=		cmake compiler:c++11-lib gettext kde:5 pkgconfig qca qt:5 tar:xz
> USE_KDE=	attica auth bookmarks codecs completion config configwidgets \
> 		coreaddons doctools ecm emoticons globalaccel guiaddons i18n \
> 		itemviews jobwidgets kcmutils kdewebkit kio notifications \
>@@ -26,7 +25,7 @@
> 		widgetsaddons xmlgui \
> 		kded_run
> USE_QT=		core dbus gui network widgets xml \
>-		buildtools_build qmake_build 
>+		buildtools_build qmake_build
> 
> USE_LDCONFIG=	yes
>

Actions: View | Diff

Attachments on bug 244682: 212262 | 212404