Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 5 Mar 2019 07:50:11 +0000 (UTC)
From:      Alexey Dokuchaev <danfe@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r494684 - head/net-p2p/torrent-file-editor
Message-ID:  <201903050750.x257oBXV004121@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: danfe
Date: Tue Mar  5 07:50:10 2019
New Revision: 494684
URL: https://svnweb.freebsd.org/changeset/ports/494684

Log:
  With Qt 4.x sadly going away in less than two weeks, use Qt 5 by default
  and remove QT5 option earlier to ease the deprecation process and reduce
  repo churn when the time comes.

Modified:
  head/net-p2p/torrent-file-editor/Makefile

Modified: head/net-p2p/torrent-file-editor/Makefile
==============================================================================
--- head/net-p2p/torrent-file-editor/Makefile	Tue Mar  5 07:49:33 2019	(r494683)
+++ head/net-p2p/torrent-file-editor/Makefile	Tue Mar  5 07:50:10 2019	(r494684)
@@ -3,7 +3,7 @@
 
 PORTNAME=	torrent-file-editor
 PORTVERSION=	0.3.13
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net-p2p
 MASTER_SITES=	SF/${PORTNAME}/v${PORTVERSION}
 
@@ -12,34 +12,17 @@ COMMENT=	Qt-based GUI tool for creating and editing .t
 
 LICENSE=	GPLv3
 
-USES=		cmake compiler:c++11-lang desktop-file-utils
-
-_QT4_DEPS=	linguisttools_build moc_build qmake_build rcc_build \
-		uic_build corelib gui
-_QT5_DEPS=	buildtools_build linguisttools_build qmake_build \
+USES=		cmake compiler:c++11-lang desktop-file-utils qt:5
+USE_QT=		buildtools_build linguisttools_build qmake_build \
 		core gui widgets
 
-OPTIONS_DEFINE=	DONATION QT5
+CMAKE_ARGS=	-DQT5_BUILD:BOOL=ON
+
+OPTIONS_DEFINE=	DONATION
 OPTIONS_DEFAULT=	DONATION
 
 DONATION_DESC=	Show donation text in the About dialog
-QT5_DESC=	Build against Qt 5 instead of Qt 4
-
 DONATION_CMAKE_OFF=	-DDISABLE_DONATION:BOOL=ON
-
-QT5_USES=	qt:5
-QT5_USES_OFF=	qt:4
-QT5_USE=	QT=${_QT5_DEPS:ts,}
-QT5_USE_OFF=	QT=${_QT4_DEPS:ts,}
-QT5_LIB_DEPENDS_OFF=	libqjson.so:devel/qjson@qt4
-QT5_CMAKE_BOOL=	QT5_BUILD
-
-.include <bsd.port.options.mk>
-
-.if ! ${PORT_OPTIONS:MQT5}
-DEPRECATED=		Qt4 has been EOL since december 2015
-EXPIRATION_DATE=	2019-03-15
-.endif
 
 post-patch:
 # Avoid conflict with C++20 <version> by adding .txt suffix



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