<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/63f9d6e568e5b2a9ab7dd14d776ed7c64b5be329">https://github.com/macports/macports-ports/commit/63f9d6e568e5b2a9ab7dd14d776ed7c64b5be329</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 63f9d6e568e5b2a9ab7dd14d776ed7c64b5be329
</span>Author: Marcus Calhoun-Lopez <marcuscalhounlopez@gmail.com>
AuthorDate: Sat Sep 16 17:37:14 2017 -0700
<span style='display:block; white-space:pre;color:#404040;'> triangle: fix patchfile
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See https://lists.macports.org/pipermail/macports-dev/2017-September/036433.html
</span>---
science/triangle/Portfile | 11 ++++-------
science/triangle/files/patch-makefile.diff | 9 +++++----
2 files changed, 9 insertions(+), 11 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/triangle/Portfile b/science/triangle/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 28da038..c7b05f0 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/triangle/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/triangle/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,7 +3,7 @@ PortSystem 1.0
</span>
name triangle
version 1.6
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 6
</span> categories science
license Noncommercial Copyleft
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -32,12 +32,9 @@ patchfiles-append patch-makefile.diff
</span> post-patch {
reinplace "s|__MACPORTS_CC__|${configure.cc}|g" ${worksrcpath}/makefile
reinplace "s|__MACPORTS_PREFIX__|${prefix}|g" ${worksrcpath}/makefile
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[variant_isset universal]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|__MACPORTS_CFLAGS__|${configure.cflags} ${configure.universal_cflags}|g" ${worksrcpath}/makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|__MACPORTS_CFLAGS__|${configure.cflags} ${configure.cc_archflags}|g" ${worksrcpath}/makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|__MACPORTS_LDFLAGS__|${configure.ldflags}|g" ${worksrcpath}/makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|__MACPORTS_CPPFLAGS__|${configure.cppflags}|g" ${worksrcpath}/makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|__MACPORTS_CFLAGS__|${configure.cflags} [get_canonical_archflags cc]|g" ${worksrcpath}/makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|__MACPORTS_LDFLAGS__|${configure.ldflags} [get_canonical_archflags ld]|g" ${worksrcpath}/makefile
</span> }
build.target trilibrary triangle
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/triangle/files/patch-makefile.diff b/science/triangle/files/patch-makefile.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 15433ef..5d5178d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/triangle/files/patch-makefile.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/triangle/files/patch-makefile.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +1,11 @@
</span> --- makefile.orig 2005-07-27 17:22:01.000000000 -0700
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ makefile 2017-09-10 00:15:00.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ makefile 2017-09-16 17:11:24.000000000 -0700
</span> @@ -18,7 +18,7 @@
# CC should be set to the name of your favorite C compiler.
-CC = cc
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+CC = /usr/bin/clang
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++CC = __MACPORTS_CC__
</span>
# CSWITCHES is a list of all switches passed to the C compiler. I strongly
# recommend using the best level of optimization. I also strongly
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -14,7 +14,7 @@
</span> # CSWITCHES = -O -DNO_TIMER -DLINUX -I/usr/X11R6/include -L/usr/X11R6/lib
-CSWITCHES = -O -DLINUX -I/usr/X11R6/include -L/usr/X11R6/lib
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+CSWITCHES = -Os -arch x86_64 -arch i386
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++CSWITCHES = __MACPORTS_CPPFLAGS__ __MACPORTS_CFLAGS__ __MACPORTS_LDFLAGS__
</span>
# TRILIBDEFS is a list of definitions used to compile an object code version
# of Triangle (triangle.o) to be called by another program. The file
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,7 +22,8 @@
</span> all: $(BIN)triangle $(BIN)showme
trilibrary: $(BIN)triangle.o $(BIN)tricall
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(CC) -dynamiclib -L/opt/local/lib -Wl,-headerpad_max_install_names -install_name /opt/local/lib/libtriangle.dylib -o libtriangle.dylib triangle.o
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $(CC) -dynamiclib -install_name __MACPORTS_PREFIX__/lib/libtriangle.dylib $(CSWITCHES) -o libtriangle.dylib $(BIN)triangle.o
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span>
$(BIN)triangle: $(SRC)triangle.c
$(CC) $(CSWITCHES) -o $(BIN)triangle $(SRC)triangle.c -lm
</pre><pre style='margin:0'>
</pre>