<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[146481] trunk/dports/aqua/fltk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/146481">146481</a></dd>
<dt>Author</dt> <dd>michaelld@macports.org</dd>
<dt>Date</dt> <dd>2016-03-09 05:40:53 -0800 (Wed, 09 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>fltk-devel: update to 1.3.x-<a href="https://trac.macports.org/changeset/11279">r11279</a>, splitting patch for fluid/Makefile into release and devel versions.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsaquafltkPortfile">trunk/dports/aqua/fltk/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsaquafltkfilespatchfluidMakefiledeveldiff">trunk/dports/aqua/fltk/files/patch-fluid-Makefile.devel.diff</a></li>
<li><a href="#trunkdportsaquafltkfilespatchfluidMakefilereleasediff">trunk/dports/aqua/fltk/files/patch-fluid-Makefile.release.diff</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportsaquafltkfilespatchfluidMakefilediff">trunk/dports/aqua/fltk/files/patch-fluid-Makefile.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsaquafltkPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/aqua/fltk/Portfile (146480 => 146481)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/aqua/fltk/Portfile 2016-03-09 13:39:03 UTC (rev 146480)
+++ trunk/dports/aqua/fltk/Portfile 2016-03-09 13:40:53 UTC (rev 146481)
</span><span class="lines">@@ -53,9 +53,9 @@
</span><span class="cx">
</span><span class="cx"> conflicts fltk
</span><span class="cx">
</span><del>- version 1.3.x-r11217
- checksums rmd160 7d5793afa30bb400c249b75e8ca770e62153119d \
- sha256 4663a4d535eadb06b78af1e7fa01a2921d9f18af9c4909167fd4e21ae8bade9d
</del><ins>+ version 1.3.x-r11279
+ checksums rmd160 3884ca24908439cb1d47f9b10f56d450f09256f5 \
+ sha256 e7e9e344a37f6005130be394b610c460910285cac6f001815791a299978f8d94
</ins><span class="cx">
</span><span class="cx"> master_sites http://fltk.org/pub/fltk/snapshots/
</span><span class="cx"> distname fltk-${version}
</span><span class="lines">@@ -69,12 +69,11 @@
</span><span class="cx"> port:libpng \
</span><span class="cx"> port:zlib
</span><span class="cx">
</span><del>-patchfiles patch-fluid-Makefile.diff
-
</del><span class="cx"> if {${subport} eq "fltk"} {
</span><span class="cx"> patchfiles-append \
</span><span class="cx"> patch-src-Makefile.release.diff \
</span><del>- patch-fix_LP64.release.diff
</del><ins>+ patch-fix_LP64.release.diff \
+ patch-fluid-Makefile.release.diff
</ins><span class="cx">
</span><span class="cx"> # the following patches are already integrated into the devel version
</span><span class="cx"> patchfiles-append \
</span><span class="lines">@@ -84,7 +83,8 @@
</span><span class="cx"> } else {
</span><span class="cx"> patchfiles-append \
</span><span class="cx"> patch-src-Makefile.devel.diff \
</span><del>- patch-fix_LP64.devel.diff
</del><ins>+ patch-fix_LP64.devel.diff \
+ patch-fluid-Makefile.devel.diff
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> post-patch {
</span></span></pre></div>
<a id="trunkdportsaquafltkfilespatchfluidMakefiledeveldiff"></a>
<div class="addfile"><h4>Added: trunk/dports/aqua/fltk/files/patch-fluid-Makefile.devel.diff (0 => 146481)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/aqua/fltk/files/patch-fluid-Makefile.devel.diff (rev 0)
+++ trunk/dports/aqua/fltk/files/patch-fluid-Makefile.devel.diff 2016-03-09 13:40:53 UTC (rev 146481)
</span><span class="lines">@@ -0,0 +1,18 @@
</span><ins>+--- fluid/Makefile.orig 2016-02-27 10:51:09.000000000 -0500
++++ fluid/Makefile 2016-03-08 12:04:16.000000000 -0500
+@@ -48,13 +48,13 @@
+ 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)
+ $(OSX_ONLY) $(INSTALL_BIN) fluid fluid.app/Contents/MacOS
+
+ fluid-shared$(EXEEXT): $(OBJECTS) ../src/$(DSONAME) ../src/$(FLDSONAME) \
+ ../src/$(IMGDSONAME)
+ echo Linking $@...
+- $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ $(OBJECTS) $(LINKSHARED) $(LDLIBS)
++ $(CXX) $(ARCHFLAGS) $(CXXFLAGS) -o $@ $(OBJECTS) $(LINKSHARED) $(LDLIBS) $(LDFLAGS)
+
+ clean:
+ -$(RM) *.o core.* *~ *.bck *.bak
</ins></span></pre></div>
<a id="trunkdportsaquafltkfilespatchfluidMakefilediff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/aqua/fltk/files/patch-fluid-Makefile.diff (146480 => 146481)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/aqua/fltk/files/patch-fluid-Makefile.diff 2016-03-09 13:39:03 UTC (rev 146480)
+++ trunk/dports/aqua/fltk/files/patch-fluid-Makefile.diff 2016-03-09 13:40:53 UTC (rev 146481)
</span><span class="lines">@@ -1,18 +0,0 @@
</span><del>---- fluid/Makefile.orig 2013-11-29 14:01:44.000000000 -0500
-+++ fluid/Makefile 2013-11-29 14:02:38.000000000 -0500
-@@ -48,13 +48,13 @@
- 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)
- $(OSX_ONLY) $(INSTALL_BIN) fluid fluid.app/Contents/MacOS
-
- fluid-shared$(EXEEXT): $(OBJECTS) ../src/$(DSONAME) ../src/$(FLDSONAME) \
- ../src/$(IMGDSONAME)
- echo Linking $@...
-- $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ $(OBJECTS) $(LINKSHARED) $(LDLIBS)
-+ $(CXX) $(ARCHFLAGS) $(CXXFLAGS) -o $@ $(OBJECTS) $(LINKSHARED) $(LDLIBS) $(LDFLAGS)
-
- clean:
- -$(RM) *.o core.* *~ *.bck *.bck
</del></span></pre></div>
<a id="trunkdportsaquafltkfilespatchfluidMakefilereleasedifffromrev146480trunkdportsaquafltkfilespatchfluidMakefilediff"></a>
<div class="copfile"><h4>Copied: trunk/dports/aqua/fltk/files/patch-fluid-Makefile.release.diff (from rev 146480, trunk/dports/aqua/fltk/files/patch-fluid-Makefile.diff) (0 => 146481)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/aqua/fltk/files/patch-fluid-Makefile.release.diff (rev 0)
+++ trunk/dports/aqua/fltk/files/patch-fluid-Makefile.release.diff 2016-03-09 13:40:53 UTC (rev 146481)
</span><span class="lines">@@ -0,0 +1,18 @@
</span><ins>+--- fluid/Makefile.orig 2013-11-29 14:01:44.000000000 -0500
++++ fluid/Makefile 2013-11-29 14:02:38.000000000 -0500
+@@ -48,13 +48,13 @@
+ 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)
+ $(OSX_ONLY) $(INSTALL_BIN) fluid fluid.app/Contents/MacOS
+
+ fluid-shared$(EXEEXT): $(OBJECTS) ../src/$(DSONAME) ../src/$(FLDSONAME) \
+ ../src/$(IMGDSONAME)
+ echo Linking $@...
+- $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ $(OBJECTS) $(LINKSHARED) $(LDLIBS)
++ $(CXX) $(ARCHFLAGS) $(CXXFLAGS) -o $@ $(OBJECTS) $(LINKSHARED) $(LDLIBS) $(LDFLAGS)
+
+ clean:
+ -$(RM) *.o core.* *~ *.bck *.bck
</ins></span></pre>
</div>
</div>
</body>
</html>