Index: math/ogdf/Makefile =================================================================== --- math/ogdf/Makefile (revision 409698) +++ math/ogdf/Makefile (working copy) @@ -2,63 +2,57 @@ # $FreeBSD$ PORTNAME= ogdf -PORTVERSION= 2012.07 -PORTREVISION= 2 +PORTVERSION= 2015.05 CATEGORIES= math -MASTER_SITES= LOCAL/gahr \ - http://people.freebsd.org/~gahr/distfiles/ +MASTER_SITES= http://www.ogdf.net/lib/exe/fetch.php/tech: DISTNAME= ${PORTNAME}.v${PORTVERSION} -MAINTAINER= ports@FreeBSD.org +MAINTAINER= woodsb02@gmail.com COMMENT= C++ class library for the automatic layout of diagrams -LICENSE= GPLv2 GPLv3 -LICENSE_COMB= dual +LICENSE= GPLv2 GPLv3 +LICENSE_COMB= dual LICENSE_FILE_GPLv2= ${WRKSRC}/LICENSE_GPL_v2.txt LICENSE_FILE_GPLv3= ${WRKSRC}/LICENSE_GPL_v3.txt -USES= zip python:build -USE_LDCONFIG= yes +USES= compiler:features gmake python:build zip +USE_LDCONFIG= yes +LDFLAGS+= -L${LOCALBASE}/lib -WRKSRC= ${WRKDIR}/${PORTNAME:tu} +FETCH_BEFORE_ARGS= -o ${PORTNAME}.v${PORTVERSION}.zip +WRKSRC= ${WRKDIR}/${PORTNAME:tu} -OPTIONS_DEFINE= COIN ABACUS -COIN_DESC= Use the Coin Open Solver Interface (Osi) -ABACUS_DESC= Use the ABACUS branch-and-cut library +OPTIONS_DEFINE= COIN +OPTIONS_SUB= yes -.include +COIN_DESC= Build with COIN solvers +COIN_USE= coin=true -.if ${PORT_OPTIONS:MCOIN} -LIB_DEPENDS+= libClp.so:${PORTSDIR}/math/coinmp -USE_COIN= true -.else -USE_COIN= false -.endif +.include -.if ${PORT_OPTIONS:MABACUS} -USE_GCC= yes -LIB_DEPENDS+= libabacus-osi.so:${PORTSDIR}/math/abacus -USE_ABACUS= true -USE_COIN= true -.else -USE_ABACUS= false +.if ${COMPILER_FEATURES:Mc++11} +STDCPP11= -std=c++11 .endif post-patch: @${REINPLACE_CMD} -e '\ s|%%CXX%%|${CXX}|g; \ + s|%%CXXFLAGS%%|${CXXFLAGS}|g; \ s|%%LOCALBASE%%|${LOCALBASE}|g; \ - s|%%USE_COIN%%|${USE_COIN}|g; \ - s|%%USE_ABACUS%%|${USE_ABACUS}|g' \ + s|%%USE_COIN%%|${USE_COIN}|g' \ ${WRKSRC}/makeMakefile.config + @${REINPLACE_CMD} -e '\ + s|%%STDCPP11%%|${STDCPP11}|g' \ + ${WRKSRC}/makeMakefile.py + do-configure: cd ${WRKSRC} && ${PYTHON_CMD} makeMakefile.py -do-install: - ${INSTALL_LIB} ${WRKSRC}/_release/libOGDF.so \ - ${STAGEDIR}${PREFIX}/lib/libOGDF.so.1 - ${LN} -sf libOGDF.so.1 ${STAGEDIR}${PREFIX}/lib/libOGDF.so - cd ${WRKSRC} && ${COPYTREE_SHARE} ogdf ${STAGEDIR}${PREFIX}/include +post-install: + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libOGDF.so +.if ${PORT_OPTIONS:MCOIN} + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libCOIN.so +.endif -.include +.include Index: math/ogdf/distinfo =================================================================== --- math/ogdf/distinfo (revision 409698) +++ math/ogdf/distinfo (working copy) @@ -1,2 +1,2 @@ -SHA256 (ogdf.v2012.07.zip) = 818029b36e04f8f726606784f95c839b34d3372de0a60c8fbeb0b6e842b4fe01 -SIZE (ogdf.v2012.07.zip) = 2159592 +SHA256 (ogdf.v2015.05.zip) = 12c279fe288e911b905956dcfdfb61ad983832175f16a72039a69fab2e6b5b3e +SIZE (ogdf.v2015.05.zip) = 5682221 Index: math/ogdf/files/patch-include_ogdf_basic_System.h =================================================================== --- math/ogdf/files/patch-include_ogdf_basic_System.h (nonexistent) +++ math/ogdf/files/patch-include_ogdf_basic_System.h (working copy) @@ -0,0 +1,20 @@ +--- include/ogdf/basic/System.h.orig 2015-05-29 15:36:24 UTC ++++ include/ogdf/basic/System.h +@@ -53,7 +53,7 @@ + #define OGDF_SYSTEM_H + + +-#if defined(OGDF_SYSTEM_OSX) ++#if defined(OGDF_SYSTEM_OSX) || defined(OGDF_SYSTEM_FREEBSD) + #include + #elif defined(OGDF_SYSTEM_UNIX) || defined(__MINGW32__) + #include +@@ -176,7 +176,7 @@ public: + static void *alignedMemoryAlloc16(size_t size) { + #ifdef OGDF_SYSTEM_WINDOWS + return _aligned_malloc(size, 16); +-#elif defined(OGDF_SYSTEM_OSX) ++#elif defined(OGDF_SYSTEM_OSX) || defined(OGDF_SYSTEM_FREEBSD) + // malloc returns 16 byte aligned memory on OS X. + return malloc(size); + #else Property changes on: math/ogdf/files/patch-include_ogdf_basic_System.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: math/ogdf/files/patch-include_ogdf_internal_basic_config.h =================================================================== --- math/ogdf/files/patch-include_ogdf_internal_basic_config.h (nonexistent) +++ math/ogdf/files/patch-include_ogdf_internal_basic_config.h (working copy) @@ -0,0 +1,23 @@ +--- include/ogdf/internal/basic/config.h.orig 2015-05-29 15:36:28 UTC ++++ include/ogdf/internal/basic/config.h +@@ -95,6 +95,11 @@ using std::string; + #define OGDF_SYSTEM_OSX + #endif + ++// Note: FreeBSD machines will be both OGDF_SYSTEM_UNIX and OGDF_SYSTEM_OSX ++#if defined(__FreeBSD__) ++#define OGDF_SYSTEM_FREEBSD ++#endif ++ + + // COIN and ABACUS + #if defined(USE_COIN) +@@ -124,7 +129,7 @@ using std::string; + // C++ standard + //--------------------------------------------------------- + +-#if __cplusplus >= 201103 ++#if __cplusplus >= 201103L + #define OGDF_HAVE_CPP11 + + #elif defined(_MSC_VER) Property changes on: math/ogdf/files/patch-include_ogdf_internal_basic_config.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: math/ogdf/files/patch-makeMakefile.config =================================================================== --- math/ogdf/files/patch-makeMakefile.config (revision 409698) +++ math/ogdf/files/patch-makeMakefile.config (working copy) @@ -1,21 +1,21 @@ ---- makeMakefile.config.orig 2012-07-18 09:17:42.000000000 +0200 -+++ makeMakefile.config 2013-06-18 12:18:55.000000000 +0200 -@@ -1,20 +1,20 @@ +--- makeMakefile.config.orig 2015-05-29 15:36:39 UTC ++++ makeMakefile.config +@@ -1,19 +1,19 @@ [GENERAL] #********************************************************** - #* build OGDF as a static library (false) or shared library (true) --sharedLib = false -+sharedLib = true - #* name of the static (import) library - libName = libOGDF.a - #* name of the shared library (.dll for Windows, .so for Linux) - sharedlibName = libOGDF.so - -compilerCommand = g++ +compilerCommand = %%CXX%% - compilerParams = -I. + # MAC USERS: if building fails, try the following line: + #compilerCommand = g++ -stdlib=libstdc++ +-compilerParams = ++compilerParams = %%CXXFLAGS%% + + #* build static (false) or shared (true) libraries +-sharedLib = false ++sharedLib = true + #* command used to create a static library libCommand = ar #* command used to create a shared library @@ -24,37 +24,21 @@ #* blank means don't call ranlib ranlibCommand = ranlib -@@ -43,16 +43,17 @@ +@@ -25,7 +25,7 @@ ranlibCommand = ranlib + rmCommand = rm -rf + mkdirCommand = mkdir -p + +-installPrefix = /usr/local ++installPrefix = %%LOCALBASE%% + + + [VERSIONS] +@@ -57,7 +57,7 @@ memoryManager = [COIN] #********************************************************** #* set to "true" to use COIN --useCoin = false --coinIncl = /somewhere/COIN/include +-useCoin = true +useCoin = %%USE_COIN%% -+coinIncl = %%LOCALBASE%%/include - #* Select your solver for COIN - #* CPLEX: - # solver_name = COIN_OSI_CPX - # solver_incl = /somewhere/ILOG/cplex90/include/ilcplex - #* Coin's CLP: --# solver_name = COIN_OSI_CLP --# solver_incl = -+solver_name = COIN_OSI_CLP -+solver_incl = %%LOCALBASE%%/include -+solver_lib = %%LOCALBASE%%/lib/libClp.so - #* Coin's Symphony - # solver_name = COIN_OSI_SYM - # solver_incl = /home/plug/COIN/SYMPHONY/include -@@ -70,7 +70,7 @@ - - [ABACUS] - #********************************************************** --useAbacus = false --# abacusDef = -DABACUS_COMPILER_GCC --# abacusIncl = /somewhere/abacus/include --# abacusLib = -L/somewhere/abacus/lib/linux-gcc33 -labacus-cplex80 -+useAbacus = %%USE_ABACUS%% -+abacusDef = -DABACUS_COMPILER_GCC -+abacusIncl = %%LOCALBASE%%/inclue/abacus -+abacusLib = %%LOCALBASE%%/lib/libabacus-osi.so + #* name of the static (import) library + libName = libCOIN.a Index: math/ogdf/files/patch-makeMakefile.py =================================================================== --- math/ogdf/files/patch-makeMakefile.py (revision 409698) +++ math/ogdf/files/patch-makeMakefile.py (working copy) @@ -1,34 +1,22 @@ ---- makeMakefile.py.orig 2012-07-18 09:17:42.000000000 +0200 -+++ makeMakefile.py 2014-02-07 17:28:44.000000000 +0100 -@@ -82,7 +82,7 @@ - libs = '' +--- makeMakefile.py.orig 2015-05-29 15:36:39 UTC ++++ makeMakefile.py +@@ -154,7 +154,7 @@ if useCoin: + if sharedLib and (sys.platform == 'win32' or sys.platform == 'cygwin'): + libs += ' -l' + v.coinSharedName() +-ogdfFlags = '-I./include ' + addIncludes ++ogdfFlags = '-I./include %%STDCPP11%% ' + addIncludes + coinFlags = '$(COIN_INSTALL_DEFINES) -I./include/coin ' + addIncludes + if sharedLib: -- compiler = ' '.join( [compiler, '-DOGDF_DLL -DOGDF_INSTALL' ] ) -+ compiler = ' '.join( [compiler, '-DOGDF_INSTALL' ] ) - if sys.platform == 'win32' or sys.platform == 'cygwin': - libs = ' '.join( [libs, '-lpsapi'] ) - else: -@@ -97,17 +97,20 @@ - # coinLib = loadConfig('COIN', 'coinLib') - solver_name = loadConfig('COIN', 'solver_name') - solver_incl = loadConfig('COIN', 'solver_incl') -- # solver_lib = loadConfig('COIN', 'solver_lib') -+ solver_lib = loadConfig('COIN', 'solver_lib') - si2 = ' ' - if solver_incl.strip() != '': - si2 = '-I'+solver_incl -+ if solver_lib.strip() != '': -+ libs = ' '.join( [libs, solver_lib] ) - compiler = ' '.join( [ compiler, '-I'+coinIncl, si2, '-D'+solver_name, '-DUSE_COIN', ' ' ] ) - - useAbacus = loadConfig('ABACUS', 'useAbacus').startswith('t') - if useAbacus: - abacusDef = loadConfig('ABACUS', 'abacusDef') - abacusIncl = loadConfig('ABACUS', 'abacusIncl') -- # abacusLib = loadConfig('ABACUS', 'abacusLib') -+ abacusLib = loadConfig('ABACUS', 'abacusLib') -+ libs = ' '.join( [libs, abacusLib] ) - compiler = ' '.join( [ compiler, abacusDef, '-I'+abacusIncl, '-DUSE_ABACUS', ' ' ] ) - - versions = [] +@@ -458,8 +458,8 @@ if installPrefix: + if useCoin: + InstallHeaders('include/coin', makefile, installPrefix) + makefile.write('\ninstall-pkgconfig: ogdf.pc\n') +- makefile.write('\tinstall -d $(DESTDIR)' + installPrefix + '/lib/pkgconfig\n') +- makefile.write('\tinstall -m 0644 ogdf.pc $(DESTDIR)' + installPrefix + '/lib/pkgconfig\n') ++ makefile.write('\tinstall -d $(DESTDIR)' + installPrefix + '/libdata/pkgconfig\n') ++ makefile.write('\tinstall -m 0644 ogdf.pc $(DESTDIR)' + installPrefix + '/libdata/pkgconfig\n') + + makefile.write('\ndistclean: clean-doc') + for v in versions: Index: math/ogdf/files/patch-ogdf-basic_System.h =================================================================== --- math/ogdf/files/patch-ogdf-basic_System.h (revision 409698) +++ math/ogdf/files/patch-ogdf-basic_System.h (nonexistent) @@ -1,20 +0,0 @@ ---- ogdf/basic/System.h.orig 2012-07-18 09:17:51.000000000 +0200 -+++ ogdf/basic/System.h 2013-06-18 10:23:07.000000000 +0200 -@@ -51,7 +51,7 @@ - - - #include --#if defined(OGDF_SYSTEM_OSX) -+#if defined(OGDF_SYSTEM_OSX) || defined(OGDF_SYSTEM_FREEBSD) - #include - #elif defined(OGDF_SYSTEM_UNIX) || defined(__MINGW32__) - #include -@@ -178,7 +178,7 @@ - size_t alignment = 16; - #ifdef OGDF_SYSTEM_WINDOWS - return _aligned_malloc(size,alignment); --#elif defined(OGDF_SYSTEM_OSX) -+#elif defined(OGDF_SYSTEM_OSX) || defined(OGDF_SYSTEM_FREEBSD) - // malloc returns 16 byte aligned memory on OS X. - return malloc(size); - #else Property changes on: math/ogdf/files/patch-ogdf-basic_System.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: math/ogdf/files/patch-ogdf-basic_basic.h =================================================================== --- math/ogdf/files/patch-ogdf-basic_basic.h (revision 409698) +++ math/ogdf/files/patch-ogdf-basic_basic.h (nonexistent) @@ -1,12 +0,0 @@ ---- ogdf/basic/basic.h.orig 2013-06-18 10:18:02.000000000 +0200 -+++ ogdf/basic/basic.h 2013-06-18 10:19:00.000000000 +0200 -@@ -88,6 +88,9 @@ - #define OGDF_SYSTEM_OSX - #endif - -+#if defined(__FreeBSD__) -+#define OGDF_SYSTEM_FREEBSD -+#endif - - #if defined(USE_COIN) || defined(OGDF_OWN_LPSOLVER) - #define OGDF_LP_SOLVER Property changes on: math/ogdf/files/patch-ogdf-basic_basic.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: math/ogdf/files/patch-ogdf-internal-cluster_basics.h =================================================================== --- math/ogdf/files/patch-ogdf-internal-cluster_basics.h (revision 409698) +++ math/ogdf/files/patch-ogdf-internal-cluster_basics.h (nonexistent) @@ -1,10 +0,0 @@ ---- ogdf/internal/cluster/basics.h.orig 2014-10-01 10:12:06.000000000 +0200 -+++ ogdf/internal/cluster/basics.h 2014-10-01 10:12:37.000000000 +0200 -@@ -47,6 +47,7 @@ - #define OGDF_CPLANAR_BASICS_H - - #include -+#include - #include - #include - #include Property changes on: math/ogdf/files/patch-ogdf-internal-cluster_basics.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: math/ogdf/files/patch-src-basic_System.cpp =================================================================== --- math/ogdf/files/patch-src-basic_System.cpp (revision 409698) +++ math/ogdf/files/patch-src-basic_System.cpp (nonexistent) @@ -1,77 +0,0 @@ ---- src/basic/System.cpp.orig 2013-06-10 17:33:24.000000000 +0200 -+++ src/basic/System.cpp 2013-06-10 17:47:24.000000000 +0200 -@@ -51,6 +51,13 @@ - #include - #include - #include -+#elif defined(OGDF_SYSTEM_FREEBSD) -+#include -+#include -+#include -+#include -+#include -+#include - #elif defined(OGDF_SYSTEM_UNIX) - #include - #endif -@@ -310,6 +317,40 @@ - return 0; - } - -+#elif defined(OGDF_SYSTEM_FREEBSD) -+ -+long long System::physicalMemory() -+{ -+ unsigned long value; -+ size_t size = sizeof( value ); -+ if (sysctlbyname("hw.physmem", (void *)&value, &size, NULL, 0) != -1) -+ return value; -+ else -+ return 0; -+} -+ -+long long System::availablePhysicalMemory() -+{ -+ int pageSize = getpagesize (); -+ unsigned long result; -+ size_t size = sizeof (result); -+ -+ if (sysctlbyname("vm.stats.vm.v_free_count", (void *)&result, &size, NULL, 0) != -1) -+ return result * pageSize; -+ else -+ return 0; -+} -+ -+ -+size_t System::memoryUsedByProcess() -+{ -+ struct rusage r; -+ if (getrusage(RUSAGE_SELF, &r) != -1) -+ return r.ru_maxrss; -+ else -+ return 0; -+} -+ - #else - // LINUX, NOT MAC OS - long long System::physicalMemory() -@@ -396,6 +437,19 @@ - { - return mstats().chunks_free; - } -+ -+#elif defined(OGDF_SYSTEM_FREEBSD) -+ -+size_t System::memoryAllocatedByMalloc() -+{ -+ return 0; -+} -+ -+size_t System::memoryInFreelistOfMalloc() -+{ -+ return 0; -+} -+ - #else - - size_t System::memoryAllocatedByMalloc() Property changes on: math/ogdf/files/patch-src-basic_System.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: math/ogdf/files/patch-src_ogdf_basic_System.cpp =================================================================== --- math/ogdf/files/patch-src_ogdf_basic_System.cpp (nonexistent) +++ math/ogdf/files/patch-src_ogdf_basic_System.cpp (working copy) @@ -0,0 +1,77 @@ +--- src/ogdf/basic/System.cpp.orig 2015-05-29 15:36:49 UTC ++++ src/ogdf/basic/System.cpp +@@ -52,6 +52,13 @@ + #include + #include + #include ++#elif defined(OGDF_SYSTEM_FREEBSD) ++#include ++#include ++#include ++#include ++#include ++#include + #elif defined(OGDF_SYSTEM_UNIX) + #include + #endif +@@ -308,6 +315,40 @@ size_t System::memoryUsedByProcess() + return 0; + } + ++#elif defined(OGDF_SYSTEM_FREEBSD) ++ ++long long System::physicalMemory() ++{ ++ unsigned long value; ++ size_t size = sizeof( value ); ++ if (sysctlbyname("hw.physmem", (void *)&value, &size, NULL, 0) != -1) ++ return value; ++ else ++ return 0; ++} ++ ++long long System::availablePhysicalMemory() ++{ ++ int pageSize = getpagesize (); ++ unsigned long result; ++ size_t size = sizeof (result); ++ ++ if (sysctlbyname("vm.stats.vm.v_free_count", (void *)&result, &size, NULL, 0) != -1) ++ return result * pageSize; ++ else ++ return 0; ++} ++ ++ ++size_t System::memoryUsedByProcess() ++{ ++ struct rusage r; ++ if (getrusage(RUSAGE_SELF, &r) != -1) ++ return r.ru_maxrss; ++ else ++ return 0; ++} ++ + #else + // LINUX, NOT MAC OS + long long System::physicalMemory() +@@ -389,6 +430,19 @@ size_t System::memoryInFreelistOfMalloc( + { + return mstats().chunks_free; + } ++ ++#elif defined(OGDF_SYSTEM_FREEBSD) ++ ++size_t System::memoryAllocatedByMalloc() ++{ ++ return 0; ++} ++ ++size_t System::memoryInFreelistOfMalloc() ++{ ++ return 0; ++} ++ + #else + + size_t System::memoryAllocatedByMalloc() Property changes on: math/ogdf/files/patch-src_ogdf_basic_System.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: math/ogdf/files/patch-test_gtest_gtest.h =================================================================== --- math/ogdf/files/patch-test_gtest_gtest.h (nonexistent) +++ math/ogdf/files/patch-test_gtest_gtest.h (working copy) @@ -0,0 +1,29 @@ +--- test/gtest/gtest.h.orig 2015-05-29 15:37:01 UTC ++++ test/gtest/gtest.h +@@ -181,6 +181,7 @@ + // the given platform; otherwise undefined): + // GTEST_OS_AIX - IBM AIX + // GTEST_OS_CYGWIN - Cygwin ++// GTEST_OS_FREEBSD - FreeBSD + // GTEST_OS_HPUX - HP-UX + // GTEST_OS_LINUX - Linux + // GTEST_OS_LINUX_ANDROID - Google Android +@@ -337,6 +338,9 @@ + # define GTEST_OS_HPUX 1 + #elif defined __native_client__ + # define GTEST_OS_NACL 1 ++#elif defined(__FreeBSD__) ++# define GTEST_OS_FREEBSD 1 ++# define GTEST_USE_OWN_TR1_TUPLE 1 + #endif // __CYGWIN__ + + // Brings in definitions for functions used in the testing::internal::posix +@@ -1602,7 +1606,7 @@ inline bool operator!=(const GTEST_10_TU + // pops up a dialog window that cannot be suppressed programmatically. + #if (GTEST_OS_LINUX || GTEST_OS_MAC || GTEST_OS_CYGWIN || GTEST_OS_SOLARIS || \ + (GTEST_OS_WINDOWS_DESKTOP && _MSC_VER >= 1400) || \ +- GTEST_OS_WINDOWS_MINGW || GTEST_OS_AIX || GTEST_OS_HPUX) ++ GTEST_OS_WINDOWS_MINGW || GTEST_OS_AIX || GTEST_OS_HPUX || GTEST_OS_FREEBSD ) + # define GTEST_HAS_DEATH_TEST 1 + # include // NOLINT + #endif Property changes on: math/ogdf/files/patch-test_gtest_gtest.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: math/ogdf/pkg-plist =================================================================== --- math/ogdf/pkg-plist (revision 409698) +++ math/ogdf/pkg-plist (working copy) @@ -1,9 +1,266 @@ -lib/libOGDF.so.1 -lib/libOGDF.so +%%COIN%%include/coin/CglAllDifferent.hpp +%%COIN%%include/coin/CglClique.hpp +%%COIN%%include/coin/CglConfig.h +%%COIN%%include/coin/CglCutGenerator.hpp +%%COIN%%include/coin/CglDuplicateRow.hpp +%%COIN%%include/coin/CglFlowCover.hpp +%%COIN%%include/coin/CglGomory.hpp +%%COIN%%include/coin/CglKnapsackCover.hpp +%%COIN%%include/coin/CglLandP.hpp +%%COIN%%include/coin/CglLandPMessages.hpp +%%COIN%%include/coin/CglLandPSimplex.hpp +%%COIN%%include/coin/CglLandPTabRow.hpp +%%COIN%%include/coin/CglLandPUtils.hpp +%%COIN%%include/coin/CglLandPValidator.hpp +%%COIN%%include/coin/CglLiftAndProject.hpp +%%COIN%%include/coin/CglMessage.hpp +%%COIN%%include/coin/CglMixedIntegerRounding.hpp +%%COIN%%include/coin/CglMixedIntegerRounding2.hpp +%%COIN%%include/coin/CglOddHole.hpp +%%COIN%%include/coin/CglParam.hpp +%%COIN%%include/coin/CglPreProcess.hpp +%%COIN%%include/coin/CglProbing.hpp +%%COIN%%include/coin/CglRedSplit.hpp +%%COIN%%include/coin/CglRedSplitParam.hpp +%%COIN%%include/coin/CglResidualCapacity.hpp +%%COIN%%include/coin/CglSimpleRounding.hpp +%%COIN%%include/coin/CglStored.hpp +%%COIN%%include/coin/CglTreeInfo.hpp +%%COIN%%include/coin/CglTwomir.hpp +%%COIN%%include/coin/ClpCholeskyBase.hpp +%%COIN%%include/coin/ClpCholeskyDense.hpp +%%COIN%%include/coin/ClpCholeskyMumps.hpp +%%COIN%%include/coin/ClpCholeskyTaucs.hpp +%%COIN%%include/coin/ClpCholeskyUfl.hpp +%%COIN%%include/coin/ClpCholeskyWssmp.hpp +%%COIN%%include/coin/ClpCholeskyWssmpKKT.hpp +%%COIN%%include/coin/ClpConfig.h +%%COIN%%include/coin/ClpConstraint.hpp +%%COIN%%include/coin/ClpConstraintLinear.hpp +%%COIN%%include/coin/ClpConstraintQuadratic.hpp +%%COIN%%include/coin/ClpDualRowDantzig.hpp +%%COIN%%include/coin/ClpDualRowPivot.hpp +%%COIN%%include/coin/ClpDualRowSteepest.hpp +%%COIN%%include/coin/ClpDummyMatrix.hpp +%%COIN%%include/coin/ClpDynamicExampleMatrix.hpp +%%COIN%%include/coin/ClpDynamicMatrix.hpp +%%COIN%%include/coin/ClpEventHandler.hpp +%%COIN%%include/coin/ClpFactorization.hpp +%%COIN%%include/coin/ClpGubDynamicMatrix.hpp +%%COIN%%include/coin/ClpGubMatrix.hpp +%%COIN%%include/coin/ClpHelperFunctions.hpp +%%COIN%%include/coin/ClpInterior.hpp +%%COIN%%include/coin/ClpLinearObjective.hpp +%%COIN%%include/coin/ClpLsqr.hpp +%%COIN%%include/coin/ClpMatrixBase.hpp +%%COIN%%include/coin/ClpMessage.hpp +%%COIN%%include/coin/ClpModel.hpp +%%COIN%%include/coin/ClpNetworkBasis.hpp +%%COIN%%include/coin/ClpNetworkMatrix.hpp +%%COIN%%include/coin/ClpNode.hpp +%%COIN%%include/coin/ClpNonLinearCost.hpp +%%COIN%%include/coin/ClpObjective.hpp +%%COIN%%include/coin/ClpPackedMatrix.hpp +%%COIN%%include/coin/ClpParameters.hpp +%%COIN%%include/coin/ClpPdco.hpp +%%COIN%%include/coin/ClpPdcoBase.hpp +%%COIN%%include/coin/ClpPlusMinusOneMatrix.hpp +%%COIN%%include/coin/ClpPredictorCorrector.hpp +%%COIN%%include/coin/ClpPresolve.hpp +%%COIN%%include/coin/ClpPrimalColumnDantzig.hpp +%%COIN%%include/coin/ClpPrimalColumnPivot.hpp +%%COIN%%include/coin/ClpPrimalColumnSteepest.hpp +%%COIN%%include/coin/ClpPrimalQuadraticDantzig.hpp +%%COIN%%include/coin/ClpQuadraticObjective.hpp +%%COIN%%include/coin/ClpSimplex.hpp +%%COIN%%include/coin/ClpSimplexDual.hpp +%%COIN%%include/coin/ClpSimplexNonlinear.hpp +%%COIN%%include/coin/ClpSimplexOther.hpp +%%COIN%%include/coin/ClpSimplexPrimal.hpp +%%COIN%%include/coin/ClpSolve.hpp +%%COIN%%include/coin/CoinAlloc.hpp +%%COIN%%include/coin/CoinBuild.hpp +%%COIN%%include/coin/CoinDenseFactorization.hpp +%%COIN%%include/coin/CoinDenseVector.hpp +%%COIN%%include/coin/CoinDistance.hpp +%%COIN%%include/coin/CoinError.hpp +%%COIN%%include/coin/CoinFactorization.hpp +%%COIN%%include/coin/CoinFileIO.hpp +%%COIN%%include/coin/CoinFinite.hpp +%%COIN%%include/coin/CoinFloatEqual.hpp +%%COIN%%include/coin/CoinHelperFunctions.hpp +%%COIN%%include/coin/CoinIndexedVector.hpp +%%COIN%%include/coin/CoinLpIO.hpp +%%COIN%%include/coin/CoinMessage.hpp +%%COIN%%include/coin/CoinMessageHandler.hpp +%%COIN%%include/coin/CoinModel.hpp +%%COIN%%include/coin/CoinModelUseful.hpp +%%COIN%%include/coin/CoinMpsIO.hpp +%%COIN%%include/coin/CoinOslC.h +%%COIN%%include/coin/CoinOslFactorization.hpp +%%COIN%%include/coin/CoinPackedMatrix.hpp +%%COIN%%include/coin/CoinPackedVector.hpp +%%COIN%%include/coin/CoinPackedVectorBase.hpp +%%COIN%%include/coin/CoinParam.hpp +%%COIN%%include/coin/CoinPragma.hpp +%%COIN%%include/coin/CoinPresolveDoubleton.hpp +%%COIN%%include/coin/CoinPresolveDual.hpp +%%COIN%%include/coin/CoinPresolveDupcol.hpp +%%COIN%%include/coin/CoinPresolveEmpty.hpp +%%COIN%%include/coin/CoinPresolveFixed.hpp +%%COIN%%include/coin/CoinPresolveForcing.hpp +%%COIN%%include/coin/CoinPresolveImpliedFree.hpp +%%COIN%%include/coin/CoinPresolveIsolated.hpp +%%COIN%%include/coin/CoinPresolveMatrix.hpp +%%COIN%%include/coin/CoinPresolvePsdebug.hpp +%%COIN%%include/coin/CoinPresolveSingleton.hpp +%%COIN%%include/coin/CoinPresolveSubst.hpp +%%COIN%%include/coin/CoinPresolveTighten.hpp +%%COIN%%include/coin/CoinPresolveTripleton.hpp +%%COIN%%include/coin/CoinPresolveUseless.hpp +%%COIN%%include/coin/CoinPresolveZeros.hpp +%%COIN%%include/coin/CoinSearchTree.hpp +%%COIN%%include/coin/CoinShallowPackedVector.hpp +%%COIN%%include/coin/CoinSignal.hpp +%%COIN%%include/coin/CoinSimpFactorization.hpp +%%COIN%%include/coin/CoinSmartPtr.hpp +%%COIN%%include/coin/CoinSnapshot.hpp +%%COIN%%include/coin/CoinSort.hpp +%%COIN%%include/coin/CoinStructuredModel.hpp +%%COIN%%include/coin/CoinTime.hpp +%%COIN%%include/coin/CoinTypes.hpp +%%COIN%%include/coin/CoinUtility.hpp +%%COIN%%include/coin/CoinUtilsConfig.h +%%COIN%%include/coin/CoinWarmStart.hpp +%%COIN%%include/coin/CoinWarmStartBasis.hpp +%%COIN%%include/coin/CoinWarmStartDual.hpp +%%COIN%%include/coin/CoinWarmStartPrimalDual.hpp +%%COIN%%include/coin/CoinWarmStartVector.hpp +%%COIN%%include/coin/Coin_C_defines.h +%%COIN%%include/coin/Idiot.hpp +%%COIN%%include/coin/MyEventHandler.hpp +%%COIN%%include/coin/MyMessageHandler.hpp +%%COIN%%include/coin/OsiAuxInfo.hpp +%%COIN%%include/coin/OsiBranchingObject.hpp +%%COIN%%include/coin/OsiChooseVariable.hpp +%%COIN%%include/coin/OsiClpSolverInterface.hpp +%%COIN%%include/coin/OsiColCut.hpp +%%COIN%%include/coin/OsiCollections.hpp +%%COIN%%include/coin/OsiCpxSolverInterface.hpp +%%COIN%%include/coin/OsiCut.hpp +%%COIN%%include/coin/OsiCuts.hpp +%%COIN%%include/coin/OsiGrbSolverInterface.hpp +%%COIN%%include/coin/OsiPresolve.hpp +%%COIN%%include/coin/OsiRowCut.hpp +%%COIN%%include/coin/OsiRowCutDebugger.hpp +%%COIN%%include/coin/OsiSolverBranch.hpp +%%COIN%%include/coin/OsiSolverInterface.hpp +%%COIN%%include/coin/OsiSolverParameters.hpp +%%COIN%%include/coin/OsiSymSolverInterface.hpp +%%COIN%%include/coin/OsiSymSolverParameters.hpp +%%COIN%%include/coin/SymConfig.h +%%COIN%%include/coin/SymWarmStart.hpp +%%COIN%%include/coin/config.h +%%COIN%%include/coin/config_cgl.h +%%COIN%%include/coin/config_cgl_default.h +%%COIN%%include/coin/config_clp_default.h +%%COIN%%include/coin/config_coinutils_default.h +%%COIN%%include/coin/config_default.h +%%COIN%%include/coin/config_sym_default.h +%%COIN%%include/coin/configall_system.h +%%COIN%%include/coin/configall_system_msc.h +%%COIN%%include/coin/sym_cg.h +%%COIN%%include/coin/sym_cg_params.h +%%COIN%%include/coin/sym_cg_u.h +%%COIN%%include/coin/sym_constants.h +%%COIN%%include/coin/sym_cp.h +%%COIN%%include/coin/sym_cp_params.h +%%COIN%%include/coin/sym_cp_u.h +%%COIN%%include/coin/sym_dg.h +%%COIN%%include/coin/sym_dg_params.h +%%COIN%%include/coin/sym_dg_u.h +%%COIN%%include/coin/sym_lp.h +%%COIN%%include/coin/sym_lp_params.h +%%COIN%%include/coin/sym_lp_solver.h +%%COIN%%include/coin/sym_lp_u.h +%%COIN%%include/coin/sym_macros.h +%%COIN%%include/coin/sym_master.h +%%COIN%%include/coin/sym_master_params.h +%%COIN%%include/coin/sym_master_u.h +%%COIN%%include/coin/sym_messages.h +%%COIN%%include/coin/sym_pack_array.h +%%COIN%%include/coin/sym_pack_cut.h +%%COIN%%include/coin/sym_prep.h +%%COIN%%include/coin/sym_prep_params.h +%%COIN%%include/coin/sym_primal_heuristics.h +%%COIN%%include/coin/sym_proccomm.h +%%COIN%%include/coin/sym_proto.h +%%COIN%%include/coin/sym_qsort.h +%%COIN%%include/coin/sym_return_values.h +%%COIN%%include/coin/sym_timemeas.h +%%COIN%%include/coin/sym_tm.h +%%COIN%%include/coin/sym_tm_params.h +%%COIN%%include/coin/sym_types.h +%%COIN%%include/coin/sym_win32_time.h +%%COIN%%include/coin/symphony.h +%%COIN%%include/coin/symphony_api.h +include/ogdf/abacus/abacusroot.h +include/ogdf/abacus/active.h +include/ogdf/abacus/bheap.h +include/ogdf/abacus/boundbranchrule.h +include/ogdf/abacus/bprioqueue.h +include/ogdf/abacus/branchrule.h +include/ogdf/abacus/column.h +include/ogdf/abacus/colvar.h +include/ogdf/abacus/conbranchrule.h +include/ogdf/abacus/conclass.h +include/ogdf/abacus/constraint.h +include/ogdf/abacus/convar.h +include/ogdf/abacus/csense.h +include/ogdf/abacus/cutbuffer.h +include/ogdf/abacus/fixcand.h +include/ogdf/abacus/fsvarstat.h +include/ogdf/abacus/global.h +include/ogdf/abacus/hash.h +include/ogdf/abacus/history.h +include/ogdf/abacus/infeascon.h +include/ogdf/abacus/lp.h +include/ogdf/abacus/lpmaster.h +include/ogdf/abacus/lpmasterosi.h +include/ogdf/abacus/lpsolution.h +include/ogdf/abacus/lpsub.h +include/ogdf/abacus/lpsubosi.h +include/ogdf/abacus/lpvarstat.h +include/ogdf/abacus/master.h +include/ogdf/abacus/nonduplpool.h +include/ogdf/abacus/numcon.h +include/ogdf/abacus/numvar.h +include/ogdf/abacus/opensub.h +include/ogdf/abacus/optsense.h +include/ogdf/abacus/osiif.h +include/ogdf/abacus/osiinclude.h +include/ogdf/abacus/pool.h +include/ogdf/abacus/poolslot.h +include/ogdf/abacus/poolslotref.h +include/ogdf/abacus/ring.h +include/ogdf/abacus/row.h +include/ogdf/abacus/rowcon.h +include/ogdf/abacus/separator.h +include/ogdf/abacus/setbranchrule.h +include/ogdf/abacus/slackstat.h +include/ogdf/abacus/sparvec.h +include/ogdf/abacus/srowcon.h +include/ogdf/abacus/standardpool.h +include/ogdf/abacus/sub.h +include/ogdf/abacus/tailoff.h +include/ogdf/abacus/valbranchrule.h +include/ogdf/abacus/variable.h +include/ogdf/abacus/vartype.h include/ogdf/augmentation/DfsMakeBiconnected.h include/ogdf/augmentation/PlanarAugmentation.h include/ogdf/augmentation/PlanarAugmentationFix.h include/ogdf/basic/AdjEntryArray.h +include/ogdf/basic/AdjacencyOracle.h include/ogdf/basic/Array.h include/ogdf/basic/Array2D.h include/ogdf/basic/ArrayBuffer.h @@ -28,6 +285,7 @@ include/ogdf/basic/GraphAttributes.h include/ogdf/basic/GraphCopy.h include/ogdf/basic/GraphCopyAttributes.h +include/ogdf/basic/GraphList.h include/ogdf/basic/GraphObserver.h include/ogdf/basic/Graph_d.h include/ogdf/basic/GridLayout.h @@ -40,6 +298,7 @@ include/ogdf/basic/HyperGraph.h include/ogdf/basic/IncNodeInserter.h include/ogdf/basic/Layout.h +include/ogdf/basic/LayoutStandards.h include/ogdf/basic/List.h include/ogdf/basic/Logger.h include/ogdf/basic/Math.h @@ -56,20 +315,19 @@ include/ogdf/basic/SList.h include/ogdf/basic/Skiplist.h include/ogdf/basic/Stack.h -include/ogdf/basic/String.h +include/ogdf/basic/Stopwatch.h +include/ogdf/basic/SubsetEnumerator.h include/ogdf/basic/System.h -include/ogdf/basic/System.h.orig include/ogdf/basic/Thread.h include/ogdf/basic/Timeouter.h include/ogdf/basic/TopologyModule.h -include/ogdf/basic/UMLGraph.h include/ogdf/basic/basic.h -include/ogdf/basic/basic.h.orig include/ogdf/basic/comparer.h include/ogdf/basic/exceptions.h include/ogdf/basic/extended_graph_alg.h include/ogdf/basic/geometry.h include/ogdf/basic/graph_generators.h +include/ogdf/basic/graphics.h include/ogdf/basic/memory.h include/ogdf/basic/precondition.h include/ogdf/basic/simple_graph_alg.h @@ -78,6 +336,7 @@ include/ogdf/cluster/CPlanarSubClusteredGraph.h include/ogdf/cluster/CconnectClusterPlanar.h include/ogdf/cluster/CconnectClusterPlanarEmbed.h +include/ogdf/cluster/ClusterAnalysis.h include/ogdf/cluster/ClusterArray.h include/ogdf/cluster/ClusterGraph.h include/ogdf/cluster/ClusterGraphAttributes.h @@ -102,7 +361,6 @@ include/ogdf/decomposition/StaticPlanarSPQRTree.h include/ogdf/decomposition/StaticSPQRTree.h include/ogdf/decomposition/StaticSkeleton.h -include/ogdf/energybased/CoinTutteLayout.h include/ogdf/energybased/DavidsonHarel.h include/ogdf/energybased/DavidsonHarelLayout.h include/ogdf/energybased/FMMMLayout.h @@ -109,10 +367,12 @@ include/ogdf/energybased/FastMultipoleEmbedder.h include/ogdf/energybased/GEMLayout.h include/ogdf/energybased/MultilevelLayout.h +include/ogdf/energybased/PivotMDS.h include/ogdf/energybased/SpringEmbedderFR.h include/ogdf/energybased/SpringEmbedderFRExact.h include/ogdf/energybased/SpringEmbedderKK.h -include/ogdf/energybased/StressMajorizationSimple.h +include/ogdf/energybased/StressMinimization.h +include/ogdf/energybased/TutteLayout.h include/ogdf/energybased/multilevelmixer/BarycenterPlacer.h include/ogdf/energybased/multilevelmixer/CirclePlacer.h include/ogdf/energybased/multilevelmixer/EdgeCoverMerger.h @@ -135,20 +395,30 @@ include/ogdf/energybased/multilevelmixer/ZeroPlacer.h include/ogdf/external/abacus.h include/ogdf/external/coin.h -include/ogdf/fileformats/DinoLineBuffer.h -include/ogdf/fileformats/DinoTools.h -include/ogdf/fileformats/DinoUmlDiagramGraph.h -include/ogdf/fileformats/DinoUmlModelGraph.h -include/ogdf/fileformats/DinoUmlToGraphConverter.h -include/ogdf/fileformats/DinoXmlParser.h -include/ogdf/fileformats/DinoXmlScanner.h +include/ogdf/fileformats/DLParser.h +include/ogdf/fileformats/DOT.h +include/ogdf/fileformats/DotLexer.h +include/ogdf/fileformats/DotParser.h +include/ogdf/fileformats/GDF.h +include/ogdf/fileformats/GEXF.h +include/ogdf/fileformats/GdfParser.h +include/ogdf/fileformats/GexfParser.h include/ogdf/fileformats/GmlParser.h +include/ogdf/fileformats/GraphIO.h +include/ogdf/fileformats/GraphML.h +include/ogdf/fileformats/GraphMLParser.h +include/ogdf/fileformats/LineBuffer.h include/ogdf/fileformats/Ogml.h include/ogdf/fileformats/OgmlParser.h -include/ogdf/fileformats/SteinLibParser.h -include/ogdf/fileformats/XmlObject.h +include/ogdf/fileformats/Tlp.h +include/ogdf/fileformats/TlpLexer.h +include/ogdf/fileformats/TlpParser.h +include/ogdf/fileformats/UmlDiagramGraph.h +include/ogdf/fileformats/UmlModelGraph.h +include/ogdf/fileformats/UmlToGraphConverter.h +include/ogdf/fileformats/Utils.h include/ogdf/fileformats/XmlParser.h -include/ogdf/fileformats/simple_graph_load.h +include/ogdf/fileformats/XmlScanner.h include/ogdf/graphalg/CliqueFinder.h include/ogdf/graphalg/Clusterer.h include/ogdf/graphalg/ConvexHull.h @@ -157,10 +427,20 @@ include/ogdf/graphalg/MinCostFlowReinelt.h include/ogdf/graphalg/MinimumCut.h include/ogdf/graphalg/PageRank.h +include/ogdf/graphalg/ShortestPathAlgorithms.h include/ogdf/graphalg/ShortestPathWithBFM.h +include/ogdf/graphalg/Voronoi.h +include/ogdf/hypergraph/EdgeStandardRep.h +include/ogdf/hypergraph/Hypergraph.h +include/ogdf/hypergraph/HypergraphArray.h +include/ogdf/hypergraph/HypergraphAttributes.h +include/ogdf/hypergraph/HypergraphLayout.h +include/ogdf/hypergraph/HypergraphLayoutModule.h +include/ogdf/hypergraph/HypergraphObserver.h include/ogdf/internal/augmentation/PALabel.h include/ogdf/internal/basic/MallocMemoryAllocator.h include/ogdf/internal/basic/PoolMemoryAllocator.h +include/ogdf/internal/basic/config.h include/ogdf/internal/basic/intrinsics.h include/ogdf/internal/basic/list_templates.h include/ogdf/internal/cluster/CPlanarSubClusteredST.h @@ -174,7 +454,7 @@ include/ogdf/internal/cluster/MaxCPlanar_MinimalClusterConnection.h include/ogdf/internal/cluster/MaxCPlanar_Sub.h include/ogdf/internal/cluster/basics.h -include/ogdf/internal/energybased/AdjacencyOracle.h +include/ogdf/internal/config_autogen.h include/ogdf/internal/energybased/Attraction.h include/ogdf/internal/energybased/EdgeAttributes.h include/ogdf/internal/energybased/EnergyFunction.h @@ -197,12 +477,15 @@ include/ogdf/internal/orthogonal/RoutingChannel.h include/ogdf/internal/planarity/BoyerMyrvoldInit.h include/ogdf/internal/planarity/BoyerMyrvoldPlanar.h +include/ogdf/internal/planarity/CliqueReplacer.h include/ogdf/internal/planarity/ConnectedSubgraph.h +include/ogdf/internal/planarity/CrossingStructure.h include/ogdf/internal/planarity/EmbedIndicator.h include/ogdf/internal/planarity/EmbedPQTree.h include/ogdf/internal/planarity/EmbedderMaxFaceBiconnectedGraphs.h include/ogdf/internal/planarity/EmbedderMaxFaceBiconnectedGraphsLayers.h include/ogdf/internal/planarity/FindKuratowskis.h +include/ogdf/internal/planarity/FixEdgeInserterCore.h include/ogdf/internal/planarity/IndInfo.h include/ogdf/internal/planarity/MDMFLengthAttribute.h include/ogdf/internal/planarity/MaxSequencePQTree.h @@ -219,14 +502,19 @@ include/ogdf/internal/planarity/PlanarLeafKey.h include/ogdf/internal/planarity/PlanarPQTree.h include/ogdf/internal/planarity/PlanarSubgraphPQTree.h +include/ogdf/internal/planarity/VarEdgeInserterCore.h +include/ogdf/internal/planarity/VarEdgeInserterDynCore.h include/ogdf/internal/planarity/whaInfo.h include/ogdf/internal/steinertree/EdgeWeightedGraph.h -include/ogdf/internal/steinertree/EdgeWeightedGraphCopy.h +include/ogdf/internal/upward/UpwardPlanarityEmbeddedDigraph.h +include/ogdf/internal/upward/UpwardPlanaritySingleSource.h +include/ogdf/internal/version.h include/ogdf/labeling/ELabelInterface.h include/ogdf/labeling/ELabelPosSimple.h -include/ogdf/labeling/EdgeLabel.h include/ogdf/layered/BarycenterHeuristic.h +include/ogdf/layered/BlockOrder.h include/ogdf/layered/CoffmanGrahamRanking.h +include/ogdf/layered/CrossingMinInterfaces.h include/ogdf/layered/CrossingsMatrix.h include/ogdf/layered/DfsAcyclicSubgraph.h include/ogdf/layered/ExtendedNestingGraph.h @@ -235,7 +523,9 @@ include/ogdf/layered/GreedyCycleRemoval.h include/ogdf/layered/GreedyInsertHeuristic.h include/ogdf/layered/GreedySwitchHeuristic.h +include/ogdf/layered/GridSifting.h include/ogdf/layered/Hierarchy.h +include/ogdf/layered/HierarchyLevels.h include/ogdf/layered/Level.h include/ogdf/layered/LongestPathRanking.h include/ogdf/layered/MedianHeuristic.h @@ -247,6 +537,7 @@ include/ogdf/layered/SugiyamaLayout.h include/ogdf/lpsolver/LPSolver.h include/ogdf/misclayout/BalloonLayout.h +include/ogdf/misclayout/BertaultLayout.h include/ogdf/misclayout/CircularLayout.h include/ogdf/misclayout/ProcrustesSubLayout.h include/ogdf/module/AcyclicSubgraphModule.h @@ -262,9 +553,12 @@ include/ogdf/module/GridLayoutModule.h include/ogdf/module/HierarchyClusterLayoutModule.h include/ogdf/module/HierarchyLayoutModule.h +include/ogdf/module/LayerByLayerSweep.h +include/ogdf/module/LayeredCrossMinModule.h include/ogdf/module/LayoutClusterPlanRepModule.h include/ogdf/module/LayoutModule.h include/ogdf/module/LayoutPlanRepModule.h +include/ogdf/module/LayoutPlanRepUMLModule.h include/ogdf/module/MMCrossingMinimizationModule.h include/ogdf/module/MMEdgeInsertionModule.h include/ogdf/module/MinCostFlowModule.h @@ -275,7 +569,8 @@ include/ogdf/module/RankingModule.h include/ogdf/module/ShellingOrderModule.h include/ogdf/module/ShortestPathModule.h -include/ogdf/module/TwoLayerCrossMin.h +include/ogdf/module/UMLCrossingMinimizationModule.h +include/ogdf/module/UMLEdgeInsertionModule.h include/ogdf/module/UMLLayoutModule.h include/ogdf/module/UPRLayoutModule.h include/ogdf/module/UpwardEdgeInserterModule.h @@ -300,6 +595,7 @@ include/ogdf/planarity/EmbedderMinDepthMaxFace.h include/ogdf/planarity/EmbedderMinDepthMaxFaceLayers.h include/ogdf/planarity/EmbedderMinDepthPiTa.h +include/ogdf/planarity/EmbedderOptimalFlexDraw.h include/ogdf/planarity/ExtractKuratowskis.h include/ogdf/planarity/FastPlanarSubgraph.h include/ogdf/planarity/FixedEmbeddingInserter.h @@ -315,14 +611,15 @@ include/ogdf/planarity/PlanRep.h include/ogdf/planarity/PlanRepExpansion.h include/ogdf/planarity/PlanRepInc.h -include/ogdf/planarity/PlanRepUML.h +include/ogdf/planarity/PlanRepLight.h include/ogdf/planarity/PlanarizationGridLayout.h include/ogdf/planarity/PlanarizationLayout.h +include/ogdf/planarity/RemoveReinsertType.h include/ogdf/planarity/SimpleEmbedder.h include/ogdf/planarity/SimpleIncNodeInserter.h include/ogdf/planarity/SubgraphPlanarizer.h include/ogdf/planarity/VariableEmbeddingInserter.h -include/ogdf/planarity/VariableEmbeddingInserter2.h +include/ogdf/planarity/VariableEmbeddingInserterDyn.h include/ogdf/planarlayout/BiconnectedShellingOrder.h include/ogdf/planarlayout/FPPLayout.h include/ogdf/planarlayout/MMCBBase.h @@ -341,8 +638,17 @@ include/ogdf/simultaneous/SimDrawCreatorSimple.h include/ogdf/simultaneous/SimDrawManipulatorModule.h include/ogdf/simultaneous/TwoLayerCrossMinSimDraw.h +include/ogdf/tree/LCA.h include/ogdf/tree/RadialTreeLayout.h include/ogdf/tree/TreeLayout.h +include/ogdf/uml/FixedEmbeddingInserterUML.h +include/ogdf/uml/OrthoLayoutUML.h +include/ogdf/uml/PlanRepUML.h +include/ogdf/uml/PlanarizationLayoutUML.h +include/ogdf/uml/SubgraphPlanarizerUML.h +include/ogdf/uml/UMLGraph.h +include/ogdf/uml/VariableEmbeddingInserterDynUML.h +include/ogdf/uml/VariableEmbeddingInserterUML.h include/ogdf/upward/DominanceLayout.h include/ogdf/upward/ExpansionGraph.h include/ogdf/upward/FUPSSimple.h @@ -353,7 +659,10 @@ include/ogdf/upward/LayerBasedUPRLayout.h include/ogdf/upward/SubgraphUpwardPlanarizer.h include/ogdf/upward/UpwardPlanRep.h -include/ogdf/upward/UpwardPlanarModule.h include/ogdf/upward/UpwardPlanarSubgraphSimple.h +include/ogdf/upward/UpwardPlanarity.h include/ogdf/upward/UpwardPlanarizationLayout.h include/ogdf/upward/VisibilityLayout.h +%%COIN%%lib/libCOIN.so +lib/libOGDF.so +libdata/pkgconfig/ogdf.pc