<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/12a6e8924f8e97877c672de9323f5d8ada70d854">https://github.com/macports/macports-ports/commit/12a6e8924f8e97877c672de9323f5d8ada70d854</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 12a6e8924f8 theseus: use makefile PG
</span>12a6e8924f8 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 12a6e8924f8e97877c672de9323f5d8ada70d854
</span>Author: Renee Otten <reneeotten@macports.org>
AuthorDate: Sun Jun 21 14:25:54 2020 -0400
<span style='display:block; white-space:pre;color:#404040;'> theseus: use makefile PG
</span>---
science/theseus/Portfile | 9 ++-------
science/theseus/files/patch-make.inc.diff | 29 +++++++++++++++--------------
2 files changed, 17 insertions(+), 21 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/theseus/Portfile b/science/theseus/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 13a2abfbeea..8579819840a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/theseus/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/theseus/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,10 +1,11 @@
</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
PortSystem 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup makefile 1.0
</span>
name theseus
version 3.3.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span>
categories science
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -58,12 +59,6 @@ post-patch {
</span> reinplace "s|error.h|Error.h|g" ${worksrcpath}/NWfill.c
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-use_configure no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.env CC=${configure.cc} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CFLAGS=${configure.cflags} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LDFLAGS=${configure.ldflags}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> post-destroot {
xinstall -m 0755 -W ${worksrcpath} theseus theseus_align ${destroot}${prefix}/bin
xinstall -m 0644 -W ${worksrcpath} theseus.1 ${destroot}${prefix}/share/man/man1
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/theseus/files/patch-make.inc.diff b/science/theseus/files/patch-make.inc.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 950deee05ca..79b28e7ce16 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/theseus/files/patch-make.inc.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/theseus/files/patch-make.inc.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- make.inc.orig 2020-03-07 09:49:19.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ make.inc 2020-03-07 09:50:50.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,116 +1,18 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- make.inc.orig 2020-06-21 15:08:26.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ make.inc 2020-06-21 15:08:59.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,116 +1,13 @@
</span> -#
-# The archiver and the flag(s) to use when building archive (library)
-# If you system has no ranlib, set RANLIB = echo.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,12 +31,12 @@
</span> -# CFLAGS := $(filter-out -O2,$(CFLAGS))
-# CC = gcc
-
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+RANLIB = @@PREFIX@@/bin/ranlib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++RANLIB = @@PREFIX@@/bin/ranlib
</span>
-#Mac OSX
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+# macOS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span> -LOCALLIBDIR = /usr/local/lib
<span style='display:block; white-space:pre;background:#e0ffe0;'>++# macOS
</span> +LOCALLIBDIR = @@PREFIX@@/lib
LIBS = -lgsl -lgslcblas -ldistfit -lmsa -ldssplite -ldltmath -lDLTutils -ltheseus
SYSLIBS = -lpthread -lgsl -lgslcblas -lm -lc
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -44,15 +44,12 @@
</span> -INSTALLDIR = /usr/local/bin
-#OPT = -O0 -ggdb
-OPT = -ggdb -O3 -ffast-math -fstrict-aliasing -funroll-loops -fomit-frame-pointer -mtune=native
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+INSTALLDIR = $(DESTDIR)@@PREFIX@@/bin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+OPT = -O3 -ffast-math -fstrict-aliasing -funroll-loops -fomit-frame-pointer
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- WARN = -Wall -pedantic -std=c99
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-WARN = -Wall -pedantic -std=c99
</span> -CFLAGS += $(WARN)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+CFLAGS += $(WARN)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # CPPFLAGS are ignored by the rest of the build system but necessary for hardening flags
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CFLAGS += $(CPPFLAGS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Filter out -O2 which overwrites the default -O3 because OPT is used before CFLAGS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CFLAGS := $(filter-out -O2,$(CFLAGS))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# CPPFLAGS are ignored by the rest of the build system but necessary for hardening flags
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-CFLAGS += $(CPPFLAGS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# Filter out -O2 which overwrites the default -O3 because OPT is used before CFLAGS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-CFLAGS := $(filter-out -O2,$(CFLAGS))
</span> -CC = /usr/bin/gcc
-#CC = /usr/local/bin/gcc
-
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -124,3 +121,7 @@
</span> -# CFLAGS = $(WARN) -DNDEBUG
-# CC = /usr/local/cross-tools/i386-mingw32msvc/bin/cc
-
<span style='display:block; white-space:pre;background:#e0ffe0;'>++INSTALLDIR = $(DESTDIR)@@PREFIX@@/bin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++OPT = -ffast-math -fstrict-aliasing -funroll-loops -fomit-frame-pointer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++WARN = -Wall -pedantic
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++CFLAGS += -std=c99 $(WARN)
</span></pre><pre style='margin:0'>
</pre>