<!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>[127818] 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/127818">127818</a></dd>
<dt>Author</dt> <dd>michaelld@macports.org</dd>
<dt>Date</dt> <dd>2014-11-04 08:26:03 -0800 (Tue, 04 Nov 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>fltk:
+ merge release and devel into a single Portfile;
+ update release to 1.3.3;
+ update devel to <a href="https://trac.macports.org/changeset/10425">r10425</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsaquafltkPortfile">trunk/dports/aqua/fltk/Portfile</a></li>
<li><a href="#trunkdportsaquafltkfilespatchfluidMakefilediff">trunk/dports/aqua/fltk/files/patch-fluid-Makefile.diff</a></li>
<li><a href="#trunkdportsaquafltkfilespatchsrcMakefilediff">trunk/dports/aqua/fltk/files/patch-src-Makefile.diff</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsaquafltkfilespatchsrcFl_JPEG_Imagecxxdiff">trunk/dports/aqua/fltk/files/patch-src-Fl_JPEG_Image.cxx.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 (127817 => 127818)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/aqua/fltk/Portfile 2014-11-04 15:53:44 UTC (rev 127817)
+++ trunk/dports/aqua/fltk/Portfile 2014-11-04 16:26:03 UTC (rev 127818)
</span><span class="lines">@@ -4,14 +4,11 @@
</span><span class="cx"> PortSystem 1.0
</span><span class="cx">
</span><span class="cx"> name fltk
</span><del>-conflicts fltk-devel
-version 1.3.2
-revision 2
</del><span class="cx"> categories aqua devel
</span><span class="cx"> license LGPL
</span><span class="cx"> platforms macosx
</span><del>-maintainers nomaintainer
-description Fast Light Tool Kit
</del><ins>+maintainers michaelld openmaintainer
+description Fast Light Tool Kit Version 1.3
</ins><span class="cx">
</span><span class="cx"> long_description \
</span><span class="cx"> FLTK (pronounced fulltick) \
</span><span class="lines">@@ -20,53 +17,96 @@
</span><span class="cx"> FLTK provides modern GUI functionality without the bloat \
</span><span class="cx"> and supports 3D graphics via OpenGL and \
</span><span class="cx"> its built-in GLUT emulation. \
</span><del>- \
</del><span class="cx"> FLTK is designed to be small and modular enough to be \
</span><span class="cx"> statically linked, but works fine as a shared library. \
</span><span class="cx"> FLTK also includes an excellent UI builder called FLUID \
</span><span class="cx"> that can be used to create applications in minutes.
</span><span class="cx">
</span><span class="cx"> homepage http://www.fltk.org/
</span><del>-master_sites http://fltk.org/pub/fltk/${version}/
-worksrcdir ${name}-${version}
-distname ${worksrcdir}-source
</del><span class="cx">
</span><del>-checksums rmd160 5d697cb582cb80a1eca50c35696731eea5591768 \
- sha256 176044df94f31bd53a5806cf5054ca78b180bf9ae27ce47649608833695ee4a4
</del><ins>+livecheck.type regexm
+livecheck.url ${homepage}
</ins><span class="cx">
</span><ins>+subport fltk-devel {}
+
+if {${subport} eq ${name}} {
+
+ conflicts fltk-devel
+
+ version 1.3.3
+ master_sites http://fltk.org/pub/fltk/${version}/
+ worksrcdir ${name}-${version}
+ distname ${worksrcdir}-source
+
+ checksums rmd160 a1736ec7da1ff751153e09bc5b5136d2fa95c18b \
+ sha256 f8398d98d7221d40e77bc7b19e761adaf2f1ef8bb0c30eceb7beb4f2273d0d97
+
+ livecheck.regex "Stable Release.*?\n.*?VERSION=(\\d+(\\.\\d+)*)'"
+
+} else {
+
+ long_description ${long_description} \
+ This port provides snapshot released of FLTK, updated weekly to monthly.
+
+ conflicts fltk
+
+ version 1.3.x-r10425
+ checksums rmd160 688af6369fa558d6423da416ca6a26deb967af70 \
+ sha256 34618e1e58edb1c3d5b41da5cac95e8de90a344618aad8848999bd00ff9b5406
+
+ master_sites http://fltk.org/pub/fltk/snapshots/
+ distname fltk-${version}
+ use_bzip2 yes
+
+ livecheck.regex "Snapshots:.*\n.*v(1\\.3\\.x-r\\d+)"
+
+}
+
</ins><span class="cx"> depends_lib port:jpeg \
</span><span class="cx"> port:libpng \
</span><span class="cx"> port:zlib
</span><span class="cx">
</span><del>-use_parallel_build yes
-
</del><span class="cx"> patchfiles patch-fluid-Makefile.diff \
</span><del>- patch-src-Makefile.diff
</del><ins>+ patch-src-Makefile.diff \
+ patch-src-Fl_JPEG_Image.cxx.diff
</ins><span class="cx">
</span><span class="cx"> post-patch {
</span><del>- reinplace "s|/Applications|${applications_dir}/${name}|g" \
</del><ins>+
+ reinplace "s|/Applications|${applications_dir}/fltk|g" \
</ins><span class="cx"> ${worksrcpath}/fluid/Makefile \
</span><span class="cx"> ${worksrcpath}/test/Makefile
</span><del>-
</del><ins>+
</ins><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 arguments, which overwrites
+ # this (and other) files to be what we want. Make sure CC is set
+ # correctly per "using the right compiler". While this port will
+ # work correctly without this addition, doing this allows the port
+ # to not error out on dev's systems set up to check whether the
+ # right compiler is being used.
+
+ system -W ${worksrcpath} "CC=${configure.cc} 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 class="cx">
</span><del>-destroot.target install \
- install-desktop
-
-livecheck.type regexm
-livecheck.url ${homepage}
-livecheck.regex "Stable Release.*?\n.*?VERSION=(\\d+(\\.\\d+)*)'"
</del><ins>+destroot.target install install-desktop
</ins></span></pre></div>
<a id="trunkdportsaquafltkfilespatchfluidMakefilediff"></a>
<div class="modfile"><h4>Modified: trunk/dports/aqua/fltk/files/patch-fluid-Makefile.diff (127817 => 127818)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/aqua/fltk/files/patch-fluid-Makefile.diff 2014-11-04 15:53:44 UTC (rev 127817)
+++ trunk/dports/aqua/fltk/files/patch-fluid-Makefile.diff 2014-11-04 16:26:03 UTC (rev 127818)
</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="trunkdportsaquafltkfilespatchsrcFl_JPEG_Imagecxxdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/aqua/fltk/files/patch-src-Fl_JPEG_Image.cxx.diff (0 => 127818)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/aqua/fltk/files/patch-src-Fl_JPEG_Image.cxx.diff (rev 0)
+++ trunk/dports/aqua/fltk/files/patch-src-Fl_JPEG_Image.cxx.diff 2014-11-04 16:26:03 UTC (rev 127818)
</span><span class="lines">@@ -0,0 +1,20 @@
</span><ins>+--- src/Fl_JPEG_Image.cxx.orig 2014-03-03 11:38:51.000000000 -0500
++++ src/Fl_JPEG_Image.cxx 2014-03-03 11:39:21.000000000 -0500
+@@ -155,7 +155,7 @@
+
+ jpeg_create_decompress(&dinfo);
+ jpeg_stdio_src(&dinfo, fp);
+- jpeg_read_header(&dinfo, 1);
++ jpeg_read_header(&dinfo, TRUE);
+
+ dinfo.quantize_colors = (boolean)FALSE;
+ dinfo.out_color_space = JCS_RGB;
+@@ -337,7 +337,7 @@
+
+ jpeg_create_decompress(&dinfo);
+ jpeg_mem_src(&dinfo, data);
+- jpeg_read_header(&dinfo, 1);
++ jpeg_read_header(&dinfo, TRUE);
+
+ dinfo.quantize_colors = (boolean)FALSE;
+ dinfo.out_color_space = JCS_RGB;
</ins></span></pre></div>
<a id="trunkdportsaquafltkfilespatchsrcMakefilediff"></a>
<div class="modfile"><h4>Modified: trunk/dports/aqua/fltk/files/patch-src-Makefile.diff (127817 => 127818)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/aqua/fltk/files/patch-src-Makefile.diff 2014-11-04 15:53:44 UTC (rev 127817)
+++ trunk/dports/aqua/fltk/files/patch-src-Makefile.diff 2014-11-04 16:26:03 UTC (rev 127818)
</span><span class="lines">@@ -1,8 +1,8 @@
</span><del>---- src/Makefile.orig 2011-07-18 23:49:30.000000000 -0500
-+++ src/Makefile 2012-09-09 11:35:36.000000000 -0500
-@@ -355,7 +355,7 @@
</del><ins>+--- src/Makefile.orig 2014-10-30 12:05:22.000000000 -0400
++++ src/Makefile 2014-11-04 09:24:43.000000000 -0500
+@@ -360,7 +360,7 @@
</ins><span class="cx"> -install_name $(libdir)/$@ \
</span><del>- -current_version 1.3.0 \
</del><ins>+ -current_version 1.3.3 \
</ins><span class="cx"> -compatibility_version 1.3.0 \
</span><span class="cx"> - $(IMGOBJECTS) -L. $(LDLIBS) $(IMAGELIBS) -lfltk
</span><span class="cx"> + $(IMGOBJECTS) -L. $(LDLIBS) $(IMAGELIBS) -lfltk $(LDFLAGS)
</span></span></pre>
</div>
</div>
</body>
</html>