- Update to 3.6.0

  Release notes: http://tulip.labri.fr/TulipDrupal/?q=node/1541

8 files changed, 500 insertions, 404 deletions

diff --git a/graphics/tulip/Makefile b/graphics/tulip/Makefile
index d38ecf946ece..27a10534259e 100644
--- a/graphics/tulip/Makefile
+++ b/graphics/tulip/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	tulip
-PORTVERSION=	3.5.0
+PORTVERSION=	3.6.0
 CATEGORIES=	graphics
 MASTER_SITES=	SF/auber/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 DISTFILES=	${DISTNAME}-src${EXTRACT_SUFX}
@@ -30,8 +30,9 @@ USE_PYTHON=	yes
 USE_CMAKE=	yes
 CMAKE_OUTSOURCE=yes
 CMAKE_ARGS+=	-DLOCALBASE:PATH=${LOCALBASE} \
-		-DPYTHON_INCLUDEDIR:PATH=${PYTHON_INCLUDEDIR}
-USE_LDCONFIG=	yes
+		-DPYTHON_INCLUDEDIR:PATH=${PYTHON_INCLUDEDIR} \
+		-DCMAKE_VERBOSE_MAKEFILE:BOOL=TRUE
+USE_LDCONFIG=	${PREFIX}/lib/tlp
 
 WRKSRC=		${WRKDIR}/${DISTNAME}-src
 
@@ -44,12 +45,7 @@ PLIST_SUB+=	TULIP_VERSION=${PORTVERSION} \
 CFLAGS+=	-fPIC
 .endif
 
-#post-extract:
-#	@${FIND} ${WRKSRC} -name "moc_*" -delete
-
 post-patch:
-	@${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>|' \
 	    ${WRKSRC}/software/tulip/src/main.cpp
 
diff --git a/graphics/tulip/distinfo b/graphics/tulip/distinfo
index c0ba03206a3f..77b16ca93e8a 100644
--- a/graphics/tulip/distinfo
+++ b/graphics/tulip/distinfo
@@ -1,4 +1,4 @@
-SHA256 (tulip-3.5.0-src.tar.gz) = 968e2bec5ed1006dee39e21507d03e8ae442dbc8bd1d7b83f1eaba4825e68072
-SIZE (tulip-3.5.0-src.tar.gz) = 23127788
-SHA256 (tulip-3.5.0-html.tar.bz2) = 238fe05685c91bca70c642ae74718ced80d3b58b75dca89dd8b310c5e301de61
-SIZE (tulip-3.5.0-html.tar.bz2) = 45704313
+SHA256 (tulip-3.6.0-src.tar.gz) = e7827eb305947c50ca4ad571c4e565f676b9ce74ef92b48feed72a1e0c9e92e6
+SIZE (tulip-3.6.0-src.tar.gz) = 26490569
+SHA256 (tulip-3.6.0-html.tar.bz2) = 0638808faa2ba8df888dffcccc22d8ba9c4db0b5b523ba15cc9cd7534821498f
+SIZE (tulip-3.6.0-html.tar.bz2) = 53369677
diff --git a/graphics/tulip/files/patch-CMakeLists.txt b/graphics/tulip/files/patch-CMakeLists.txt
index 19541f80fba3..144f3bd7862a 100644
--- a/graphics/tulip/files/patch-CMakeLists.txt
+++ b/graphics/tulip/files/patch-CMakeLists.txt
@@ -1,70 +1,13 @@
---- CMakeLists.txt.orig	2011-04-04 15:17:26.000000000 +0200
-+++ CMakeLists.txt	2011-04-12 12:07:39.000000000 +0200
-@@ -163,30 +163,24 @@
- FIND_PACKAGE(PythonLibs)

- IF(PYTHONLIBS_FOUND)

-   SET(SIP_LIB siplib)

--  TRY_COMPILE(SIP_OK ${CMAKE_CURRENT_BINARY_DIR}/thirdparty/sip-4.11.2/sipgen ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/sip-4.11.2/sipgen sip CMAKE_FLAGS -DCMAKE_OSX_ARCHITECTURES=${CMAKE_OSX_ARCHITECTURES})

--  IF(SIP_OK)

--    IF(WIN32 AND EXISTS "${CMAKE_CURRENT_BINARY_DIR}/thirdparty/sip-4.11.2/sipgen/Debug/sipgen.exe")

--      SET(SIP_EXE ${CMAKE_CURRENT_BINARY_DIR}/thirdparty/sip-4.11.2/sipgen/Debug/sipgen.exe)

--    ELSE()

--      SET(SIP_EXE ${CMAKE_CURRENT_BINARY_DIR}/thirdparty/sip-4.11.2/sipgen/sipgen)

--    ENDIF()

--    SET(SIP_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/sip-4.11.2/siplib/)

--  ENDIF(SIP_OK)

-+  SET(SIP_EXE ${LOCALBASE}/bin/sip)

-+  SET(SIP_INCLUDE_DIR ${PYTHON_INCLUDEDIR})

- ENDIF(PYTHONLIBS_FOUND)

- 

- 

- ## -----------------------------------------------------------------------------------------------

- ## Include file paths

- ## -----------------------------------------------------------------------------------------------

--SET(GZStreamInclude ${PROJECT_SOURCE_DIR}/thirdparty/gzstream/)

--SET(FTGLInclude ${PROJECT_SOURCE_DIR}/thirdparty/ftgl/)

--SET(qscintilla2Include ${PROJECT_SOURCE_DIR}/thirdparty/QScintilla-gpl-2.4.6/Qt4/)

-+SET(GZStreamInclude )

-+SET(FTGLInclude ${LOCALBASE}/include)

-+SET(qscintilla2Include ${LOCALBASE}/include/qt4)

- SET(TulipInclude ${PROJECT_SOURCE_DIR}/library/tulip/include/)

- SET(TulipBuildInclude ${PROJECT_BINARY_DIR}/library/tulip/include/)

- SET(TulipOGLInclude ${PROJECT_SOURCE_DIR}/library/tulip-ogl/include/)

- SET(TulipQtInclude ${PROJECT_SOURCE_DIR}/library/tulip-qt/include/)

- SET(TulipQtBuildInclude ${PROJECT_BINARY_DIR}/library/tulip-qt/include/)

- SET(TulipPluginsManagerInclude ${PROJECT_SOURCE_DIR}/software/plugins-manager/include/)

-+LINK_DIRECTORIES(${LOCALBASE}/lib)

- 

- ## -----------------------------------------------------------------------------------------------

- ## Install paths

-@@ -205,7 +199,7 @@
- SET(TulipPluginsInstallDir ${TulipLibInstallDir}/tlp/)

+--- CMakeLists.txt.orig	2011-08-03 09:12:07.000000000 +0200
++++ CMakeLists.txt	2011-08-03 09:14:33.000000000 +0200
+@@ -230,8 +230,8 @@
+ SET(TulipBitmapInstallDir ${TulipShareInstallDir}/bitmaps/)

+ SET(TulipAppleResourcesDir ${TulipAppleContentsDir}Resources/)

+ ELSE()

+-SET(TulipLibInstallDir lib/)

+-SET(TulipPluginsInstallDir ${TulipLibInstallDir}/tulip/)

++SET(TulipLibInstallDir lib/tlp)

++SET(TulipPluginsInstallDir ${TulipLibInstallDir})

  SET(TulipBinInstallDir bin/)

  SET(TulipIncludeInstallDir include/)

--SET(TulipShareInstallDir share/)

-+SET(TulipShareInstallDir share)

- SET(TulipBitmapInstallDir lib/tlp/bitmaps/)

- ENDIF()

- 

-@@ -327,7 +321,7 @@
- ## -----------------------------------------------------------------------------------------------

- ## Sub dir (no comment)

- ## -----------------------------------------------------------------------------------------------

--ADD_SUBDIRECTORY(thirdparty)

-+#ADD_SUBDIRECTORY(thirdparty)

- ADD_SUBDIRECTORY(library)

- ADD_SUBDIRECTORY(software)

- ADD_SUBDIRECTORY(plugins)

-@@ -377,11 +371,7 @@
- INSTALL(PROGRAMS ${PROJECT_BINARY_DIR}/tulip-config

-         DESTINATION ${TulipBinInstallDir})

- INSTALL(FILES FindTULIP3.cmake 

--        DESTINATION ${TulipShareInstallDir})

--INSTALL(FILES FindGLEW.cmake 

--        DESTINATION ${TulipShareInstallDir})

--INSTALL(FILES FindXML2.cmake 

--        DESTINATION ${TulipShareInstallDir})

-+        DESTINATION ${TulipShareInstallDir}/tulip)

- ## -----------------------------------------------------------------------------------------------

- ## Script for linux Tulip bundle building

- IF(LINUX)

+ SET(TulipShareInstallDir share/tulip)

diff --git a/graphics/tulip/files/patch-dirent b/graphics/tulip/files/patch-dirent
index 3ec2f378251c..42e88213d317 100644
--- a/graphics/tulip/files/patch-dirent
+++ b/graphics/tulip/files/patch-dirent
@@ -1,6 +1,6 @@
---- library/tulip/src/PluginLibraryLoader.cpp.orig	2010-01-19 19:14:04.000000000 +0000
-+++ library/tulip/src/PluginLibraryLoader.cpp	2010-04-09 12:21:13.000000000 +0000
-@@ -161,7 +161,14 @@
+--- library/tulip/src/PluginLibraryLoader.cpp.orig	2011-08-02 13:57:48.000000000 +0200
++++ library/tulip/src/PluginLibraryLoader.cpp	2011-08-02 13:58:38.000000000 +0200
+@@ -169,7 +169,14 @@
  }
  
  // accepts only file whose name matches *.so or *.dylib
@@ -15,7 +15,7 @@
  #if !defined(__APPLE__)
    const char *suffix = ".so";
    const unsigned long suffix_len = 3;
-@@ -183,9 +190,6 @@
+@@ -191,9 +198,6 @@
    struct dirent **namelist;
    n = scandir((const char *) _pluginPath.c_str(),
          &namelist,
diff --git a/graphics/tulip/files/patch-opengl b/graphics/tulip/files/patch-opengl
index b02063a2c77d..c40455dc2750 100644
--- a/graphics/tulip/files/patch-opengl
+++ b/graphics/tulip/files/patch-opengl
@@ -1,50 +1,60 @@
---- library/tulip-ogl/src/CMakeLists.txt.orig	2011-04-11 15:38:08.000000000 +0200
-+++ library/tulip-ogl/src/CMakeLists.txt	2011-04-11 15:38:28.000000000 +0200
-@@ -1,6 +1,6 @@
- FILE(GLOB tulip-ogl_LIB_SRCS "*.cpp")
- 
--INCLUDE_DIRECTORIES(${TulipInclude} ${TulipBuildInclude} ../include/ ${PROJECT_SOURCE_DIR} ${FTGLInclude} ${LIBXML2_INCLUDE_DIR} ${FREETYPE_INCLUDE_DIRS})
-+INCLUDE_DIRECTORIES(${TulipInclude} ${TulipBuildInclude} ../include/ ${PROJECT_SOURCE_DIR} ${FTGLInclude} ${LIBXML2_INCLUDE_DIR} ${FREETYPE_INCLUDE_DIRS} ${OPENGL_INCLUDE_DIR})
- INCLUDE_DIRECTORIES(${OPENGL_INCLUDE_DIR} ${GLEW_INCLUDE_DIR} ${JPEG_INCLUDE_DIR})
- 
- IF(ENABLE_RENDERING_TIME_DISPLAY)
---- library/tulip-python/tulip-ogl/CMakeLists.txt.orig	2011-04-11 16:04:13.000000000 +0200
-+++ library/tulip-python/tulip-ogl/CMakeLists.txt	2011-04-11 16:04:33.000000000 +0200
-@@ -34,7 +34,7 @@
- # instead of those installed in the system
- INCLUDE_DIRECTORIES(BEFORE ${SIP_INCLUDE_DIR})
- 
--INCLUDE_DIRECTORIES(${PYTHON_INCLUDE_DIR} ${PYTHON_INCLUDE_PATH} ${TulipInclude} ${TulipBuildInclude} ${TulipOGLInclude})
-+INCLUDE_DIRECTORIES(${PYTHON_INCLUDE_DIR} ${PYTHON_INCLUDE_PATH} ${TulipInclude} ${TulipBuildInclude} ${TulipOGLInclude} ${OPENGL_INCLUDE_DIR})
- 
- ADD_LIBRARY(${LibTulipOglPythonName} STATIC ${TULIPOGL_PYTHON_BINDINGS_SRC})
- 
---- library/tulip-qt/src/CMakeLists.txt.orig	2011-04-11 14:48:18.000000000 +0200
-+++ library/tulip-qt/src/CMakeLists.txt	2011-04-11 14:48:57.000000000 +0200
-@@ -173,7 +173,7 @@
+--- library/tulip-qt/src/CMakeLists.txt.orig	2011-08-04 10:27:37.000000000 +0200
++++ library/tulip-qt/src/CMakeLists.txt	2011-08-04 10:28:07.000000000 +0200
+@@ -192,7 +192,7 @@
  ADD_DEFINITIONS(-DQT_DLL)
  ADD_DEFINITIONS(-DQT_THREAD_SUPPORT)
  
 -INCLUDE_DIRECTORIES(../include/ ../include/tulip ${TulipInclude} ${TulipBuildInclude} ${TulipOGLInclude} ${TulipQtBuildInclude} ${PROJECT_BINARY_DIR}/library/tulip-qt/include/tulip/)
 +INCLUDE_DIRECTORIES(../include/ ../include/tulip ${TulipInclude} ${TulipBuildInclude} ${TulipOGLInclude} ${TulipQtBuildInclude} ${PROJECT_BINARY_DIR}/library/tulip-qt/include/tulip/ ${OPENGL_INCLUDE_DIR})
  ADD_LIBRARY(${LibTulipQtName} SHARED ${tulip-qt_UI_SRCS} ${tulip-qt_MOC_SRCS} ${tulip-qt_RCC_SRCS} ${tulip-qt_LIB_SRCS})
- TARGET_LINK_LIBRARIES(${LibTulipQtName} ${QT_QTCORE_LIBRARY})
- TARGET_LINK_LIBRARIES(${LibTulipQtName} ${QT_QTGUI_LIBRARY})
---- software/tulip/src/CMakeLists.txt.orig	2011-04-11 16:09:11.000000000 +0200
-+++ software/tulip/src/CMakeLists.txt	2011-04-11 16:09:29.000000000 +0200
-@@ -34,7 +34,7 @@
+ TARGET_LINK_LIBRARIES(${LibTulipQtName} ${GLEW_LIBRARY})
+ TARGET_LINK_LIBRARIES(${LibTulipQtName} ${OPENGL_glu_LIBRARY})
+--- software/tulip/src/CMakeLists.txt.orig	2011-08-04 11:05:06.000000000 +0200
++++ software/tulip/src/CMakeLists.txt	2011-08-04 11:05:19.000000000 +0200
+@@ -33,7 +33,8 @@
  TULIP_QT4_WRAP_CPP(tulip_MOC_SRCS ${tulip_MOC} OPTIONS "-DQT_MINOR_REL=${QT_VERSION_MINOR}")
  QT4_ADD_RESOURCES(tulip_RCC_SRCS ${tulip_RCC})
  
 -INCLUDE_DIRECTORIES(../include/ ${TulipBuildInclude} ${TulipQtBuildInclude} ${PROJECT_BINARY_DIR}/library/tulip-qt/include/tulip ${PROJECT_BINARY_DIR}/software/tulip/include ${TulipInclude} ${TulipQtInclude} ${TulipOGLInclude} ${TulipPluginsManagerInclude})
-+INCLUDE_DIRECTORIES(../include/ ${TulipBuildInclude} ${TulipQtBuildInclude} ${PROJECT_BINARY_DIR}/library/tulip-qt/include/tulip ${PROJECT_BINARY_DIR}/software/tulip/include ${TulipInclude} ${TulipQtInclude} ${TulipOGLInclude} ${TulipPluginsManagerInclude} ${OPENGL_INCLUDE_DIR})
++INCLUDE_DIRECTORIES(../include/ ${TulipBuildInclude} ${TulipQtBuildInclude} ${PROJECT_BINARY_DIR}/library/tulip-qt/include/tulip ${PROJECT_BINARY_DIR}/software/tulip/include ${TulipInclude} ${TulipQtInclude} ${TulipOGLInclude} ${TulipPluginsManagerInclude}
++	${OPENGL_INCLUDE_DIR})
  
  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DQT_MINOR_REL=${QT_VERSION_MINOR}")
  
---- plugins/CMakeLists.txt.orig	2011-04-11 16:43:41.000000000 +0200
-+++ plugins/CMakeLists.txt	2011-04-11 16:20:26.000000000 +0200
-@@ -1,3 +1,4 @@
-+INCLUDE_DIRECTORIES(${OPENGL_INCLUDE_DIR})
- ADD_SUBDIRECTORY(clustering)
- ADD_SUBDIRECTORY(colors)
- ADD_SUBDIRECTORY(import)
+--- plugins/colors/CMakeLists.txt.orig	2011-08-04 11:14:55.000000000 +0200
++++ plugins/colors/CMakeLists.txt	2011-08-04 11:15:05.000000000 +0200
+@@ -1,4 +1,4 @@
+-INCLUDE_DIRECTORIES(${TulipInclude} ${TulipBuildInclude} ${TulipOGLInclude} ${TulipQtInclude} ${CMAKE_CURRENT_BINARY_DIR} .)
++INCLUDE_DIRECTORIES(${TulipInclude} ${TulipBuildInclude} ${TulipOGLInclude} ${TulipQtInclude} ${CMAKE_CURRENT_BINARY_DIR} . ${OPENGL_INCLUDE_DIR})
+ 
+ ##----------------------------------------------------------------------------------------------------------------------------
+ SET(ColorMapping_SRCS
+--- plugins/view/spreadsheet/CMakeLists.txt.orig	2011-08-04 11:53:35.000000000 +0200
++++ plugins/view/spreadsheet/CMakeLists.txt	2011-08-04 11:53:48.000000000 +0200
+@@ -1,6 +1,6 @@
+ INCLUDE("${PROJECT_SOURCE_DIR}/${TulipUseFile}")
+ 
+-INCLUDE_DIRECTORIES(${TulipInclude} ${TulipBuildInclude} ${TulipOGLInclude} ${TulipQtInclude} ${CMAKE_CURRENT_BINARY_DIR} .)	
++INCLUDE_DIRECTORIES(${TulipInclude} ${TulipBuildInclude} ${TulipOGLInclude} ${TulipQtInclude} ${CMAKE_CURRENT_BINARY_DIR} . ${OPENGL_INCLUDE_DIR})	
+ 
+ SET(spreadsheet_LIB_SRCS
+     SpreadView.cpp 
+--- plugins/view/pythonscriptview/CMakeLists.txt.orig	2011-08-04 12:08:47.000000000 +0200
++++ plugins/view/pythonscriptview/CMakeLists.txt	2011-08-04 12:09:00.000000000 +0200
+@@ -6,7 +6,7 @@
+ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DQSCINTILLA_DLL")
+ 
+ # Force to use SIP and QScintilla headers located in thirdparty and not those installed in the system
+-INCLUDE_DIRECTORIES(BEFORE ${qscintilla2Include} ${SIP_INCLUDE_DIR})
++INCLUDE_DIRECTORIES(BEFORE ${qscintilla2Include} ${SIP_INCLUDE_DIR} ${OPENGL_INCLUDE_DIR})
+ INCLUDE_DIRECTORIES(${TulipInclude} ${TulipBuildInclude} ${TulipOGLInclude} ${TulipQtInclude} ${QT_INCLUDE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${PYTHON_INCLUDE_DIR} ${PYTHON_INCLUDE_PATH})
+ 
+ SET(QT_USE_QTWEBKIT true)
+--- plugins/interactor/CMakeLists.txt.orig	2011-08-04 12:22:38.000000000 +0200
++++ plugins/interactor/CMakeLists.txt	2011-08-04 12:22:48.000000000 +0200
+@@ -1,4 +1,4 @@
+-INCLUDE_DIRECTORIES(${TulipInclude} ${TulipBuildInclude} ${TulipOGLInclude} ${TulipQtInclude})
++INCLUDE_DIRECTORIES(${TulipInclude} ${TulipBuildInclude} ${TulipOGLInclude} ${TulipQtInclude} ${OPENGL_INCLUDE_DIR})
+ 
+ ##----------------------------------------------------------------------------------------------------------------------------
+ SET(InteractorNavigation_SRCS
diff --git a/graphics/tulip/files/patch-thirdparty-OGDF-ogdf-basic_basic.h b/graphics/tulip/files/patch-thirdparty-OGDF-ogdf-basic_basic.h
new file mode 100644
index 000000000000..1671b2cca646
--- /dev/null
+++ b/graphics/tulip/files/patch-thirdparty-OGDF-ogdf-basic_basic.h
@@ -0,0 +1,11 @@
+--- thirdparty/OGDF/ogdf/basic/basic.h.orig	2011-08-02 12:31:30.000000000 +0200
++++ thirdparty/OGDF/ogdf/basic/basic.h	2011-08-02 12:31:51.000000000 +0200
+@@ -161,7 +161,7 @@
+ #endif
+ 
+ // Note: Apple OS X machines will be both OGDF_SYSTEM_UNIX and OGDF_SYSTEM_OSX
+-#if defined(__APPLE__)
++#if defined(__APPLE__) || defined(__FreeBSD__)
+ #define OGDF_SYSTEM_OSX
+ #endif
+ 
diff --git a/graphics/tulip/files/patch-thirdparty-OGDF-src-basic_System.cpp b/graphics/tulip/files/patch-thirdparty-OGDF-src-basic_System.cpp
new file mode 100644
index 000000000000..113a52284e94
--- /dev/null
+++ b/graphics/tulip/files/patch-thirdparty-OGDF-src-basic_System.cpp
@@ -0,0 +1,83 @@
+--- thirdparty/OGDF/src/basic/System.cpp.orig	2011-08-02 14:18:48.000000000 +0200
++++ thirdparty/OGDF/src/basic/System.cpp	2011-08-02 14:41:15.000000000 +0200
+@@ -61,6 +61,12 @@
+ #include <mach/vm_statistics.h>
+ #include <mach/mach.h>
+ #include <mach/machine.h>
++#elif defined(__FreeBSD__)
++#include <stdlib.h>
++#include <sys/types.h>
++#include <sys/sysctl.h>
++#include <sys/user.h>
++#include <libutil.h>
+ #elif defined(OGDF_SYSTEM_UNIX)
+ #include <malloc.h>
+ #endif
+@@ -317,6 +323,47 @@
+ 	return 0;
+ }
+ 
++
++#elif __FreeBSD__
++
++long long System::physicalMemory()
++{
++	unsigned long long value;
++	size_t  size = sizeof( value );
++	if (sysctlbyname("hw.physmem", &value, &size, NULL, 0) !=-1)
++		return value;
++	else 
++		return 0;
++}
++
++long long System::availablePhysicalMemory()
++{
++	unsigned long long pageSize, freePages, inactPages;
++	long long result;
++	size_t  size = sizeof( pageSize );
++	sysctlbyname("hw.pagesize", &pageSize, &size, NULL, 0);
++	sysctlbyname("vm.stats.vm.v_free_count", &freePages, &size, NULL, 0);
++	sysctlbyname("vm.stats.vm.v_inactive_count", &inactPages, &size, NULL, 0);
++	
++	result = (unsigned long long)(freePages + inactPages) * pageSize;
++	return result;
++}
++
++
++size_t System::memoryUsedByProcess()
++{
++#if __FreeBSD_version >= 900035
++	int pid = getpid();
++	struct kinfo_proc *kp;
++
++	if ((kp = kinfo_getproc(pid))) {
++		return (kp->ki_size);
++	}
++#endif
++
++	return 0;
++}
++
+ #else
+ // LINUX, NOT MAC OS
+ long long System::physicalMemory()
+@@ -403,6 +450,19 @@
+ {
+ 	return mstats().chunks_free;
+ }
++
++#elif __FreeBSD__
++
++size_t System::memoryAllocatedByMalloc()
++{
++	return 0;
++}
++
++size_t System::memoryInFreelistOfMalloc()
++{
++	return 0;
++}
++
+ #else
+ 
+ size_t System::memoryAllocatedByMalloc()
diff --git a/graphics/tulip/pkg-plist b/graphics/tulip/pkg-plist
index d74c009fcb7a..be48b1a9fc1b 100644
--- a/graphics/tulip/pkg-plist
+++ b/graphics/tulip/pkg-plist
@@ -2,334 +2,310 @@ bin/tulip
 bin/tulip-config
 bin/tulip_app
 bin/tulip_need_restart
-include/tulip/AbstractGlCurve.h
-include/tulip/AbstractProperty.h
-include/tulip/AbstractView.h
-include/tulip/AcyclicTest.h
-include/tulip/Algorithm.h
-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/Ordering.h
+include/tulip/ConvexHull.h
+include/tulip/Delaunay.h
+include/tulip/tulipconf.h
+include/tulip/GraphTools.h
+include/tulip/tuliphash.h
+include/tulip/Array.h
+include/tulip/Vector.h
+include/tulip/VectorCast.h
+include/tulip/Matrix.h
+include/tulip/Rectangle.h
+include/tulip/Circle.h
+include/tulip/SimpleTest.h
+include/tulip/TreeTest.h
+include/tulip/AcyclicTest.h
+include/tulip/ConnectedTest.h
 include/tulip/BiconnectedTest.h
+include/tulip/TriconnectedTest.h
+include/tulip/GraphProperty.h
+include/tulip/LayoutProperty.h
+include/tulip/Plugin.h
+include/tulip/Algorithm.h
 include/tulip/BooleanAlgorithm.h
-include/tulip/BooleanProperty.h
-include/tulip/BoundingBox.h
-include/tulip/CSVContentHandler.h
-include/tulip/CSVGraphImport.h
-include/tulip/CSVGraphMappingConfigurationWidget.h
-include/tulip/CSVGraphMappingConfigurationWidgetData.h
-include/tulip/CSVImportConfigurationWidget.h
-include/tulip/CSVImportConfigurationWidgetData.h
-include/tulip/CSVImportWizard.h
-include/tulip/CSVImportWizardData.h
-include/tulip/CSVParser.h
-include/tulip/CSVParserConfigurationWidget.h
-include/tulip/CSVParserConfigurationWidgetData.h
-include/tulip/Camera.h
-include/tulip/CameraObserver.h
-include/tulip/ChooseFileNameDialogData.h
-include/tulip/Circle.h
+include/tulip/LayoutAlgorithm.h
+include/tulip/PluginLoader.h
+include/tulip/Size.h
+include/tulip/Node.h
+include/tulip/Edge.h
+include/tulip/Graph.h
+include/tulip/PropertyTypes.h
 include/tulip/Color.h
-include/tulip/ColorAlgorithm.h
+include/tulip/MethodFactory.h
+include/tulip/PluginLoaderTxt.h
+include/tulip/SizeProperty.h
 include/tulip/ColorProperty.h
-include/tulip/ColorScale.h
-include/tulip/ColorScaleConfigDialog.h
-include/tulip/ColorScaleConfigDialogData.h
-include/tulip/ColorScaleWidget.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/ImportModule.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
+include/tulip/PropertyAlgorithm.h
+include/tulip/SizeAlgorithm.h
+include/tulip/ColorAlgorithm.h
+include/tulip/IntegerProperty.h
+include/tulip/DoubleAlgorithm.h
+include/tulip/Coord.h
+include/tulip/StringProperty.h
+include/tulip/TemplateFactory.h
+include/tulip/IntegerAlgorithm.h
+include/tulip/Observable.h
+include/tulip/ObservableGraph.h
+include/tulip/ObservableProperty.h
+include/tulip/PropertyInterface.h
+include/tulip/AbstractProperty.h
+include/tulip/StringAlgorithm.h
+include/tulip/TlpTools.h
+include/tulip/PluginContext.h
+include/tulip/BooleanProperty.h
+include/tulip/TulipPlugin.h
 include/tulip/ExportModule.h
+include/tulip/Reflect.h
+include/tulip/DataSet.h
+include/tulip/WithParameter.h
+include/tulip/WithDependency.h
+include/tulip/PluginProgress.h
+include/tulip/Iterator.h
+include/tulip/SimplePluginProgress.h
+include/tulip/StlIterator.h
+include/tulip/StableIterator.h
+include/tulip/SortIterator.h
+include/tulip/GraphMeasure.h
+include/tulip/ConcatIterator.h
+include/tulip/StoredType.h
+include/tulip/MutableContainer.h
+include/tulip/PluginLibraryLoader.h
+include/tulip/StlFunctions.h
 include/tulip/ExtendedClusterOperation.h
+include/tulip/StringCollection.h
+include/tulip/DrawingTools.h
 include/tulip/Face.h
+include/tulip/PlanarityTest.h
+include/tulip/OuterPlanarTest.h
 include/tulip/FaceIterator.h
-include/tulip/FindSelectionData.h
-include/tulip/FindSelectionWidget.h
-include/tulip/Fonts.h
+include/tulip/PlanarConMap.h
+include/tulip/GraphDecorator.h
+include/tulip/cxx/Array.cxx
+include/tulip/cxx/Vector.cxx
+include/tulip/cxx/Matrix.cxx
+include/tulip/cxx/Circle.cxx
+include/tulip/cxx/AbstractProperty.cxx
+include/tulip/cxx/TemplateFactory.cxx
+include/tulip/cxx/Reflect.cxx
+include/tulip/cxx/Graph.cxx
 include/tulip/ForEach.h
-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/MapIterator.h
+include/tulip/BoundingBox.h
+include/tulip/ColorScale.h
+include/tulip/TulipRelease.h
+include/tulip/PreferenceManager.h
+include/tulip/QuadTree.h
+include/tulip/memorypool.h
+include/tulip/conversioniterator.h
+include/tulip/filteriterator.h
+include/tulip/uniqueiterator.h
+include/tulip/stlfilteriterator.h
+include/tulip/vectorgraph.h
+include/tulip/vectorgraphproperty.h
+include/tulip/Camera.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
-include/tulip/GlEntity.h
-include/tulip/GlFeedBackBuilder.h
-include/tulip/GlFeedBackRecorder.h
 include/tulip/GlGraphComposite.h
-include/tulip/GlGraphInputData.h
+include/tulip/GlGrid.h
+include/tulip/GlEntity.h
 include/tulip/GlGraphRenderingParameters.h
 include/tulip/GlGraphStaticData.h
-include/tulip/GlGrid.h
+include/tulip/GlCircle.h
+include/tulip/GlLabel.h
+include/tulip/GlRect.h
+include/tulip/GlRectTextured.h
+include/tulip/Gl2DRect.h
+include/tulip/GlAbstractPolygon.h
+include/tulip/GlPolygon.h
+include/tulip/GlRegularPolygon.h
+include/tulip/GlTriangle.h
 include/tulip/GlHexagon.h
+include/tulip/GlPentagon.h
+include/tulip/GlComplexPolygon.h
+include/tulip/GlSphere.h
+include/tulip/GlLayer.h
 include/tulip/GlLODCalculator.h
 include/tulip/GlLODSceneVisitor.h
-include/tulip/GlLabel.h
-include/tulip/GlLayer.h
+include/tulip/GlBox.h
+include/tulip/GlScene.h
+include/tulip/GlTextureManager.h
+include/tulip/Glyph.h
+include/tulip/GlSimpleEntity.h
+include/tulip/GlComplexeEntity.h
+include/tulip/GlSelectSceneVisitor.h
+include/tulip/GlSceneVisitor.h
+include/tulip/GlFeedBackRecorder.h
+include/tulip/GlFeedBackBuilder.h
+include/tulip/GlGraphInputData.h
+include/tulip/GlTLPFeedBackBuilder.h
+include/tulip/GlyphManager.h
+include/tulip/GlNode.h
+include/tulip/GlMetaNode.h
+include/tulip/GlEdge.h
+include/tulip/GlDisplayListManager.h
+include/tulip/GlConvexHull.h
+include/tulip/GlConvexGraphHull.h
+include/tulip/GlSceneObserver.h
 include/tulip/GlLine.h
+include/tulip/GlCurve.h
+include/tulip/GlQuad.h
+include/tulip/GlPolyQuad.h
+include/tulip/GlAxis.h
+include/tulip/GlQuantitativeAxis.h
+include/tulip/GlNominativeAxis.h
+include/tulip/GlProgressBar.h
+include/tulip/GlXMLTools.h
+include/tulip/GlBoundingBoxSceneVisitor.h
 include/tulip/GlLines.h
-include/tulip/GlMainView.h
-include/tulip/GlMainWidget.h
-include/tulip/GlMainWidgetGraphicsView.h
-include/tulip/GlMainWidgetItem.h
-include/tulip/GlMainWidgetPlugin.h
-include/tulip/GlMetaNode.h
+include/tulip/GlColorScale.h
 include/tulip/GlMetaNodeRenderer.h
 include/tulip/GlMetaNodeTrueRenderer.h
-include/tulip/GlNode.h
-include/tulip/GlNominativeAxis.h
-include/tulip/GlOffscreenRenderer.h
+include/tulip/GlTools.h
+include/tulip/GlBezierCurve.h
+include/tulip/GlCatmullRomCurve.h
+include/tulip/EdgeExtremityGlyph.h
+include/tulip/EdgeExtremityGlyphManager.h
+include/tulip/OcclusionTest.h
+include/tulip/Curves.h
+include/tulip/GlShaderProgram.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/GlCubicBSplineInterpolation.h
+include/tulip/OpenGlConfigManager.h
+include/tulip/OpenGlErrorViewer.h
+include/tulip/AbstractGlCurve.h
+include/tulip/GlCPULODCalculator.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/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/ParametricCurves.h
 include/tulip/GlVertexArrayManager.h
 include/tulip/GlVertexArrayVisitor.h
-include/tulip/GlXMLTools.h
-include/tulip/Glyph.h
-include/tulip/GlyphManager.h
-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/TextRenderer.h
+include/tulip/TulipTableWidget.h
+include/tulip/GlMainWidget.h
+include/tulip/TabWidget.h
+include/tulip/PropertyDialog.h
+include/tulip/CopyPropertyDialog.h
+include/tulip/RenderingParametersDialog.h
+include/tulip/LayerManagerWidget.h
+include/tulip/AugmentedDisplayDialog.h
 include/tulip/GridOptionsWidget.h
-include/tulip/ImportModule.h
-include/tulip/IntegerAlgorithm.h
-include/tulip/IntegerProperty.h
+include/tulip/GlMainView.h
+include/tulip/NodeLinkDiagramComponent.h
+include/tulip/InteractorManager.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/ListPropertyWidgetData.h
-include/tulip/MainController.h
-include/tulip/MapIterator.h
-include/tulip/Matrix.h
-include/tulip/MethodFactory.h
-include/tulip/Morphing.h
+include/tulip/ForegroundEntity.h
+include/tulip/MouseSelector.h
 include/tulip/MouseBoxZoomer.h
-include/tulip/MouseEdgeBendEditor.h
 include/tulip/MouseEdgeBuilder.h
-include/tulip/MouseEdgeSelector.h
 include/tulip/MouseInteractors.h
-include/tulip/MouseMagicSelector.h
 include/tulip/MouseNodeBuilder.h
 include/tulip/MouseSelectionEditor.h
-include/tulip/MouseSelector.h
+include/tulip/MouseEdgeSelector.h
+include/tulip/MouseEdgeBendEditor.h
 include/tulip/MouseShowElementInfos.h
-include/tulip/MutableContainer.h
-include/tulip/Node.h
-include/tulip/NodeLinkDiagramComponent.h
-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
-include/tulip/PluginContext.h
-include/tulip/PluginLibraryLoader.h
-include/tulip/PluginLoader.h
-include/tulip/PluginLoaderTxt.h
-include/tulip/PluginProgress.h
-include/tulip/PluginProgressWidget.h
-include/tulip/PluginProgressWidgetData.h
-include/tulip/PreferenceManager.h
-include/tulip/PropertyAlgorithm.h
-include/tulip/PropertyDialog.h
-include/tulip/PropertyDialogData.h
-include/tulip/PropertyInterface.h
-include/tulip/PropertyTypes.h
 include/tulip/PropertyWidget.h
+include/tulip/ElementPropertiesWidgetUI.h
+include/tulip/ElementPropertiesWidget.h
+include/tulip/FindSelectionWidget.h
+include/tulip/SGHierarchyWidget.h
+include/tulip/GWOverviewWidget.h
+include/tulip/TlpQtTools.h
+include/tulip/SGHierarchyWidgetPlugin.h
+include/tulip/GlMainWidgetPlugin.h
+include/tulip/ElementPropertiesWidgetPlugin.h
+include/tulip/GWOverviewWidgetPlugin.h
 include/tulip/PropertyWidgetPlugin.h
+include/tulip/QtProgress.h
+include/tulip/PluginProgressWidget.h
+include/tulip/Controller.h
+include/tulip/ControllerAlgorithmTools.h
+include/tulip/ControllerViewsTools.h
+include/tulip/ControllerViewsManager.h
+include/tulip/MainController.h
+include/tulip/ControllerPluginsManager.h
+include/tulip/View.h
+include/tulip/AbstractView.h
+include/tulip/GraphPropertiesSelectionWidget.h
+include/tulip/ItemsListWidget.h
+include/tulip/StringsListSelectionWidget.h
+include/tulip/ViewPluginsManager.h
+include/tulip/ColorScaleConfigDialog.h
+include/tulip/ColorScaleWidget.h
+include/tulip/StringsListSelectionWidgetInterface.h
+include/tulip/CSVParser.h
+include/tulip/SimpleStringsListSelectionWidget.h
+include/tulip/DoubleStringsListSelectionWidget.h
 include/tulip/QGlBufferManager.h
 include/tulip/QGlPixelBufferManager.h
-include/tulip/QtGlSceneZoomAndPanAnimator.h
+include/tulip/GlCompositeHierarchyManager.h
+include/tulip/BaseGraphicsViewComponentMacro.h
 include/tulip/QtOpenGlErrorViewer.h
-include/tulip/QtOpenGlErrorViewerWithAskAgainDialogData.h
-include/tulip/QtProgress.h
-include/tulip/QuadTree.h
-include/tulip/Rectangle.h
-include/tulip/Reflect.h
-include/tulip/RenderingParametersDialog.h
-include/tulip/RenderingParametersDialogData.h
-include/tulip/SGHierarchyWidget.h
-include/tulip/SGHierarchyWidgetPlugin.h
-include/tulip/SimplePluginProgress.h
-include/tulip/SimpleStringsListSelectionWidget.h
-include/tulip/SimpleStringsListSelectionWidgetData.h
-include/tulip/SimpleTest.h
-include/tulip/Size.h
-include/tulip/SizeAlgorithm.h
-include/tulip/SizeProperty.h
-include/tulip/SmallMultiplesNavigatorComponent.h
+include/tulip/CSVContentHandler.h
+include/tulip/CSVGraphImport.h
+include/tulip/CSVGraphMappingConfigurationWidget.h
+include/tulip/CSVImportConfigurationWidget.h
+include/tulip/CSVParserConfigurationWidget.h
+include/tulip/CSVImportWizard.h
+include/tulip/Morphing.h
+include/tulip/QtGlSceneZoomAndPanAnimator.h
+include/tulip/GraphPropertiesTableWidget.h
+include/tulip/TextEditDialog.h
 include/tulip/SmallMultiplesView.h
-include/tulip/SortIterator.h
-include/tulip/StableIterator.h
-include/tulip/StlFunctions.h
-include/tulip/StlIterator.h
-include/tulip/StoredType.h
-include/tulip/StringAlgorithm.h
-include/tulip/StringCollection.h
-include/tulip/StringProperty.h
-include/tulip/StringsListSelectionWidget.h
-include/tulip/StringsListSelectionWidgetInterface.h
-include/tulip/TabWidget.h
-include/tulip/TabWidgetData.h
+include/tulip/SmallMultiplesNavigatorComponent.h
+include/tulip/GlOffscreenRenderer.h
+include/tulip/SnapshotDialog.h
+include/tulip/PropertyCreationDialog.h
+include/tulip/TulipSettings.h
+include/tulip/ColorButton.h
+include/tulip/CoordWidget.h
+include/tulip/SizeWidget.h
+include/tulip/FileNameEditorWidget.h
+include/tulip/BaseGraphicsViewComponent.h
+include/tulip/GlMainWidgetGraphicsView.h
+include/tulip/GlMainWidgetItem.h
 include/tulip/TabWidgetHidableMenuGraphicsProxy.h
-include/tulip/TemplateFactory.h
-include/tulip/TextEditDialog.h
+include/tulip/GraphicsWidgetBase.h
+include/tulip/TabWidgetData.h
+include/tulip/PropertyDialogData.h
+include/tulip/CopyPropertyDialogData.h
+include/tulip/FindSelectionData.h
+include/tulip/RenderingParametersDialogData.h
+include/tulip/LayerManagerWidgetData.h
+include/tulip/AugmentedDisplayDialogData.h
+include/tulip/GWOverviewWidgetData.h
+include/tulip/GridOptionsData.h
+include/tulip/PluginProgressWidgetData.h
+include/tulip/ColorScaleConfigDialogData.h
+include/tulip/SimpleStringsListSelectionWidgetData.h
+include/tulip/DoubleStringsListSelectionWidgetData.h
+include/tulip/ListPropertyWidgetData.h
+include/tulip/ChooseFileNameDialogData.h
 include/tulip/TextEditDialogData.h
-include/tulip/TextRenderer.h
-include/tulip/TlpQtTools.h
-include/tulip/TlpTools.h
-include/tulip/TreeTest.h
-include/tulip/TriconnectedTest.h
-include/tulip/TulipPlugin.h
-include/tulip/TulipRelease.h
-include/tulip/TulipTableWidget.h
-include/tulip/Vector.h
-include/tulip/VectorCast.h
-include/tulip/View.h
-include/tulip/ViewPluginsManager.h
-include/tulip/WithDependency.h
-include/tulip/WithParameter.h
-include/tulip/cxx/AbstractProperty.cxx
-include/tulip/cxx/Array.cxx
-include/tulip/cxx/Circle.cxx
-include/tulip/cxx/Graph.cxx
-include/tulip/cxx/Matrix.cxx
-include/tulip/cxx/Reflect.cxx
-include/tulip/cxx/TemplateFactory.cxx
-include/tulip/cxx/Vector.cxx
-include/tulip/memorypool.h
-include/tulip/tulipconf.h
-include/tulip/tuliphash.h
-lib/libtulip-pluginsmanager-%%TULIP_VERS%%.so
-lib/libtulip-ogl-%%TULIP_VERS%%.so
-lib/libtulip-qt4-%%TULIP_VERS%%.so
-lib/libtulip-%%TULIP_VERS%%.so
-lib/tlp/bitmaps/arrowSprite.png
-lib/tlp/bitmaps/candiSprite.png
-lib/tlp/bitmaps/colorscales/BiologicalHeatMap.png
-lib/tlp/bitmaps/colorscales/BlackPink.png
-lib/tlp/bitmaps/colorscales/BlackRedYellowWhite.png
-lib/tlp/bitmaps/colorscales/Blue.png
-lib/tlp/bitmaps/colorscales/BlueGreenYellow.png
-lib/tlp/bitmaps/colorscales/Brown.png
-lib/tlp/bitmaps/colorscales/BrownCyan.png
-lib/tlp/bitmaps/colorscales/CMYK.png
-lib/tlp/bitmaps/colorscales/GreenRed.png
-lib/tlp/bitmaps/colorscales/MentheGrenadine.png
-lib/tlp/bitmaps/colorscales/OrangeBlue.png
-lib/tlp/bitmaps/colorscales/Pink.png
-lib/tlp/bitmaps/colorscales/Rainbow.png
-lib/tlp/bitmaps/colorscales/Red.png
-lib/tlp/bitmaps/colorscales/RedBlue.png
-lib/tlp/bitmaps/colorscales/RedYellow.png
-lib/tlp/bitmaps/colorscales/Temperature.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/halfCylinderTexture.png
-lib/tlp/bitmaps/headerlogo.bmp
-lib/tlp/bitmaps/logo.bmp
-lib/tlp/bitmaps/logo32x32.bmp
-lib/tlp/bitmaps/logo32x32.ico
-lib/tlp/bitmaps/logolabri.jpg
-lib/tlp/bitmaps/logotulip.jpg
-lib/tlp/bitmaps/roundTexture.png
-lib/tlp/bitmaps/startup.gif
-lib/tlp/bitmaps/tex_back.png
-lib/tlp/bitmaps/titlebarGradient.png
-lib/tlp/bitmaps/welcomelogo.bmp
+include/tulip/QtOpenGlErrorViewerWithAskAgainDialogData.h
+include/tulip/CSVGraphMappingConfigurationWidgetData.h
+include/tulip/CSVImportConfigurationWidgetData.h
+include/tulip/CSVParserConfigurationWidgetData.h
+include/tulip/CSVImportWizardData.h
+include/tulip/SnapshotDialogData.h
+include/tulip/PropertyCreationDialogData.h
+include/tulip/CoordWidgetData.h
+include/tulip/SizeWidgetData.h
+include/tulip/FileNameEditorWidgetData.h
 lib/tlp/glyphs/libBillboard-%%TULIP_VERSION%%.so
 lib/tlp/glyphs/libChristmasTree-%%TULIP_VERSION%%.so
 lib/tlp/glyphs/libCircle-%%TULIP_VERSION%%.so
 lib/tlp/glyphs/libCone-%%TULIP_VERSION%%.so
+lib/tlp/glyphs/libCross-%%TULIP_VERSION%%.so
 lib/tlp/glyphs/libCube-%%TULIP_VERSION%%.so
 lib/tlp/glyphs/libCubeOutlinedTransparent-%%TULIP_VERSION%%.so
 lib/tlp/glyphs/libCylinder-%%TULIP_VERSION%%.so
+lib/tlp/glyphs/libDiamond-%%TULIP_VERSION%%.so
 lib/tlp/glyphs/libHalfCylinder-%%TULIP_VERSION%%.so
 lib/tlp/glyphs/libHexagone-%%TULIP_VERSION%%.so
 lib/tlp/glyphs/libPentagone-%%TULIP_VERSION%%.so
@@ -411,16 +387,93 @@ lib/tlp/libTreeRadial-%%TULIP_VERSION%%.so
 lib/tlp/libTreeReingoldAndTilforExtended-%%TULIP_VERSION%%.so
 lib/tlp/libTutte-%%TULIP_VERSION%%.so
 lib/tlp/libWebImport-%%TULIP_VERSION%%.so
+lib/tlp/libogdfballoon-%%TULIP_VERSION%%.so
+lib/tlp/libogdfcircular-%%TULIP_VERSION%%.so
+lib/tlp/libogdfdavidsonharel-%%TULIP_VERSION%%.so
+lib/tlp/libogdfdominance-%%TULIP_VERSION%%.so
+lib/tlp/libogdffastmultipoleembedder-%%TULIP_VERSION%%.so
+lib/tlp/libogdffastmultipolemultilevelembedder-%%TULIP_VERSION%%.so
+lib/tlp/libogdffm3-%%TULIP_VERSION%%.so
+lib/tlp/libogdffrutchermanreingold-%%TULIP_VERSION%%.so
+lib/tlp/libogdfgemfrick-%%TULIP_VERSION%%.so
+lib/tlp/libogdfkamadakawai-%%TULIP_VERSION%%.so
+lib/tlp/libogdfmmmexamplefastlayout-%%TULIP_VERSION%%.so
+lib/tlp/libogdfmmmexamplenicelayout-%%TULIP_VERSION%%.so
+lib/tlp/libogdfmmmexamplenotwistlayout-%%TULIP_VERSION%%.so
+lib/tlp/libogdfplanarizationgrid-%%TULIP_VERSION%%.so
+lib/tlp/libogdfstressmajorization-%%TULIP_VERSION%%.so
+lib/tlp/libogdfsugiyama-%%TULIP_VERSION%%.so
+lib/tlp/libogdftree-%%TULIP_VERSION%%.so
+lib/tlp/libogdfupwardplanarization-%%TULIP_VERSION%%.so
+lib/tlp/libogdfvisibility-%%TULIP_VERSION%%.so
 lib/tlp/view/libSpreadSheet-%%TULIP_VERSION%%.so
-%%DATADIR%%/tulip.qhc
-%%DATADIR%%/tulip.qch
+lib/tlp/view/libpythonscriptview-%%TULIP_VERSION%%.so
+lib/tlp/libgzstream.so
+lib/tlp/libftgl.so
+lib/tlp/libOGDF.so
+lib/tlp/libqscintilla2.so
+lib/tlp/sip.so
+lib/tlp/stl.so
+lib/tlp/tulip.so
+lib/tlp/tulipplugins.py
+lib/tlp/libtulip-%%TULIP_VERS%%.so
+lib/tlp/libtulip-ogdf-%%TULIP_VERS%%.so
+lib/tlp/libtulip-ogl-%%TULIP_VERS%%.so
+lib/tlp/libtulip-qt4-%%TULIP_VERS%%.so
+%%DATADIR%%/FindGLEW.cmake
 %%DATADIR%%/FindTULIP3.cmake
-@dirrm include/tulip/cxx
-@dirrm include/tulip
+%%DATADIR%%/FindXML2.cmake
+%%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-3.1.api
+%%DATADIR%%/apiFiles/tulip.api
+%%DATADIR%%/bitmaps/arrowSprite.png
+%%DATADIR%%/bitmaps/candiSprite.png
+%%DATADIR%%/bitmaps/colorscales/BiologicalHeatMap.png
+%%DATADIR%%/bitmaps/colorscales/BlackPink.png
+%%DATADIR%%/bitmaps/colorscales/BlackRedYellowWhite.png
+%%DATADIR%%/bitmaps/colorscales/Blue.png
+%%DATADIR%%/bitmaps/colorscales/BlueGreenYellow.png
+%%DATADIR%%/bitmaps/colorscales/Brown.png
+%%DATADIR%%/bitmaps/colorscales/BrownCyan.png
+%%DATADIR%%/bitmaps/colorscales/CMYK.png
+%%DATADIR%%/bitmaps/colorscales/GreenRed.png
+%%DATADIR%%/bitmaps/colorscales/MentheGrenadine.png
+%%DATADIR%%/bitmaps/colorscales/OrangeBlue.png
+%%DATADIR%%/bitmaps/colorscales/Pink.png
+%%DATADIR%%/bitmaps/colorscales/Rainbow.png
+%%DATADIR%%/bitmaps/colorscales/Red.png
+%%DATADIR%%/bitmaps/colorscales/RedBlue.png
+%%DATADIR%%/bitmaps/colorscales/RedYellow.png
+%%DATADIR%%/bitmaps/colorscales/Temperature.png
+%%DATADIR%%/bitmaps/cylinderTexture.png
+%%DATADIR%%/bitmaps/edgeBlomSprite.png
+%%DATADIR%%/bitmaps/edgeSpring.png
+%%DATADIR%%/bitmaps/font.ttf
+%%DATADIR%%/bitmaps/fontb.ttf
+%%DATADIR%%/bitmaps/halfCylinderTexture.png
+%%DATADIR%%/bitmaps/headerlogo.bmp
+%%DATADIR%%/bitmaps/logo.bmp
+%%DATADIR%%/bitmaps/logo32x32.bmp
+%%DATADIR%%/bitmaps/logo32x32.ico
+%%DATADIR%%/bitmaps/logolabri.jpg
+%%DATADIR%%/bitmaps/logotulip.jpg
+%%DATADIR%%/bitmaps/roundTexture.png
+%%DATADIR%%/bitmaps/startup.gif
+%%DATADIR%%/bitmaps/tex_back.png
+%%DATADIR%%/bitmaps/titlebarGradient.png
+%%DATADIR%%/bitmaps/welcomelogo.bmp
+%%DATADIR%%/tulip360.qch
+%%DATADIR%%/tulip360.qhc
+@dirrm %%DATADIR%%/bitmaps/colorscales
+@dirrm %%DATADIR%%/bitmaps
+@dirrm %%DATADIR%%/apiFiles
+@dirrm %%DATADIR%%
 @dirrm lib/tlp/view
 @dirrm lib/tlp/interactors
 @dirrm lib/tlp/glyphs
-@dirrm lib/tlp/bitmaps/colorscales
-@dirrm lib/tlp/bitmaps
 @dirrm lib/tlp
-@dirrm %%DATADIR%%
+@dirrm include/tulip/cxx
+@dirrm include/tulip