graphics/tulip: Update to 4.10.0

Changes this release:
  http://tulip.labri.fr/TulipDrupal/?q=node/2143

Approved by:	adamw (mentor, implicit)

7 files changed, 14 insertions, 67 deletions

diff --git a/graphics/tulip/Makefile b/graphics/tulip/Makefile
index a7c4b4173c58..59667655b6ed 100644
--- a/graphics/tulip/Makefile
+++ b/graphics/tulip/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	tulip
-PORTVERSION=	4.9.0
+PORTVERSION=	4.10.0
 DISTVERSIONSUFFIX=	_src
 CATEGORIES=	graphics
 MASTER_SITES=	SF/auber/${PORTNAME}/${PORTNAME}-${PORTVERSION}
@@ -12,8 +12,6 @@ COMMENT=	System dedicated to the visualization of huge graphs
 
 LICENSE=	LGPL3
 
-BROKEN_FreeBSD_9=	does not build
-
 LIB_DEPENDS=	libquazip.so:archivers/quazip \
 		libpng.so:graphics/png \
 		libOGDF.so:math/ogdf \
@@ -49,11 +47,13 @@ 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
+QT5_CMAKE_BOOL=		USE_QT5_IF_INSTALLED
+
+# Upstream contacted regarding build failures on FreeBSD 9: https://sourceforge.net/p/auber/discussion/206283/thread/489d80e8/
+BROKEN_FreeBSD_9=	/usr/local/include/bfd.h:1610:38: error: expected ',' or '...' before 'ATTRIBUTE_UNUSED'
 
 post-build:
 	@${LN} -sf logo32x32.png \
diff --git a/graphics/tulip/distinfo b/graphics/tulip/distinfo
index 1df87fdb7795..f4ccce9d3819 100644
--- a/graphics/tulip/distinfo
+++ b/graphics/tulip/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1468022227
-SHA256 (tulip-4.9.0_src.tar.gz) = 432d9e12839d41b8ed5bb497c08cd4922cb112868f4c47cd0675e7254e3a0c5e
-SIZE (tulip-4.9.0_src.tar.gz) = 76325634
+TIMESTAMP = 1482046849
+SHA256 (tulip-4.10.0_src.tar.gz) = f7c2196f8e892a3474c90b4cc11a0777fdef7054b0edd20fbcb94736e6a7cc9f
+SIZE (tulip-4.10.0_src.tar.gz) = 74675072
diff --git a/graphics/tulip/files/patch-library_tulip-core_src_PluginLibraryLoader.cpp b/graphics/tulip/files/patch-library_tulip-core_src_PluginLibraryLoader.cpp
deleted file mode 100644
index 1a40859dcdbc..000000000000
--- a/graphics/tulip/files/patch-library_tulip-core_src_PluginLibraryLoader.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
---- library/tulip-core/src/PluginLibraryLoader.cpp.orig	2016-07-07 20:15:54 UTC
-+++ library/tulip-core/src/PluginLibraryLoader.cpp
-@@ -138,7 +138,14 @@ bool PluginLibraryLoader::loadPluginLibr
- }
- 
- // accepts only file whose name matches *.so or *.dylib
-+#ifdef __FreeBSD__
-+#include <sys/param.h>
-+#if (__FreeBSD_version < 900000 && __FreeBSD_version >= 800501) || (__FreeBSD_version >= 900006)
-+int __tulip_select_libs(const struct dirent *ent) {
-+#else
- int __tulip_select_libs(struct dirent *ent) {
-+#endif /* __FreeBSD_version */
-+#endif /* __FreeBSD__ */
- #if !defined(__APPLE__)
-   const char *suffix = ".so";
-   const unsigned long suffix_len = 3;
diff --git a/graphics/tulip/files/patch-plugins_view_HistogramView_HistogramStatistics.cpp b/graphics/tulip/files/patch-plugins_view_HistogramView_HistogramStatistics.cpp
deleted file mode 100644
index adf871b92e9b..000000000000
--- a/graphics/tulip/files/patch-plugins_view_HistogramView_HistogramStatistics.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- plugins/view/HistogramView/HistogramStatistics.cpp.orig	2015-10-16 02:16:56 UTC
-+++ plugins/view/HistogramView/HistogramStatistics.cpp
-@@ -28,7 +28,7 @@
- #include "HistoStatsConfigWidget.h"
- #include "HistogramView.h"
- 
--#if defined(_MSC_VER) || (defined(__clang_major__) && __clang_major__ >= 4)
-+#if defined(_MSC_VER) || (defined(__clang_major__) && __clang_major__ >= 4) || defined(__FreeBSD__)
- 
- #include <functional>
- 
diff --git a/graphics/tulip/files/patch-software_crash__handling_CrashHandling.cpp b/graphics/tulip/files/patch-software_crash__handling_CrashHandling.cpp
deleted file mode 100644
index e13d7531155a..000000000000
--- a/graphics/tulip/files/patch-software_crash__handling_CrashHandling.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- software/crash_handling/CrashHandling.cpp.orig	2016-07-07 20:15:39 UTC
-+++ software/crash_handling/CrashHandling.cpp
-@@ -78,7 +78,7 @@ static void dumpStackTrace(StackWalker &
- /*
-   Linux/MacOS-specific handling
-  */
--#if defined(__unix__) || defined(__APPLE__)
-+#if (defined(__unix__) || defined(__APPLE__)) && !defined(__FreeBSD__)
- 
- #if defined(__i386__) || defined(__amd64__)
- 
diff --git a/graphics/tulip/files/patch-software_tulip_include_TulipPerspectiveProcessHandler.h b/graphics/tulip/files/patch-software_tulip_include_TulipPerspectiveProcessHandler.h
deleted file mode 100644
index 76fa5dea2933..000000000000
--- a/graphics/tulip/files/patch-software_tulip_include_TulipPerspectiveProcessHandler.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- software/tulip/include/TulipPerspectiveProcessHandler.h.orig	2015-04-18 20:15:52 UTC
-+++ software/tulip/include/TulipPerspectiveProcessHandler.h
-@@ -27,6 +27,8 @@
- 
- #include <QTcpServer>
- 
-+#include <ctime>
-+
- // Some utility class used in crash handler dialog designer form
- 
- class SelectionButton: public QPushButton {
diff --git a/graphics/tulip/pkg-plist b/graphics/tulip/pkg-plist
index 35d147634b7b..c309cf6ed1a9 100644
--- a/graphics/tulip/pkg-plist
+++ b/graphics/tulip/pkg-plist
@@ -2,6 +2,7 @@ bin/tulip
 bin/tulip-config
 bin/tulip_perspective
 include/tulip/APIDataBase.h
+include/tulip/AboutTulipPage.h
 include/tulip/AbstractGlCurve.h
 include/tulip/AbstractProperty.h
 include/tulip/AcyclicTest.h
@@ -35,6 +36,7 @@ include/tulip/ColorScale.h
 include/tulip/ColorScaleButton.h
 include/tulip/ColorScaleConfigDialog.h
 include/tulip/ColorScaleWidget.h
+include/tulip/ColorScalesManager.h
 include/tulip/ConcatIterator.h
 include/tulip/ConnectedTest.h
 include/tulip/ConsoleUtils.h
@@ -199,7 +201,6 @@ include/tulip/PropertyAnimation.h
 include/tulip/PropertyCreationDialog.h
 include/tulip/PropertyInterface.h
 include/tulip/PropertyTypes.h
-include/tulip/PropertyWrapper.h
 include/tulip/PythonCodeEditor.h
 include/tulip/PythonCppTypesConverter.h
 include/tulip/PythonEditorsTabWidget.h
@@ -238,7 +239,6 @@ include/tulip/StringProperty.h
 include/tulip/StringsListSelectionDialog.h
 include/tulip/StringsListSelectionWidget.h
 include/tulip/StringsListSelectionWidgetInterface.h
-include/tulip/SystemDefinition.h
 include/tulip/TemplateAlgorithm.h
 include/tulip/TextureFileDialog.h
 include/tulip/TlpQtTools.h
@@ -263,7 +263,6 @@ include/tulip/TulipSettings.h
 include/tulip/TulipViewSettings.h
 include/tulip/TypeInterface.h
 include/tulip/Vector.h
-include/tulip/VectorCast.h
 include/tulip/VectorEditor.h
 include/tulip/VectorPropertyAnimation.h
 include/tulip/View.h
@@ -295,7 +294,6 @@ include/tulip/memorypool.h
 include/tulip/minmaxproperty.h
 include/tulip/tulipconf.h
 include/tulip/tuliphash.h
-include/tulip/uniqueiterator.h
 include/tulip/vectorgraph.h
 include/tulip/vectorgraphproperty.h
 include/tulip2ogdf/OGDFLayoutPluginBase.h
@@ -308,8 +306,6 @@ lib/libgzstream-tulip-%%TULIP_VERS%%.so.0
 lib/libquazip-tulip-%%TULIP_VERS%%.so
 lib/libquazip-tulip-%%TULIP_VERS%%.so.1
 lib/libquazip-tulip-%%TULIP_VERS%%.so.1.0.0
-lib/libqxt-tulip-%%TULIP_VERS%%.so
-lib/libqxt-tulip-%%TULIP_VERS%%.so.0
 lib/libtess2-tulip-%%TULIP_VERS%%.so
 lib/libtulip-core-%%TULIP_VERS%%.so
 lib/libtulip-gui-%%TULIP_VERS%%.so
@@ -412,6 +408,7 @@ lib/tulip/libLinkCommunities-%%TULIP_VERSION%%.so
 lib/tulip/libLoopSelection-%%TULIP_VERSION%%.so
 lib/tulip/libLouvainClustering-%%TULIP_VERSION%%.so
 lib/tulip/libMCLClustering-%%TULIP_VERSION%%.so
+lib/tulip/libMakeGraph-%%TULIP_VERSION%%.so
 lib/tulip/libMetricSizeMapping-%%TULIP_VERSION%%.so
 lib/tulip/libMixedModel-%%TULIP_VERSION%%.so
 lib/tulip/libMultipleSelection-%%TULIP_VERSION%%.so
@@ -486,6 +483,8 @@ lib/tulip/view/libSOMView-%%TULIP_VERSION%%.so
 lib/tulip/view/libScatterPlot2DView-%%TULIP_VERSION%%.so
 lib/tulip/view/libTableView-%%TULIP_VERSION%%.so
 share/pixmaps/tulip.png
+%%DATADIR%%/AUTHORS
+%%DATADIR%%/COPYING.LESSER
 %%DATADIR%%/FindGLEW.cmake
 %%DATADIR%%/FindQtX.cmake
 %%DATADIR%%/FindTULIP.cmake
@@ -499,6 +498,7 @@ share/pixmaps/tulip.png
 %%DATADIR%%/apiFiles/Python-3.2.api
 %%DATADIR%%/apiFiles/Python-3.3.api
 %%DATADIR%%/apiFiles/Python-3.4.api
+%%DATADIR%%/apiFiles/Python-3.5.api
 %%DATADIR%%/apiFiles/tulip.api
 %%DATADIR%%/apiFiles/tulipgui.api
 %%DATADIR%%/apiFiles/tulipogl.api
@@ -888,11 +888,8 @@ share/pixmaps/tulip.png
 %%DATADIR%%/bitmaps/radialGradientTexture.png
 %%DATADIR%%/bitmaps/roundTexture.png
 %%DATADIR%%/bitmaps/samplePictures/1221.png
-%%DATADIR%%/bitmaps/samplePictures/1291.png
 %%DATADIR%%/bitmaps/samplePictures/1531.png
 %%DATADIR%%/bitmaps/samplePictures/1861.jpg
-%%DATADIR%%/bitmaps/samplePictures/741.png
-%%DATADIR%%/bitmaps/samplePictures/891.png
 %%DATADIR%%/bitmaps/titlebarGradient.png
 %%DATADIR%%/bitmaps/tulip-file-icon.ico
 %%DATADIR%%/bitmaps/tulip.ico