<!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>[125503] trunk/dports/textproc/colorer</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/125503">125503</a></dd>
<dt>Author</dt> <dd>ryandesign@macports.org</dd>
<dt>Date</dt> <dd>2014-09-18 19:29:16 -0700 (Thu, 18 Sep 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>colorer: allow compiling with clang; use requested C++ library and revbump to rebuild with libc++ on applicable systems; move insertion of -arch flags to patch files; become maintainer</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportstextproccolorerPortfile">trunk/dports/textproc/colorer/Portfile</a></li>
<li><a href="#trunkdportstextproccolorerfilespatchsrclibcolorermakefilegccdiff">trunk/dports/textproc/colorer/files/patch-src-libcolorer-makefile.gcc.diff</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportstextproccolorerfilespatchsrccolorermakefilegccdiff">trunk/dports/textproc/colorer/files/patch-src-colorer-makefile.gcc.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportstextproccolorerPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/textproc/colorer/Portfile (125502 => 125503)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/textproc/colorer/Portfile 2014-09-19 02:22:18 UTC (rev 125502)
+++ trunk/dports/textproc/colorer/Portfile 2014-09-19 02:29:16 UTC (rev 125503)
</span><span class="lines">@@ -5,11 +5,11 @@
</span><span class="cx">
</span><span class="cx"> name colorer
</span><span class="cx"> version take5.be5
</span><del>-revision 1
</del><ins>+revision 2
</ins><span class="cx"> license MPL-1.1 GPL-2 LGPL-2.1
</span><span class="cx"> categories textproc devel
</span><span class="cx"> platforms darwin
</span><del>-maintainers nomaintainer
</del><ins>+maintainers ryandesign openmaintainer
</ins><span class="cx"> description A library that provides source text syntax highlighting services
</span><span class="cx">
</span><span class="cx"> long_description \
</span><span class="lines">@@ -37,34 +37,27 @@
</span><span class="cx"> variant universal {}
</span><span class="cx">
</span><span class="cx"> patchfiles patch-Makefile.in.diff \
</span><ins>+ patch-src-colorer-makefile.gcc.diff \
</ins><span class="cx"> patch-src-libcolorer-makefile.gcc.diff
</span><span class="cx">
</span><span class="cx"> post-patch {
</span><del>- # Use makefile.macos for colorer
- reinplace {/\/colorer/s/gcc/macos/} ${worksrcpath}/Makefile.in
-
</del><span class="cx"> # error: cast from 'int*' to 'int' loses precision
</span><span class="cx"> reinplace s/int(/bool(/ ${worksrcpath}/src/shared/unicode/BitArray.cpp
</span><span class="cx">
</span><span class="cx"> # Do not force installation as root
</span><span class="cx"> reinplace {s/-g 0 -o 0//} ${worksrcpath}/Makefile.in
</span><del>-
- reinplace "/^CPPFLAGS/s:\$: [get_canonical_archflags cc]:" \
- ${worksrcpath}/src/shared/makefile.colorer.gcc
- reinplace -E "/^(LIB)?FLAGS/s:\$: [get_canonical_archflags ld]:" \
- ${worksrcpath}/src/colorer/makefile.macos \
- ${worksrcpath}/src/libcolorer/makefile.gcc
</del><span class="cx"> }
</span><span class="cx">
</span><del>-# error: taking the address of a temporary object of type 'DString'
-compiler.blacklist *clang*
-
</del><span class="cx"> configure.cmd sh src/libcolorer/linux/configure
</span><span class="cx"> configure.args --srcdir=.
</span><span class="cx">
</span><span class="cx"> build.target colorer
</span><span class="cx"> # Yes, this build system uses "CPP" for the C compiler and "LINK" for the C++ compiler.
</span><del>-build.args CPP=${configure.cc} \
</del><ins>+build.args ARCHFLAGS="[get_canonical_archflags]" \
+ CPP=${configure.cc} \
+ CPPFLAGS_CUSTOM="[get_canonical_archflags] -Wno-error=address-of-temporary" \
+ FLAGS= \
+ LIBINC="/usr/lib/${configure.cxx_stdlib}.dylib" \
</ins><span class="cx"> LINK=${configure.cxx} \
</span><span class="cx"> prefix=${prefix}
</span><span class="cx"> use_parallel_build yes
</span></span></pre></div>
<a id="trunkdportstextproccolorerfilespatchsrccolorermakefilegccdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/textproc/colorer/files/patch-src-colorer-makefile.gcc.diff (0 => 125503)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/textproc/colorer/files/patch-src-colorer-makefile.gcc.diff (rev 0)
+++ trunk/dports/textproc/colorer/files/patch-src-colorer-makefile.gcc.diff 2014-09-19 02:29:16 UTC (rev 125503)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+Use -arch flags
+--- src/colorer/makefile.gcc.orig 2006-11-24 17:14:38.000000000 -0600
++++ src/colorer/makefile.gcc 2014-09-18 20:48:15.000000000 -0500
+@@ -8,7 +8,7 @@
+ include ../shared/makefile.colorer.gcc
+
+ LIBINC = -lc -lm -lstdc++
+-LIBFLAGS = $(objs) $(FLAGS) -o $(TARGET) $(LIBINC)
++LIBFLAGS = $(objs) $(FLAGS) -o $(TARGET) $(LIBINC) $(ARCHFLAGS)
+
+ include makefile.core
+
</ins></span></pre></div>
<a id="trunkdportstextproccolorerfilespatchsrclibcolorermakefilegccdiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/textproc/colorer/files/patch-src-libcolorer-makefile.gcc.diff (125502 => 125503)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/textproc/colorer/files/patch-src-libcolorer-makefile.gcc.diff 2014-09-19 02:22:18 UTC (rev 125502)
+++ trunk/dports/textproc/colorer/files/patch-src-libcolorer-makefile.gcc.diff 2014-09-19 02:29:16 UTC (rev 125503)
</span><span class="lines">@@ -1,8 +1,9 @@
</span><span class="cx"> Change library extension to .dylib
</span><span class="cx"> Create library with -dynamiclib
</span><span class="cx"> Use -install_name
</span><ins>+Use -arch flags
</ins><span class="cx"> --- src/libcolorer/makefile.gcc.orig 2006-11-24 17:14:40.000000000 -0600
</span><del>-+++ src/libcolorer/makefile.gcc 2014-09-04 22:14:17.000000000 -0500
</del><ins>++++ src/libcolorer/makefile.gcc 2014-09-18 20:48:15.000000000 -0500
</ins><span class="cx"> @@ -1,5 +1,5 @@
</span><span class="cx">
</span><span class="cx"> -TARGET=libcolorer.so
</span><span class="lines">@@ -15,7 +16,7 @@
</span><span class="cx">
</span><span class="cx"> LIBINC = -lstdc++
</span><span class="cx"> -LIBFLAGS = $(coreobjects) -shared -o $(TARGET) $(LIBINC)
</span><del>-+LIBFLAGS = $(coreobjects) -dynamiclib -install_name $(prefix)/lib/$(TARGET) -o $(TARGET) $(LIBINC)
</del><ins>++LIBFLAGS = $(coreobjects) -dynamiclib -install_name $(prefix)/lib/$(TARGET) -o $(TARGET) $(LIBINC) $(ARCHFLAGS)
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> -libcolorer.so: $(coreobjects)
</span></span></pre>
</div>
</div>
</body>
</html>