View | Details | Raw Unified | Return to bug 244682 | Differences between
and this patch

Collapse All | Expand All

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

Return to bug 244682