<!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>[133391] trunk/dports/textproc/simstring</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/133391">133391</a></dd>
<dt>Author</dt> <dd>hum@macports.org</dd>
<dt>Date</dt> <dd>2015-02-28 03:42:51 -0800 (Sat, 28 Feb 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>simstring: update to 20140723; fetch from github; add patch for libc++; add python port</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportstextprocsimstringPortfile">trunk/dports/textproc/simstring/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>trunk/dports/textproc/simstring/files/</li>
<li><a href="#trunkdportstextprocsimstringfilespatchlibcdiff">trunk/dports/textproc/simstring/files/patch-libc++.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportstextprocsimstringPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/textproc/simstring/Portfile (133390 => 133391)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/textproc/simstring/Portfile 2015-02-28 11:38:35 UTC (rev 133390)
+++ trunk/dports/textproc/simstring/Portfile 2015-02-28 11:42:51 UTC (rev 133391)
</span><span class="lines">@@ -2,9 +2,10 @@
</span><span class="cx"> # $Id$
</span><span class="cx">
</span><span class="cx"> PortSystem 1.0
</span><ins>+PortGroup github 1.0
</ins><span class="cx">
</span><del>-name simstring
-version 1.0
</del><ins>+github.setup chokkan simstring 6209ea86d84f7043f8e19029d83299f458665ec5
+version 20140723
</ins><span class="cx"> categories textproc math
</span><span class="cx"> maintainers hum openmaintainer
</span><span class="cx">
</span><span class="lines">@@ -21,9 +22,47 @@
</span><span class="cx"> platforms darwin
</span><span class="cx"> license BSD
</span><span class="cx">
</span><del>-master_sites http://www.chokkan.org/software/dist/
-checksums rmd160 91824658636dc3d4bf518971fd46ecbc0431c224 \
- sha256 386f5e18c9a92a84eccd6caee407e28da939dd74bb68bd17912c4d918f0e4171
</del><ins>+checksums rmd160 b583d69175504f70b7d761d9365b8a274628431a \
+ sha256 298e292c597f21fd4d3e7a4e6478f9b73f46d04372b78c6ea0a901ecfeb52d2d
</ins><span class="cx">
</span><del>-livecheck.type regex
-livecheck.regex ${name}-(\[0-9.\]+)\\.tar
</del><ins>+if {[string match *clang* ${configure.cxx}] && ${configure.cxx_stdlib} == "libc++"} {
+ # https://github.com/chokkan/simstring/issues/16
+ patchfiles patch-libc++.diff
+ notes "UTF16/32 not supported because of libc++ incompatibility"
+}
+
+depends_build port:autoconf \
+ port:automake \
+ port:libtool
+
+use_autoconf yes
+autoconf.cmd ./autogen.sh
+
+# Python port
+subport py27-simstring {
+ PortGroup python 1.0
+ name py-simstring
+ python.versions 27
+ categories-append textproc math
+ description SimString Python module
+ long_description ${description}
+ set python_dir ${worksrcpath}/swig/python
+
+ depends_build-append port:swig-python
+
+ use_configure yes
+ build.dir ${python_dir}
+ pre-build {
+ system -W ${python_dir} "./prepare.sh --swig"
+ }
+ build.target build_ext
+ destroot.dir ${python_dir}
+ post-destroot {
+ set exdir ${prefix}/share/examples/${subport}
+ xinstall -m 755 -d ${destroot}${exdir}
+ foreach py {sample.py sample_unicode.py} {
+ xinstall -m 755 ${python_dir}/${py} ${destroot}${exdir}
+ reinplace "s|#!/usr/bin/env python|#!${python.bin}|" ${destroot}${exdir}/${py}
+ }
+ }
+}
</ins></span></pre></div>
<a id="trunkdportstextprocsimstringfilespatchlibcdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/textproc/simstring/files/patch-libc++.diff (0 => 133391)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/textproc/simstring/files/patch-libc++.diff (rev 0)
+++ trunk/dports/textproc/simstring/files/patch-libc++.diff 2015-02-28 11:42:51 UTC (rev 133391)
</span><span class="lines">@@ -0,0 +1,69 @@
</span><ins>+--- swig/export.cpp 2015-02-27 21:14:36.000000000 +0900
++++ swig/export.cpp 2015-02-27 21:06:34.000000000 +0900
+@@ -279,10 +279,10 @@
+ retrieve_thru(dbr, query, this->measure, this->threshold, std::back_inserter(ret));
+ break;
+ case 2:
+- retrieve_iconv<uint16_t>(dbr, query, UTF16, this->measure, this->threshold, std::back_inserter(ret));
++ throw std::runtime_error("UTF16 not supported in OSX python bindings because of libc++ incompatibility");
+ break;
+ case 4:
+- retrieve_iconv<uint32_t>(dbr, query, UTF32, this->measure, this->threshold, std::back_inserter(ret));
++ throw std::runtime_error("UTF32 not supported in OSX python bindings because of libc++ incompatibility");
+ break;
+ }
+
+@@ -296,18 +296,8 @@
+ if (dbr.char_size() == 1) {
+ std::string qstr = query;
+ return dbr.check(qstr, translate_measure(this->measure), this->threshold);
+- } else if (dbr.char_size() == 2) {
+- std::basic_string<uint16_t> qstr;
+- iconv_t fwd = iconv_open(UTF16, "UTF-8");
+- iconv_convert(fwd, std::string(query), qstr);
+- iconv_close(fwd);
+- return dbr.check(qstr, translate_measure(this->measure), this->threshold);
+- } else if (dbr.char_size() == 4) {
+- std::basic_string<uint32_t> qstr;
+- iconv_t fwd = iconv_open(UTF32, "UTF-8");
+- iconv_convert(fwd, std::string(query), qstr);
+- iconv_close(fwd);
+- return dbr.check(qstr, translate_measure(this->measure), this->threshold);
++ } else {
++ throw std::runtime_error("UTF16/32 not supported in OSX python bindings because of libc++ incompatibility");
+ }
+
+ return false;
+--- swig/python/sample_unicode.py.orig 2015-02-27 21:06:34.000000000 +0900
++++ swig/python/sample_unicode.py 2015-02-28 19:33:29.000000000 +0900
+@@ -11,8 +11,8 @@
+
+ import simstring
+
+-# Open a SimString database for writing with Unicode mode.
+-db = simstring.writer('sample_unicode.db', 3, False, True)
++# Open a SimString database for writing.
++db = simstring.writer('sample_unicode.db')
+
+ # Write a string, and close the database.
+ db.insert('スパゲティ')
+--- swig/python/setup.py.in.orig 2015-02-28 20:08:27.000000000 +0900
++++ swig/python/setup.py.in 2015-02-28 20:06:41.000000000 +0900
+@@ -15,9 +15,6 @@
+ def get_swigdir():
+ return os.path.join(get_rootdir(), 'swig')
+
+-import os; os.environ['CC'] = 'g++'; os.environ['CXX'] = 'g++';
+-os.environ['CPP'] = 'g++'; os.environ['LDSHARED'] = 'g++'
+-
+ from distutils.core import setup, Extension
+
+ simstring_module = Extension(
+@@ -27,7 +24,6 @@
+ 'export_wrap.cpp',
+ ],
+ include_dirs=[get_includedir(),],
+- extra_link_args=['-shared'],
+ language='c++',
+ )
+
</ins></span></pre>
</div>
</div>
</body>
</html>