From owner-svn-ports-head@FreeBSD.ORG Mon Feb 16 07:44:56 2015 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id AF06990E; Mon, 16 Feb 2015 07:44:56 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 90192CD9; Mon, 16 Feb 2015 07:44:56 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1G7iuXw065528; Mon, 16 Feb 2015 07:44:56 GMT (envelope-from vanilla@FreeBSD.org) Received: (from vanilla@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1G7itpR065522; Mon, 16 Feb 2015 07:44:55 GMT (envelope-from vanilla@FreeBSD.org) Message-Id: <201502160744.t1G7itpR065522@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: vanilla set sender to vanilla@FreeBSD.org using -f From: "Vanilla I. Shu" Date: Mon, 16 Feb 2015 07:44:55 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r379067 - head/graphics/tulip X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Feb 2015 07:44:56 -0000 Author: vanilla Date: Mon Feb 16 07:44:54 2015 New Revision: 379067 URL: https://svnweb.freebsd.org/changeset/ports/379067 QAT: https://qat.redports.org/buildarchive/r379067/ Log: 1: Upgrade to 4.6.1. 2: add LICENSE. 3: add option for QT5. PR: 197440 Submitted by: Ports Fury. Modified: head/graphics/tulip/Makefile head/graphics/tulip/distinfo head/graphics/tulip/pkg-descr head/graphics/tulip/pkg-plist Modified: head/graphics/tulip/Makefile ============================================================================== --- head/graphics/tulip/Makefile Mon Feb 16 06:17:55 2015 (r379066) +++ head/graphics/tulip/Makefile Mon Feb 16 07:44:54 2015 (r379067) @@ -2,20 +2,23 @@ # $FreeBSD$ PORTNAME= tulip -PORTVERSION= 4.6.0 -PORTREVISION= 2 +PORTVERSION= 4.6.1 +DISTVERSIONSUFFIX= _src CATEGORIES= graphics MASTER_SITES= SF/auber/${PORTNAME}/${PORTNAME}-${PORTVERSION} -DISTNAME= ${PORTNAME}-${PORTVERSION}_src MAINTAINER= ports@FreeBSD.org COMMENT= System dedicated to the visualization of huge graphs -LIB_DEPENDS= libfreetype.so:${PORTSDIR}/print/freetype2 \ - libOGDF.so:${PORTSDIR}/math/ogdf \ +LICENSE= LGPL3 + +LIB_DEPENDS= libquazip.so:${PORTSDIR}/archivers/quazip \ + libjpeg.so:${PORTSDIR}/graphics/jpeg \ libpng.so:${PORTSDIR}/graphics/png \ - libquazip.so:${PORTSDIR}/archivers/quazip \ - libjpeg.so:${PORTSDIR}/graphics/jpeg + libOGDF.so:${PORTSDIR}/math/ogdf \ + libfreetype.so:${PORTSDIR}/print/freetype2 + +WRKSRC= ${WRKDIR}/${PORTNAME} USES= cmake:outsource compiler:c++11-lib dos2unix execinfo python \ shebangfix @@ -24,18 +27,38 @@ DOS2UNIX_FILES= software/tulip/src/main. USE_CXXSTD= c++11 USE_GL= glew glut USE_GNOME= libxml2 -USE_QT4= corelib gui network opengl webkit xml xmlpatterns \ - qmake_build moc_build rcc_build uic_build +CMAKE_ARGS= -DBUILD_DOC:BOOL=OFF \ + -DOGDFInclude:STRING=${LOCALBASE}/include \ + -DOGDFLibrary:STRING=${LOCALBASE}/lib/libOGDF.so +USE_LDCONFIG= ${PREFIX}/lib/tulip + CXXFLAGS+= -fPIC -I${LOCALBASE}/include -DNDEBUG -DOGDF_DLL LDFLAGS+= -L${LOCALBASE}/lib -CMAKE_ARGS= -DOGDFLibrary=${LOCALBASE}/lib/libOGDF.so \ - -DOGDFInclude=${LOCALBASE}/include \ - -DBUILD_DOC:BOOL=false -USE_LDCONFIG= ${PREFIX}/lib/tulip -WRKSRC= ${WRKDIR}/${PORTNAME} +PLIST_SUB= TULIP_VERSION="${PORTVERSION}" \ + TULIP_VERS="${PORTVERSION:R}" + +DESKTOP_ENTRIES="Tulip" "" "${PREFIX}/share/pixmaps.tulip.png" "tulip" "" "" -PLIST_SUB+= TULIP_VERSION=${PORTVERSION} \ - TULIP_VERS=${PORTVERSION:R} +OPTIONS_SINGLE= GUI +OPTIONS_SINGLE_GUI= QT4 QT5 +OPTIONS_DEFAULT= QT4 + +QT4_USE= qt4=corelib,gui,network,opengl,webkit \ + qt4=xml,xmlpatterns \ + qt4=moc_build,qmake_build,rcc_build,uic_build +QT4_CMAKE_ON= -DUSE_QT5_IF_INSTALLED:BOOL=OFF +QT5_USE= qt5=core,gui,network,opengl,webkit,widgets \ + qt5=xml,xmlpatterns \ + qt5=buildtools_build,qmake_build +QT5_CMAKE_ON= -DUSE_QT5_IF_INSTALLED:BOOL=ON + +post-build: + @${LN} -sf logo32x32.png \ + ${WRKSRC}/library/tulip-gui/resources/icons/tulip.png + +post-install: + (cd ${WRKSRC}/library/tulip-gui/resources/icons && ${INSTALL_DATA} \ + tulip.png ${STAGEDIR}${PREFIX}/share/pixmaps) .include Modified: head/graphics/tulip/distinfo ============================================================================== --- head/graphics/tulip/distinfo Mon Feb 16 06:17:55 2015 (r379066) +++ head/graphics/tulip/distinfo Mon Feb 16 07:44:54 2015 (r379067) @@ -1,2 +1,2 @@ -SHA256 (tulip-4.6.0_src.tar.gz) = 6012dab496883b4e835bf7b4d7c2b7f4df7f5e05c00a2345f8a0d93d5c2eacd7 -SIZE (tulip-4.6.0_src.tar.gz) = 82681832 +SHA256 (tulip-4.6.1_src.tar.gz) = 27ab129af9541b94bfb6f63497b4055a298a3058be58795b3bc67c2d9789a18b +SIZE (tulip-4.6.1_src.tar.gz) = 82574518 Modified: head/graphics/tulip/pkg-descr ============================================================================== --- head/graphics/tulip/pkg-descr Mon Feb 16 06:17:55 2015 (r379066) +++ head/graphics/tulip/pkg-descr Mon Feb 16 07:44:54 2015 (r379067) @@ -1,7 +1,7 @@ -Tulip software is a system dedicated to the visualization of huge graphs. It -manages graphs with a number of elements(node and edges) up to 500.000 on a -personal computer(PIII 600, with 256mo). Its SuperGraph technology architecture -enables to do the following things : +Tulip software is a system dedicated to the visualization of huge +graphs. It manages graphs with a number of elements(node and edges) up +to 500.000 on a personal computer(PIII 600, with 256mo). Its SuperGraph +technology architecture enables to do the following things : * 3D visualizations * 3D modifications * Plug-in support for easy evolution Modified: head/graphics/tulip/pkg-plist ============================================================================== --- head/graphics/tulip/pkg-plist Mon Feb 16 06:17:55 2015 (r379066) +++ head/graphics/tulip/pkg-plist Mon Feb 16 07:44:54 2015 (r379067) @@ -233,6 +233,7 @@ include/tulip/StlFunctions.h include/tulip/StlIterator.h include/tulip/StoredType.h include/tulip/StringCollection.h +include/tulip/StringEditor.h include/tulip/StringProperty.h include/tulip/StringsListSelectionDialog.h include/tulip/StringsListSelectionWidget.h @@ -613,6 +614,7 @@ lib/tulip/view/libpythonscriptview-%%TUL %%DATADIR%%/bitmaps/samplePictures/741.png %%DATADIR%%/bitmaps/samplePictures/891.png %%DATADIR%%/bitmaps/titlebarGradient.png +%%DATADIR%%/bitmaps/tulip.ico %%DATADIR%%/bitmaps/welcomelogo.bmp %%DATADIR%%/wizards/README.txt %%DATADIR%%/wizards/tlpalgorithm/algorithm.cmake @@ -649,3 +651,4 @@ lib/tulip/view/libpythonscriptview-%%TUL %%DATADIR%%/wizards/tlpview/view.cpp %%DATADIR%%/wizards/tlpview/view.h %%DATADIR%%/wizards/tlpview/wizard.xml +share/pixmaps/tulip.png