<!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>[120293] trunk/dports/aqua/tagainijisho</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/120293">120293</a></dd>
<dt>Author</dt> <dd>ryandesign@macports.org</dd>
<dt>Date</dt> <dd>2014-05-21 17:26:08 -0700 (Wed, 21 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>tagainijisho: update to 1.0.2 (#43736; maintainer timeout)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsaquatagainijishoPortfile">trunk/dports/aqua/tagainijisho/Portfile</a></li>
<li><a href="#trunkdportsaquatagainijishofilespatchCMakeListstxtdiff">trunk/dports/aqua/tagainijisho/files/patch-CMakeLists.txt.diff</a></li>
<li><a href="#trunkdportsaquatagainijishofilespatchpackCMakeListstxtdiff">trunk/dports/aqua/tagainijisho/files/patch-pack-CMakeLists.txt.diff</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsaquatagainijishofilespatchi18nCMakeListstxtdiff">trunk/dports/aqua/tagainijisho/files/patch-i18n-CMakeLists.txt.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsaquatagainijishoPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/aqua/tagainijisho/Portfile (120292 => 120293)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/aqua/tagainijisho/Portfile 2014-05-22 00:21:50 UTC (rev 120292)
+++ trunk/dports/aqua/tagainijisho/Portfile 2014-05-22 00:26:08 UTC (rev 120293)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx"> PortGroup github 1.0
</span><span class="cx"> PortGroup cmake 1.0
</span><span class="cx">
</span><del>-github.setup Gnurou tagainijisho 0.9.4
</del><ins>+github.setup Gnurou tagainijisho 1.0.2
</ins><span class="cx"> license GPL-3+
</span><span class="cx"> categories aqua education japanese
</span><span class="cx"> platforms darwin
</span><span class="lines">@@ -27,14 +27,15 @@
</span><span class="cx"> or printing them on a small booklet.
</span><span class="cx">
</span><span class="cx"> homepage http://www.tagaini.net/
</span><del>-master_sites http://cloud.github.com/downloads/Gnurou/${name}/
</del><ins>+github.tarball_from releases
</ins><span class="cx">
</span><del>-checksums rmd160 0693e567da51f15bee8399ba312b20b4076ff84e \
- sha256 61b840d1252c459d1130c24dfa7883b50ced513e076cf31388c88ab5eca4f0e0
</del><ins>+checksums rmd160 a47a9702d71bd154aeaea06d3234d9e4ef75d8d4 \
+ sha256 144a516a69d440014269dd2a11e10760fd9543726affd9af152b28e1e1d57c3f
</ins><span class="cx">
</span><span class="cx"> depends_lib port:qt4-mac
</span><span class="cx">
</span><span class="cx"> patchfiles patch-CMakeLists.txt.diff \
</span><ins>+ patch-i18n-CMakeLists.txt.diff \
</ins><span class="cx"> patch-pack-CMakeLists.txt.diff
</span><span class="cx">
</span><span class="cx"> configure.pre_args -DCMAKE_INSTALL_PREFIX=${applications_dir}
</span></span></pre></div>
<a id="trunkdportsaquatagainijishofilespatchCMakeListstxtdiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/aqua/tagainijisho/files/patch-CMakeLists.txt.diff (120292 => 120293)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/aqua/tagainijisho/files/patch-CMakeLists.txt.diff 2014-05-22 00:21:50 UTC (rev 120292)
+++ trunk/dports/aqua/tagainijisho/files/patch-CMakeLists.txt.diff 2014-05-22 00:26:08 UTC (rev 120293)
</span><span class="lines">@@ -1,11 +1,11 @@
</span><del>---- CMakeLists.txt.orig 2012-05-10 17:42:15.000000000 -0500
-+++ CMakeLists.txt 2012-08-27 20:00:35.000000000 -0500
</del><ins>+--- CMakeLists.txt.orig 2014-04-13 22:16:06.000000000 -0500
++++ CMakeLists.txt 2014-05-16 19:32:25.000000000 -0500
</ins><span class="cx"> @@ -30,8 +30,6 @@
</span><span class="cx"> # 64 bits Intel binary with 10.6 compatibility
</span><span class="cx"> if(APPLE)
</span><span class="cx"> set(CMAKE_OSX_ARCHITECTURES "${ARCHS_STANDARD_64_BIT}")
</span><del>-- set(CMAKE_OSX_SYSROOT "/Developer/SDKs/MacOSX10.6.sdk")
</del><ins>+- set(CMAKE_OSX_SYSROOT "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk")
</ins><span class="cx"> - set(CMAKE_OSX_DEPLOYMENT_TARGET "10.6")
</span><span class="cx"> set(CMAKE_PREFIX_PATH "${CMAKE_OSX_SYSROOT}/usr")
</span><span class="cx"> set(CMAKE_FRAMEWORK_PATH "${CMAKE_OSX_SYSROOT}/Library/Frameworks:${CMAKE_OSX_SYSROOT}/System/")
</span><del>- set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -sectcreate __TEXT __info_plist ${CMAKE_BINARY_DIR}/src/gui/Tagaini\\ Jisho.app/Contents/Info.plist")
</del><ins>+ set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/pack/MacOS/")
</ins></span></pre></div>
<a id="trunkdportsaquatagainijishofilespatchi18nCMakeListstxtdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/aqua/tagainijisho/files/patch-i18n-CMakeLists.txt.diff (0 => 120293)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/aqua/tagainijisho/files/patch-i18n-CMakeLists.txt.diff (rev 0)
+++ trunk/dports/aqua/tagainijisho/files/patch-i18n-CMakeLists.txt.diff 2014-05-22 00:26:08 UTC (rev 120293)
</span><span class="lines">@@ -0,0 +1,14 @@
</span><ins>+Fixes destroot failure when path to source code contains underscore
+due to overly greedy regular expression:
+https://github.com/Gnurou/tagainijisho/issues/103
+--- i18n/CMakeLists.txt.orig 2014-04-13 22:16:06.000000000 -0500
++++ i18n/CMakeLists.txt 2014-05-16 20:42:09.000000000 -0500
+@@ -11,7 +11,7 @@
+
+ set(UI_LANG "")
+ foreach(tsfile ${TRANSLATIONS_FILES})
+- string(REGEX REPLACE "[^_]*_(.*)\\.ts" "\\1" rmatch ${tsfile})
++ string(REGEX REPLACE "^.+/tagainijisho_([^/]+)\\.ts$" "\\1" rmatch ${tsfile})
+ set(UI_LANG "${UI_LANG};${rmatch}")
+ endforeach(tsfile ${TRANSLATIONS_FILES})
+
</ins></span></pre></div>
<a id="trunkdportsaquatagainijishofilespatchpackCMakeListstxtdiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/aqua/tagainijisho/files/patch-pack-CMakeLists.txt.diff (120292 => 120293)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/aqua/tagainijisho/files/patch-pack-CMakeLists.txt.diff 2014-05-22 00:21:50 UTC (rev 120292)
+++ trunk/dports/aqua/tagainijisho/files/patch-pack-CMakeLists.txt.diff 2014-05-22 00:26:08 UTC (rev 120293)
</span><span class="lines">@@ -1,6 +1,15 @@
</span><del>---- pack/CMakeLists.txt.orig 2011-11-17 16:21:18.000000000 +0100
-+++ pack/CMakeLists.txt 2011-11-19 17:52:15.000000000 +0100
-@@ -72,7 +72,7 @@
</del><ins>+First part fixes destroot failure because of ignoring DESTDIR:
+https://github.com/Gnurou/tagainijisho/issues/104
+--- pack/CMakeLists.txt.orig 2014-04-13 22:16:06.000000000 -0500
++++ pack/CMakeLists.txt 2014-05-16 20:02:11.000000000 -0500
+@@ -67,13 +67,13 @@
+ endforeach(LANG ${UI_LANG})
+
+ # Qt config
+- install(CODE "file(WRITE \"\${CMAKE_INSTALL_PREFIX}/${RESOURCES_DIR}/qt.conf\" \"[Paths]\nPlugins = PlugIns\nTranslations = Translations\n\")" COMPONENT Runtime)
++ install(CODE "file(WRITE \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${RESOURCES_DIR}/qt.conf\" \"[Paths]\nPlugins = PlugIns\nTranslations = Translations\n\")" COMPONENT Runtime)
+
+ # Qt plugins
</ins><span class="cx"> install(CODE "
</span><span class="cx"> file(GLOB_RECURSE QTPLUGINS \"\${CMAKE_INSTALL_PREFIX}/${EXE_DIR}/plugins/*${CMAKE_SHARED_LIBRARY_SUFFIX}\")
</span><span class="cx"> include(BundleUtilities)
</span></span></pre>
</div>
</div>
</body>
</html>