From owner-svn-ports-all@freebsd.org Sat Mar 16 16:00:26 2019 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D930415332F4; Sat, 16 Mar 2019 16:00:25 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 7A9FB8EBC3; Sat, 16 Mar 2019 16:00:25 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6CEBC243A0; Sat, 16 Mar 2019 16:00:25 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x2GG0PiN077013; Sat, 16 Mar 2019 16:00:25 GMT (envelope-from tcberner@FreeBSD.org) Received: (from tcberner@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x2GG0PO8077012; Sat, 16 Mar 2019 16:00:25 GMT (envelope-from tcberner@FreeBSD.org) Message-Id: <201903161600.x2GG0PO8077012@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tcberner set sender to tcberner@FreeBSD.org using -f From: "Tobias C. Berner" Date: Sat, 16 Mar 2019 16:00:25 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r495898 - head/graphics/tulip X-SVN-Group: ports-head X-SVN-Commit-Author: tcberner X-SVN-Commit-Paths: head/graphics/tulip X-SVN-Commit-Revision: 495898 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 7A9FB8EBC3 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.95 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.998,0]; NEURAL_HAM_SHORT(-0.95)[-0.949,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Mar 2019 16:00:26 -0000 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 - -.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 \