3 files changed, 76 insertions, 36 deletions

diff --git a/graphics/tulip/Makefile b/graphics/tulip/Makefile
index eef80aef9c89..794dc3f12296 100644
--- a/graphics/tulip/Makefile
+++ b/graphics/tulip/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	tulip
-PORTVERSION=	3.3.1
+PORTVERSION=	3.4.0
 CATEGORIES=	graphics
 MASTER_SITES=	SF/auber/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
@@ -42,7 +42,7 @@ CFLAGS+=	-fPIC
 
 post-patch:
 	@${GREP} -lr '/usr/X11R6/include' ${WRKSRC} | ${XARGS} \
-	    ${REINPLACE_CMD} -e 's|/usr/X11R6/include||g'
+	    ${REINPLACE_CMD} -e 's|/usr/X11R6/include|${LOCALBASE}/include|g'
 	@${REINPLACE_CMD} -e 's|<qdir.h>|<QtCore/qdir.h>|' \
 	    ${WRKSRC}/software/tulip/src/Application.cpp
 	@${REINPLACE_CMD} -e 's|<qtimer.h>|<QtCore/qtimer.h>|;s|<qlocale.h>|<QtCore/qlocale.h>|' \
diff --git a/graphics/tulip/distinfo b/graphics/tulip/distinfo
index f99034388586..ad5d44543de5 100644
--- a/graphics/tulip/distinfo
+++ b/graphics/tulip/distinfo
@@ -1,6 +1,6 @@
-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
+MD5 (tulip-3.4.0.tar.bz2) = 5d11d70e0e20ca59a917385be7abb615
+SHA256 (tulip-3.4.0.tar.bz2) = 2889113f773ba539472d501fb4f45dbf5eb76e02c949dfa74c63f6f815a2baab
+SIZE (tulip-3.4.0.tar.bz2) = 16468506
+MD5 (tulip-3.4.0-html.tar.bz2) = 1f4790dc778b5ecdfa353a63270afb54
+SHA256 (tulip-3.4.0-html.tar.bz2) = 749e0140396f00351f33787a29bc1d82b8445056b4452443a602a2e98cdd8e73
+SIZE (tulip-3.4.0-html.tar.bz2) = 10227744
diff --git a/graphics/tulip/pkg-plist b/graphics/tulip/pkg-plist
index 0ce5ea0d95db..36a32a6a7d8c 100644
--- a/graphics/tulip/pkg-plist
+++ b/graphics/tulip/pkg-plist
@@ -1,9 +1,12 @@
 bin/tulip
 bin/tulip-config
+bin/tulip_app
 bin/tulip_check_pl
+bin/tulip_need_restart
 include/SpreadConfigurationWidgetData.h
 include/SpreadInsertColumnDialogData.h
 include/SpreadMainWidgetData.h
+include/tulip/AbstractGlCurve.h
 include/tulip/AbstractProperty.h
 include/tulip/AbstractView.h
 include/tulip/AcyclicTest.h
@@ -18,7 +21,10 @@ include/tulip/BiconnectedTest.h
 include/tulip/BooleanAlgorithm.h
 include/tulip/BooleanProperty.h
 include/tulip/BoundingBox.h
+include/tulip/CSVContentHandler.h
+include/tulip/CSVParser.h
 include/tulip/Camera.h
+include/tulip/ChooseFileNameDialogData.h
 include/tulip/Circle.h
 include/tulip/Color.h
 include/tulip/ColorAlgorithm.h
@@ -56,7 +62,6 @@ include/tulip/ExportModule.h
 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
@@ -65,17 +70,23 @@ include/tulip/ForegroundEntity.h
 include/tulip/GWOverviewWidget.h
 include/tulip/GWOverviewWidgetData.h
 include/tulip/GWOverviewWidgetPlugin.h
+include/tulip/Gl2DRect.h
+include/tulip/GlAbstractPolygon.h
 include/tulip/GlAxis.h
 include/tulip/GlBezierCurve.h
 include/tulip/GlBoundingBoxSceneVisitor.h
 include/tulip/GlBox.h
+include/tulip/GlCPULODCalculator.h
 include/tulip/GlCatmullRomCurve.h
 include/tulip/GlCircle.h
 include/tulip/GlColorScale.h
 include/tulip/GlComplexPolygon.h
 include/tulip/GlComplexeEntity.h
 include/tulip/GlComposite.h
+include/tulip/GlCompositeHierarchyManager.h
+include/tulip/GlConvexGraphHull.h
 include/tulip/GlConvexHull.h
+include/tulip/GlCubicBSplineInterpolation.h
 include/tulip/GlCurve.h
 include/tulip/GlDisplayListManager.h
 include/tulip/GlEdge.h
@@ -87,7 +98,7 @@ include/tulip/GlGraphInputData.h
 include/tulip/GlGraphRenderingParameters.h
 include/tulip/GlGraphStaticData.h
 include/tulip/GlGrid.h
-include/tulip/GlHierarchyConvexHulls.h
+include/tulip/GlHexagon.h
 include/tulip/GlLODCalculator.h
 include/tulip/GlLODSceneVisitor.h
 include/tulip/GlLabel.h
@@ -95,7 +106,6 @@ 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
@@ -103,26 +113,31 @@ 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
+include/tulip/GlOpenUniformCubicBSpline.h
+include/tulip/GlPentagon.h
 include/tulip/GlPolyQuad.h
 include/tulip/GlPolygon.h
 include/tulip/GlProgressBar.h
 include/tulip/GlQuad.h
+include/tulip/GlQuadTreeLODCalculator.h
 include/tulip/GlQuantitativeAxis.h
 include/tulip/GlRect.h
 include/tulip/GlRectTextured.h
+include/tulip/GlRegularPolygon.h
 include/tulip/GlScene.h
 include/tulip/GlSceneObserver.h
 include/tulip/GlSceneVisitor.h
+include/tulip/GlSceneZoomAndPan.h
 include/tulip/GlSelectSceneVisitor.h
-include/tulip/GlShaderManager.h
+include/tulip/GlShaderProgram.h
 include/tulip/GlSimpleEntity.h
 include/tulip/GlSphere.h
 include/tulip/GlTLPFeedBackBuilder.h
 include/tulip/GlTextureManager.h
 include/tulip/GlTools.h
+include/tulip/GlTriangle.h
 include/tulip/GlXMLTools.h
 include/tulip/Glyph.h
 include/tulip/GlyphManager.h
@@ -130,11 +145,16 @@ include/tulip/Graph.h
 include/tulip/GraphDecorator.h
 include/tulip/GraphMeasure.h
 include/tulip/GraphPropertiesSelectionWidget.h
+include/tulip/GraphPropertiesTableWidget.h
 include/tulip/GraphProperty.h
 include/tulip/GraphTools.h
 include/tulip/GraphicsWidgetBase.h
 include/tulip/GridOptionsData.h
 include/tulip/GridOptionsWidget.h
+include/tulip/ImportCSVDataConfigurationWidget.h
+include/tulip/ImportCSVDataConfigurationWidgetData.h
+include/tulip/ImportCSVDataDialog.h
+include/tulip/ImportCSVDataWidget.h
 include/tulip/ImportModule.h
 include/tulip/IntegerAlgorithm.h
 include/tulip/IntegerProperty.h
@@ -154,6 +174,7 @@ include/tulip/MainController.h
 include/tulip/MapIterator.h
 include/tulip/Matrix.h
 include/tulip/MethodFactory.h
+include/tulip/Morphing.h
 include/tulip/MouseBoxZoomer.h
 include/tulip/MouseEdgeBendEditor.h
 include/tulip/MouseEdgeBuilder.h
@@ -171,8 +192,11 @@ include/tulip/Observable.h
 include/tulip/ObservableGraph.h
 include/tulip/ObservableProperty.h
 include/tulip/OcclusionTest.h
+include/tulip/OpenGlConfigManager.h
+include/tulip/OpenGlErrorViewer.h
 include/tulip/Ordering.h
 include/tulip/OuterPlanarTest.h
+include/tulip/ParametricCurves.h
 include/tulip/PlanarConMap.h
 include/tulip/PlanarityTest.h
 include/tulip/Plugin.h
@@ -189,11 +213,13 @@ include/tulip/PropertyInterface.h
 include/tulip/PropertyWidget.h
 include/tulip/PropertyWidgetPlugin.h
 include/tulip/QGlPixelBufferManager.h
-include/tulip/QtCPULODCalculator.h
+include/tulip/QtGlSceneZoomAndPanAnimator.h
 include/tulip/QtMetaNodeRenderer.h
+include/tulip/QtOpenGlErrorViewer.h
+include/tulip/QtOpenGlErrorViewerWithAskAgainDialogData.h
 include/tulip/QtProgress.h
 include/tulip/QtProgressData.h
-include/tulip/QtQuadTreeLODCalculator.h
+include/tulip/QuadTree.h
 include/tulip/Rectangle.h
 include/tulip/Reflect.h
 include/tulip/RenderingParametersDialog.h
@@ -227,8 +253,6 @@ include/tulip/TreeTest.h
 include/tulip/TriconnectedTest.h
 include/tulip/TulipPlugin.h
 include/tulip/TulipRelease.h
-include/tulip/TulipStatsData.h
-include/tulip/TulipStatsWidget.h
 include/tulip/TulipTableWidget.h
 include/tulip/Types.h
 include/tulip/Vector.h
@@ -245,11 +269,6 @@ include/tulip/cxx/Matrix.cxx
 include/tulip/cxx/Reflect.cxx
 include/tulip/cxx/TemplateFactory.cxx
 include/tulip/cxx/Vector.cxx
-include/tulip/elementpropertieswidget.h
-include/tulip/glmainwidget.h
-include/tulip/gwoverviewwidget.h
-include/tulip/propertywidget.h
-include/tulip/sghierarchywidget.h
 include/tulip/tulipconf.h
 include/tulip/tuliphash.h
 lib/libtulip-%%TULIP_VERS%%.so
@@ -268,7 +287,11 @@ lib/libtulip-qt4.so
 lib/libtulip.a
 lib/libtulip.la
 lib/libtulip.so
+lib/tlp/bitmaps/arrowSprite.png
+lib/tlp/bitmaps/candiSprite.png
 lib/tlp/bitmaps/cylinderTexture.png
+lib/tlp/bitmaps/edgeBlomSprite.png
+lib/tlp/bitmaps/edgeSpring.png
 lib/tlp/bitmaps/font.ttf
 lib/tlp/bitmaps/fontb.ttf
 lib/tlp/bitmaps/headerlogo.bmp
@@ -277,8 +300,6 @@ lib/tlp/bitmaps/logo32x32.bmp
 lib/tlp/bitmaps/logo32x32.ico
 lib/tlp/bitmaps/logolabri.jpg
 lib/tlp/bitmaps/logotulip.jpg
-lib/tlp/bitmaps/parallel_sliders_texture.png
-lib/tlp/bitmaps/parallel_texture.png
 lib/tlp/bitmaps/startup.gif
 lib/tlp/bitmaps/tex_back.png
 lib/tlp/bitmaps/welcomelogo.bmp
@@ -323,9 +344,6 @@ lib/tlp/glyphs/libCubeOutlinedTransparent-%%TULIP_VERSION%%.so
 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
@@ -344,12 +362,39 @@ lib/tlp/glyphs/libSphere-%%TULIP_VERSION%%.so
 lib/tlp/glyphs/libSquare-%%TULIP_VERSION%%.a
 lib/tlp/glyphs/libSquare-%%TULIP_VERSION%%.la
 lib/tlp/glyphs/libSquare-%%TULIP_VERSION%%.so
-lib/tlp/glyphs/libSquareBorderTextured-%%TULIP_VERSION%%.a
-lib/tlp/glyphs/libSquareBorderTextured-%%TULIP_VERSION%%.la
-lib/tlp/glyphs/libSquareBorderTextured-%%TULIP_VERSION%%.so
 lib/tlp/glyphs/libTriangle-%%TULIP_VERSION%%.a
 lib/tlp/glyphs/libTriangle-%%TULIP_VERSION%%.la
 lib/tlp/glyphs/libTriangle-%%TULIP_VERSION%%.so
+lib/tlp/interactors/libInteractorAddEdge-%%TULIP_VERSION%%.a
+lib/tlp/interactors/libInteractorAddEdge-%%TULIP_VERSION%%.la
+lib/tlp/interactors/libInteractorAddEdge-%%TULIP_VERSION%%.so
+lib/tlp/interactors/libInteractorAddNode-%%TULIP_VERSION%%.a
+lib/tlp/interactors/libInteractorAddNode-%%TULIP_VERSION%%.la
+lib/tlp/interactors/libInteractorAddNode-%%TULIP_VERSION%%.so
+lib/tlp/interactors/libInteractorDeleteElement-%%TULIP_VERSION%%.a
+lib/tlp/interactors/libInteractorDeleteElement-%%TULIP_VERSION%%.la
+lib/tlp/interactors/libInteractorDeleteElement-%%TULIP_VERSION%%.so
+lib/tlp/interactors/libInteractorEditEdgeBends-%%TULIP_VERSION%%.a
+lib/tlp/interactors/libInteractorEditEdgeBends-%%TULIP_VERSION%%.la
+lib/tlp/interactors/libInteractorEditEdgeBends-%%TULIP_VERSION%%.so
+lib/tlp/interactors/libInteractorGetInformation-%%TULIP_VERSION%%.a
+lib/tlp/interactors/libInteractorGetInformation-%%TULIP_VERSION%%.la
+lib/tlp/interactors/libInteractorGetInformation-%%TULIP_VERSION%%.so
+lib/tlp/interactors/libInteractorMagicSelection-%%TULIP_VERSION%%.a
+lib/tlp/interactors/libInteractorMagicSelection-%%TULIP_VERSION%%.la
+lib/tlp/interactors/libInteractorMagicSelection-%%TULIP_VERSION%%.so
+lib/tlp/interactors/libInteractorNavigation-%%TULIP_VERSION%%.a
+lib/tlp/interactors/libInteractorNavigation-%%TULIP_VERSION%%.la
+lib/tlp/interactors/libInteractorNavigation-%%TULIP_VERSION%%.so
+lib/tlp/interactors/libInteractorRectangleZoom-%%TULIP_VERSION%%.a
+lib/tlp/interactors/libInteractorRectangleZoom-%%TULIP_VERSION%%.la
+lib/tlp/interactors/libInteractorRectangleZoom-%%TULIP_VERSION%%.so
+lib/tlp/interactors/libInteractorSelection-%%TULIP_VERSION%%.a
+lib/tlp/interactors/libInteractorSelection-%%TULIP_VERSION%%.la
+lib/tlp/interactors/libInteractorSelection-%%TULIP_VERSION%%.so
+lib/tlp/interactors/libInteractorSelectionModifier-%%TULIP_VERSION%%.a
+lib/tlp/interactors/libInteractorSelectionModifier-%%TULIP_VERSION%%.la
+lib/tlp/interactors/libInteractorSelectionModifier-%%TULIP_VERSION%%.so
 lib/tlp/libAdjacencyMatrixImport-%%TULIP_VERSION%%.a
 lib/tlp/libAdjacencyMatrixImport-%%TULIP_VERSION%%.la
 lib/tlp/libAdjacencyMatrixImport-%%TULIP_VERSION%%.so
@@ -407,9 +452,6 @@ lib/tlp/libDotImport-%%TULIP_VERSION%%.so
 lib/tlp/libEccentricity-%%TULIP_VERSION%%.a
 lib/tlp/libEccentricity-%%TULIP_VERSION%%.la
 lib/tlp/libEccentricity-%%TULIP_VERSION%%.so
-lib/tlp/libEmbedder-%%TULIP_VERSION%%.a
-lib/tlp/libEmbedder-%%TULIP_VERSION%%.la
-lib/tlp/libEmbedder-%%TULIP_VERSION%%.so
 lib/tlp/libEnumColorValuesMapping-%%TULIP_VERSION%%.a
 lib/tlp/libEnumColorValuesMapping-%%TULIP_VERSION%%.la
 lib/tlp/libEnumColorValuesMapping-%%TULIP_VERSION%%.so
@@ -530,9 +572,6 @@ lib/tlp/libStrongComponent-%%TULIP_VERSION%%.so
 lib/tlp/libTreeLeaf-%%TULIP_VERSION%%.a
 lib/tlp/libTreeLeaf-%%TULIP_VERSION%%.la
 lib/tlp/libTreeLeaf-%%TULIP_VERSION%%.so
-lib/tlp/libTreeMap-%%TULIP_VERSION%%.a
-lib/tlp/libTreeMap-%%TULIP_VERSION%%.la
-lib/tlp/libTreeMap-%%TULIP_VERSION%%.so
 lib/tlp/libTreeRadial-%%TULIP_VERSION%%.a
 lib/tlp/libTreeRadial-%%TULIP_VERSION%%.la
 lib/tlp/libTreeRadial-%%TULIP_VERSION%%.so
@@ -552,6 +591,7 @@ share/aclocal/tulip.m4
 @dirrm include/tulip/cxx
 @dirrm include/tulip
 @dirrm lib/tlp/view
+@dirrm lib/tlp/interactors
 @dirrm lib/tlp/glyphs
 @dirrm lib/tlp/designer
 @dirrm lib/tlp/bitmaps