svn commit: r495946 - in head: . net-im net-im/ktp-accounts-kcm net-im/ktp-approver net-im/ktp-auth-handler net-im/ktp-call-ui net-im/ktp-common-internals net-im/ktp-contact-list net-im/ktp-contact...

Sat Mar 16 19:13:38 UTC 2019

Author: tcberner
Date: Sat Mar 16 19:13:34 2019
New Revision: 495946
URL: https://svnweb.freebsd.org/changeset/ports/495946

Log:
  net-im/telepathy-qt: remove flavors (Qt4 deprecation)

Modified:
  head/MOVED
  head/net-im/Makefile
  head/net-im/ktp-accounts-kcm/Makefile
  head/net-im/ktp-approver/Makefile
  head/net-im/ktp-auth-handler/Makefile
  head/net-im/ktp-call-ui/Makefile
  head/net-im/ktp-common-internals/Makefile
  head/net-im/ktp-contact-list/Makefile
  head/net-im/ktp-contact-runner/Makefile
  head/net-im/ktp-filetransfer-handler/Makefile
  head/net-im/ktp-kded-module/Makefile
  head/net-im/ktp-send-file/Makefile
  head/net-im/ktp-text-ui/Makefile
  head/net-im/telepathy-logger-qt4/Makefile
  head/net-im/telepathy-logger-qt5/Makefile
  head/net-im/telepathy-qt/Makefile
  head/net/krfb/Makefile
  head/www/choqok/Makefile

Modified: head/MOVED
==============================================================================

--- head/MOVED	Sat Mar 16 19:12:40 2019	(r495945)
+++ head/MOVED	Sat Mar 16 19:13:34 2019	(r495946)
@@ -10523,8 +10523,6 @@ editors/latexila|editors/gnome-latex|2018-10-05|Projec
 math/arpack|math/arpack-ng|2018-10-06|math/arpack is the old, unmaintained version, math/arpack-ng should be used instead
 net-p2p/libtorrent-rasterbar-python|net-p2p/py-libtorrent-rasterbar|2018-10-06|Rename to the canonical name for a python port
 biology/tinker|science/tinker|2018-10-06|Move to proper category
-net-im/telepathy-qt4|net-im/telepathy-qt at qt4|2018-10-07|Moved to flavored version
-net-im/telepathy-qt5|net-im/telepathy-qt at qt5|2018-10-07|Moved to flavored version
 graphics/gegl3|graphics/gegl|2018-10-07|Replaced old gegl version with the newer version
 www/mediawiki129|www/mediawiki131|2018-10-08|Has expired: Deprecated by upstream
 devel/pecl-xdebug26|devel/pecl-xdebug|2018-10-09|Renamed because 2.6 is the new default
@@ -11674,3 +11672,5 @@ security/qtkeychain at qt4||2019-03-16|Qt4 deprecation
 security/qtkeychain at qt5|security/qtkeychain|2019-03-16|Flavor has been removed
 deskutils/znotes at qt4||2019-03-16|Qt4 deprecation
 deskutils/znotes at qt5|deskutils/znotes|2019-03-16|Flavor has been removed
+net-im/telepathy-qt at qt4||2019-03-16|Qt4 deprecation
+net-im/telepathy-qt at qt5|net-im/telepathy-qt|2019-03-16|Flavor has been removed

Modified: head/net-im/Makefile
==============================================================================
--- head/net-im/Makefile	Sat Mar 16 19:12:40 2019	(r495945)
+++ head/net-im/Makefile	Sat Mar 16 19:13:34 2019	(r495946)
@@ -1,4 +1,5 @@
 # $FreeBSD$
+PORTREVISION=	1
 #
 
     COMMENT = Instant messaging

Modified: head/net-im/ktp-accounts-kcm/Makefile
==============================================================================
--- head/net-im/ktp-accounts-kcm/Makefile	Sat Mar 16 19:12:40 2019	(r495945)
+++ head/net-im/ktp-accounts-kcm/Makefile	Sat Mar 16 19:13:34 2019	(r495946)
@@ -2,6 +2,7 @@
 
 PORTNAME=	ktp-accounts-kcm
 DISTVERSION=	${KDE_APPLICATIONS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	net-im kde kde-applications
 
 MAINTAINER=	kde at FreeBSD.org
@@ -12,7 +13,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libaccounts-qt5.so:net-im/libaccounts-qt5 \
 		libkaccounts.so:net-im/kaccounts-integration \
-		libtelepathy-qt5.so:net-im/telepathy-qt at qt5 \
+		libtelepathy-qt5.so:net-im/telepathy-qt \
 		libtelepathy-logger-qt.so:net-im/telepathy-logger-qt5 \
 		libKTpCommonInternals.so:net-im/ktp-common-internals \
 		libKF5AkonadiPrivate.so:databases/akonadi \

Modified: head/net-im/ktp-approver/Makefile
==============================================================================
--- head/net-im/ktp-approver/Makefile	Sat Mar 16 19:12:40 2019	(r495945)
+++ head/net-im/ktp-approver/Makefile	Sat Mar 16 19:13:34 2019	(r495946)
@@ -2,6 +2,7 @@
 
 PORTNAME=	ktp-approver
 DISTVERSION=	${KDE_APPLICATIONS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	net-im kde kde-applications
 
 MAINTAINER=	kde at FreeBSD.org
@@ -10,7 +11,7 @@ COMMENT=	KDE instant messaging notifier
 LICENSE=	LGPL21+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libtelepathy-qt5.so:net-im/telepathy-qt at qt5 \
+LIB_DEPENDS=	libtelepathy-qt5.so:net-im/telepathy-qt \
 		libKTpCommonInternals.so:net-im/ktp-common-internals
 RUN_DEPENDS=	${KDE_PREFIX}/bin/ktp-contactlist:net-im/ktp-contact-list
 

Modified: head/net-im/ktp-auth-handler/Makefile
==============================================================================
--- head/net-im/ktp-auth-handler/Makefile	Sat Mar 16 19:12:40 2019	(r495945)
+++ head/net-im/ktp-auth-handler/Makefile	Sat Mar 16 19:13:34 2019	(r495946)
@@ -2,6 +2,7 @@
 
 PORTNAME=	ktp-auth-handler
 DISTVERSION=	${KDE_APPLICATIONS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	net-im kde kde-applications
 
 MAINTAINER=	kde at FreeBSD.org
@@ -11,7 +12,7 @@ LICENSE=	LGPL21+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libqca-qt5.so:devel/qca at qt5 \
-		libtelepathy-qt5.so:net-im/telepathy-qt at qt5 \
+		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 \

Modified: head/net-im/ktp-call-ui/Makefile
==============================================================================
--- head/net-im/ktp-call-ui/Makefile	Sat Mar 16 19:12:40 2019	(r495945)
+++ head/net-im/ktp-call-ui/Makefile	Sat Mar 16 19:13:34 2019	(r495946)
@@ -2,6 +2,7 @@
 
 PORTNAME=	ktp-call-ui
 DISTVERSION=	${KDE_APPLICATIONS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	net-im kde kde-applications
 
 MAINTAINER=	kde at FreeBSD.org
@@ -13,7 +14,7 @@ LIB_DEPENDS=	libKTpCommonInternals.so:net-im/ktp-commo
 		libfarstream-0.2.so:net-im/farstream \
 		libtelepathy-farstream.so:net-im/telepathy-farstream \
 		libtelepathy-glib.so:net-im/telepathy-glib \
-		libtelepathy-qt5-farstream.so:net-im/telepathy-qt at qt5
+		libtelepathy-qt5-farstream.so:net-im/telepathy-qt
 
 USES=		cmake compiler:c++11-lang gettext kde:5 pkgconfig \
 		python:2.7 qt:5 tar:xz

Modified: head/net-im/ktp-common-internals/Makefile
==============================================================================
--- head/net-im/ktp-common-internals/Makefile	Sat Mar 16 19:12:40 2019	(r495945)
+++ head/net-im/ktp-common-internals/Makefile	Sat Mar 16 19:13:34 2019	(r495946)
@@ -2,6 +2,7 @@
 
 PORTNAME=	ktp-common-internals
 DISTVERSION=	${KDE_APPLICATIONS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	net-im kde kde-applications
 
 MAINTAINER=	kde at FreeBSD.org
@@ -9,7 +10,7 @@ COMMENT=	KDE Telepathy internal library
 
 LIB_DEPENDS=	libgcrypt.so:security/libgcrypt \
 		libsignon-qt5.so:sysutils/signon-qt5 \
-		libtelepathy-qt5.so:net-im/telepathy-qt at qt5 \
+		libtelepathy-qt5.so:net-im/telepathy-qt \
 		libtelepathy-logger-qt.so:net-im/telepathy-logger-qt5 \
 		libotr.so:security/libotr \
 		libaccounts-qt5.so:net-im/libaccounts-qt5 \

Modified: head/net-im/ktp-contact-list/Makefile
==============================================================================
--- head/net-im/ktp-contact-list/Makefile	Sat Mar 16 19:12:40 2019	(r495945)
+++ head/net-im/ktp-contact-list/Makefile	Sat Mar 16 19:13:34 2019	(r495946)
@@ -2,12 +2,13 @@
 
 PORTNAME=	ktp-contact-list
 DISTVERSION=	${KDE_APPLICATIONS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	net-im kde kde-applications
 
 MAINTAINER=	kde at FreeBSD.org
 COMMENT=	KDE instant messaging contact list application
 
-LIB_DEPENDS=	libtelepathy-qt5.so:net-im/telepathy-qt at qt5 \
+LIB_DEPENDS=	libtelepathy-qt5.so:net-im/telepathy-qt \
 		libtelepathy-logger-qt.so:net-im/telepathy-logger-qt5 \
 		libKTpCommonInternals.so:net-im/ktp-common-internals
 

Modified: head/net-im/ktp-contact-runner/Makefile
==============================================================================
--- head/net-im/ktp-contact-runner/Makefile	Sat Mar 16 19:12:40 2019	(r495945)
+++ head/net-im/ktp-contact-runner/Makefile	Sat Mar 16 19:13:34 2019	(r495946)
@@ -2,12 +2,13 @@
 
 PORTNAME=	ktp-contact-runner
 DISTVERSION=	${KDE_APPLICATIONS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	net-im kde kde-applications
 
 MAINTAINER=	kde at FreeBSD.org
 COMMENT=	KRunner integration module for KDE Telepathy
 
-LIB_DEPENDS=	libtelepathy-qt5.so:net-im/telepathy-qt at qt5 \
+LIB_DEPENDS=	libtelepathy-qt5.so:net-im/telepathy-qt \
 		libKTpCommonInternals.so:net-im/ktp-common-internals
 
 USES=		compiler:c++11-lang cmake gettext kde:5 qt:5 tar:xz

Modified: head/net-im/ktp-filetransfer-handler/Makefile
==============================================================================
--- head/net-im/ktp-filetransfer-handler/Makefile	Sat Mar 16 19:12:40 2019	(r495945)
+++ head/net-im/ktp-filetransfer-handler/Makefile	Sat Mar 16 19:13:34 2019	(r495946)
@@ -2,6 +2,7 @@
 
 PORTNAME=	ktp-filetransfer-handler
 DISTVERSION=	${KDE_APPLICATIONS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	net-im kde kde-applications
 
 MAINTAINER=	kde at FreeBSD.org
@@ -10,7 +11,7 @@ COMMENT=	KDE instant messaging file transfer handler
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libtelepathy-qt5.so:net-im/telepathy-qt at qt5 \
+LIB_DEPENDS=	libtelepathy-qt5.so:net-im/telepathy-qt \
 		libKTpCommonInternals.so:net-im/ktp-common-internals
 
 USES=		compiler:c++11-lang cmake gettext kde:5 qt:5 tar:xz

Modified: head/net-im/ktp-kded-module/Makefile
==============================================================================
--- head/net-im/ktp-kded-module/Makefile	Sat Mar 16 19:12:40 2019	(r495945)
+++ head/net-im/ktp-kded-module/Makefile	Sat Mar 16 19:13:34 2019	(r495946)
@@ -2,6 +2,7 @@
 
 PORTNAME=	ktp-kded-module
 DISTVERSION=	${KDE_APPLICATIONS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	net-im kde kde-applications
 
 MAINTAINER=	kde at FreeBSD.org
@@ -10,7 +11,7 @@ COMMENT=	Module for integration of instant messaging i
 LICENSE=	LGPL21+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libtelepathy-qt5.so:net-im/telepathy-qt at qt5 \
+LIB_DEPENDS=	libtelepathy-qt5.so:net-im/telepathy-qt \
 		libKTpCommonInternals.so:net-im/ktp-common-internals
 
 USES=		compiler:c++11-lang cmake gettext kde:5 qt:5 tar:xz

Modified: head/net-im/ktp-send-file/Makefile
==============================================================================
--- head/net-im/ktp-send-file/Makefile	Sat Mar 16 19:12:40 2019	(r495945)
+++ head/net-im/ktp-send-file/Makefile	Sat Mar 16 19:13:34 2019	(r495946)
@@ -2,12 +2,13 @@
 
 PORTNAME=	ktp-send-file
 DISTVERSION=	${KDE_APPLICATIONS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	net-im kde kde-applications
 
 MAINTAINER=	kde at FreeBSD.org
 COMMENT=	KDE instant messaging file transfer application
 
-LIB_DEPENDS=	libtelepathy-qt5.so:net-im/telepathy-qt at qt5 \
+LIB_DEPENDS=	libtelepathy-qt5.so:net-im/telepathy-qt \
 		libKTpCommonInternals.so:net-im/ktp-common-internals
 RUN_DEPENDS=	${KDE_PREFIX}/lib/libexec/ktp-filetransfer-handler:net-im/ktp-filetransfer-handler \
 		${KDE_PREFIX}/bin/ktp-contactlist:net-im/ktp-contact-list

Modified: head/net-im/ktp-text-ui/Makefile
==============================================================================
--- head/net-im/ktp-text-ui/Makefile	Sat Mar 16 19:12:40 2019	(r495945)
+++ head/net-im/ktp-text-ui/Makefile	Sat Mar 16 19:13:34 2019	(r495946)
@@ -2,12 +2,13 @@
 
 PORTNAME=	ktp-text-ui
 DISTVERSION=	${KDE_APPLICATIONS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	net-im kde kde-applications
 
 MAINTAINER=	kde at FreeBSD.org
 COMMENT=	KDE chat window application
 
-LIB_DEPENDS=	libtelepathy-qt5.so:net-im/telepathy-qt at qt5 \
+LIB_DEPENDS=	libtelepathy-qt5.so:net-im/telepathy-qt \
 		libtelepathy-logger-qt.so:net-im/telepathy-logger-qt5 \
 		libKTpCommonInternals.so:net-im/ktp-common-internals
 RUN_DEPENDS=	${KDE_PREFIX}/bin/ktp-contactlist:net-im/ktp-contact-list

Modified: head/net-im/telepathy-logger-qt4/Makefile
==============================================================================
--- head/net-im/telepathy-logger-qt4/Makefile	Sat Mar 16 19:12:40 2019	(r495945)
+++ head/net-im/telepathy-logger-qt4/Makefile	Sat Mar 16 19:13:34 2019	(r495946)
@@ -2,7 +2,7 @@
 
 PORTNAME=	telepathy-logger-qt4
 PORTVERSION=	0.8.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-im
 MASTER_SITES=	KDE/stable/${PORTNAME:C/4$//}/${PORTVERSION}/src
 DISTNAME=	${PORTNAME:C/4$//}-${PORTVERSION}
@@ -18,8 +18,8 @@ EXPIRATION_DATE=	2019-03-15
 LIB_DEPENDS=	libdbus-1.so:devel/dbus \
 		libdbus-glib-1.so:devel/dbus-glib \
 		libtelepathy-glib.so:net-im/telepathy-glib \
-		libtelepathy-logger.so:net-im/telepathy-logger \
-		libtelepathy-qt4.so:net-im/telepathy-qt at qt4
+		libtelepathy-logger.so:net-im/telepathy-logger
+BROKEN=		libtelepathy-qt4.so:net-im/telepathy-qt at qt4 removed
 
 USES=		bison:build cmake pkgconfig python:2.7,build qt:4 tar:bzip2
 USE_GNOME=	glib20 libxml2

Modified: head/net-im/telepathy-logger-qt5/Makefile
==============================================================================
--- head/net-im/telepathy-logger-qt5/Makefile	Sat Mar 16 19:12:40 2019	(r495945)
+++ head/net-im/telepathy-logger-qt5/Makefile	Sat Mar 16 19:13:34 2019	(r495946)
@@ -2,7 +2,7 @@
 
 PORTNAME=	telepathy-logger-qt
 DISTVERSION=	17.08.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net-im
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTNAME}/${PORTVERSION:R}/src
@@ -19,7 +19,7 @@ LIB_DEPENDS=	libdbus-1.so:devel/dbus \
 		libdbus-glib-1.so:devel/dbus-glib \
 		libtelepathy-glib.so:net-im/telepathy-glib \
 		libtelepathy-logger.so:net-im/telepathy-logger \
-		libtelepathy-qt5.so:net-im/telepathy-qt at qt5
+		libtelepathy-qt5.so:net-im/telepathy-qt
 
 USES=		bison:build cmake compiler:c++11-lang kde:5 \
 		pkgconfig python:2.7,build qt:5 tar:xz

Modified: head/net-im/telepathy-qt/Makefile
==============================================================================
--- head/net-im/telepathy-qt/Makefile	Sat Mar 16 19:12:40 2019	(r495945)
+++ head/net-im/telepathy-qt/Makefile	Sat Mar 16 19:13:34 2019	(r495946)
@@ -3,9 +3,10 @@
 
 PORTNAME=	telepathy-qt
 PORTVERSION=	0.9.7
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	net-im
 MASTER_SITES=	https://telepathy.freedesktop.org/releases/${PORTNAME}/
+PKGNAMESUFFIX=	5
 
 MAINTAINER=	kde at FreeBSD.org
 COMMENT=	High-level Qt binding for Telepathy
@@ -17,34 +18,21 @@ LIB_DEPENDS=	libtelepathy-farstream.so:net-im/telepath
 		libtelepathy-glib.so:net-im/telepathy-glib
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/_dbus_bindings.so:devel/py-dbus@${PY_FLAVOR}
 
-FLAVORS=	qt5 qt4
-FLAVOR?=	${FLAVORS:[1]}
-qt4_PKGNAMESUFFIX=	4
-qt5_PKGNAMESUFFIX=	5
 
-USES=		cmake gettext gnome localbase:ldflags pathfix pkgconfig python:2.7,build
+USES=		cmake compiler:c++11-lang gettext gnome localbase:ldflags pathfix \
+		pkgconfig python:2.7,build qt:5
 USE_GNOME=	glib20 libxslt:build
 USE_GSTREAMER=	yes
 USE_LDCONFIG=	yes
+USE_QT=		core dbus gui network xml \
+		buildtools_build qmake_build testlib_build widgets_build
 
 CMAKE_ON=	ENABLE_FARSTREAM CMAKE_DISABLE_FIND_PACKAGE_Doxygen
 CMAKE_OFF=	ENABLE_EXAMPLES ENABLE_FARSIGHT ENABLE_TESTS
 CMAKE_ARGS=	-DDESIRED_QT_VERSION:STRING=${PKGNAMESUFFIX} \
 		-DQT_QMAKE_EXECUTABLE:FILEPATH=${QMAKE}
 
-. if ${FLAVOR} == qt4
-DEPRECATED=	Qt4 has been EOL since december 2015
-EXPIRATION_DATE=2019-03-15
-USES+=		qt:4
-USE_QT=		corelib dbus gui network xml \
-		moc_build qmake_build qtestlib_build rcc_build uic_build
-SHLIB_SUFFIX=	2
-. else
-USES+=		compiler:c++11-lang qt:5
-USE_QT=		core dbus gui network xml \
-		buildtools_build qmake_build testlib_build widgets_build
 SHLIB_SUFFIX=	0
-. endif
 
 OPTIONS_DEFINE=	DOCS
 

Modified: head/net/krfb/Makefile
==============================================================================
--- head/net/krfb/Makefile	Sat Mar 16 19:12:40 2019	(r495945)
+++ head/net/krfb/Makefile	Sat Mar 16 19:13:34 2019	(r495946)
@@ -2,6 +2,7 @@
 
 PORTNAME=	krfb
 DISTVERSION=	${KDE_APPLICATIONS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	net kde kde-applications
 
 MAINTAINER=	kde at FreeBSD.org
@@ -22,6 +23,6 @@ USE_XORG=	x11 xcb xdamage xext xtst
 OPTIONS_DEFINE=		TELEPATHY DOCS
 OPTIONS_SUB=		yes
 TELEPATHY_DESC=		Support for Telepathy Tubes
-TELEPATHY_LIB_DEPENDS=	libtelepathy-qt5.so:net-im/telepathy-qt at qt5
+TELEPATHY_LIB_DEPENDS=	libtelepathy-qt5.so:net-im/telepathy-qt
 
 .include <bsd.port.mk>

Modified: head/www/choqok/Makefile
==============================================================================
--- head/www/choqok/Makefile	Sat Mar 16 19:12:40 2019	(r495945)
+++ head/www/choqok/Makefile	Sat Mar 16 19:13:34 2019	(r495946)
@@ -2,7 +2,7 @@
 
 PORTNAME=	choqok
 DISTVERSION=	1.6.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	www kde
 MASTER_SITES=	KDE/stable/${PORTNAME}/${PORTVERSION:R}/src
 DIST_SUBDIR=	KDE/${PORTNAME}
@@ -16,7 +16,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 LIB_DEPENDS=	libqjson-qt5.so:devel/qjson at qt5 \
 		libqca-qt5.so:devel/qca at qt5 \
 		libqoauth-qt5.so:net/qoauth-qt5 \
-		libtelepathy-qt5.so:net-im/telepathy-qt at qt5
+		libtelepathy-qt5.so:net-im/telepathy-qt
 
 USES=		cmake compiler:c++11-lib gettext kde:5 pkgconfig qt:5 tar:xz
 USE_KDE=	attica auth bookmarks codecs completion config configwidgets \
