1
0
mirror of https://git.FreeBSD.org/ports.git synced 2025-02-05 11:35:01 +00:00

Update to 4.7.0, pet portlint, rename patch files so the names are

unambiguous, and assign maintainership to submitter.

PR:		199614
Submitted by:	Ben Woods (new maintainer)
This commit is contained in:
Adam Weinberger 2015-04-28 14:47:42 +00:00
parent 1e75b9ebaf
commit 98ad8e8462
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=384903
14 changed files with 75 additions and 81 deletions

View File

@ -2,12 +2,12 @@
# $FreeBSD$
PORTNAME= tulip
PORTVERSION= 4.6.1
PORTVERSION= 4.7.0
DISTVERSIONSUFFIX= _src
CATEGORIES= graphics
MASTER_SITES= SF/auber/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
MAINTAINER= woodsb02@gmail.com
COMMENT= System dedicated to the visualization of huge graphs
LICENSE= LGPL3

View File

@ -1,2 +1,2 @@
SHA256 (tulip-4.6.1_src.tar.gz) = 27ab129af9541b94bfb6f63497b4055a298a3058be58795b3bc67c2d9789a18b
SIZE (tulip-4.6.1_src.tar.gz) = 82574518
SHA256 (tulip-4.7.0_src.tar.gz) = 8ae2fe8e27e147a845eb21a3b8e9a3bb88d3d0c8d9e9c2952579399908e07874
SIZE (tulip-4.7.0_src.tar.gz) = 82801728

View File

@ -1,18 +1,6 @@
--- CMakeLists.txt.orig 2014-09-28 22:18:14.000000000 +0200
+++ CMakeLists.txt 2014-09-30 12:39:54.000000000 +0200
@@ -108,7 +108,10 @@
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 @@
--- CMakeLists.txt.orig 2015-04-22 14:45:15 UTC
+++ CMakeLists.txt
@@ -367,8 +367,8 @@ SET(FTGLInclude ${PROJECT_SOURCE_DIR}/th
SET(FTGLLibrary ftgl-tulip-${TulipMMVersion})
ENDIF(NOT BUILD_CORE_ONLY)

View File

@ -1,6 +1,6 @@
--- 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 @@
--- 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

View File

@ -1,5 +1,5 @@
--- plugins/view/HistogramView/HistogramStatistics.cpp.orig 2014-04-18 12:05:56.000000000 +0200
+++ plugins/view/HistogramView/HistogramStatistics.cpp 2014-04-18 12:07:56.000000000 +0200
--- plugins/view/HistogramView/HistogramStatistics.cpp.orig 2015-04-18 20:15:49 UTC
+++ plugins/view/HistogramView/HistogramStatistics.cpp
@@ -30,7 +30,7 @@
#include "HistoStatsConfigWidget.h"
#include "HistogramView.h"

View File

@ -1,12 +0,0 @@
--- 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

View File

@ -1,12 +0,0 @@
--- 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;

View File

@ -1,6 +1,6 @@
--- software/crash_handling/CrashHandling.cpp.orig 2014-04-18 10:33:31.000000000 +0200
+++ software/crash_handling/CrashHandling.cpp 2014-04-18 10:34:25.000000000 +0200
@@ -38,7 +38,7 @@
--- software/crash_handling/CrashHandling.cpp.orig 2015-04-18 20:15:52 UTC
+++ software/crash_handling/CrashHandling.cpp
@@ -48,7 +48,7 @@ void setExtraSymbolsSearchPaths(const st
/*
Linux/MacOS-specific handling
*/

View File

@ -1,6 +1,6 @@
--- 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 @@
--- 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;

View File

@ -0,0 +1,12 @@
--- 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;

View File

@ -1,5 +1,5 @@
--- software/tulip/include/TulipPerspectiveProcessHandler.h.orig 2014-04-18 11:41:35.000000000 +0200
+++ software/tulip/include/TulipPerspectiveProcessHandler.h 2014-04-18 11:47:38.000000000 +0200
--- software/tulip/include/TulipPerspectiveProcessHandler.h.orig 2015-04-18 20:15:52 UTC
+++ software/tulip/include/TulipPerspectiveProcessHandler.h
@@ -27,6 +27,8 @@
#include <QTcpServer>

View File

@ -0,0 +1,12 @@
--- software/tulip/src/main.cpp.orig 2015-04-22 14:45:04 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 ");

View File

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

View File

@ -45,6 +45,7 @@ include/tulip/CopyPropertyDialog.h
include/tulip/Curves.h
include/tulip/DataSet.h
include/tulip/Delaunay.h
include/tulip/DocumentationNavigator.h
include/tulip/DoubleProperty.h
include/tulip/DoublePropertyAnimation.h
include/tulip/DoubleStringsListSelectionWidget.h
@ -248,6 +249,7 @@ include/tulip/TriconnectedTest.h
include/tulip/TulipException.h
include/tulip/TulipFileDescriptorWidget.h
include/tulip/TulipFont.h
include/tulip/TulipFontAwesome.h
include/tulip/TulipFontDialog.h
include/tulip/TulipItemDelegate.h
include/tulip/TulipItemEditorCreators.h
@ -331,6 +333,7 @@ lib/tulip/glyph/libCube-%%TULIP_VERSION%%.so
lib/tulip/glyph/libCubeOutlinedTransparent-%%TULIP_VERSION%%.so
lib/tulip/glyph/libCylinder-%%TULIP_VERSION%%.so
lib/tulip/glyph/libDiamond-%%TULIP_VERSION%%.so
lib/tulip/glyph/libFontAwesomeIcon-%%TULIP_VERSION%%.so
lib/tulip/glyph/libGlowSphere-%%TULIP_VERSION%%.so
lib/tulip/glyph/libHalfCylinder-%%TULIP_VERSION%%.so
lib/tulip/glyph/libHexagone-%%TULIP_VERSION%%.so
@ -372,6 +375,7 @@ lib/tulip/libConnected-%%TULIP_VERSION%%.so
lib/tulip/libConnectedComponent-%%TULIP_VERSION%%.so
lib/tulip/libConnectedComponentPacking-%%TULIP_VERSION%%.so
lib/tulip/libConvolutionClustering-%%TULIP_VERSION%%.so
lib/tulip/libCurveEdges-%%TULIP_VERSION%%.so
lib/tulip/libDagLevelMetric-%%TULIP_VERSION%%.so
lib/tulip/libDegreeMetric-%%TULIP_VERSION%%.so
lib/tulip/libDelaunay-%%TULIP_VERSION%%.so
@ -410,6 +414,25 @@ lib/tulip/libMetricSizeMapping-%%TULIP_VERSION%%.so
lib/tulip/libMixedModel-%%TULIP_VERSION%%.so
lib/tulip/libMultipleSelection-%%TULIP_VERSION%%.so
lib/tulip/libNodeMetric-%%TULIP_VERSION%%.so
lib/tulip/libOGDFBalloon-%%TULIP_VERSION%%.so
lib/tulip/libOGDFCircular-%%TULIP_VERSION%%.so
lib/tulip/libOGDFDavidsonHarel-%%TULIP_VERSION%%.so
lib/tulip/libOGDFDominance-%%TULIP_VERSION%%.so
lib/tulip/libOGDFFastMultipoleEmbedder-%%TULIP_VERSION%%.so
lib/tulip/libOGDFFastMultipoleMultilevelEmbedder-%%TULIP_VERSION%%.so
lib/tulip/libOGDFFm3-%%TULIP_VERSION%%.so
lib/tulip/libOGDFFrutchermanReingold-%%TULIP_VERSION%%.so
lib/tulip/libOGDFGemFrick-%%TULIP_VERSION%%.so
lib/tulip/libOGDFKamadaKawai-%%TULIP_VERSION%%.so
lib/tulip/libOGDFMMMExampleFastLayout-%%TULIP_VERSION%%.so
lib/tulip/libOGDFMMMExampleNiceLayout-%%TULIP_VERSION%%.so
lib/tulip/libOGDFMMMExampleNoTwistLayout-%%TULIP_VERSION%%.so
lib/tulip/libOGDFPlanarizationGrid-%%TULIP_VERSION%%.so
lib/tulip/libOGDFStressMajorization-%%TULIP_VERSION%%.so
lib/tulip/libOGDFSugiyama-%%TULIP_VERSION%%.so
lib/tulip/libOGDFTree-%%TULIP_VERSION%%.so
lib/tulip/libOGDFUpwardPlanarization-%%TULIP_VERSION%%.so
lib/tulip/libOGDFVisibility-%%TULIP_VERSION%%.so
lib/tulip/libOuterplanar-%%TULIP_VERSION%%.so
lib/tulip/libPageRank-%%TULIP_VERSION%%.so
lib/tulip/libPathLengthMetric-%%TULIP_VERSION%%.so
@ -425,6 +448,7 @@ lib/tulip/libRandomSimpleGraph-%%TULIP_VERSION%%.so
lib/tulip/libRandomTree-%%TULIP_VERSION%%.so
lib/tulip/libRandomTreeGeneral-%%TULIP_VERSION%%.so
lib/tulip/libReachableSubGraphSelection-%%TULIP_VERSION%%.so
lib/tulip/libReverseEdges-%%TULIP_VERSION%%.so
lib/tulip/libSVGExport-%%TULIP_VERSION%%.so
lib/tulip/libSimple-%%TULIP_VERSION%%.so
lib/tulip/libSmallWorldGraph-%%TULIP_VERSION%%.so
@ -445,36 +469,17 @@ lib/tulip/libTutte-%%TULIP_VERSION%%.so
lib/tulip/libVoronoi-%%TULIP_VERSION%%.so
lib/tulip/libWebImport-%%TULIP_VERSION%%.so
lib/tulip/libWelshPowell-%%TULIP_VERSION%%.so
lib/tulip/libogdfballoon-%%TULIP_VERSION%%.so
lib/tulip/libogdfcircular-%%TULIP_VERSION%%.so
lib/tulip/libogdfdavidsonharel-%%TULIP_VERSION%%.so
lib/tulip/libogdfdominance-%%TULIP_VERSION%%.so
lib/tulip/libogdffastmultipoleembedder-%%TULIP_VERSION%%.so
lib/tulip/libogdffastmultipolemultilevelembedder-%%TULIP_VERSION%%.so
lib/tulip/libogdffm3-%%TULIP_VERSION%%.so
lib/tulip/libogdffrutchermanreingold-%%TULIP_VERSION%%.so
lib/tulip/libogdfgemfrick-%%TULIP_VERSION%%.so
lib/tulip/libogdfkamadakawai-%%TULIP_VERSION%%.so
lib/tulip/libogdfmmmexamplefastlayout-%%TULIP_VERSION%%.so
lib/tulip/libogdfmmmexamplenicelayout-%%TULIP_VERSION%%.so
lib/tulip/libogdfmmmexamplenotwistlayout-%%TULIP_VERSION%%.so
lib/tulip/libogdfplanarizationgrid-%%TULIP_VERSION%%.so
lib/tulip/libogdfstressmajorization-%%TULIP_VERSION%%.so
lib/tulip/libogdfsugiyama-%%TULIP_VERSION%%.so
lib/tulip/libogdftree-%%TULIP_VERSION%%.so
lib/tulip/libogdfupwardplanarization-%%TULIP_VERSION%%.so
lib/tulip/libogdfvisibility-%%TULIP_VERSION%%.so
lib/tulip/libreverseedges-%%TULIP_VERSION%%.so
lib/tulip/perspective/libGraphPerspective-%%TULIP_VERSION%%.so
lib/tulip/view/libGeographicView-%%TULIP_VERSION%%.so
lib/tulip/view/libHistogramView-%%TULIP_VERSION%%.so
lib/tulip/view/libMatrixView-%%TULIP_VERSION%%.so
lib/tulip/view/libParallelCoordinatesView-%%TULIP_VERSION%%.so
lib/tulip/view/libPixelOrientedView-%%TULIP_VERSION%%.so
lib/tulip/view/libPythonScriptView-%%TULIP_VERSION%%.so
lib/tulip/view/libSOMView-%%TULIP_VERSION%%.so
lib/tulip/view/libScatterPlot2DView-%%TULIP_VERSION%%.so
lib/tulip/view/libTableView-%%TULIP_VERSION%%.so
lib/tulip/view/libpythonscriptview-%%TULIP_VERSION%%.so
share/pixmaps/tulip.png
%%DATADIR%%/FindGLEW.cmake
%%DATADIR%%/FindTULIP.cmake
%%DATADIR%%/TulipUseFile.cmake
@ -512,6 +517,7 @@ lib/tulip/view/libpythonscriptview-%%TULIP_VERSION%%.so
%%DATADIR%%/bitmaps/edgeBlomSprite.png
%%DATADIR%%/bitmaps/edgeSpring.png
%%DATADIR%%/bitmaps/font.ttf
%%DATADIR%%/bitmaps/fontawesome-webfont.ttf
%%DATADIR%%/bitmaps/fontb.ttf
%%DATADIR%%/bitmaps/fonts/DejaVuMono/DejaVuMono.ttf
%%DATADIR%%/bitmaps/fonts/DejaVuMono/DejaVuMono_Bold.ttf
@ -614,6 +620,7 @@ lib/tulip/view/libpythonscriptview-%%TULIP_VERSION%%.so
%%DATADIR%%/bitmaps/samplePictures/741.png
%%DATADIR%%/bitmaps/samplePictures/891.png
%%DATADIR%%/bitmaps/titlebarGradient.png
%%DATADIR%%/bitmaps/tulip-file-icon.ico
%%DATADIR%%/bitmaps/tulip.ico
%%DATADIR%%/bitmaps/welcomelogo.bmp
%%DATADIR%%/wizards/README.txt
@ -651,4 +658,3 @@ lib/tulip/view/libpythonscriptview-%%TULIP_VERSION%%.so
%%DATADIR%%/wizards/tlpview/view.cpp
%%DATADIR%%/wizards/tlpview/view.h
%%DATADIR%%/wizards/tlpview/wizard.xml
share/pixmaps/tulip.png