<!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>[114158] trunk/dports/aqua/fltk-devel</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/114158">114158</a></dd>
<dt>Author</dt> <dd>michaelld@macports.org</dd>
<dt>Date</dt> <dd>2013-11-30 07:59:00 -0800 (Sat, 30 Nov 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>fltk-devel: update to 1.3.x-<a href="https://trac.macports.org/changeset/10020">r10020</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsaquafltkdevelPortfile">trunk/dports/aqua/fltk-devel/Portfile</a></li>
<li><a href="#trunkdportsaquafltkdevelfilespatchfluidMakefilediff">trunk/dports/aqua/fltk-devel/files/patch-fluid-Makefile.diff</a></li>
<li><a href="#trunkdportsaquafltkdevelfilespatchsrcMakefilediff">trunk/dports/aqua/fltk-devel/files/patch-src-Makefile.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsaquafltkdevelPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/aqua/fltk-devel/Portfile (114157 => 114158)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/aqua/fltk-devel/Portfile 2013-11-30 15:58:58 UTC (rev 114157)
+++ trunk/dports/aqua/fltk-devel/Portfile 2013-11-30 15:59:00 UTC (rev 114158)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx">
</span><span class="cx"> name fltk-devel
</span><span class="cx"> conflicts fltk
</span><del>-version 1.3.x-r9965
</del><ins>+version 1.3.x-r10020
</ins><span class="cx"> categories aqua devel
</span><span class="cx"> license LGPL
</span><span class="cx"> platforms macosx
</span><span class="lines">@@ -30,8 +30,8 @@
</span><span class="cx"> distname fltk-${version}
</span><span class="cx"> use_bzip2 yes
</span><span class="cx">
</span><del>-checksums rmd160 ac32fbec144147aff32d43f14840dfcb2eef950d \
- sha256 6ddd756316d6071640d75fb31b47a3420c0c4a0d041b3c44e76cb34f84096890
</del><ins>+checksums rmd160 0fec8d95997ebfd0e77677e16f1bc1b19db11864 \
+ sha256 8f9ed6b125c71a87f44847b06b4e8e7b829d337c9f445bee443c1ebcc6345d31
</ins><span class="cx">
</span><span class="cx"> depends_lib port:jpeg \
</span><span class="cx"> port:libpng \
</span><span class="lines">@@ -49,16 +49,28 @@
</span><span class="cx">
</span><span class="cx"> # Disable silent rules
</span><span class="cx"> reinplace "/^\\.SILENT:$/d" ${worksrcpath}/makeinclude.in
</span><ins>+
+ # tell fltk's make script to create config.sub, which is required
+ # before configure will execute properly. This command actually
+ # runs configure through once, to create the file; we then call
+ # configure manually with the correct argument, which overwrites
+ # this (and other) files to be what we want.
+
+ system "cd ${worksrcpath} && make config.sub"
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-variant universal {}
</del><ins>+pre-configure {
+ configure.args-append \
+ --with-archflags="[get_canonical_archflags]"
+}
</ins><span class="cx">
</span><span class="cx"> configure.args --enable-shared \
</span><span class="cx"> --disable-localjpeg \
</span><span class="cx"> --disable-localzlib \
</span><del>- --disable-localpng \
- --with-archflags="[get_canonical_archflags]"
</del><ins>+ --disable-localpng
</ins><span class="cx">
</span><ins>+configure.universal_args-delete --disable-dependency-tracking
+
</ins><span class="cx"> post-configure {
</span><span class="cx"> reinplace -E {s|-arch [a-z0-9_]+||g} ${worksrcpath}/fltk-config
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkdportsaquafltkdevelfilespatchfluidMakefilediff"></a>
<div class="modfile"><h4>Modified: trunk/dports/aqua/fltk-devel/files/patch-fluid-Makefile.diff (114157 => 114158)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/aqua/fltk-devel/files/patch-fluid-Makefile.diff 2013-11-30 15:58:58 UTC (rev 114157)
+++ trunk/dports/aqua/fltk-devel/files/patch-fluid-Makefile.diff 2013-11-30 15:59:00 UTC (rev 114158)
</span><span class="lines">@@ -1,11 +1,18 @@
</span><del>---- fluid/Makefile.orig 2012-09-09 10:28:39.000000000 -0500
-+++ fluid/Makefile 2012-09-09 10:30:39.000000000 -0500
-@@ -54,7 +54,7 @@
</del><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
+
</ins><span class="cx"> fluid-shared$(EXEEXT): $(OBJECTS) ../src/$(DSONAME) ../src/$(FLDSONAME) \
</span><span class="cx"> ../src/$(IMGDSONAME)
</span><span class="cx"> echo Linking $@...
</span><del>-- $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ $(OBJECTS) $(LINKSHARED) $(LDLIBS)
-+ $(CXX) $(ARCHFLAGS) -o $@ $(OBJECTS) $(LINKSHARED) $(LDLIBS) $(LDFLAGS)
</del><ins>+- $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ $(OBJECTS) $(LINKSHARED) $(LDLIBS)
++ $(CXX) $(ARCHFLAGS) $(CXXFLAGS) -o $@ $(OBJECTS) $(LINKSHARED) $(LDLIBS) $(LDFLAGS)
</ins><span class="cx">
</span><span class="cx"> clean:
</span><span class="cx"> -$(RM) *.o core.* *~ *.bck *.bck
</span></span></pre></div>
<a id="trunkdportsaquafltkdevelfilespatchsrcMakefilediff"></a>
<div class="modfile"><h4>Modified: trunk/dports/aqua/fltk-devel/files/patch-src-Makefile.diff (114157 => 114158)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/aqua/fltk-devel/files/patch-src-Makefile.diff 2013-11-30 15:58:58 UTC (rev 114157)
+++ trunk/dports/aqua/fltk-devel/files/patch-src-Makefile.diff 2013-11-30 15:59:00 UTC (rev 114158)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><del>---- src/Makefile.orig 2013-04-16 10:02:42.000000000 -0400
-+++ src/Makefile 2013-07-02 14:19:06.000000000 -0400
</del><ins>+--- src/Makefile.orig 2013-11-29 14:05:10.000000000 -0500
++++ src/Makefile 2013-11-29 14:05:50.000000000 -0500
</ins><span class="cx"> @@ -355,7 +355,7 @@
</span><span class="cx"> -install_name $(libdir)/$@ \
</span><span class="cx"> -current_version 1.3.2 \
</span></span></pre>
</div>
</div>
</body>
</html>