<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-base.

</pre>
<p><a href="https://github.com/macports/macports-base/commit/df7026dc5363a8834a5640ddde666c532f42dea7">https://github.com/macports/macports-base/commit/df7026dc5363a8834a5640ddde666c532f42dea7</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit df7026dc5363a8834a5640ddde666c532f42dea7
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Sat Aug 24 12:53:28 2019 +1000

<span style='display:block; white-space:pre;color:#404040;'>    use @OS_PLATFORM@ in makefiles
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    ... rather than various more complicated ways of finding the same
</span><span style='display:block; white-space:pre;color:#404040;'>    information.
</span>---
 doc/Makefile.in                   | 2 +-
 src/darwintracelib1.0/Makefile.in | 2 +-
 src/machista1.0/Makefile.in       | 2 +-
 src/macports1.0/Makefile.in       | 2 +-
 src/pextlib1.0/Makefile.in        | 2 +-
 src/port/Makefile.in              | 2 +-
 src/registry2.0/Makefile.in       | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/doc/Makefile.in b/doc/Makefile.in
</span><span style='display:block; white-space:pre;color:#808080;'>index 3df4bb1..ffd6de1 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/doc/Makefile.in
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/doc/Makefile.in
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -189,7 +189,7 @@ install: all
</span> 
        < prefix.mtree $(MTREE) -U -e -p "${DESTDIR}${INSTALLDIR}" > /dev/null
        < base.mtree $(MTREE) -U -e -p "${DESTDIR}${INSTALLDIR}" > /dev/null
<span style='display:block; white-space:pre;background:#ffe0e0;'>-ifneq (,$(findstring darwin,@build_os@))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ifeq (darwin,@OS_PLATFORM@)
</span> ifneq (8,@OS_MAJOR@)
 # Tiger's chmod doesn't accept -h
 # mtree with umask 0077 doesn't get the permissions of the symlink right
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/darwintracelib1.0/Makefile.in b/src/darwintracelib1.0/Makefile.in
</span><span style='display:block; white-space:pre;color:#808080;'>index bcac492..28deaf8 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/darwintracelib1.0/Makefile.in
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/darwintracelib1.0/Makefile.in
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -41,7 +41,7 @@ INSTALLDIR = $(TCL_PACKAGE_PATH)/darwintrace1.0
</span> CFLAGS_PEDANTIC =
 CFLAGS += -fPIC $(UNIVERSAL_ARCHFLAGS)
 SHLIB_LDFLAGS += $(UNIVERSAL_ARCHFLAGS)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-ifeq ($(shell uname),Darwin)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ifeq (darwin,@OS_PLATFORM@)
</span> SHLIB_LDFLAGS += -install_name $(INSTALLDIR)/$(SHLIB_NAME)
 endif
 
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/machista1.0/Makefile.in b/src/machista1.0/Makefile.in
</span><span style='display:block; white-space:pre;color:#808080;'>index f2cbca2..6b5874c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/machista1.0/Makefile.in
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/machista1.0/Makefile.in
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,7 +20,7 @@ TESTS = ./tests/libmachista-test
</span> include $(srcdir)/../../Mk/macports.tea.mk
 
 CFLAGS+= -fPIC
<span style='display:block; white-space:pre;background:#ffe0e0;'>-ifeq ($(shell uname),Darwin)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ifeq (darwin,@OS_PLATFORM@)
</span> SHLIB_LDFLAGS+= -install_name ${INSTALLDIR}/${SHLIB_NAME}
 endif
 
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/macports1.0/Makefile.in b/src/macports1.0/Makefile.in
</span><span style='display:block; white-space:pre;color:#808080;'>index 23aba45..c851221 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/macports1.0/Makefile.in
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/macports1.0/Makefile.in
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19,7 +19,7 @@ endif
</span> 
 pkgIndex.tcl: $(SRCS)
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-ifeq ($(shell uname),Darwin)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ifeq (darwin,@OS_PLATFORM@)
</span> SHLIB_LDFLAGS+= -install_name ${INSTALLDIR}/${SHLIB_NAME}
 endif
 
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/pextlib1.0/Makefile.in b/src/pextlib1.0/Makefile.in
</span><span style='display:block; white-space:pre;color:#808080;'>index 5b41d4b..26ea251 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/pextlib1.0/Makefile.in
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/pextlib1.0/Makefile.in
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -53,7 +53,7 @@ tracelib.o: ../darwintracelib1.0/sandbox_actions.h
</span> 
 CFLAGS+= ${CURL_CFLAGS} ${MD5_CFLAGS} ${READLINE_CFLAGS}
 LIBS+= ${CURL_LIBS} ${MD5_LIBS} ${READLINE_LIBS}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-ifeq ($(shell uname),Darwin)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ifeq (darwin,@OS_PLATFORM@)
</span> LIBS+= ../registry2.0/registry${SHLIB_SUFFIX}
 SHLIB_LDFLAGS+= -install_name ${INSTALLDIR}/${SHLIB_NAME}
 ${SHLIB_NAME}: ../registry2.0/registry${SHLIB_SUFFIX}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/port/Makefile.in b/src/port/Makefile.in
</span><span style='display:block; white-space:pre;color:#808080;'>index a70a06e..0005779 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/port/Makefile.in
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/port/Makefile.in
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -40,7 +40,7 @@ install: all mkdirs
</span>   $(INSTALL)    -o "${DSTUSR}" -g "${DSTGRP}" -m 555 port portindex portmirror "${DESTDIR}${INSTALLDIR}/bin/"
        $(LN_S) -f port "${DESTDIR}${INSTALLDIR}/bin/portf"
        $(LN_S) -f "${TCLSH}" "${DESTDIR}${INSTALLDIR}/bin/port-tclsh"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-ifneq (,$(findstring darwin,@build_os@))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ifeq (darwin,@OS_PLATFORM@)
</span> ifneq (8,@OS_MAJOR@)
        chmod -h 555 "${DESTDIR}${INSTALLDIR}/bin/portf" "${DESTDIR}${INSTALLDIR}/bin/port-tclsh"
 endif
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/registry2.0/Makefile.in b/src/registry2.0/Makefile.in
</span><span style='display:block; white-space:pre;color:#808080;'>index 461cdcb..defcb96 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/registry2.0/Makefile.in
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/registry2.0/Makefile.in
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,7 +22,7 @@ pkgIndex.tcl: $(SRCS) $(SRCS_AUTOCONF)
</span> 
 CFLAGS+=       ${SQLITE3_CFLAGS}
 LIBS+= ${SQLITE3_LIBS} ../cregistry/cregistry.a
<span style='display:block; white-space:pre;background:#ffe0e0;'>-ifeq ($(shell uname),Darwin)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ifeq (darwin,@OS_PLATFORM@)
</span> SHLIB_LDFLAGS+= -install_name @loader_path/../registry2.0/${SHLIB_NAME}
 endif
 
</pre><pre style='margin:0'>

</pre>