<pre style='margin:0'>
Michael Dickens (michaelld) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/c5a5e442efc619e4cf5285c090bd3b5a3276d007">https://github.com/macports/macports-ports/commit/c5a5e442efc619e4cf5285c090bd3b5a3276d007</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 c5a5e44 fltk-devel: update to c92f9923 (20190212)
</span>c5a5e44 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit c5a5e442efc619e4cf5285c090bd3b5a3276d007
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Tue Feb 12 14:36:18 2019 -0500
<span style='display:block; white-space:pre;color:#404040;'> fltk-devel: update to c92f9923 (20190212)
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Split `fluid/Makefile` patch into devel and release versions.
</span>---
aqua/fltk/Portfile | 19 +++++++++++--------
...-Makefile.diff => patch-fluid-Makefile.devel.diff} | 6 ++++--
...akefile.diff => patch-fluid-Makefile.release.diff} | 2 +-
3 files changed, 16 insertions(+), 11 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/fltk/Portfile b/aqua/fltk/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 0be4bbb..4002e15 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/fltk/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/fltk/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -50,6 +50,9 @@ if {${subport} eq ${name}} {
</span> size 5281263
revision 0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-fluid-Makefile.release.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> livecheck.type regexm
livecheck.url ${homepage}
livecheck.regex "Stable Release.*?\n.*?VERSION=(\\d+(\\.\\d+)*)'"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -63,13 +66,16 @@ if {${subport} eq ${name}} {
</span>
conflicts fltk
<span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup fltk fltk 2ce406ab428bcaa960f368ab19a0911047b1a98a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version 20190201
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 2c8180407c66e37e168405ed5479760dab722dee \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 055a9a60d6802eff1a39712423acd2089513c14f1aa91bed389dc1a00b2944d9 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 5937342
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup fltk fltk c92f992380704942825e6dcf4363ea45585ac6cd
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 20190212
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 3723517ade818d78e0386b30cd5d19494e7b402d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 48c8793e54cb0e0a8ed328899cb2739842a6012a40cdcb2b816bd2ce13b96161 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 5943700
</span> revision 0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-fluid-Makefile.devel.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> }
depends_build port:autoconf
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -77,9 +83,6 @@ depends_lib port:jpeg \
</span> port:libpng \
port:zlib
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-fluid-Makefile.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> if {${subport} eq "fltk"} {
# see https://github.com/fltk/fltk/commit/f76d2a2bf8c35c0c313f05bbd6deda49dd344efc
if {[vercmp ${xcodeversion} 10.0] >= 0} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/fltk/files/patch-fluid-Makefile.diff b/aqua/fltk/files/patch-fluid-Makefile.devel.diff
</span>similarity index 84%
copy from aqua/fltk/files/patch-fluid-Makefile.diff
copy to aqua/fltk/files/patch-fluid-Makefile.devel.diff
<span style='display:block; white-space:pre;color:#808080;'>index 48c496f..15b1696 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/fltk/files/patch-fluid-Makefile.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/fltk/files/patch-fluid-Makefile.devel.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,13 +1,15 @@
</span> --- fluid/Makefile.orig
+++ fluid/Makefile
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -57,13 +57,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -57,7 +57,7 @@
</span> fluid$(EXEEXT): $(OBJECTS) $(LIBNAME) $(FLLIBNAME) \
$(IMGLIBNAME)
echo Linking $@...
- $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ $(OBJECTS) $(LINKFLTKFORMS) $(LINKFLTKIMG) $(LDLIBS)
+ $(CXX) $(ARCHFLAGS) $(CXXFLAGS) -o $@ $(OBJECTS) $(LINKFLTKFORMS) $(LINKFLTKIMG) $(LDLIBS) $(LDFLAGS)
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(OSX_ONLY) $(RM) -r -f fluid.app/Contents/MacOS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(OSX_ONLY) mkdir fluid.app/Contents/MacOS
</span> $(OSX_ONLY) $(INSTALL_BIN) fluid fluid.app/Contents/MacOS
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -65,7 +65,7 @@
</span> fluid-shared$(EXEEXT): $(OBJECTS) ../src/$(DSONAME) ../src/$(FLDSONAME) \
../src/$(IMGDSONAME)
echo Linking $@...
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/fltk/files/patch-fluid-Makefile.diff b/aqua/fltk/files/patch-fluid-Makefile.release.diff
</span>similarity index 97%
rename from aqua/fltk/files/patch-fluid-Makefile.diff
rename to aqua/fltk/files/patch-fluid-Makefile.release.diff
<span style='display:block; white-space:pre;color:#808080;'>index 48c496f..49be223 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/fltk/files/patch-fluid-Makefile.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/fltk/files/patch-fluid-Makefile.release.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span> --- fluid/Makefile.orig
+++ fluid/Makefile
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -57,13 +57,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -50,13 +50,13 @@
</span> fluid$(EXEEXT): $(OBJECTS) $(LIBNAME) $(FLLIBNAME) \
$(IMGLIBNAME)
echo Linking $@...
</pre><pre style='margin:0'>
</pre>