<pre style='margin:0'>
Marcus Calhoun-Lopez (MarcusCalhoun-Lopez) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/e10214ff446d96dc665f26bcaeda801b3d1fe131">https://github.com/macports/macports-ports/commit/e10214ff446d96dc665f26bcaeda801b3d1fe131</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit e10214ff446d96dc665f26bcaeda801b3d1fe131
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Thu Mar 19 10:15:26 2020 -0700
<span style='display:block; white-space:pre;color:#404040;'> scotch: whitespace changes
</span>---
science/scotch/Portfile | 124 ++++++++++++++++++++++++------------------------
1 file changed, 61 insertions(+), 63 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 7dee16c..cd76c97 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;'>@@ -1,95 +1,93 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup mpi 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup muniversal 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup mpi 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup muniversal 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 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+name scotch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 6.0.9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set v_regexp {(\d+\.\d+\.\d+)([a-zA-Z]?)}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set v_regexp {(\d+\.\d+\.\d+)([a-zA-Z]?)}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-categories science
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers {mcalhoun @MarcusCalhoun-Lopez} openmaintainer
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-license CeCILL-C
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+categories science
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers {mcalhoun @MarcusCalhoun-Lopez} openmaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+platforms darwin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+license CeCILL-C
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-description Scotch is a software package for graph and mesh/hypergraph \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- partitioning and sparse matrix ordering.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-long_description ${description}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+description Scotch is a software package for graph and mesh/hypergraph \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ partitioning and sparse matrix ordering.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+long_description ${description}
</span>
<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;'>+homepage http://gforge.inria.fr/projects/scotch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites https://gforge.inria.fr/frs/download.php/latestfile/298
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+distname scotch_${version}
</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-($v_regexp)"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.type regex
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.url https://gforge.inria.fr/frs/?group_id=248
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.regex "scotch-($v_regexp)"
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-use_bzip2 no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+use_bzip2 no
</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:#e0ffe0;'>+configure.dir ${worksrcpath}/src
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.dir ${configure.dir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot.dir ${configure.dir}
</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:#e0ffe0;'>+checksums rmd160 ee66679b59dfd5d8b5e4533b96680645267c224b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 622b4143cf01c480bb15708b3651b29c25e4aeb00c8c6447ff196aca2eca5c93 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 6246692
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-compilers.choose cc cxx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-mpi.setup require
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compilers.choose cc cxx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+mpi.setup require
</span>
<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:#e0ffe0;'>+patchfiles patch-libscotch-shared.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-libscotchmetis-shared.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-esmumps-shared.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-Makefile-shared.diff
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.env-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CCS=${configure.cc} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CCP=\$(CC) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CCD=\$(CC) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- prefix=\$(DESTDIR)${prefix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.env-append CCS=${configure.cc} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CCP=\$(CC) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CCD=\$(CC) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ prefix=\$(DESTDIR)${prefix}
</span>
# default values
# see ${worksrcpath}/src/Make.inc/Makefile.inc.i686_mac_darwin10
<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 \
</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 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -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;'>+configure.optflags -O3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.cflags-append -Drestrict=__restrict \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DCOMMON_FILE_COMPRESS_GZ \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DCOMMON_PTHREAD \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DCOMMON_PTHREAD_BARRIER \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DCOMMON_RANDOM_FIXED_SEED \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DCOMMON_TIMING_OLD \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DSCOTCH_PTHREAD \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DSCOTCH_RENAME
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.ldflags-append -lz \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -lm \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -lpthread
</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.cflags-delete -DSCOTCH_PTHREAD
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.cflags-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -fPIC \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DCOMMON_FILE_COMPRESS_BZ2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.cflags-append -fPIC \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DCOMMON_FILE_COMPRESS_BZ2
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.cflags-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- \$(CPPFLAGS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.cflags-append \$(CPPFLAGS)
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.ldflags-append -lbz2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.ldflags-append -lbz2
</span>
pre-configure {
copy ${configure.dir}/Make.inc/Makefile.inc.i686_mac_darwin8 ${configure.dir}/Makefile.inc
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.cmd printenv
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.cmd printenv
</span> configure.pre_args
configure.universal_args
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.post_args {>> Makefile.inc}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.post_args {>> Makefile.inc}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-build.target scotch ptscotch esmumps ptesmumps
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.target scotch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ptscotch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ esmumps \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ptesmumps
</span>
if {[variant_isset universal]} {
merger-post-destroot {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -107,4 +105,4 @@ if {[variant_isset universal]} {
</span> }
# scotch and ptscotch MUST be built sequentially according to scotch's INSTALL.txt
<span style='display:block; white-space:pre;background:#ffe0e0;'>-use_parallel_build no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+use_parallel_build no
</span></pre><pre style='margin:0'>
</pre>