Date: Wed, 1 Oct 2014 07:45:43 +0000 (UTC) From: Pietro Cerutti <gahr@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r369698 - in head/graphics/tulip: . files Message-ID: <201410010745.s917jhgU026203@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gahr Date: Wed Oct 1 07:45:42 2014 New Revision: 369698 URL: https://svnweb.freebsd.org/changeset/ports/369698 QAT: https://qat.redports.org/buildarchive/r369698/ Log: - Update to 4.6.0 Release notes: http://tulip.labri.fr/TulipDrupal/?q=node/2041 Modified: head/graphics/tulip/Makefile head/graphics/tulip/distinfo head/graphics/tulip/files/patch-CMakeLists.txt head/graphics/tulip/files/patch-thirdparty_CMakeLists.txt head/graphics/tulip/pkg-plist Modified: head/graphics/tulip/Makefile ============================================================================== --- head/graphics/tulip/Makefile Wed Oct 1 07:13:26 2014 (r369697) +++ head/graphics/tulip/Makefile Wed Oct 1 07:45:42 2014 (r369698) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= tulip -PORTVERSION= 4.5.0 -PORTREVISION= 1 +PORTVERSION= 4.6.0 CATEGORIES= graphics MASTER_SITES= SF/auber/${PORTNAME}/${PORTNAME}-${PORTVERSION} DISTNAME= ${PORTNAME}-${PORTVERSION}_src @@ -17,13 +16,12 @@ LIB_DEPENDS= libexecinfo.so:${PORTSDIR}/ libpng.so:${PORTSDIR}/graphics/png \ libjpeg.so:${PORTSDIR}/graphics/jpeg -USES= cmake:outsource compiler:c++11-lib shebangfix dos2unix +USES= cmake:outsource compiler:c++11-lib dos2unix python shebangfix SHEBANG_FILES= tulip-config.in DOS2UNIX_FILES= software/tulip/src/main.cpp USE_CXXSTD= c++11 USE_GL= glew glut USE_GNOME= libxml2 -USE_PYTHON= yes USE_QT4= corelib moc_build uic_build rcc_build gui opengl xml network qmake_build \ designer assistant assistantclient CXXFLAGS+= -fPIC -I${LOCALBASE}/include -DNDEBUG -DOGDF_DLL @@ -31,7 +29,8 @@ LDFLAGS+= -L${LOCALBASE}/lib CMAKE_ARGS+= -DPYTHON_INCLUDEDIR:PATH=${PYTHON_INCLUDEDIR} \ -DLOCALBASE:PATH=${LOCALBASE} \ -DOGDFLibrary=${LOCALBASE}/lib/libOGDF.so \ - -DOGDFInclude=${LOCALBASE}/include + -DOGDFInclude=${LOCALBASE}/include \ + -DBUILD_DOC:BOOL=false USE_LDCONFIG= ${PREFIX}/lib/tulip WRKSRC= ${WRKDIR}/${PORTNAME} Modified: head/graphics/tulip/distinfo ============================================================================== --- head/graphics/tulip/distinfo Wed Oct 1 07:13:26 2014 (r369697) +++ head/graphics/tulip/distinfo Wed Oct 1 07:45:42 2014 (r369698) @@ -1,2 +1,2 @@ -SHA256 (tulip-4.5.0_src.tar.gz) = b3c776e2f029765749b93ea0b396faea7922341d2b57fc83024d21a1df5abfa5 -SIZE (tulip-4.5.0_src.tar.gz) = 78391448 +SHA256 (tulip-4.6.0_src.tar.gz) = 6012dab496883b4e835bf7b4d7c2b7f4df7f5e05c00a2345f8a0d93d5c2eacd7 +SIZE (tulip-4.6.0_src.tar.gz) = 82681832 Modified: head/graphics/tulip/files/patch-CMakeLists.txt ============================================================================== --- head/graphics/tulip/files/patch-CMakeLists.txt Wed Oct 1 07:13:26 2014 (r369697) +++ head/graphics/tulip/files/patch-CMakeLists.txt Wed Oct 1 07:45:42 2014 (r369698) @@ -1,13 +1,13 @@ ---- CMakeLists.txt.orig 2014-04-18 10:21:16.000000000 +0200 -+++ CMakeLists.txt 2014-04-18 10:22:19.000000000 +0200 -@@ -274,8 +274,8 @@ - SET(FTGLInclude ${PROJECT_SOURCE_DIR}/thirdparty/ftgl/) +--- CMakeLists.txt.orig 2014-09-28 22:18:14.000000000 +0200 ++++ CMakeLists.txt 2014-09-30 12:39:54.000000000 +0200 +@@ -401,8 +401,8 @@ SET(FTGLLibrary ftgl-tulip-${TulipMMVersion}) - SET(qscintilla2Include ${PROJECT_SOURCE_DIR}/thirdparty/QScintilla-gpl-2.5.1/Qt4/) + ENDIF(NOT BUILD_CORE_ONLY) + -SET(OGDFInclude ${PROJECT_SOURCE_DIR}/thirdparty/OGDF) -SET(OGDFLibrary OGDF-tulip-${TulipMMVersion}) +#SET(OGDFInclude ${PROJECT_SOURCE_DIR}/thirdparty/OGDF) +#SET(OGDFLibrary OGDF-tulip-${TulipMMVersion}) SET(QHULLInclude ${PROJECT_SOURCE_DIR}/thirdparty) + SET(UTF8CppInclude ${PROJECT_SOURCE_DIR}/thirdparty/utf8-cpp/source) SET(YajlLibrary yajl-tulip-${TulipMMVersion}) - SET(TulipCoreInclude ${PROJECT_SOURCE_DIR}/library/tulip-core/include/) Modified: head/graphics/tulip/files/patch-thirdparty_CMakeLists.txt ============================================================================== --- head/graphics/tulip/files/patch-thirdparty_CMakeLists.txt Wed Oct 1 07:13:26 2014 (r369697) +++ head/graphics/tulip/files/patch-thirdparty_CMakeLists.txt Wed Oct 1 07:45:42 2014 (r369698) @@ -1,11 +1,11 @@ ---- thirdparty/CMakeLists.txt.orig 2014-04-18 10:22:25.000000000 +0200 -+++ thirdparty/CMakeLists.txt 2014-04-18 10:22:30.000000000 +0200 -@@ -2,7 +2,7 @@ +--- thirdparty/CMakeLists.txt.orig 2014-09-28 22:17:08.000000000 +0200 ++++ thirdparty/CMakeLists.txt 2014-09-30 14:20:28.000000000 +0200 +@@ -3,7 +3,7 @@ + ADD_CORE_FILES(CMakeLists.txt) ADD_SUBDIRECTORY(gzstream) - ADD_SUBDIRECTORY(ftgl) -ADD_SUBDIRECTORY(OGDF) +#ADD_SUBDIRECTORY(OGDF) - ADD_SUBDIRECTORY(quazip) + ADD_SUBDIRECTORY(libqhull) ADD_SUBDIRECTORY(yajl) - ADD_SUBDIRECTORY(qxt) + Modified: head/graphics/tulip/pkg-plist ============================================================================== --- head/graphics/tulip/pkg-plist Wed Oct 1 07:13:26 2014 (r369697) +++ head/graphics/tulip/pkg-plist Wed Oct 1 07:45:42 2014 (r369698) @@ -234,6 +234,7 @@ include/tulip/StlIterator.h include/tulip/StoredType.h include/tulip/StringCollection.h include/tulip/StringProperty.h +include/tulip/StringsListSelectionDialog.h include/tulip/StringsListSelectionWidget.h include/tulip/StringsListSelectionWidgetInterface.h include/tulip/SystemDefinition.h @@ -261,7 +262,7 @@ include/tulip/TulipViewSettings.h include/tulip/TypeInterface.h include/tulip/Vector.h include/tulip/VectorCast.h -include/tulip/VectorEditionWidget.h +include/tulip/VectorEditor.h include/tulip/VectorPropertyAnimation.h include/tulip/View.h include/tulip/ViewWidget.h @@ -314,7 +315,7 @@ lib/libtulip-ogl-%%TULIP_VERS%%.so lib/libtulip-python-%%TULIP_VERS%%.so lib/libyajl-tulip-%%TULIP_VERS%%.so lib/libyajl-tulip-%%TULIP_VERS%%.so.2 -lib/libyajl-tulip-%%TULIP_VERS%%.so.2.0.1 +lib/libyajl-tulip-%%TULIP_VERS%%.so.2.1.0 lib/python/facebook.py lib/python/sip.so lib/python/stl.so @@ -483,7 +484,7 @@ lib/tulip/view/libpythonscriptview-%%TUL %%DATADIR%%/apiFiles/Python-2.4.api %%DATADIR%%/apiFiles/Python-2.5.api %%DATADIR%%/apiFiles/Python-2.6.api -%%DATADIR%%/apiFiles/Python-2.7.api +%%DATADIR%%/apiFiles/Python-%%PYTHON_VER%%.api %%DATADIR%%/apiFiles/Python-3.1.api %%DATADIR%%/apiFiles/Python-3.2.api %%DATADIR%%/apiFiles/Python-3.3.api @@ -514,6 +515,18 @@ lib/tulip/view/libpythonscriptview-%%TUL %%DATADIR%%/bitmaps/edgeSpring.png %%DATADIR%%/bitmaps/font.ttf %%DATADIR%%/bitmaps/fontb.ttf +%%DATADIR%%/bitmaps/fonts/DejaVuMono/DejaVuMono.ttf +%%DATADIR%%/bitmaps/fonts/DejaVuMono/DejaVuMono_Bold.ttf +%%DATADIR%%/bitmaps/fonts/DejaVuMono/DejaVuMono_Bold_Italic.ttf +%%DATADIR%%/bitmaps/fonts/DejaVuMono/DejaVuMono_Italic.ttf +%%DATADIR%%/bitmaps/fonts/DejaVuSans/DejaVuSans.ttf +%%DATADIR%%/bitmaps/fonts/DejaVuSans/DejaVuSans_Bold.ttf +%%DATADIR%%/bitmaps/fonts/DejaVuSans/DejaVuSans_Bold_Italic.ttf +%%DATADIR%%/bitmaps/fonts/DejaVuSans/DejaVuSans_Italic.ttf +%%DATADIR%%/bitmaps/fonts/DejaVuSerif/DejaVuSerif.ttf +%%DATADIR%%/bitmaps/fonts/DejaVuSerif/DejaVuSerif_Bold.ttf +%%DATADIR%%/bitmaps/fonts/DejaVuSerif/DejaVuSerif_Bold_Italic.ttf +%%DATADIR%%/bitmaps/fonts/DejaVuSerif/DejaVuSerif_Italic.ttf %%DATADIR%%/bitmaps/fonts/FreeMono/FreeMono.ttf %%DATADIR%%/bitmaps/fonts/FreeMono/FreeMono_Bold.ttf %%DATADIR%%/bitmaps/fonts/FreeMono/FreeMono_Bold_Italic.ttf @@ -639,45 +652,3 @@ lib/tulip/view/libpythonscriptview-%%TUL %%DATADIR%%/wizards/tlpview/view.cpp %%DATADIR%%/wizards/tlpview/view.h %%DATADIR%%/wizards/tlpview/wizard.xml -@dirrm %%DATADIR%%/wizards/tlpview -@dirrm %%DATADIR%%/wizards/tlpproperty -@dirrm %%DATADIR%%/wizards/tlpmain -@dirrm %%DATADIR%%/wizards/tlpinteractor -@dirrm %%DATADIR%%/wizards/tlpimport -@dirrm %%DATADIR%%/wizards/tlpexport -@dirrm %%DATADIR%%/wizards/tlpalgorithm -@dirrm %%DATADIR%%/wizards -@dirrm %%DATADIR%%/bitmaps/samplePictures -@dirrm %%DATADIR%%/bitmaps/fonts/Waree -@dirrm %%DATADIR%%/bitmaps/fonts/Umpush -@dirrm %%DATADIR%%/bitmaps/fonts/Ubuntu -@dirrm %%DATADIR%%/bitmaps/fonts/TlwgTypo -@dirrm %%DATADIR%%/bitmaps/fonts/TlwgTypist -@dirrm %%DATADIR%%/bitmaps/fonts/TlwgTypewriter -@dirrm %%DATADIR%%/bitmaps/fonts/TlwgMono -@dirrm %%DATADIR%%/bitmaps/fonts/Sawasdee -@dirrm %%DATADIR%%/bitmaps/fonts/Purisa -@dirrm %%DATADIR%%/bitmaps/fonts/Norasi -@dirrm %%DATADIR%%/bitmaps/fonts/Loma -@dirrm %%DATADIR%%/bitmaps/fonts/LiberationSerif -@dirrm %%DATADIR%%/bitmaps/fonts/LiberationSans -@dirrm %%DATADIR%%/bitmaps/fonts/LiberationMono -@dirrm %%DATADIR%%/bitmaps/fonts/Kinnari -@dirrm %%DATADIR%%/bitmaps/fonts/Garuda -@dirrm %%DATADIR%%/bitmaps/fonts/FreeSerif -@dirrm %%DATADIR%%/bitmaps/fonts/FreeSans -@dirrm %%DATADIR%%/bitmaps/fonts/FreeMono -@dirrm %%DATADIR%%/bitmaps/fonts -@dirrm %%DATADIR%%/bitmaps/colorscales -@dirrm %%DATADIR%%/bitmaps -@dirrm %%DATADIR%%/apiFiles -@dirrm %%DATADIR%% -@dirrm lib/tulip/view -@dirrm lib/tulip/perspective -@dirrm lib/tulip/interactor -@dirrm lib/tulip/glyph -@dirrm lib/tulip -@dirrm lib/python -@dirrm include/tulip2ogdf -@dirrm include/tulip/cxx -@dirrm include/tulip
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201410010745.s917jhgU026203>