Index: Makefile =================================================================== RCS file: /home/pcvs/ports/graphics/tulip/Makefile,v retrieving revision 1.46 diff -u -r1.46 Makefile --- Makefile 22 Mar 2010 02:26:03 -0000 1.46 +++ Makefile 25 Mar 2010 08:29:12 -0000 @@ -7,14 +7,10 @@ # PORTNAME= tulip -PORTVERSION= 3.1.2 +PORTVERSION= 3.3.1 CATEGORIES= graphics -MASTER_SITES= SF/auber/${PORTNAME}/${PORTNAME}-${PORTVERSION}:src \ - http://tulip.labri.fr/userHandbook/:doc -DISTFILES= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}:src \ - userManual.pdf:doc -DIST_SUBDIR= tulip/${PDFUPDATE} -EXTRACT_ONLY= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} +MASTER_SITES= SF/auber/${PORTNAME}/${PORTNAME}-${PORTVERSION} +DISTFILES= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= gahr@FreeBSD.org COMMENT= A system dedicated to the visualization of huge graphs @@ -32,35 +28,33 @@ USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes -PORTDOCS= userManual.pdf -PDFUPDATE= 2 - -PLIST_SUB+= TULIP_VERSION=${PORTVERSION} +PLIST_SUB+= TULIP_VERSION=${PORTVERSION} \ + TULIP_VERS=${PORTVERSION:R} .include -.if ${OSVERSION} >= 800501 -BROKEN= "broken by dirent.h update" -.endif - .if ${ARCH} == "amd64" || ${ARCH} == "ia64" CFLAGS+= -fPIC .endif -post-extract: - @${FIND} ${WRKSRC} -name "moc_*" -delete +#post-extract: +# @${FIND} ${WRKSRC} -name "moc_*" -delete post-patch: + @${GREP} -lr '/usr/X11R6/include' ${WRKSRC} | ${XARGS} \ + ${REINPLACE_CMD} -e 's|/usr/X11R6/include||g' @${REINPLACE_CMD} -e 's|||' \ ${WRKSRC}/software/tulip/src/Application.cpp - @${REINPLACE_CMD} -e 's|||' \ + @${REINPLACE_CMD} -e 's|||;s|||' \ ${WRKSRC}/software/tulip/src/main.cpp - @${REINPLACE_CMD} -e 's|docs||g' ${WRKSRC}/Makefile.am ${WRKSRC}/Makefile.in +# @${REINPLACE_CMD} -e 's|docs||g' ${WRKSRC}/Makefile.am ${WRKSRC}/Makefile.in .if !defined(NOPORTDOCS) +DISTFILES+= ${PORTNAME}-${PORTVERSION}-html.tar.bz2 +PORTDOCS= * post-install: ${INSTALL} -d ${DOCSDIR} - ${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/userManual.pdf ${DOCSDIR} + (cd ${WRKDIR}/${PORTNAME}-${PORTVERSION}-html && ${COPYTREE_SHARE} \* ${DOCSDIR}) .endif .include Index: distinfo =================================================================== RCS file: /home/pcvs/ports/graphics/tulip/distinfo,v retrieving revision 1.13 diff -u -r1.13 distinfo --- distinfo 17 Aug 2009 07:59:08 -0000 1.13 +++ distinfo 22 Mar 2010 12:58:06 -0000 @@ -1,6 +1,6 @@ -MD5 (tulip/2/tulip-3.1.2.tar.bz2) = cdd55f60c60828a7f1aeac88ab839e3d -SHA256 (tulip/2/tulip-3.1.2.tar.bz2) = bda400784bd1b7aa31cb9dfbf1d2da9b897809e5174f46eb33b509f492216ac2 -SIZE (tulip/2/tulip-3.1.2.tar.bz2) = 20335763 -MD5 (tulip/2/userManual.pdf) = 30087eef2f0a321b35a6d3796f6b4abf -SHA256 (tulip/2/userManual.pdf) = 4ecd02e67957b761db20f1520786a9108ba585f0fa6f0959577d1d39bb17fd18 -SIZE (tulip/2/userManual.pdf) = 6984535 +MD5 (tulip-3.3.1.tar.bz2) = aee8cb8db2949c9e326e92fa2c9fa870 +SHA256 (tulip-3.3.1.tar.bz2) = e4209e1938767596e4a7bff4a299a2cf623c773238cb00e3dd53d8a0f3122cb1 +SIZE (tulip-3.3.1.tar.bz2) = 20612344 +MD5 (tulip-3.3.1-html.tar.bz2) = 5dcf96448107fd11ec24ce5e644904f8 +SHA256 (tulip-3.3.1-html.tar.bz2) = c30ff303b3f0f2364bea9682e2848e5f864a99fb0fea673a1b586ca8c90237cf +SIZE (tulip-3.3.1-html.tar.bz2) = 10298053 Index: pkg-plist =================================================================== RCS file: /home/pcvs/ports/graphics/tulip/pkg-plist,v retrieving revision 1.10 diff -u -r1.10 pkg-plist --- pkg-plist 25 Mar 2009 06:20:31 -0000 1.10 +++ pkg-plist 24 Mar 2010 23:45:51 -0000 @@ -1,7 +1,7 @@ -bin/tulip_check_pl bin/tulip bin/tulip-config -include/ParallelCoordinatesConfigDialogData.h +bin/tulip_check_pl +include/SpreadConfigurationWidgetData.h include/SpreadInsertColumnDialogData.h include/SpreadMainWidgetData.h include/tulip/AbstractProperty.h @@ -11,6 +11,8 @@ include/tulip/Array.h include/tulip/AugmentedDisplayDialog.h include/tulip/AugmentedDisplayDialogData.h +include/tulip/BaseGraphicsViewComponent.h +include/tulip/BaseGraphicsViewComponentMacro.h include/tulip/Bfs.h include/tulip/BiconnectedTest.h include/tulip/BooleanAlgorithm.h @@ -26,17 +28,27 @@ include/tulip/ColorScaleConfigDialogData.h include/tulip/ConcatIterator.h include/tulip/ConnectedTest.h +include/tulip/Context.h include/tulip/Controller.h +include/tulip/ControllerAlgorithmTools.h include/tulip/ControllerPluginsManager.h +include/tulip/ControllerViewsManager.h +include/tulip/ControllerViewsTools.h include/tulip/ConvexHull.h include/tulip/Coord.h include/tulip/CopyPropertyDialog.h include/tulip/CopyPropertyDialogData.h +include/tulip/Curves.h +include/tulip/DataSet.h include/tulip/Delaunay.h include/tulip/DoubleAlgorithm.h include/tulip/DoubleProperty.h +include/tulip/DoubleStringsListSelectionWidget.h +include/tulip/DoubleStringsListSelectionWidgetData.h include/tulip/DrawingTools.h include/tulip/Edge.h +include/tulip/EdgeExtremityGlyph.h +include/tulip/EdgeExtremityGlyphManager.h include/tulip/ElementPropertiesWidget.h include/tulip/ElementPropertiesWidgetPlugin.h include/tulip/ElementPropertiesWidgetUI.h @@ -44,17 +56,20 @@ include/tulip/ExtendedClusterOperation.h include/tulip/Face.h include/tulip/FaceIterator.h +include/tulip/FastBezier.h include/tulip/FindSelectionData.h include/tulip/FindSelectionWidget.h +include/tulip/Fonts.h include/tulip/ForEach.h include/tulip/ForegroundEntity.h -include/tulip/GWInteractor.h include/tulip/GWOverviewWidget.h include/tulip/GWOverviewWidgetData.h include/tulip/GWOverviewWidgetPlugin.h include/tulip/GlAxis.h +include/tulip/GlBezierCurve.h include/tulip/GlBoundingBoxSceneVisitor.h include/tulip/GlBox.h +include/tulip/GlCatmullRomCurve.h include/tulip/GlCircle.h include/tulip/GlColorScale.h include/tulip/GlComplexPolygon.h @@ -74,14 +89,20 @@ include/tulip/GlGrid.h include/tulip/GlHierarchyConvexHulls.h include/tulip/GlLODCalculator.h +include/tulip/GlLODSceneVisitor.h include/tulip/GlLabel.h include/tulip/GlLayer.h include/tulip/GlLine.h include/tulip/GlLines.h include/tulip/GlMainView.h +include/tulip/GlMainViewInteractor.h include/tulip/GlMainWidget.h +include/tulip/GlMainWidgetGraphicsView.h +include/tulip/GlMainWidgetItem.h include/tulip/GlMainWidgetPlugin.h include/tulip/GlMetaNode.h +include/tulip/GlMetaNodeRenderer.h +include/tulip/GlMetaNodeTrueRenderer.h include/tulip/GlMultiPolygon.h include/tulip/GlNode.h include/tulip/GlNominativeAxis.h @@ -96,10 +117,12 @@ include/tulip/GlSceneObserver.h include/tulip/GlSceneVisitor.h include/tulip/GlSelectSceneVisitor.h +include/tulip/GlShaderManager.h include/tulip/GlSimpleEntity.h include/tulip/GlSphere.h include/tulip/GlTLPFeedBackBuilder.h include/tulip/GlTextureManager.h +include/tulip/GlTools.h include/tulip/GlXMLTools.h include/tulip/Glyph.h include/tulip/GlyphManager.h @@ -109,16 +132,24 @@ include/tulip/GraphPropertiesSelectionWidget.h include/tulip/GraphProperty.h include/tulip/GraphTools.h +include/tulip/GraphicsWidgetBase.h include/tulip/GridOptionsData.h include/tulip/GridOptionsWidget.h include/tulip/ImportModule.h include/tulip/IntegerAlgorithm.h include/tulip/IntegerProperty.h +include/tulip/Interactor.h +include/tulip/InteractorChainOfResponsibility.h +include/tulip/InteractorComponent.h include/tulip/InteractorManager.h include/tulip/ItemsListWidget.h include/tulip/Iterator.h +include/tulip/LayerManagerWidget.h +include/tulip/LayerManagerWidgetData.h include/tulip/LayoutAlgorithm.h include/tulip/LayoutProperty.h +include/tulip/ListPropertyWidget.h +include/tulip/ListPropertyWidgetData.h include/tulip/MainController.h include/tulip/MapIterator.h include/tulip/Matrix.h @@ -139,6 +170,7 @@ include/tulip/Observable.h include/tulip/ObservableGraph.h include/tulip/ObservableProperty.h +include/tulip/OcclusionTest.h include/tulip/Ordering.h include/tulip/OuterPlanarTest.h include/tulip/PlanarConMap.h @@ -149,14 +181,19 @@ include/tulip/PluginLoader.h include/tulip/PluginLoaderTxt.h include/tulip/PluginProgress.h +include/tulip/PreferenceManager.h include/tulip/PropertyAlgorithm.h include/tulip/PropertyDialog.h include/tulip/PropertyDialogData.h +include/tulip/PropertyInterface.h include/tulip/PropertyWidget.h include/tulip/PropertyWidgetPlugin.h +include/tulip/QGlPixelBufferManager.h include/tulip/QtCPULODCalculator.h +include/tulip/QtMetaNodeRenderer.h include/tulip/QtProgress.h include/tulip/QtProgressData.h +include/tulip/QtQuadTreeLODCalculator.h include/tulip/Rectangle.h include/tulip/Reflect.h include/tulip/RenderingParametersDialog.h @@ -164,6 +201,8 @@ include/tulip/ReturnType.h include/tulip/SGHierarchyWidget.h include/tulip/SGHierarchyWidgetPlugin.h +include/tulip/SimpleStringsListSelectionWidget.h +include/tulip/SimpleStringsListSelectionWidgetData.h include/tulip/SimpleTest.h include/tulip/Size.h include/tulip/SizeAlgorithm.h @@ -174,12 +213,14 @@ include/tulip/StlIterator.h include/tulip/StringAlgorithm.h include/tulip/StringCollection.h -include/tulip/StringListSelectionWidget.h -include/tulip/StringListSelectionWidgetData.h include/tulip/StringProperty.h +include/tulip/StringsListSelectionWidget.h +include/tulip/StringsListSelectionWidgetInterface.h include/tulip/TabWidget.h include/tulip/TabWidgetData.h +include/tulip/TabWidgetHidableMenuGraphicsProxy.h include/tulip/TemplateFactory.h +include/tulip/TextRenderer.h include/tulip/TlpQtTools.h include/tulip/TlpTools.h include/tulip/TreeTest.h @@ -191,6 +232,7 @@ include/tulip/TulipTableWidget.h include/tulip/Types.h include/tulip/Vector.h +include/tulip/VectorCast.h include/tulip/View.h include/tulip/ViewPluginsManager.h include/tulip/WithDependency.h @@ -206,26 +248,27 @@ include/tulip/elementpropertieswidget.h include/tulip/glmainwidget.h include/tulip/gwoverviewwidget.h -include/tulip/hash_string.h include/tulip/propertywidget.h include/tulip/sghierarchywidget.h include/tulip/tulipconf.h -lib/libtulip-3.1.so -lib/libtulip-ogl-3.1.so +include/tulip/tuliphash.h +lib/libtulip-%%TULIP_VERS%%.so +lib/libtulip-ogl-%%TULIP_VERS%%.so lib/libtulip-ogl.a lib/libtulip-ogl.la lib/libtulip-ogl.so -lib/libtulip-pluginsmanager-3.1.so +lib/libtulip-pluginsmanager-%%TULIP_VERS%%.so lib/libtulip-pluginsmanager.a lib/libtulip-pluginsmanager.la lib/libtulip-pluginsmanager.so -lib/libtulip-qt4-3.1.so +lib/libtulip-qt4-%%TULIP_VERS%%.so lib/libtulip-qt4.a lib/libtulip-qt4.la lib/libtulip-qt4.so lib/libtulip.a lib/libtulip.la lib/libtulip.so +lib/tlp/bitmaps/cylinderTexture.png lib/tlp/bitmaps/font.ttf lib/tlp/bitmaps/fontb.ttf lib/tlp/bitmaps/headerlogo.bmp @@ -239,23 +282,23 @@ lib/tlp/bitmaps/startup.gif lib/tlp/bitmaps/tex_back.png lib/tlp/bitmaps/welcomelogo.bmp -lib/tlp/designer/libElementPropertiesWidgetPlugin-3.1.so +lib/tlp/designer/libElementPropertiesWidgetPlugin-%%TULIP_VERS%%.so lib/tlp/designer/libElementPropertiesWidgetPlugin.a lib/tlp/designer/libElementPropertiesWidgetPlugin.la lib/tlp/designer/libElementPropertiesWidgetPlugin.so -lib/tlp/designer/libGWOverviewWidgetPlugin-3.1.so +lib/tlp/designer/libGWOverviewWidgetPlugin-%%TULIP_VERS%%.so lib/tlp/designer/libGWOverviewWidgetPlugin.a lib/tlp/designer/libGWOverviewWidgetPlugin.la lib/tlp/designer/libGWOverviewWidgetPlugin.so -lib/tlp/designer/libGlMainWidgetPlugin-3.1.so +lib/tlp/designer/libGlMainWidgetPlugin-%%TULIP_VERS%%.so lib/tlp/designer/libGlMainWidgetPlugin.a lib/tlp/designer/libGlMainWidgetPlugin.la lib/tlp/designer/libGlMainWidgetPlugin.so -lib/tlp/designer/libPropertyWidgetPlugin-3.1.so +lib/tlp/designer/libPropertyWidgetPlugin-%%TULIP_VERS%%.so lib/tlp/designer/libPropertyWidgetPlugin.a lib/tlp/designer/libPropertyWidgetPlugin.la lib/tlp/designer/libPropertyWidgetPlugin.so -lib/tlp/designer/libSGHierarchyWidgetPlugin-3.1.so +lib/tlp/designer/libSGHierarchyWidgetPlugin-%%TULIP_VERS%%.so lib/tlp/designer/libSGHierarchyWidgetPlugin.a lib/tlp/designer/libSGHierarchyWidgetPlugin.la lib/tlp/designer/libSGHierarchyWidgetPlugin.so @@ -280,6 +323,9 @@ lib/tlp/glyphs/libCylinder-%%TULIP_VERSION%%.a lib/tlp/glyphs/libCylinder-%%TULIP_VERSION%%.la lib/tlp/glyphs/libCylinder-%%TULIP_VERSION%%.so +lib/tlp/glyphs/libEdgeExtremityArrow-%%TULIP_VERSION%%.a +lib/tlp/glyphs/libEdgeExtremityArrow-%%TULIP_VERSION%%.la +lib/tlp/glyphs/libEdgeExtremityArrow-%%TULIP_VERSION%%.so lib/tlp/glyphs/libHalfCylinder-%%TULIP_VERSION%%.a lib/tlp/glyphs/libHalfCylinder-%%TULIP_VERSION%%.la lib/tlp/glyphs/libHalfCylinder-%%TULIP_VERSION%%.so @@ -499,9 +545,6 @@ lib/tlp/libWebImport-%%TULIP_VERSION%%.a lib/tlp/libWebImport-%%TULIP_VERSION%%.la lib/tlp/libWebImport-%%TULIP_VERSION%%.so -lib/tlp/view/libParallelCoordinates-%%TULIP_VERSION%%.a -lib/tlp/view/libParallelCoordinates-%%TULIP_VERSION%%.la -lib/tlp/view/libParallelCoordinates-%%TULIP_VERSION%%.so lib/tlp/view/libSpreadSheet-%%TULIP_VERSION%%.a lib/tlp/view/libSpreadSheet-%%TULIP_VERSION%%.la lib/tlp/view/libSpreadSheet-%%TULIP_VERSION%%.so Index: files/patch-dirent =================================================================== RCS file: files/patch-dirent diff -N files/patch-dirent --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-dirent 22 Mar 2010 12:58:34 -0000 @@ -0,0 +1,11 @@ +--- library/tulip/src/PluginLibraryLoader.cpp.orig 2010-03-22 09:54:25.000000000 +0100 ++++ library/tulip/src/PluginLibraryLoader.cpp 2010-03-22 10:00:13.000000000 +0100 +@@ -183,7 +183,7 @@ + struct dirent **namelist; + n = scandir((const char *) _pluginPath.c_str(), + &namelist, +-#if !(defined(__APPLE__) || defined(__FreeBSD__)) ++#if !(defined(__APPLE__) || (defined(__FreeBSD__) && (__FreeBSD_version >= 900006 || (__FreeBSD_version >= 800501 && __FreeBSD_version < 900000) || (__FreeBSD_version >= 730000 && __FreeBSD_version < 800000)))) + (int (*) (const dirent *)) + #endif + __tulip_select_libs, Index: files/patch-library-tulip-qt-src_Makefile.am =================================================================== RCS file: files/patch-library-tulip-qt-src_Makefile.am diff -N files/patch-library-tulip-qt-src_Makefile.am --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-library-tulip-qt-src_Makefile.am 24 Mar 2010 12:57:49 -0000 @@ -0,0 +1,13 @@ +--- library/tulip-qt/src/Makefile.am.orig 2010-03-24 13:57:22.000000000 +0100 ++++ library/tulip-qt/src/Makefile.am 2010-03-24 13:57:38.000000000 +0100 +@@ -11,8 +11,8 @@ + lib_LTLIBRARIES = libtulip-qt4.la + qtplugin_LTLIBRARIES = libPropertyWidgetPlugin.la libElementPropertiesWidgetPlugin.la libGlMainWidgetPlugin.la libSGHierarchyWidgetPlugin.la libGWOverviewWidgetPlugin.la + +-INCLUDES = ${DLL_TULIP_QT} @GL_INCLUDES@ @TULIP_QT_INCLUDE@ -D_REENTRANT -DQT_THREAD_SUPPORT -DQT_PLUGIN -DQT_SHARED \ +- @QT_INCLUDES@ @TULIP_INCLUDE@ @TULIP_OGL_INCLUDE@ ++INCLUDES = ${DLL_TULIP_QT} @TULIP_QT_INCLUDE@ -D_REENTRANT -DQT_THREAD_SUPPORT -DQT_PLUGIN -DQT_SHARED \ ++ @QT_INCLUDES@ @TULIP_INCLUDE@ @TULIP_OGL_INCLUDE@ @GL_INCLUDES@ + PLUGINS_LDFLAGS = ${DLL_FLAGS} @GL_LDFLAGS@ @LIB_GL@ @QT_LDFLAGS@ @LIB_QT@ @TULIP_LDFLAGS@ @TULIP_OGL_LDFLAGS@ @TULIP_QT_LDFLAGS@ -avoid-version + AM_LDFLAGS = ${DLL_FLAGS} @GL_LDFLAGS@ @LIB_GL@ @QT_LDFLAGS@ @LIB_QT@ @TULIP_LDFLAGS@ @TULIP_OGL_LDFLAGS@ -release @MAJOR_VERSION@.@MINOR_VERSION@ + Index: files/patch-library-tulip-qt-src_Makefile.in =================================================================== RCS file: files/patch-library-tulip-qt-src_Makefile.in diff -N files/patch-library-tulip-qt-src_Makefile.in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-library-tulip-qt-src_Makefile.in 24 Mar 2010 12:57:10 -0000 @@ -0,0 +1,13 @@ +--- library/tulip-qt/src/Makefile.in.orig 2010-03-24 13:56:37.000000000 +0100 ++++ library/tulip-qt/src/Makefile.in 2010-03-24 13:56:49.000000000 +0100 +@@ -411,8 +411,8 @@ + @WIN32_TRUE@DLL_TULIP_QT2 = -DDLL_TULIP_QT2 + lib_LTLIBRARIES = libtulip-qt4.la + qtplugin_LTLIBRARIES = libPropertyWidgetPlugin.la libElementPropertiesWidgetPlugin.la libGlMainWidgetPlugin.la libSGHierarchyWidgetPlugin.la libGWOverviewWidgetPlugin.la +-INCLUDES = ${DLL_TULIP_QT} @GL_INCLUDES@ @TULIP_QT_INCLUDE@ -D_REENTRANT -DQT_THREAD_SUPPORT -DQT_PLUGIN -DQT_SHARED \ +- @QT_INCLUDES@ @TULIP_INCLUDE@ @TULIP_OGL_INCLUDE@ ++INCLUDES = ${DLL_TULIP_QT} @TULIP_QT_INCLUDE@ -D_REENTRANT -DQT_THREAD_SUPPORT -DQT_PLUGIN -DQT_SHARED \ ++ @QT_INCLUDES@ @TULIP_INCLUDE@ @TULIP_OGL_INCLUDE@ @GL_INCLUDES@ + + PLUGINS_LDFLAGS = ${DLL_FLAGS} @GL_LDFLAGS@ @LIB_GL@ @QT_LDFLAGS@ @LIB_QT@ @TULIP_LDFLAGS@ @TULIP_OGL_LDFLAGS@ @TULIP_QT_LDFLAGS@ -avoid-version + AM_LDFLAGS = ${DLL_FLAGS} @GL_LDFLAGS@ @LIB_GL@ @QT_LDFLAGS@ @LIB_QT@ @TULIP_LDFLAGS@ @TULIP_OGL_LDFLAGS@ -release @MAJOR_VERSION@.@MINOR_VERSION@