<!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>[125101] 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/125101">125101</a></dd>
<dt>Author</dt> <dd>ryandesign@macports.org</dd>
<dt>Date</dt> <dd>2014-09-05 01:08:03 -0700 (Fri, 05 Sep 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>colorer: move some reinplaces to patchfiles</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportstextproccolorerPortfile">trunk/dports/textproc/colorer/Portfile</a></li>
<li><a href="#trunkdportstextproccolorerfilespatchMakefileindiff">trunk/dports/textproc/colorer/files/patch-Makefile.in.diff</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportstextproccolorerfilespatchsrclibcolorermakefilegccdiff">trunk/dports/textproc/colorer/files/patch-src-libcolorer-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 (125100 => 125101)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/textproc/colorer/Portfile 2014-09-05 06:08:19 UTC (rev 125100)
+++ trunk/dports/textproc/colorer/Portfile 2014-09-05 08:08:03 UTC (rev 125101)
</span><span class="lines">@@ -36,7 +36,8 @@
</span><span class="cx">
</span><span class="cx"> variant universal {}
</span><span class="cx">
</span><del>-patchfiles patch-Makefile.in.diff
</del><ins>+patchfiles patch-Makefile.in.diff \
+ patch-src-libcolorer-makefile.gcc.diff
</ins><span class="cx">
</span><span class="cx"> post-patch {
</span><span class="cx"> # Use makefile.macos for colorer
</span><span class="lines">@@ -45,23 +46,9 @@
</span><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><del>- # Libraries extension is ".dylib" on Darwin, not ".so"
- reinplace {s/\.so/.dylib/} \
- ${worksrcpath}/Makefile.in \
- ${worksrcpath}/src/libcolorer/makefile.gcc
-
- # The flag to build dynamic libraries on Darwin is -dynamiclib
- # Furthermore we need to write down libcolorer install name
- reinplace \
- "s:-shared:-dynamiclib -install_name ${prefix}/lib/\$(TARGET):" \
- ${worksrcpath}/src/libcolorer/makefile.gcc
-
</del><span class="cx"> # Do not force installation as root
</span><span class="cx"> reinplace {s/-g 0 -o 0//} ${worksrcpath}/Makefile.in
</span><span class="cx">
</span><del>- # Install documentation in an unversioned directory
- reinplace s:doc/colorer-take5:doc/colorer: ${worksrcpath}/Makefile.in
-
</del><span class="cx"> reinplace "/^CPPFLAGS/s:\$: [get_canonical_archflags cc]:" \
</span><span class="cx"> ${worksrcpath}/src/shared/makefile.colorer.gcc
</span><span class="cx"> reinplace -E "/^(LIB)?FLAGS/s:\$: [get_canonical_archflags ld]:" \
</span><span class="lines">@@ -78,7 +65,8 @@
</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><span class="cx"> build.args CPP=${configure.cc} \
</span><del>- LINK=${configure.cxx}
</del><ins>+ LINK=${configure.cxx} \
+ prefix=${prefix}
</ins><span class="cx"> use_parallel_build yes
</span><span class="cx">
</span><span class="cx"> destroot.destdir prefix=${destroot}${prefix}
</span></span></pre></div>
<a id="trunkdportstextproccolorerfilespatchMakefileindiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/textproc/colorer/files/patch-Makefile.in.diff (125100 => 125101)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/textproc/colorer/files/patch-Makefile.in.diff 2014-09-05 06:08:19 UTC (rev 125100)
+++ trunk/dports/textproc/colorer/files/patch-Makefile.in.diff 2014-09-05 08:08:03 UTC (rev 125101)
</span><span class="lines">@@ -1,9 +1,26 @@
</span><ins>+Change library extension to .dylib
+Use unversioned doc dir
</ins><span class="cx"> Do not use GNU cp --parents flag
</span><del>-
---- Makefile.in.orig 2010-01-12 05:09:19.000000000 +0100
-+++ Makefile.in 2010-01-12 05:13:13.000000000 +0100
-@@ -37,5 +37,8 @@
</del><ins>+--- Makefile.in.orig 2006-11-24 17:14:40.000000000 -0600
++++ Makefile.in 2014-09-04 22:28:40.000000000 -0500
+@@ -16,7 +16,7 @@
+ install:
+ install -g 0 -o 0 -m 755 -d $(prefix)
+ install -g 0 -o 0 -m 755 -d $(prefix)/lib
+- install -g 0 -o 0 -m 755 src/libcolorer/libcolorer.so $(prefix)/lib
++ install -g 0 -o 0 -m 755 src/libcolorer/libcolorer.dylib $(prefix)/lib
</ins><span class="cx">
</span><ins>+ install -g 0 -o 0 -m 755 -d $(prefix)/bin
+ install -g 0 -o 0 -m 755 src/colorer/colorer $(prefix)/bin
+@@ -32,10 +32,13 @@
+ chmod 0777 /tmp/colorer.log
+
+ install -g 0 -o 0 -m 755 -d $(prefix)/share/doc
+- install -g 0 -o 0 -m 755 -d $(prefix)/share/doc/colorer-take5
+- cp -r doc/* $(prefix)/share/doc/colorer-take5
++ install -g 0 -o 0 -m 755 -d $(prefix)/share/doc/colorer
++ cp -r doc/* $(prefix)/share/doc/colorer
+
</ins><span class="cx"> install -g 0 -o 0 -m 755 -d $(prefix)/include
</span><span class="cx"> install -g 0 -o 0 -m 755 -d $(prefix)/include/colorer
</span><span class="cx"> - cd src/shared; cp --parents `find . -name '*.h'` $(prefix)/include/colorer
</span></span></pre></div>
<a id="trunkdportstextproccolorerfilespatchsrclibcolorermakefilegccdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/textproc/colorer/files/patch-src-libcolorer-makefile.gcc.diff (0 => 125101)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/textproc/colorer/files/patch-src-libcolorer-makefile.gcc.diff (rev 0)
+++ trunk/dports/textproc/colorer/files/patch-src-libcolorer-makefile.gcc.diff 2014-09-05 08:08:03 UTC (rev 125101)
</span><span class="lines">@@ -0,0 +1,25 @@
</span><ins>+Change library extension to .dylib
+Create library with -dynamiclib
+Use -install_name
+--- src/libcolorer/makefile.gcc.orig 2006-11-24 17:14:40.000000000 -0600
++++ src/libcolorer/makefile.gcc 2014-09-04 22:14:17.000000000 -0500
+@@ -1,5 +1,5 @@
+
+-TARGET=libcolorer.so
++TARGET=libcolorer.dylib
+ all: $(TARGET)
+
+ shared_path=../shared/
+@@ -8,10 +8,10 @@
+ include ../shared/makefile.colorer.gcc
+
+ LIBINC = -lstdc++
+-LIBFLAGS = $(coreobjects) -shared -o $(TARGET) $(LIBINC)
++LIBFLAGS = $(coreobjects) -dynamiclib -install_name $(prefix)/lib/$(TARGET) -o $(TARGET) $(LIBINC)
+
+
+-libcolorer.so: $(coreobjects)
++libcolorer.dylib: $(coreobjects)
+ $(CPP) $(LIBFLAGS)
+
+ clean:
</ins></span></pre>
</div>
</div>
</body>
</html>