7 files changed, 69 insertions, 39 deletions

diff --git a/graphics/tulip/Makefile b/graphics/tulip/Makefile
index 6bfd46d6dc69..c92c3ab7a03a 100644
--- a/graphics/tulip/Makefile
+++ b/graphics/tulip/Makefile
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	tulip
-PORTVERSION=	3.7.0
-PORTREVISION=	2
+PORTVERSION=	3.8.0
 CATEGORIES=	graphics
 MASTER_SITES=	SF/auber/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 DISTFILES=	${DISTNAME}-src${EXTRACT_SUFX}
@@ -30,8 +29,7 @@ USE_PYTHON=	yes
 USE_CMAKE=	yes
 CMAKE_OUTSOURCE=yes
 CMAKE_ARGS+=	-DLOCALBASE:PATH=${LOCALBASE} \
-		-DPYTHON_INCLUDEDIR:PATH=${PYTHON_INCLUDEDIR} \
-		-DCMAKE_VERBOSE_MAKEFILE:BOOL=TRUE
+		-DPYTHON_INCLUDEDIR:PATH=${PYTHON_INCLUDEDIR}
 USE_LDCONFIG=	${PREFIX}/lib/tlp
 
 WRKSRC=		${WRKDIR}/${DISTNAME}-src
diff --git a/graphics/tulip/distinfo b/graphics/tulip/distinfo
index 9cb3fc77045f..e8aa87187aeb 100644
--- a/graphics/tulip/distinfo
+++ b/graphics/tulip/distinfo
@@ -1,4 +1,4 @@
-SHA256 (tulip-3.7.0-src.tar.gz) = 5892ef464329d81f7bc17b4c493d8226a384a7582c18bf74a19baede6e920e94
-SIZE (tulip-3.7.0-src.tar.gz) = 21469118
-SHA256 (tulip-3.7.0-html.tar.bz2) = 0e4d44c5289f4229dcd6bd0867aadd1881b5d2cd2d3cbc9c6e5438677e52a73f
-SIZE (tulip-3.7.0-html.tar.bz2) = 54061118
+SHA256 (tulip-3.8.0-src.tar.gz) = 2b938ec1894b81bdd798d04d172a853dbd99b8660895c1dc3e8e2019fb1e42d4
+SIZE (tulip-3.8.0-src.tar.gz) = 23052697
+SHA256 (tulip-3.8.0-html.tar.bz2) = fcc9d7db32cb4d8a0c4f27693bae54a5c5482ca513d652effcbae21687ea75a0
+SIZE (tulip-3.8.0-html.tar.bz2) = 48553953
diff --git a/graphics/tulip/files/patch-CMakeLists.txt b/graphics/tulip/files/patch-CMakeLists.txt
index afa864cc4bb0..65c865621971 100644
--- a/graphics/tulip/files/patch-CMakeLists.txt
+++ b/graphics/tulip/files/patch-CMakeLists.txt
@@ -1,17 +1,17 @@
---- CMakeLists.txt.orig	2012-02-21 12:23:29.000000000 +0100
-+++ CMakeLists.txt	2012-02-24 14:05:03.000000000 +0100
-@@ -266,8 +266,8 @@
- SET(TulipBitmapInstallDir ${TulipShareInstallDir}/bitmaps/)

- SET(TulipAppleResourcesDir ${TulipAppleContentsDir}Resources/)

+--- CMakeLists.txt.orig	2012-06-13 09:46:31.000000000 +0200
++++ CMakeLists.txt	2012-06-13 09:49:10.000000000 +0200
+@@ -277,8 +277,8 @@
+ SET(TulipBitmapInstallDir ${TulipShareInstallDir}/bitmaps)

+ SET(TulipAppleResourcesDir ${TulipAppleContentsDir}/Resources)

  ELSE()

--SET(TulipLibInstallDir lib/)

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

+-SET(TulipLibInstallDir lib)

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

 +SET(TulipLibInstallDir lib/tlp)

 +SET(TulipPluginsInstallDir ${TulipLibInstallDir})

- SET(TulipBinInstallDir bin/)

- SET(TulipIncludeInstallDir include/)

+ SET(TulipBinInstallDir bin)

+ SET(TulipIncludeInstallDir include)

  SET(TulipShareInstallDir share/tulip)

-@@ -395,6 +395,12 @@
+@@ -409,6 +409,12 @@
    STRING(COMPARE EQUAL "${UNAME_OUT}" "ia64" I64)

  ENDIF(NOT I64)

  IF(NOT I64)

diff --git a/graphics/tulip/files/patch-dirent b/graphics/tulip/files/patch-dirent
index 76a9ca6f4490..7e59b11a6f9b 100644
--- a/graphics/tulip/files/patch-dirent
+++ b/graphics/tulip/files/patch-dirent
@@ -1,6 +1,6 @@
---- library/tulip/src/PluginLibraryLoader.cpp.orig	2011-11-22 09:39:46.000000000 +0100
-+++ library/tulip/src/PluginLibraryLoader.cpp	2011-11-22 09:39:50.000000000 +0100
-@@ -194,7 +194,14 @@
+--- library/tulip/src/PluginLibraryLoader.cpp.orig	2012-06-11 09:46:14.000000000 +0200
++++ library/tulip/src/PluginLibraryLoader.cpp	2012-06-13 09:50:05.000000000 +0200
+@@ -191,7 +191,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;
-@@ -218,7 +225,7 @@
+@@ -216,7 +223,7 @@
    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 a2166af8e13f..26440ffdaf89 100644
--- a/graphics/tulip/files/patch-opengl
+++ b/graphics/tulip/files/patch-opengl
@@ -1,11 +1,11 @@
---- 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 @@
+--- library/tulip-qt/src/CMakeLists.txt.orig	2012-06-13 09:54:25.000000000 +0200
++++ library/tulip-qt/src/CMakeLists.txt	2012-06-13 09:54:41.000000000 +0200
+@@ -194,7 +194,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})
+-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} ${GLEW_LIBRARY})
  TARGET_LINK_LIBRARIES(${LibTulipQtName} ${OPENGL_glu_LIBRARY})
@@ -57,3 +57,25 @@
  
  ##----------------------------------------------------------------------------------------------------------------------------
  SET(InteractorNavigation_SRCS
+--- library/tulip-python/tulip-ogl/CMakeLists.txt.orig	2012-06-13 10:59:41.000000000 +0200
++++ library/tulip-python/tulip-ogl/CMakeLists.txt	2012-06-13 11:00:08.000000000 +0200
+@@ -41,7 +41,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} ${LIBXML2_INCLUDE_DIR})
++INCLUDE_DIRECTORIES(${PYTHON_INCLUDE_DIR} ${PYTHON_INCLUDE_PATH} ${TulipInclude} ${TulipBuildInclude} ${TulipOGLInclude} ${LIBXML2_INCLUDE_DIR} ${OPENGL_INCLUDE_DIR})
+ 
+ ADD_LIBRARY(${LibTulipOglPythonName} SHARED ${TULIPOGL_PYTHON_BINDINGS_SRC})
+ 
+--- library/tulip-python/tulipgui/CMakeLists.txt.orig	2012-06-13 11:04:02.000000000 +0200
++++ library/tulip-python/tulipgui/CMakeLists.txt	2012-06-13 11:04:21.000000000 +0200
+@@ -30,7 +30,7 @@
+ # instead of those installed in the system
+ INCLUDE_DIRECTORIES(BEFORE ${SIP_INCLUDE_DIR})
+ 
+-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${PYTHON_INCLUDE_DIR} ${PYTHON_INCLUDE_PATH} ${QT_INCLUDE_DIR} ${QT_INCLUDE_DIR}/QtOpenGL ${TulipInclude} ${TulipOGLInclude} ${TulipQtInclude} ${TulipQtBuildInclude} ${TulipBuildInclude})
++INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${PYTHON_INCLUDE_DIR} ${PYTHON_INCLUDE_PATH} ${QT_INCLUDE_DIR} ${QT_INCLUDE_DIR}/QtOpenGL ${TulipInclude} ${TulipOGLInclude} ${TulipQtInclude} ${TulipQtBuildInclude} ${TulipBuildInclude} ${OPENGL_INCLUDE_DIR})
+ 
+ ADD_LIBRARY(tulipgui SHARED ${TULIP_GUI_PYTHON_BINDINGS_SRC})
+ 
diff --git a/graphics/tulip/files/patch-thirdparty-OGDF-src-basic_System.cpp b/graphics/tulip/files/patch-thirdparty-OGDF-src-basic_System.cpp
index 113a52284e94..62dcf694f39c 100644
--- a/graphics/tulip/files/patch-thirdparty-OGDF-src-basic_System.cpp
+++ b/graphics/tulip/files/patch-thirdparty-OGDF-src-basic_System.cpp
@@ -1,6 +1,6 @@
---- 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 @@
+--- thirdparty/OGDF/src/basic/System.cpp.orig	2012-06-11 09:46:14.000000000 +0200
++++ thirdparty/OGDF/src/basic/System.cpp	2012-06-13 09:51:21.000000000 +0200
+@@ -51,6 +51,12 @@
  #include <mach/vm_statistics.h>
  #include <mach/mach.h>
  #include <mach/machine.h>
@@ -13,7 +13,7 @@
  #elif defined(OGDF_SYSTEM_UNIX)
  #include <malloc.h>
  #endif
-@@ -317,6 +323,47 @@
+@@ -310,6 +316,47 @@
  	return 0;
  }
  
@@ -61,7 +61,7 @@
  #else
  // LINUX, NOT MAC OS
  long long System::physicalMemory()
-@@ -403,6 +450,19 @@
+@@ -396,6 +443,19 @@
  {
  	return mstats().chunks_free;
  }
diff --git a/graphics/tulip/pkg-plist b/graphics/tulip/pkg-plist
index e4a6ab533233..bdcd29013a44 100644
--- a/graphics/tulip/pkg-plist
+++ b/graphics/tulip/pkg-plist
@@ -268,6 +268,7 @@ include/tulip/TextEditDialog.h
 include/tulip/TextEditDialogData.h
 include/tulip/TextRenderer.h
 include/tulip/ThreadedComputeProperty.h
+include/tulip/TlpNetworkAccess.h
 include/tulip/TlpQtTools.h
 include/tulip/TlpTools.h
 include/tulip/TreeTest.h
@@ -394,7 +395,9 @@ 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/libdelaunay-%%TULIP_VERSION%%.so
+lib/tlp/libDelaunay-%%TULIP_VERSION%%.so
+lib/tlp/libVoronoi-%%TULIP_VERSION%%.so
+lib/tlp/libGEXFImport-%%TULIP_VERSION%%.so
 lib/tlp/libftgl.so
 lib/tlp/libgzstream.so
 lib/tlp/libogdfballoon-%%TULIP_VERSION%%.so
@@ -420,10 +423,12 @@ 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
-lib/tlp/sip.so
-lib/tlp/stl.so
-lib/tlp/tulip.so
-lib/tlp/tulipplugins.py
+lib/tlp/python/sip.so
+lib/tlp/python/stl.so
+lib/tlp/python/tulip.so
+lib/tlp/python/tulipplugins.py
+lib/tlp/python/tulipogl.so
+lib/tlp/python/tulipgui.so
 lib/tlp/view/libSpreadSheet-%%TULIP_VERSION%%.so
 lib/tlp/view/libpythonscriptview-%%TULIP_VERSION%%.so
 %%DATADIR%%/FindGLEW.cmake
@@ -434,6 +439,10 @@ lib/tlp/view/libpythonscriptview-%%TULIP_VERSION%%.so
 %%DATADIR%%/apiFiles/Python-2.6.api
 %%DATADIR%%/apiFiles/Python-2.7.api
 %%DATADIR%%/apiFiles/Python-3.1.api
+%%DATADIR%%/apiFiles/Python-3.2.api
+%%DATADIR%%/apiFiles/PyQt4.api
+%%DATADIR%%/apiFiles/tulipgui.api
+%%DATADIR%%/apiFiles/tulipogl.api
 %%DATADIR%%/apiFiles/tulip.api
 %%DATADIR%%/bitmaps/arrowSprite.png
 %%DATADIR%%/bitmaps/candiSprite.png
@@ -471,8 +480,8 @@ lib/tlp/view/libpythonscriptview-%%TULIP_VERSION%%.so
 %%DATADIR%%/bitmaps/tex_back.png
 %%DATADIR%%/bitmaps/titlebarGradient.png
 %%DATADIR%%/bitmaps/welcomelogo.bmp
-%%DATADIR%%/tulip370.qch
-%%DATADIR%%/tulip370.qhc
+%%DATADIR%%/tulip380.qch
+%%DATADIR%%/tulip380.qhc
 @dirrm %%DATADIR%%/bitmaps/colorscales
 @dirrm %%DATADIR%%/bitmaps
 @dirrm %%DATADIR%%/apiFiles
@@ -480,6 +489,7 @@ lib/tlp/view/libpythonscriptview-%%TULIP_VERSION%%.so
 @dirrm lib/tlp/view
 @dirrm lib/tlp/interactors
 @dirrm lib/tlp/glyphs
+@dirrm lib/tlp/python
 @dirrm lib/tlp
 @dirrm include/tulip/cxx
 @dirrm include/tulip