Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 21 Mar 2020 07:24:00 +0000 (UTC)
From:      "Tobias C. Berner" <tcberner@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r528829 - in head: . Mk/Uses audio/amarok audio/clementine-player databases/kbibtex deskutils/kdeconnect-kde deskutils/kdepim-runtime devel devel/okteta devel/qca devel/qca-legacy devel...
Message-ID:  <202003210724.02L7O0Ft017670@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: tcberner
Date: Sat Mar 21 07:23:59 2020
New Revision: 528829
URL: https://svnweb.freebsd.org/changeset/ports/528829

Log:
  devel/qca: update to 2.3
  
  - qca-2.3 drop support for OSSL<1.1
  - copy devel/qca to devel/qca-legacy which is held at the current version
  - update devel/qca to 2.3
  - Add Uses/qca.mk which handles dependency on either of the ports depending on
    the FreeBSD version
  
  Users on FreeBSD11 must therefore change their pkg orign à la:
  
     pkg set -o devel/qca:devel/qca-legacy
  
  PR:		244682
  Exp-run by:	antoine
  Reviewed by:	arrowd
  Differential Revision:	https://reviews.freebsd.org/D24042

Added:
  head/Mk/Uses/qca.mk   (contents, props changed)
  head/devel/qca-legacy/
     - copied from r528191, head/devel/qca/
Deleted:
  head/devel/qca/files/
Modified:
  head/UPDATING
  head/audio/amarok/Makefile
  head/audio/clementine-player/Makefile
  head/databases/kbibtex/Makefile
  head/deskutils/kdeconnect-kde/Makefile
  head/deskutils/kdepim-runtime/Makefile
  head/devel/Makefile
  head/devel/okteta/Makefile
  head/devel/qca-legacy/Makefile
  head/devel/qca/Makefile
  head/devel/qca/distinfo
  head/editors/calligra/Makefile
  head/finance/skrooge/Makefile
  head/games/ksirk/Makefile
  head/graphics/okular/Makefile
  head/graphics/qgis-ltr/Makefile
  head/graphics/qgis/Makefile
  head/irc/konversation/Makefile
  head/irc/quassel/Makefile
  head/net-im/kopete/Makefile
  head/net-im/ktp-auth-handler/Makefile
  head/net-im/psi/Makefile
  head/net-p2p/libktorrent/Makefile
  head/net/kget/Makefile
  head/net/messagelib/Makefile
  head/net/qoauth-qt5/Makefile
  head/polish/kadu/Makefile
  head/www/choqok/Makefile

Added: head/Mk/Uses/qca.mk
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/Mk/Uses/qca.mk	Sat Mar 21 07:23:59 2020	(r528829)
@@ -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

Modified: head/UPDATING
==============================================================================
--- head/UPDATING	Sat Mar 21 06:08:53 2020	(r528828)
+++ head/UPDATING	Sat Mar 21 07:23:59 2020	(r528829)
@@ -5,6 +5,21 @@ they are unavoidable.
 You should get into the habit of checking this file for changes each time
 you update your ports collection, before attempting any port upgrades.
 
+20200320
+  AFFECTS: users of devel/qca
+  AUTHOR: kde@FreeBSD.org
+
+  New versions of devel/qca stopped supporting OpenSSL < 1.1.
+  For this reason devel/qca-legacy has been added, which is
+  held back at an older version until FreeBSD 11 goes EOL.
+
+  Ports depending on devel/qca should stop adding direct LIB_DEPENDS
+  and switch to depending on it via USES=qca.
+
+  FreeBSD 11 users might want to run something like
+
+      pkg set -o devel/qca:devel/qca-legacy
+
 20200320:
   AFFECTS: users of x11/libxkbcommon
   AUTHOR: zeising@FreeBSD.org

Modified: head/audio/amarok/Makefile
==============================================================================
--- head/audio/amarok/Makefile	Sat Mar 21 06:08:53 2020	(r528828)
+++ head/audio/amarok/Makefile	Sat Mar 21 07:23:59 2020	(r528829)
@@ -4,7 +4,7 @@ PORTNAME=	amarok
 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 @@ LIB_DEPENDS=	libdbus-1.so:devel/dbus \
 		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 \

Modified: head/audio/clementine-player/Makefile
==============================================================================
--- head/audio/clementine-player/Makefile	Sat Mar 21 06:08:53 2020	(r528828)
+++ head/audio/clementine-player/Makefile	Sat Mar 21 07:23:59 2020	(r528829)
@@ -3,6 +3,7 @@
 
 PORTNAME=	clementine
 DISTVERSION=	1.4.0
+PORTREVISION=	1
 CATEGORIES=	audio
 PKGNAMESUFFIX=	-player
 
@@ -16,7 +17,6 @@ BUILD_DEPENDS=	${LOCALBASE}/include/boost/shared_ptr.h
 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 @@ USES=		cmake \
 		desktop-file-utils \
 		gettext-tools \
 		pkgconfig \
+		qca \
 		qt:5 \
 		sqlite \
 		gl \

Modified: head/databases/kbibtex/Makefile
==============================================================================
--- head/databases/kbibtex/Makefile	Sat Mar 21 06:08:53 2020	(r528828)
+++ head/databases/kbibtex/Makefile	Sat Mar 21 07:23:59 2020	(r528829)
@@ -11,13 +11,12 @@ MAINTAINER=	kde@FreeBSD.org
 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 \

Modified: head/deskutils/kdeconnect-kde/Makefile
==============================================================================
--- head/deskutils/kdeconnect-kde/Makefile	Sat Mar 21 06:08:53 2020	(r528828)
+++ head/deskutils/kdeconnect-kde/Makefile	Sat Mar 21 07:23:59 2020	(r528829)
@@ -2,6 +2,7 @@
 
 PORTNAME=	kdeconnect-kde
 DISTVERSION=	1.4
+PORTREVISION=	1
 CATEGORIES=	deskutils kde
 MASTER_SITES=	KDE/stable/kdeconnect/${DISTVERSION}
 DIST_SUBDIR=	KDE
@@ -13,7 +14,6 @@ LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libfakekey.so:x11/libfakekey \
-		libqca-qt5.so:devel/qca \
 		libKF5PulseAudioQt.so:audio/pulseaudio-qt
 BUILD_DEPENDS=	kpeoplevcard>0:net/kpeoplevcard
 RUN_DEPENDS=	sshpass:security/sshpass \
@@ -23,7 +23,7 @@ RUN_DEPENDS=	sshpass:security/sshpass \
 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 kirigami2 notifications \

Modified: head/deskutils/kdepim-runtime/Makefile
==============================================================================
--- head/deskutils/kdepim-runtime/Makefile	Sat Mar 21 06:08:53 2020	(r528828)
+++ head/deskutils/kdepim-runtime/Makefile	Sat Mar 21 07:23:59 2020	(r528829)
@@ -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 @@ LICENSE=	LGPL21
 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 \

Modified: head/devel/Makefile
==============================================================================
--- head/devel/Makefile	Sat Mar 21 06:08:53 2020	(r528828)
+++ head/devel/Makefile	Sat Mar 21 07:23:59 2020	(r528829)
@@ -5227,6 +5227,7 @@
     SUBDIR += pythontidy
     SUBDIR += qbs
     SUBDIR += qca
+    SUBDIR += qca-legacy
     SUBDIR += qconf
     SUBDIR += qgit
     SUBDIR += qjson

Modified: head/devel/okteta/Makefile
==============================================================================
--- head/devel/okteta/Makefile	Sat Mar 21 06:08:53 2020	(r528828)
+++ head/devel/okteta/Makefile	Sat Mar 21 07:23:59 2020	(r528829)
@@ -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 @@ MASTER_SITES=	KDE/stable/${PORTNAME}/${DISTVERSION}/sr
 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 \

Modified: head/devel/qca-legacy/Makefile
==============================================================================
--- head/devel/qca/Makefile	Tue Mar 10 18:46:35 2020	(r528191)
+++ head/devel/qca-legacy/Makefile	Sat Mar 21 07:23:59 2020	(r528829)
@@ -3,16 +3,18 @@
 
 PORTNAME=	qca
 PORTVERSION=	2.2.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	devel
 MASTER_SITES=	KDE/stable/qca/${PORTVERSION}
-PKGNAMESUFFIX=	-qt5
+PKGNAMESUFFIX=	-legacy-qt5
 
 MAINTAINER=	kde@FreeBSD.org
-COMMENT=	Cross-platform crypto API for Qt ${FLAVOR:C/qt//}
+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

Modified: head/devel/qca/Makefile
==============================================================================
--- head/devel/qca/Makefile	Sat Mar 21 06:08:53 2020	(r528828)
+++ head/devel/qca/Makefile	Sat Mar 21 07:23:59 2020	(r528829)
@@ -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_CMAKE_BOOL=	BUILD_TESTS
 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>

Modified: head/devel/qca/distinfo
==============================================================================
--- head/devel/qca/distinfo	Sat Mar 21 06:08:53 2020	(r528828)
+++ head/devel/qca/distinfo	Sat Mar 21 07:23:59 2020	(r528829)
@@ -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

Modified: head/editors/calligra/Makefile
==============================================================================
--- head/editors/calligra/Makefile	Sat Mar 21 06:08:53 2020	(r528828)
+++ head/editors/calligra/Makefile	Sat Mar 21 07:23:59 2020	(r528829)
@@ -25,7 +25,6 @@ LIB_DEPENDS=	libImath.so:graphics/ilmbase \
 		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 @@ RUN_DEPENDS=	pstoedit:graphics/pstoedit
 
 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 \

Modified: head/finance/skrooge/Makefile
==============================================================================
--- head/finance/skrooge/Makefile	Sat Mar 21 06:08:53 2020	(r528828)
+++ head/finance/skrooge/Makefile	Sat Mar 21 07:23:59 2020	(r528829)
@@ -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 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 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 \

Modified: head/games/ksirk/Makefile
==============================================================================
--- head/games/ksirk/Makefile	Sat Mar 21 06:08:53 2020	(r528828)
+++ head/games/ksirk/Makefile	Sat Mar 21 07:23:59 2020	(r528829)
@@ -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

Modified: head/graphics/okular/Makefile
==============================================================================
--- head/graphics/okular/Makefile	Sat Mar 21 06:08:53 2020	(r528828)
+++ head/graphics/okular/Makefile	Sat Mar 21 07:23:59 2020	(r528829)
@@ -23,13 +23,12 @@ LIB_DEPENDS=	libchm.so:misc/chmlib \
 		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 \

Modified: head/graphics/qgis-ltr/Makefile
==============================================================================
--- head/graphics/qgis-ltr/Makefile	Sat Mar 21 06:08:53 2020	(r528828)
+++ head/graphics/qgis-ltr/Makefile	Sat Mar 21 07:23:59 2020	(r528829)
@@ -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 @@ LIB_DEPENDS=	libexiv2.so:graphics/exiv2 \
 		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 @@ LIB_DEPENDS=	libexiv2.so:graphics/exiv2 \
 
 ### 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 \

Modified: head/graphics/qgis/Makefile
==============================================================================
--- head/graphics/qgis/Makefile	Sat Mar 21 06:08:53 2020	(r528828)
+++ head/graphics/qgis/Makefile	Sat Mar 21 07:23:59 2020	(r528829)
@@ -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 @@ LIB_DEPENDS=	libexiv2.so:graphics/exiv2 \
 		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 @@ LIB_DEPENDS=	libexiv2.so:graphics/exiv2 \
 
 ### 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

Modified: head/irc/konversation/Makefile
==============================================================================
--- head/irc/konversation/Makefile	Sat Mar 21 06:08:53 2020	(r528828)
+++ head/irc/konversation/Makefile	Sat Mar 21 07:23:59 2020	(r528829)
@@ -3,7 +3,7 @@
 
 PORTNAME=	konversation
 PORTVERSION=	1.7.5
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	irc kde
 MASTER_SITES=	KDE/stable/${PORTNAME}/${DISTVERSION}/src
 
@@ -13,10 +13,8 @@ COMMENT=	User friendly IRC client for KDE
 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 \

Modified: head/irc/quassel/Makefile
==============================================================================
--- head/irc/quassel/Makefile	Sat Mar 21 06:08:53 2020	(r528828)
+++ head/irc/quassel/Makefile	Sat Mar 21 07:23:59 2020	(r528829)
@@ -3,7 +3,7 @@
 
 PORTNAME=	quassel
 PORTVERSION=	0.13.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	irc
 
 MAINTAINER=	woodsb02@FreeBSD.org
@@ -39,7 +39,7 @@ CLIENT_LIB_DEPENDS=	libdbusmenu-qt5.so:devel/libdbusme
 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 @@ CORE_PLIST_FILES=	bin/quasselcore
 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
 

Modified: head/net-im/kopete/Makefile
==============================================================================
--- head/net-im/kopete/Makefile	Sat Mar 21 06:08:53 2020	(r528828)
+++ head/net-im/kopete/Makefile	Sat Mar 21 07:23:59 2020	(r528829)
@@ -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 @@ BUILD_DEPENDS=	v4l_compat>0:multimedia/v4l_compat
 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 \

Modified: head/net-im/ktp-auth-handler/Makefile
==============================================================================
--- head/net-im/ktp-auth-handler/Makefile	Sat Mar 21 06:08:53 2020	(r528828)
+++ head/net-im/ktp-auth-handler/Makefile	Sat Mar 21 07:23:59 2020	(r528829)
@@ -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,15 +11,14 @@ COMMENT=	KWallet integration module for KDE Telepathy
 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 \
 		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 \

Modified: head/net-im/psi/Makefile
==============================================================================
--- head/net-im/psi/Makefile	Sat Mar 21 06:08:53 2020	(r528828)
+++ head/net-im/psi/Makefile	Sat Mar 21 07:23:59 2020	(r528829)
@@ -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 @@ COMMENT=	Qt-based Jabber (XMPP) client
 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

Modified: head/net-p2p/libktorrent/Makefile
==============================================================================
--- head/net-p2p/libktorrent/Makefile	Sat Mar 21 06:08:53 2020	(r528828)
+++ head/net-p2p/libktorrent/Makefile	Sat Mar 21 07:23:59 2020	(r528829)
@@ -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 @@ COMMENT=	Torrent library from KTorrent project
 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 \

Modified: head/net/kget/Makefile
==============================================================================
--- head/net/kget/Makefile	Sat Mar 21 06:08:53 2020	(r528828)
+++ head/net/kget/Makefile	Sat Mar 21 07:23:59 2020	(r528829)
@@ -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 @@ LIB_DEPENDS=    libKF5Torrent.so:net-p2p/libktorrent  
 		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 \

Modified: head/net/messagelib/Makefile
==============================================================================
--- head/net/messagelib/Makefile	Sat Mar 21 06:08:53 2020	(r528828)
+++ head/net/messagelib/Makefile	Sat Mar 21 07:23:59 2020	(r528829)
@@ -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 @@ LIB_DEPENDS=	libassuan.so:security/libassuan \
 		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 \

Modified: head/net/qoauth-qt5/Makefile
==============================================================================
--- head/net/qoauth-qt5/Makefile	Sat Mar 21 06:08:53 2020	(r528828)
+++ head/net/qoauth-qt5/Makefile	Sat Mar 21 07:23:59 2020	(r528829)
@@ -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 @@ COMMENT=	Qt5 support for OAuth-powered network service
 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
 

Modified: head/polish/kadu/Makefile
==============================================================================
--- head/polish/kadu/Makefile	Sat Mar 21 06:08:53 2020	(r528828)
+++ head/polish/kadu/Makefile	Sat Mar 21 07:23:59 2020	(r528829)
@@ -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 @@ BUILD_DEPENDS=	bash:shells/bash \
 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 @@ GG6_EMOTS_DISTFILE=	kompatybilne_z_GG6.tar.gz
 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 \

Modified: head/www/choqok/Makefile
==============================================================================
--- head/www/choqok/Makefile	Sat Mar 21 06:08:53 2020	(r528828)
+++ head/www/choqok/Makefile	Sat Mar 21 07:23:59 2020	(r528829)
@@ -2,7 +2,7 @@
 
 PORTNAME=	choqok
 DISTVERSION=	1.6.0
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	www kde
 MASTER_SITES=	KDE/stable/${PORTNAME}/${PORTVERSION:R}/src
 DIST_SUBDIR=	KDE/${PORTNAME}
@@ -14,11 +14,10 @@ LICENSE=	GPLv3
 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 \



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202003210724.02L7O0Ft017670>