Attachment #156042 for bug #199614




# $FreeBSD$

PORTNAME=	tulip
PORTVERSION=	4.7.0
DISTVERSIONSUFFIX=	_src
CATEGORIES=	graphics
MASTER_SITES=	SF/auber/${PORTNAME}/${PORTNAME}-${PORTVERSION}

MAINTAINER=	woodsb02@gmail.com
COMMENT=	System dedicated to the visualization of huge graphs

LICENSE=	LGPL3

Lines 1-2 Link Here

(-)graphics/tulip/distinfo (-2 / +2 lines)
1	SHA256 (tulip-4.6.1_src.tar.gz) = 27ab129af9541b94bfb6f63497b4055a298a3058be58795b3bc67c2d9789a18b	1	SHA256 (tulip-4.7.0_src.tar.gz) = 8ae2fe8e27e147a845eb21a3b8e9a3bb88d3d0c8d9e9c2952579399908e07874
2	SIZE (tulip-4.6.1_src.tar.gz) = 82574518	2	SIZE (tulip-4.7.0_src.tar.gz) = 82801728




--- CMakeLists.txt.orig	2015-04-18 20:15:58 UTC
+++ CMakeLists.txt
@@ -367,8 +367,8 @@ SET(FTGLInclude ${PROJECT_SOURCE_DIR}/th
   IF(APPLE)
     SET_TARGET_PROPERTIES(${name} PROPERTIES INSTALL_NAME_DIR "@executable_path/../lib")
   ENDIF(APPLE)
-  SET_TARGET_PROPERTIES(${name} PROPERTIES INSTALL_RPATH "$ORIGIN")
+  GET_TARGET_PROPERTY(_target_type ${name} TYPE)
+  IF(NOT "${_target_type}" STREQUAL "INTERFACE_LIBRARY")
+    SET_TARGET_PROPERTIES(${name} PROPERTIES INSTALL_RPATH "$ORIGIN")
+  ENDIF(NOT "${_target_type}" STREQUAL "INTERFACE_LIBRARY")
   IF(MSVC)
     SET_TARGET_PROPERTIES(${name} PROPERTIES RUNTIME_OUTPUT_DIRECTORY_DEBUG "${CMAKE_CURRENT_BINARY_DIR}")
     SET_TARGET_PROPERTIES(${name} PROPERTIES RUNTIME_OUTPUT_DIRECTORY_RELEASE "${CMAKE_CURRENT_BINARY_DIR}")
@@ -401,8 +401,8 @@
 SET(FTGLLibrary ftgl-tulip-${TulipMMVersion})
 ENDIF(NOT BUILD_CORE_ONLY)
 




--- library/tulip-core/src/PluginLibraryLoader.cpp.orig	2014-03-25 10:10:30.000000000 +0100
+++ library/tulip-core/src/PluginLibraryLoader.cpp	2014-04-01 13:50:00.000000000 +0200
@@ -130,7 +130,14 @@
 }
 
 // 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;




--- library/tulip-core/src/PluginLibraryLoader.cpp.orig	2015-04-18 20:15:27 UTC
+++ library/tulip-core/src/PluginLibraryLoader.cpp
@@ -130,7 +130,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;

Lines 1-11 Link Here

(-)graphics/tulip/files/patch-plugins-view-HistogramView_HistogramStatistics.cpp (-11 lines)
1	--- plugins/view/HistogramView/HistogramStatistics.cpp.orig 2014-04-18 12:05:56.000000000 +0200
2	+++ plugins/view/HistogramView/HistogramStatistics.cpp 2014-04-18 12:07:56.000000000 +0200
3	@@ -30,7 +30,7 @@
4	#include "HistoStatsConfigWidget.h"
5	#include "HistogramView.h"
6
7	-#if defined(_MSC_VER) \|\| (defined(__clang_major__) && __clang_major__ > 4)
8	+#if defined(_MSC_VER) \|\| (defined(__clang_major__) && __clang_major__ > 4) \|\| defined(__FreeBSD__)
9
10	#include <functional>
11

Line 0 Link Here

(-)graphics/tulip/files/patch-plugins_view_HistogramView_HistogramStatistics.cpp (+11 lines)
	1	--- plugins/view/HistogramView/HistogramStatistics.cpp.orig 2015-04-18 20:15:49 UTC
	2	+++ plugins/view/HistogramView/HistogramStatistics.cpp
	3	@@ -30,7 +30,7 @@
	4	#include "HistoStatsConfigWidget.h"
	5	#include "HistogramView.h"
	6
	7	-#if defined(_MSC_VER) \|\| (defined(__clang_major__) && __clang_major__ > 4)
	8	+#if defined(_MSC_VER) \|\| (defined(__clang_major__) && __clang_major__ > 4) \|\| defined(__FreeBSD__)
	9
	10	#include <functional>
	11

Lines 1-11 Link Here

(-)graphics/tulip/files/patch-software-crash_handling_CrashHandling.cpp (-11 lines)
1	--- software/crash_handling/CrashHandling.cpp.orig 2014-04-18 10:33:31.000000000 +0200
2	+++ software/crash_handling/CrashHandling.cpp 2014-04-18 10:34:25.000000000 +0200
3	@@ -38,7 +38,7 @@
4	/*
5	Linux/MacOS-specific handling
6	*/
7	-#if defined(__unix__) \|\| defined(__APPLE__)
8	+#if (defined(__unix__) \|\| defined(__APPLE__)) && !defined(__FreeBSD__)
9
10	# if defined(__i386__) \|\| defined(__amd64__)
11




--- software/crash_handling/StackWalker.cpp.orig	2014-04-22 16:44:05.000000000 +0200
+++ software/crash_handling/StackWalker.cpp	2014-04-22 16:46:01.000000000 +0200
@@ -255,8 +255,13 @@
       char * real_name = abi::__cxa_demangle(mangled_name, 0, 0, &status);
 
       char *end;
+#if defined(__FreeBSD__) && __FreeBSD_version < 9000000
+      int64_t runtimeAddr = static_cast<int64_t>(strtol(runtime_addr, &end, 16));
+      int64_t runtimeOffset = static_cast<int64_t>(strtol(runtime_offset, &end, 0));
+#else
       int64_t runtimeAddr = static_cast<int64_t>(strtoll(runtime_addr, &end, 16));
       int64_t runtimeOffset = static_cast<int64_t>(strtoll(runtime_offset, &end, 0));
+#endif
 
       if (runtimeAddr == 1 && i == (size - 1))
         break;

Lines 1-11 Link Here

(-)graphics/tulip/files/patch-software-tulip-include_TulipPerspectiveProcessHandler.h (-11 lines)
1	--- software/tulip/include/TulipPerspectiveProcessHandler.h.orig 2014-04-18 11:41:35.000000000 +0200
2	+++ software/tulip/include/TulipPerspectiveProcessHandler.h 2014-04-18 11:47:38.000000000 +0200
3	@@ -27,6 +27,8 @@
4
5	#include <QTcpServer>
6
7	+#include <ctime>
8	+
9	// Some utility class used in crash handler dialog designer form
10
11	class SelectionButton: public QPushButton {




--- software/tulip/src/main.cpp.orig	2014-04-18 11:56:26.000000000 +0200
+++ software/tulip/src/main.cpp	2014-04-18 11:56:38.000000000 +0200
@@ -119,7 +119,9 @@
 }
 
 int main(int argc, char **argv) {
+#ifndef __FreeBSD__
   start_crash_handler();
+#endif
 
 
 




--- software/tulip_perspective/src/main.cpp.orig	2014-04-18 11:58:12.000000000 +0200
+++ software/tulip_perspective/src/main.cpp	2014-04-18 11:58:27.000000000 +0200
@@ -129,7 +129,9 @@
 }
 
 int main(int argc,char **argv) {
+#ifndef __FreeBSD__
   start_crash_handler();
+#endif
 
   QString appName("Tulip ");
   QString iconPath;

Line 0 Link Here

(-)graphics/tulip/files/patch-software_crash__handling_CrashHandling.cpp (+11 lines)
	1	--- software/crash_handling/CrashHandling.cpp.orig 2015-04-18 20:15:52 UTC
	2	+++ software/crash_handling/CrashHandling.cpp
	3	@@ -48,7 +48,7 @@ void setExtraSymbolsSearchPaths(const st
	4	/*
	5	Linux/MacOS-specific handling
	6	*/
	7	-#if defined(__unix__) \|\| defined(__APPLE__)
	8	+#if (defined(__unix__) \|\| defined(__APPLE__)) && !defined(__FreeBSD__)
	9
	10	# if defined(__i386__) \|\| defined(__amd64__)
	11




--- software/crash_handling/StackWalker.cpp.orig	2015-04-18 20:15:52 UTC
+++ software/crash_handling/StackWalker.cpp
@@ -255,8 +255,13 @@ void StackWalkerGCC::printCallStack(std:
       char * real_name = abi::__cxa_demangle(mangled_name, 0, 0, &status);
 
       char *end;
+#if defined(__FreeBSD__) && __FreeBSD_version < 9000000
+      int64_t runtimeAddr = static_cast<int64_t>(strtol(runtime_addr, &end, 16));
+      int64_t runtimeOffset = static_cast<int64_t>(strtol(runtime_offset, &end, 0));
+#else
       int64_t runtimeAddr = static_cast<int64_t>(strtoll(runtime_addr, &end, 16));
       int64_t runtimeOffset = static_cast<int64_t>(strtoll(runtime_offset, &end, 0));
+#endif
 
       if (runtimeAddr == 1 && i == (size - 1))
         break;




--- software/tulip_perspective/src/main.cpp.orig	2015-04-18 20:15:52 UTC
+++ software/tulip_perspective/src/main.cpp
@@ -134,7 +134,9 @@ void usage(const QString &error) {
 }
 
 int main(int argc,char **argv) {
+#ifndef __FreeBSD__
   start_crash_handler();
+#endif
 
   QString appName("Tulip ");
   QString iconPath;

Line 0 Link Here

(-)graphics/tulip/files/patch-software_tulip_include_TulipPerspectiveProcessHandler.h (+11 lines)
	1	--- software/tulip/include/TulipPerspectiveProcessHandler.h.orig 2015-04-18 20:15:52 UTC
	2	+++ software/tulip/include/TulipPerspectiveProcessHandler.h
	3	@@ -27,6 +27,8 @@
	4
	5	#include <QTcpServer>
	6
	7	+#include <ctime>
	8	+
	9	// Some utility class used in crash handler dialog designer form
	10
	11	class SelectionButton: public QPushButton {




--- software/tulip/src/main.cpp.orig	2015-04-27 14:02:35 UTC
+++ software/tulip/src/main.cpp
@@ -124,7 +124,9 @@ void checkTulipRunning(const QString& pe
 }
 
 int main(int argc, char **argv) {
+#ifndef __FreeBSD__
   start_crash_handler();
+#endif
 
   QApplication tulip_agent(argc, argv);
   QString name("Tulip ");

Lines 1-6 Link Here

(-)graphics/tulip/files/patch-thirdparty_CMakeLists.txt (-3 / +3 lines)
1	--- thirdparty/CMakeLists.txt.orig 2014-09-28 22:17:08.000000000 +0200	1	--- thirdparty/CMakeLists.txt.orig 2015-04-18 20:15:20 UTC
2	+++ thirdparty/CMakeLists.txt 2014-09-30 14:20:28.000000000 +0200	2	+++ thirdparty/CMakeLists.txt
3	@@ -3,7 +3,7 @@	3	@@ -3,7 +3,7 @@ DISABLE_COMPILER_WARNINGS()
4	ADD_CORE_FILES(CMakeLists.txt)	4	ADD_CORE_FILES(CMakeLists.txt)
5		5
6	ADD_SUBDIRECTORY(gzstream)	6	ADD_SUBDIRECTORY(gzstream)

Return to bug 199614

Lines 2-13 Link Here

(-)graphics/tulip/Makefile (-2 / +2 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= tulip	4	PORTNAME= tulip
5	PORTVERSION= 4.6.1	5	PORTVERSION= 4.7.0
6	DISTVERSIONSUFFIX= _src	6	DISTVERSIONSUFFIX= _src
7	CATEGORIES= graphics	7	CATEGORIES= graphics
8	MASTER_SITES= SF/auber/${PORTNAME}/${PORTNAME}-${PORTVERSION}	8	MASTER_SITES= SF/auber/${PORTNAME}/${PORTNAME}-${PORTVERSION}
9		9
10	MAINTAINER= ports@FreeBSD.org	10	MAINTAINER= woodsb02@gmail.com
11	COMMENT= System dedicated to the visualization of huge graphs	11	COMMENT= System dedicated to the visualization of huge graphs
12		12
13	LICENSE= LGPL3	13	LICENSE= LGPL3

Lines 1-18 Link Here

(-)graphics/tulip/files/patch-CMakeLists.txt (-15 / +3 lines)
1	--- CMakeLists.txt.orig 2014-09-28 22:18:14.000000000 +0200	1	--- CMakeLists.txt.orig 2015-04-18 20:15:58 UTC
2	+++ CMakeLists.txt 2014-09-30 12:39:54.000000000 +0200	2	+++ CMakeLists.txt
3	@@ -108,7 +108,10 @@	3	@@ -367,8 +367,8 @@ SET(FTGLInclude ${PROJECT_SOURCE_DIR}/th
4	IF(APPLE)
5	SET_TARGET_PROPERTIES(${name} PROPERTIES INSTALL_NAME_DIR "@executable_path/../lib")
6	ENDIF(APPLE)
7	- SET_TARGET_PROPERTIES(${name} PROPERTIES INSTALL_RPATH "$ORIGIN")
8	+ GET_TARGET_PROPERTY(_target_type ${name} TYPE)
9	+ IF(NOT "${_target_type}" STREQUAL "INTERFACE_LIBRARY")
10	+ SET_TARGET_PROPERTIES(${name} PROPERTIES INSTALL_RPATH "$ORIGIN")
11	+ ENDIF(NOT "${_target_type}" STREQUAL "INTERFACE_LIBRARY")
12	IF(MSVC)
13	SET_TARGET_PROPERTIES(${name} PROPERTIES RUNTIME_OUTPUT_DIRECTORY_DEBUG "${CMAKE_CURRENT_BINARY_DIR}")
14	SET_TARGET_PROPERTIES(${name} PROPERTIES RUNTIME_OUTPUT_DIRECTORY_RELEASE "${CMAKE_CURRENT_BINARY_DIR}")
15	@@ -401,8 +401,8 @@
16	SET(FTGLLibrary ftgl-tulip-${TulipMMVersion})	4	SET(FTGLLibrary ftgl-tulip-${TulipMMVersion})
17	ENDIF(NOT BUILD_CORE_ONLY)	5	ENDIF(NOT BUILD_CORE_ONLY)
18		6

Lines 1-17 Link Here

(-)graphics/tulip/files/patch-dirent (-17 lines)
1	--- library/tulip-core/src/PluginLibraryLoader.cpp.orig 2014-03-25 10:10:30.000000000 +0100
2	+++ library/tulip-core/src/PluginLibraryLoader.cpp 2014-04-01 13:50:00.000000000 +0200
3	@@ -130,7 +130,14 @@
4	}
5
6	// accepts only file whose name matches .so or .dylib
7	+#ifdef __FreeBSD__
8	+#include <sys/param.h>
9	+#if (__FreeBSD_version < 900000 && __FreeBSD_version >= 800501) \|\| (__FreeBSD_version >= 900006)
10	+int __tulip_select_libs(const struct dirent *ent) {
11	+#else
12	int __tulip_select_libs(struct dirent *ent) {
13	+#endif /* __FreeBSD_version */
14	+#endif /* __FreeBSD__ */
15	#if !defined(__APPLE__)
16	const char *suffix = ".so";
17	const unsigned long suffix_len = 3;

Line 0 Link Here

(-)graphics/tulip/files/patch-library_tulip-core_src_PluginLibraryLoader.cpp (+17 lines)
	1	--- library/tulip-core/src/PluginLibraryLoader.cpp.orig 2015-04-18 20:15:27 UTC
	2	+++ library/tulip-core/src/PluginLibraryLoader.cpp
	3	@@ -130,7 +130,14 @@ bool PluginLibraryLoader::loadPluginLibr
	4	}
	5
	6	// accepts only file whose name matches .so or .dylib
	7	+#ifdef __FreeBSD__
	8	+#include <sys/param.h>
	9	+#if (__FreeBSD_version < 900000 && __FreeBSD_version >= 800501) \|\| (__FreeBSD_version >= 900006)
	10	+int __tulip_select_libs(const struct dirent *ent) {
	11	+#else
	12	int __tulip_select_libs(struct dirent *ent) {
	13	+#endif /* __FreeBSD_version */
	14	+#endif /* __FreeBSD__ */
	15	#if !defined(__APPLE__)
	16	const char *suffix = ".so";
	17	const unsigned long suffix_len = 3;

Lines 1-16 Link Here

(-)graphics/tulip/files/patch-software-crash_handling_StackWalker.cpp (-16 lines)
1	--- software/crash_handling/StackWalker.cpp.orig 2014-04-22 16:44:05.000000000 +0200
2	+++ software/crash_handling/StackWalker.cpp 2014-04-22 16:46:01.000000000 +0200
3	@@ -255,8 +255,13 @@
4	char * real_name = abi::__cxa_demangle(mangled_name, 0, 0, &status);
5
6	char *end;
7	+#if defined(__FreeBSD__) && __FreeBSD_version < 9000000
8	+ int64_t runtimeAddr = static_cast<int64_t>(strtol(runtime_addr, &end, 16));
9	+ int64_t runtimeOffset = static_cast<int64_t>(strtol(runtime_offset, &end, 0));
10	+#else
11	int64_t runtimeAddr = static_cast<int64_t>(strtoll(runtime_addr, &end, 16));
12	int64_t runtimeOffset = static_cast<int64_t>(strtoll(runtime_offset, &end, 0));
13	+#endif
14
15	if (runtimeAddr == 1 && i == (size - 1))
16	break;

Lines 1-12 Link Here

(-)graphics/tulip/files/patch-software-tulip-src_main.cpp (-12 lines)
1	--- software/tulip/src/main.cpp.orig 2014-04-18 11:56:26.000000000 +0200
2	+++ software/tulip/src/main.cpp 2014-04-18 11:56:38.000000000 +0200
3	@@ -119,7 +119,9 @@
4	}
5
6	int main(int argc, char **argv) {
7	+#ifndef __FreeBSD__
8	start_crash_handler();
9	+#endif
10
11
12

Lines 1-12 Link Here

(-)graphics/tulip/files/patch-software-tulip_perspective-src_main.cpp (-12 lines)
1	--- software/tulip_perspective/src/main.cpp.orig 2014-04-18 11:58:12.000000000 +0200
2	+++ software/tulip_perspective/src/main.cpp 2014-04-18 11:58:27.000000000 +0200
3	@@ -129,7 +129,9 @@
4	}
5
6	int main(int argc,char **argv) {
7	+#ifndef __FreeBSD__
8	start_crash_handler();
9	+#endif
10
11	QString appName("Tulip ");
12	QString iconPath;

Line 0 Link Here

(-)graphics/tulip/files/patch-software_tulip_src_main.cpp (+12 lines)
	1	--- software/tulip/src/main.cpp.orig 2015-04-27 14:02:35 UTC
	2	+++ software/tulip/src/main.cpp
	3	@@ -124,7 +124,9 @@ void checkTulipRunning(const QString& pe
	4	}
	5
	6	int main(int argc, char **argv) {
	7	+#ifndef __FreeBSD__
	8	start_crash_handler();
	9	+#endif
	10
	11	QApplication tulip_agent(argc, argv);
	12	QString name("Tulip ");