svn commit: r495947 - in head: . graphics/fracplanet

[Tobias C. Berner]

Author: tcberner
Date: Sat Mar 16 19:17:36 2019
New Revision: 495947
URL: https://svnweb.freebsd.org/changeset/ports/495947

Log:
  graphics/fracplanet: remove Flavors (Qt4 deprecation)
  
  Approved by:	portmgr (implicit)

Modified:
  head/MOVED
  head/graphics/fracplanet/Makefile

Modified: head/MOVED
==============================================================================
--- head/MOVED	Sat Mar 16 19:13:34 2019	(r495946)
+++ head/MOVED	Sat Mar 16 19:17:36 2019	(r495947)
@@ -11674,3 +11674,5 @@ 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
+graphics/fracplanet at qt4||2019-03-16|Qt4 deprecation
+graphics/fracplanet at qt5|graphics/fracplanet|2019-03-16|Flavor has been removed

Modified: head/graphics/fracplanet/Makefile
==============================================================================
--- head/graphics/fracplanet/Makefile	Sat Mar 16 19:13:34 2019	(r495946)
+++ head/graphics/fracplanet/Makefile	Sat Mar 16 19:17:36 2019	(r495947)
@@ -3,7 +3,7 @@
 
 PORTNAME=	fracplanet
 PORTVERSION=	0.5.1
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	graphics
 MASTER_SITES=	SF \
 		SF/nemysisfreebsdp/:icons
@@ -18,23 +18,10 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libboost_program_options.so:devel/boost-libs
 
-FLAVORS=	qt5 qt4
-FLAVOR?=	${FLAVORS:[1]}
-qt5_PKGNAMESUFFIX=	-${FLAVOR}
-
-USES=		compiler:c++11-lang gl qmake:outsource
+USES=		compiler:c++11-lang gl qmake:outsource qt:5
 USE_GL=		gl glu
 QMAKE_ARGS=	VERSION_NUMBER=${PORTVERSION}
-
-.if ${FLAVOR} == qt4
-DEPRECATED=	Qt4 has been EOL since december 2015
-EXPIRATION_DATE=2019-03-15
-USES+=	qt:4
-USE_QT=		corelib gui moc_build opengl
-.else
-USES+=	qt:5
 USE_QT=		buildtools_build core gui opengl
-.endif
 
 DESKTOP_ENTRIES=	"Fracplanet" \
 			"" \
@@ -49,6 +36,8 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 OPTIONS_DEFINE=		DOXYGEN DOCS
 DOXYGEN_BUILD_DEPENDS=	doxygen:devel/doxygen
 DOXYGEN_IMPLIES=	DOCS
+
+CONFLICTS_INSTALL=	fracplanet-qt5
 
 DOCFILES=	BUGS NEWS README THANKS fracplanet.css fracplanet.htm
 ICON_SIZES=	32x32 48x48 64x64 72x72 96x96