<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/e9b61886655093d37a0691342924c20587495a8a">https://github.com/macports/macports-ports/commit/e9b61886655093d37a0691342924c20587495a8a</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit e9b61886655093d37a0691342924c20587495a8a
</span>Author: Marcus Calhoun-Lopez <marcuscalhounlopez@gmail.com>
AuthorDate: Sat Sep 16 14:39:34 2017 -0700
<span style='display:block; white-space:pre;color:#404040;'> triangle: fix universal build
</span>---
science/triangle/Portfile | 21 ++++++++++++++-------
science/triangle/files/patch-makefile.diff | 28 ++++++++++++++++++++++++++++
2 files changed, 42 insertions(+), 7 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 ba0d194..747b62a 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 4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 5
</span> categories science
license Noncommercial Copyleft
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,18 +27,25 @@ use_zip yes
</span>
extract.mkdir yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s/-DLINUX//" ${worksrcpath}/makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|/usr/X11R6|${prefix}|g" ${worksrcpath}/makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|CC = cc|CC = ${configure.cc}|g" ${worksrcpath}/makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|CSWITCHES = -O|CSWITCHES = ${configure.cflags} ${configure.cc_archflags}|" ${worksrcpath}/makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|trilibrary: \$(BIN)triangle.o \$(BIN)tricall|trilibrary: \$(BIN)triangle.o\\\n\\\t${configure.cc} -dynamiclib -install_name ${prefix}/lib/libtriangle.dylib -o libtriangle.dylib triangle.o|" ${worksrcpath}/makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-makefile.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|__MACPORTS_CC__|${configure.cc}|g" ${worksrcpath}/makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|__MACPORTS_PREFIX__|${prefix}|g" ${worksrcpath}/makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[variant_isset universal]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|__MACPORTS_CFLAGS__|${configure.cflags} ${configure.universal_cflags}|g" ${worksrcpath}/makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|__MACPORTS_CFLAGS__|${configure.cflags} ${configure.cc_archflags}|g" ${worksrcpath}/makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|__MACPORTS_LDFLAGS__|${configure.ldflags}|g" ${worksrcpath}/makefile
</span> }
build.target trilibrary triangle
use_configure no
<span style='display:block; white-space:pre;background:#e0ffe0;'>+variant universal {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> destroot {
xinstall -d ${destroot}${prefix}/share/doc/${name}
xinstall -W ${worksrcpath} triangle ${destroot}${prefix}/bin
<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>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..15433ef
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</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;'>@@ -0,0 +1,28 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- makefile.orig 2005-07-27 17:22:01.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ makefile 2017-09-10 00:15:00.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -18,7 +18,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # CC should be set to the name of your favorite C compiler.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-CC = cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++CC = /usr/bin/clang
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # CSWITCHES is a list of all switches passed to the C compiler. I strongly
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # recommend using the best level of optimization. I also strongly
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -73,7 +73,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # CSWITCHES = -O -DNO_TIMER -DLINUX -I/usr/X11R6/include -L/usr/X11R6/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-CSWITCHES = -O -DLINUX -I/usr/X11R6/include -L/usr/X11R6/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++CSWITCHES = -Os -arch x86_64 -arch i386
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # TRILIBDEFS is a list of definitions used to compile an object code version
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # of Triangle (triangle.o) to be called by another program. The file
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -97,6 +97,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ all: $(BIN)triangle $(BIN)showme
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ trilibrary: $(BIN)triangle.o $(BIN)tricall
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $(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;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(BIN)triangle: $(SRC)triangle.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(CC) $(CSWITCHES) -o $(BIN)triangle $(SRC)triangle.c -lm
</span></pre><pre style='margin:0'>
</pre>