<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/41d38a6d4f8dfa88081300bc16d6baca654d27cd">https://github.com/macports/macports-ports/commit/41d38a6d4f8dfa88081300bc16d6baca654d27cd</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 41d38a6d4f8dfa88081300bc16d6baca654d27cd
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Thu Mar 19 10:17:34 2020 -0700
<span style='display:block; white-space:pre;color:#404040;'> scotch: tweak patch files to apply cleanly
</span>---
science/scotch/files/patch-Makefile-shared.diff | 2 +-
science/scotch/files/patch-libscotch-shared.diff | 4 ++--
science/scotch/files/patch-libscotchmetis-shared.diff | 6 +++---
3 files changed, 6 insertions(+), 6 deletions(-)
<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><span style='display:block; white-space:pre;color:#808080;'>index 9229d47..0d90dcf 100644
</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;'>+++ b/science/scotch/files/patch-Makefile-shared.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span> --- src/Makefile.orig 2018-07-14 08:24:49.000000000 -0700
+++ src/Makefile 2018-07-27 19:36:21.000000000 -0700
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -120,6 +120,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -123,6 +123,8 @@
</span> -$(CP) -f ../bin/d[agm]*$(EXE) $(bindir)
-$(CP) -f ../include/*esmumps*.h $(includedir)
-$(CP) -f ../include/*scotch*.h $(includedir)
<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><span style='display:block; white-space:pre;color:#808080;'>index 64b3142..d6a13af 100644
</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;'>+++ b/science/scotch/files/patch-libscotch-shared.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span> --- src/libscotch/Makefile.orig 2014-01-12 21:15:13.000000000 -0600
+++ src/libscotch/Makefile 2014-01-12 21:16:04.000000000 -0600
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -100,9 +100,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -112,9 +112,11 @@
</span>
$(libdir)/libscotch$(LIB) : libscotch$(LIB)
-$(CP) libscotch$(LIB) libscotcherr*$(LIB) $(libdir)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -12,7 +12,7 @@
</span>
##
## Library dependencies.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3064,26 +3066,32 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3092,26 +3094,32 @@
</span> library_pt_f.h
./ptdummysizes$(EXE) "-s$(SCOTCH_NAME_SUFFIX)" library_pt_f.h ptscotchf.h
<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><span style='display:block; white-space:pre;color:#808080;'>index 1d6b70c..c10d7f4 100644
</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;'>+++ b/science/scotch/files/patch-libscotchmetis-shared.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span> --- src/libscotchmetis/Makefile.orig 2014-01-12 20:59:29.000000000 -0600
+++ src/libscotchmetis/Makefile 2014-01-12 21:07:57.000000000 -0600
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -65,6 +65,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -68,6 +68,7 @@
</span> install : scotch
-$(CP) metis.h $(includedir)
-$(CP) libscotchmetis$(LIB) $(libdir)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8,7 +8,7 @@
</span>
ptinstall : ptscotch
-$(CP) parmetis.h $(includedir)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -141,6 +142,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -144,6 +145,7 @@
</span> parmetis_dgraph_part_f$(OBJ)
$(AR) $(ARFLAGS) $(@) $(^)
-$(RANLIB) $(@)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -16,7 +16,7 @@
</span>
libscotchmetis$(LIB) : metis_graph_order$(OBJ) \
metis_graph_order_f$(OBJ) \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -148,3 +150,4 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -151,3 +153,4 @@
</span> metis_graph_part_f$(OBJ)
$(AR) $(ARFLAGS) $(@) $(^)
-$(RANLIB) $(@)
</pre><pre style='margin:0'>
</pre>