svn commit: r495898 - head/graphics/tulip

Tobias C. Berner tcberner at FreeBSD.org
Sat Mar 16 16:00:26 UTC 2019


Author: tcberner
Date: Sat Mar 16 16:00:25 2019
New Revision: 495898
URL: https://svnweb.freebsd.org/changeset/ports/495898

Log:
  graphics/tulip: remove QT4/QT5 options (Qt4 deprecation)
  
  - untested, as marked broken
  
  Approved by:	portmgr (implicit)

Modified:
  head/graphics/tulip/Makefile

Modified: head/graphics/tulip/Makefile
==============================================================================
--- head/graphics/tulip/Makefile	Sat Mar 16 15:59:26 2019	(r495897)
+++ head/graphics/tulip/Makefile	Sat Mar 16 16:00:25 2019	(r495898)
@@ -3,7 +3,7 @@
 
 PORTNAME=	tulip
 PORTVERSION=	4.10.0
-PORTREVISION=	7
+PORTREVISION=	8
 DISTVERSIONSUFFIX=	_src
 CATEGORIES=	graphics
 MASTER_SITES=	SF/auber/${PORTNAME}/${PORTNAME}-${PORTVERSION}
@@ -22,7 +22,7 @@ BROKEN_powerpc64=	fails to link: libOGDF.so: undefined
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
-USES=		cmake:noninja compiler:c++11-lib dos2unix jpeg python \
+USES=		cmake:noninja compiler:c++11-lib dos2unix jpeg python qt:5 \
 		shebangfix
 SHEBANG_FILES=	tulip-config.in
 DOS2UNIX_FILES=	software/tulip/src/main.cpp
@@ -32,6 +32,9 @@ CMAKE_ARGS=	-DBUILD_DOC:BOOL=OFF \
 		-DOGDFInclude:STRING=${LOCALBASE}/include \
 		-DOGDFLibrary:STRING=${LOCALBASE}/lib/libOGDF.so
 USE_LDCONFIG=	${PREFIX}/lib/tulip
+USE_QT=			core gui network opengl webkit widgets \
+			xml xmlpatterns \
+			buildtools_build qmake_build
 
 CXXFLAGS+=	-fPIC -I${LOCALBASE}/include -DNDEBUG -DOGDF_DLL
 # Unhide std::to_string() to fix build with GCC (see ports/193528 for details)
@@ -43,30 +46,9 @@ PLIST_SUB=	TULIP_VERSION="${PORTVERSION}" \
 
 DESKTOP_ENTRIES="Tulip" "" "${PREFIX}/share/pixmaps.tulip.png" "tulip" "" ""
 
-OPTIONS_SINGLE=		GUI
-OPTIONS_SINGLE_GUI=	QT4 QT5
-OPTIONS_DEFAULT=	QT5
+CMAKE_ON=		USE_QT5_IF_INSTALLED
 
-QT4_USES=		qt:4
-QT4_USE=		qt=corelib,gui,network,opengl,webkit \
-			qt=xml,xmlpatterns \
-			qt=moc_build,qmake_build,rcc_build,uic_build
-QT_USES=		qt:5
-QT5_USE=		qt=core,gui,network,opengl,webkit,widgets \
-			qt=xml,xmlpatterns \
-			qt=buildtools_build,qmake_build
-QT5_CMAKE_BOOL=		USE_QT5_IF_INSTALLED
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MQT4}
-DEPRECATED=		Qt4 has been EOL since december 2015
-EXPIRATION_DATE=	2019-03-15
-.endif
-
-.if ${PORT_OPTIONS:MQT5}
 BROKEN=			does not build
-.endif
 
 post-build:
 	@${LN} -sf logo32x32.png \


More information about the svn-ports-all mailing list