<pre style='margin:0'>
Perry E. Metzger (pmetzger) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/f59d6a4fac8b0dd1a8338c97c3bc0488acfcf832">https://github.com/macports/macports-ports/commit/f59d6a4fac8b0dd1a8338c97c3bc0488acfcf832</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit f59d6a4fac8b0dd1a8338c97c3bc0488acfcf832
</span>Author: Kirill A. Korinsky <kirill@korins.ky>
AuthorDate: Mon Nov 14 17:42:27 2022 +0100
<span style='display:block; white-space:pre;color:#404040;'> scotch: update to 7.0.1
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> I've also switched to gitlab as source of distfiles, and rework portfile
</span><span style='display:block; white-space:pre;color:#404040;'> from scratch to simplified it by cmake-based build.
</span>---
science/scotch/Portfile | 90 +++++-----------------
science/scotch/files/cmake-shared-library.diff | 58 ++++++++++++++
science/scotch/files/patch-Makefile-shared.diff | 11 ---
science/scotch/files/patch-esmumps-shared.diff | 23 ------
science/scotch/files/patch-libscotch-shared.diff | 49 ------------
.../scotch/files/patch-libscotchmetis-shared.diff | 23 ------
6 files changed, 76 insertions(+), 178 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/scotch/Portfile b/science/scotch/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 009b4ab3bb5..0a9b4c32fd2 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/scotch/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/scotch/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,14 +3,14 @@
</span> PortSystem 1.0
PortGroup mpi 1.0
PortGroup muniversal 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup makefile 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup cmake 1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup gitlab 1.0
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-name scotch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 6.0.9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+gitlab.setup scotch scotch 7.0.1 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+gitlab.instance https://gitlab.inria.fr
</span>
categories science
<span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers {mcalhoun @MarcusCalhoun-Lopez} openmaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers {mcalhoun @MarcusCalhoun-Lopez} {@catap korins.ky:kirill} openmaintainer
</span> platforms darwin
license CeCILL-C
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,26 +18,13 @@ description a software package for graph and mesh/hypergraph \
</span> partitioning and sparse matrix ordering
long_description Scotch is ${description}.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://gforge.inria.fr/projects/scotch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites https://gforge.inria.fr/frs/download.php/latestfile/298
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-distname scotch_${version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 85379220f8ab06a57c1f8737732e05fd178f340c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 2f9620bb9bb4376e12b36098d93b48cc77e7486e77b778c8047aba191977af28 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 6403898
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.dir ${worksrcpath}/src
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.dir ${configure.dir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.dir ${configure.dir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 ee66679b59dfd5d8b5e4533b96680645267c224b \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 622b4143cf01c480bb15708b3651b29c25e4aeb00c8c6447ff196aca2eca5c93 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 6246692
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-compilers.choose cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compilers.choose cc fc
</span> mpi.setup require
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-libscotch-shared.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-libscotchmetis-shared.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-esmumps-shared.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-Makefile-shared.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> depends_build-append port:bison \
port:flex
depends_skip_archcheck-append \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -48,57 +35,16 @@ depends_lib-append port:bzip2 \
</span> port:xz \
port:zlib
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# scotch and ptscotch MUST be built sequentially according to scotch's INSTALL.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-use_parallel_build no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-makefile.override CFLAGS \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LDFLAGS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-makefile.prefix_name prefix
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-makefile.has_destdir no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# set serial compiler
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.args-append CCS=${configure.cc}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-pre-build {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # set parallel compiler
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.args-append CCP=${configure.cc} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CCD=${configure.cc}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# default values
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# see ${worksrcpath}/src/Make.inc/Makefile.inc.i686_mac_darwin10
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.optflags -O3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.cflags-append -fPIC \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -Drestrict=__restrict \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DCOMMON_FILE_COMPRESS_GZ \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DCOMMON_PTHREAD \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DCOMMON_PTHREAD_BARRIER \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DCOMMON_RANDOM_FIXED_SEED \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DCOMMON_TIMING_OLD \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DSCOTCH_PTHREAD \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DSCOTCH_RENAME
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.ldflags-append -lz \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -lm \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -lpthread
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append cmake-shared-library.diff
</span>
# MPI implementation is not threadsafe, do not use DSCOTCH_PTHREAD
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.cflags-delete -DSCOTCH_PTHREAD
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append -DMPI_THREAD_MULTIPLE=OFF
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# allow more type of compression
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.cflags-append -DCOMMON_FILE_COMPRESS_BZ2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DCOMMON_FILE_COMPRESS_LZMA
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.ldflags-append -lbz2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -llzma
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# libScotchMeTiS header stubs conflicts with original MeTiS headers
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append -DINSTALL_METIS_HEADERS=OFF
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-post-extract {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- copy ${configure.dir}/Make.inc/Makefile.inc.i686_mac_darwin8 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${configure.dir}/Makefile.inc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.target scotch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ptscotch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- esmumps \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ptesmumps
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Build a shared library, not static!
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append -DBUILD_SHARED_LIBS=ON
</span>
if {[variant_isset universal]} {
merger-post-destroot {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -115,6 +61,6 @@ if {[variant_isset universal]} {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.type regex
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.url https://gforge.inria.fr/frs/?group_id=248
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.regex {scotch-(\d+\.\d+\.\d+[a-zA-Z]?)}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ move ${destroot}${prefix}/man ${destroot}${prefix}/share/man
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/scotch/files/cmake-shared-library.diff b/science/scotch/files/cmake-shared-library.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..8591b209851
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/scotch/files/cmake-shared-library.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,58 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git src/libscotch/CMakeLists.txt src/libscotch/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index d1ca5b7..a267b8f 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/libscotch/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/libscotch/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -550,7 +550,7 @@ if(CMAKE_BUILD_TYPE STREQUAL Debug)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target_compile_definitions(scotch PRIVATE SCOTCH_DEBUG_LIBRARY1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-add_library(scotcherr library_error.c)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++add_library(scotcherr STATIC library_error.c)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target_include_directories(scotcherr PUBLIC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $<BUILD_INTERFACE:${GENERATED_INCLUDE_DIR}>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -558,7 +558,11 @@ target_include_directories(scotcherr PUBLIC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_dependencies(scotcherr scotch_h)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-add_library(scotcherrexit library_error_exit.c)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if (BUILD_SHARED_LIBS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ target_link_libraries(scotch PRIVATE scotcherr)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++add_library(scotcherrexit STATIC library_error_exit.c)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target_include_directories(scotcherrexit PUBLIC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $<BUILD_INTERFACE:${GENERATED_INCLUDE_DIR}>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -769,6 +773,10 @@ if(BUILD_PTSCOTCH)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_dependencies(ptscotcherr ptscotch_h scotch_h)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (BUILD_SHARED_LIBS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ target_link_libraries(ptscotch PRIVATE ptscotcherr)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_library(ptscotcherrexit library_error_exit.c)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target_include_directories(ptscotcherrexit PUBLIC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -790,6 +798,8 @@ if(BUILD_PTSCOTCH)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif(BUILD_PTSCOTCH)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach(_target ${TARGETS_LIST})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set_target_properties(${_target} PROPERTIES POSITION_INDEPENDENT_CODE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ${BUILD_SHARED_LIBS})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ install(EXPORT ${_target}Targets
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FILE ${_target}Targets.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ NAMESPACE SCOTCH::
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git src/libscotchmetis/CMakeLists.txt src/libscotchmetis/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 80cc2ac..1736e31 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/libscotchmetis/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/libscotchmetis/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -163,6 +163,7 @@ if(BUILD_PTSCOTCH)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $<INSTALL_INTERFACE:include>)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target_link_libraries(ptscotchparmetisv${version} PRIVATE scotch)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ target_link_libraries(ptscotchparmetisv${version} PRIVATE ptscotch)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target_link_libraries(ptscotchparmetisv${version} PUBLIC MPI::MPI_C)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_dependencies(ptscotchparmetisv${version} ptscotch_h)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/scotch/files/patch-Makefile-shared.diff b/science/scotch/files/patch-Makefile-shared.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0d90dcfe342..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/scotch/files/patch-Makefile-shared.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/Makefile.orig 2018-07-14 08:24:49.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/Makefile 2018-07-27 19:36:21.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -123,6 +123,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -$(CP) -f ../bin/d[agm]*$(EXE) $(bindir)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -$(CP) -f ../include/*esmumps*.h $(includedir)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -$(CP) -f ../include/*scotch*.h $(includedir)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ -$(CP) -f ../lib/*scotch*.dylib $(libdir)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ -$(CP) -f ../lib/*esmumps*.dylib $(libdir)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -$(CP) -f ../lib/*esmumps*$(LIB) $(libdir)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -$(CP) -f ../lib/*scotch*$(LIB) $(libdir)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -$(CP) -Rf ../man/* $(mandir)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/scotch/files/patch-esmumps-shared.diff b/science/scotch/files/patch-esmumps-shared.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index ee5ee74e209..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/scotch/files/patch-esmumps-shared.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,23 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/esmumps/Makefile.orig 2015-04-27 05:14:15.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/esmumps/Makefile 2018-06-29 11:18:44.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -62,10 +62,12 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- install : scotch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -$(CP) esmumps.h $(includedir)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -$(CP) libesmumps$(LIB) $(libdir)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ -$(CP) libesmumps.dylib $(libdir)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ptinstall : scotch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -$(CP) esmumps.h $(includedir)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -$(CP) libesmumps$(LIB) $(libdir)/libptesmumps$(LIB)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ -$(CP) libesmumps.dylib $(libdir)/libptesmumps.dylib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- clean :
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -$(RM) *~ common.h *$(OBJ) lib*$(LIB) main_esmumps$(EXE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -150,6 +152,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- esmumps_strats$(OBJ)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(AR) $(ARFLAGS) $(@) $(?)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -$(RANLIB) $(@)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(CC) $(^) $(LDFLAGS) ../libscotch/libscotch.dylib ../libscotch/libscotcherr.dylib -dynamiclib -install_name $(prefix)/lib/libesmumps.dylib -o libesmumps.dylib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- main_esmumps$(EXE) : main_esmumps.c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- common.h \
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/scotch/files/patch-libscotch-shared.diff b/science/scotch/files/patch-libscotch-shared.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index d6a13afcb08..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/scotch/files/patch-libscotch-shared.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,49 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/libscotch/Makefile.orig 2014-01-12 21:15:13.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/libscotch/Makefile 2014-01-12 21:16:04.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -112,9 +112,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(libdir)/libscotch$(LIB) : libscotch$(LIB)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -$(CP) libscotch$(LIB) libscotcherr*$(LIB) $(libdir)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ -$(CP) libscotch.dylib libscotcherr*.dylib $(libdir)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(libdir)/libptscotch$(LIB) : libptscotch$(LIB)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -$(CP) libptscotch$(LIB) libptscotcherr*$(LIB) $(libdir)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ -$(CP) libptscotch.dylib libptscotcherr*.dylib $(libdir)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ##
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ## Library dependencies.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3092,26 +3094,32 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- library_pt_f.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ./ptdummysizes$(EXE) "-s$(SCOTCH_NAME_SUFFIX)" library_pt_f.h ptscotchf.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--libscotch$(LIB) : $(LIBSCOTCHDEPS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+libscotch$(LIB) : $(LIBSCOTCHDEPS) libscotcherr$(LIB)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(AR) $(ARFLAGS) $(@) $(?)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -$(RANLIB) $(@)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(CC) $(?) libscotcherr.dylib $(LDFLAGS) -dynamiclib -install_name $(prefix)/lib/libscotch.dylib -o libscotch.dylib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- libscotcherr$(LIB) : library_error$(OBJ)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(AR) $(ARFLAGS) $(@) $(?)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -$(RANLIB) $(@)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(CC) $(?) $(LDFLAGS) -dynamiclib -install_name $(prefix)/lib/libscotcherr.dylib -o libscotcherr.dylib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- libscotcherrexit$(LIB) : library_error_exit$(OBJ)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(AR) $(ARFLAGS) $(@) $(?)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -$(RANLIB) $(@)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(CC) $(?) $(LDFLAGS) -dynamiclib -install_name $(prefix)/lib/libscotcherrexit.dylib -o libscotcherrexit.dylib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--libptscotch$(LIB) : $(LIBPTSCOTCHDEPS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+libptscotch$(LIB) : $(LIBPTSCOTCHDEPS) libscotch$(LIB)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(AR) $(ARFLAGS) $(@) $(?)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -$(RANLIB) $(@)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(CC) $(?) libscotch.dylib libscotcherr.dylib $(LDFLAGS) -dynamiclib -install_name $(prefix)/lib/libptscotch.dylib -o libptscotch.dylib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- libptscotcherr$(LIB) : library_error_pt$(OBJ)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(AR) $(ARFLAGS) $(@) $(?)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -$(RANLIB) $(@)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(CC) $(?) $(LDFLAGS) -dynamiclib -install_name $(prefix)/lib/libptscotcherr.dylib -o libptscotcherr.dylib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- libptscotcherrexit$(LIB) : library_error_exit_pt$(OBJ)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(AR) $(ARFLAGS) $(@) $(?)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -$(RANLIB) $(@)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(CC) $(?) $(LDFLAGS) -dynamiclib -install_name $(prefix)/lib/libptscotcherrexit.dylib -o libptscotcherrexit.dylib
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/scotch/files/patch-libscotchmetis-shared.diff b/science/scotch/files/patch-libscotchmetis-shared.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index c10d7f45cff..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/scotch/files/patch-libscotchmetis-shared.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,23 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/libscotchmetis/Makefile.orig 2014-01-12 20:59:29.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/libscotchmetis/Makefile 2014-01-12 21:07:57.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -68,6 +68,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- install : scotch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -$(CP) metis.h $(includedir)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -$(CP) libscotchmetis$(LIB) $(libdir)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ -$(CP) libscotchmetis.dylib $(libdir)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ptinstall : ptscotch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -$(CP) parmetis.h $(includedir)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -144,6 +145,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- parmetis_dgraph_part_f$(OBJ)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(AR) $(ARFLAGS) $(@) $(^)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -$(RANLIB) $(@)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(CC) $(^) ../libscotch/libptscotch.dylib ../libscotch/libscotch.dylib ../libscotch/libscotcherr.dylib $(LDFLAGS) -dynamiclib -install_name $(prefix)/lib/libptscotchparmetis.dylib -o libptscotchparmetis.dylib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- libscotchmetis$(LIB) : metis_graph_order$(OBJ) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- metis_graph_order_f$(OBJ) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -151,3 +153,4 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- metis_graph_part_f$(OBJ)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(AR) $(ARFLAGS) $(@) $(^)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -$(RANLIB) $(@)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(CC) $(^) ../libscotch/libscotch.dylib ../libscotch/libscotcherr.dylib $(LDFLAGS) -dynamiclib -install_name $(prefix)/lib/libscotchmetis.dylib -o libscotchmetis.dylib
</span></pre><pre style='margin:0'>
</pre>