<!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>[117653] users/devans/GNOME-3/stable/dports/gnome</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/117653">117653</a></dd>
<dt>Author</dt> <dd>devans@macports.org</dd>
<dt>Date</dt> <dd>2014-03-06 21:32:48 -0800 (Thu, 06 Mar 2014)</dd>
</dl>

<h3>Log Message</h3>
<pre>GNOME-3/stable/dports: devhelp, epiphany, sync with trunk.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#usersdevansGNOME3stabledportsgnomedevhelpPortfile">users/devans/GNOME-3/stable/dports/gnome/devhelp/Portfile</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#usersdevansGNOME3stabledportsgnomedevhelpfilesautogensh">users/devans/GNOME-3/stable/dports/gnome/devhelp/files/autogen.sh</a></li>
</ul>

<h3>Removed Paths</h3>
<ul>
<li><a href="#usersdevansGNOME3stabledportsgnomedevhelpfilespatchconfigurediff">users/devans/GNOME-3/stable/dports/gnome/devhelp/files/patch-configure.diff</a></li>
</ul>

<h3>Property Changed</h3>
<ul>
<li><a href="#usersdevansGNOME3stabledportsgnomedevhelp">users/devans/GNOME-3/stable/dports/gnome/devhelp/</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomeepiphany">users/devans/GNOME-3/stable/dports/gnome/epiphany/</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="usersdevansGNOME3stabledportsgnomedevhelp"></a>
<div class="propset"><h4>Property changes: users/devans/GNOME-3/stable/dports/gnome/devhelp</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4>Modified: svn:mergeinfo</h4></div>
<span class="cx">/trunk/dports/gnome/devhelp:108265-116642
</span><span class="cx">/users/rmstonecipher/gnome/devhelp:102363-103172
</span><span class="cx">   + /branches/mld-qt-481/dports/gnome/devhelp:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
</span><span class="cx">/trunk/dports/gnome/devhelp:108265-117651
</span><span class="cx">/users/rmstonecipher/gnome/devhelp:102363-103172
</span><a id="usersdevansGNOME3stabledportsgnomedevhelpPortfile"></a>
<div class="modfile"><h4>Modified: users/devans/GNOME-3/stable/dports/gnome/devhelp/Portfile (117652 => 117653)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/gnome/devhelp/Portfile        2014-03-07 05:09:28 UTC (rev 117652)
+++ users/devans/GNOME-3/stable/dports/gnome/devhelp/Portfile        2014-03-07 05:32:48 UTC (rev 117653)
</span><span class="lines">@@ -5,7 +5,6 @@
</span><span class="cx"> 
</span><span class="cx"> name            devhelp
</span><span class="cx"> version         3.10.2
</span><del>-revision        1
</del><span class="cx"> license         GPL-2+
</span><span class="cx"> set branch      [join [lrange [split ${version} .] 0 1] .]
</span><span class="cx"> description     Devhelp is an API documentation browser for GTK+ and GNOME.
</span><span class="lines">@@ -26,10 +25,12 @@
</span><span class="cx"> checksums       rmd160  8aa043fb87408f5c723a1e4a199e6c77a65f5e25 \
</span><span class="cx">                 sha256  498cc367b9cb7924dd4905e9c3e7d9738f572e4735a769fc5de6e2f06bebf793
</span><span class="cx"> 
</span><del>-patchfiles      patch-configure.diff
-
</del><span class="cx"> depends_build   port:pkgconfig \
</span><del>-                port:intltool
</del><ins>+                port:intltool \
+                port:gnome-common \
+                port:autoconf \
+                port:automake \
+                port:libtool
</ins><span class="cx"> 
</span><span class="cx"> depends_lib     port:desktop-file-utils \
</span><span class="cx">                 port:gnome-icon-theme \
</span><span class="lines">@@ -57,6 +58,14 @@
</span><span class="cx">     }
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+# use upstream autogen.sh to update m4/intltool.m4 using intltoolize and autoreconf
+
+post-patch {
+    xinstall -m 755 ${filespath}/autogen.sh ${worksrcpath}
+}
+
+configure.cmd   ./autogen.sh
+
</ins><span class="cx"> configure.args  --disable-schemas-compile
</span><span class="cx"> 
</span><span class="cx"> variant python26 conflicts python27 description {Build using Python 2.6} {
</span><span class="lines">@@ -74,7 +83,7 @@
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> post-activate {
</span><del>-    system &quot;${prefix}/bin/gtk-update-icon-cache -f -t ${prefix}/share/icons/hicolor&quot;
</del><ins>+    system &quot;${prefix}/bin/gtk-update-icon-cache-3.0 -f -t ${prefix}/share/icons/hicolor&quot;
</ins><span class="cx">     system &quot;${prefix}/bin/update-desktop-database ${prefix}/share/applications&quot;
</span><span class="cx">     system &quot;${prefix}/bin/glib-compile-schemas ${prefix}/share/glib-2.0/schemas&quot;
</span><span class="cx"> }
</span></span></pre></div>
<a id="usersdevansGNOME3stabledportsgnomedevhelpfilesautogenshfromrev117651trunkdportsgnomedevhelpfilesautogensh"></a>
<div class="copfile"><h4>Copied: users/devans/GNOME-3/stable/dports/gnome/devhelp/files/autogen.sh (from rev 117651, trunk/dports/gnome/devhelp/files/autogen.sh) (0 => 117653)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/gnome/devhelp/files/autogen.sh                                (rev 0)
+++ users/devans/GNOME-3/stable/dports/gnome/devhelp/files/autogen.sh        2014-03-07 05:32:48 UTC (rev 117653)
</span><span class="lines">@@ -0,0 +1,20 @@
</span><ins>+#!/bin/sh
+# Run this to generate all the initial makefiles, etc.
+
+srcdir=`dirname $0`
+test -z &quot;$srcdir&quot; &amp;&amp; srcdir=.
+
+PKG_NAME=&quot;Devhelp&quot;
+
+(test -f $srcdir/src/dh-main.c) || {
+    echo -n &quot;**Error**: Directory &quot;\`$srcdir\'&quot; does not look like the&quot;
+    echo &quot; top-level $PKG_NAME directory&quot;
+    exit 1
+}
+
+which gnome-autogen.sh || {
+    echo &quot;You need to install gnome-common.&quot;
+    exit 1
+}
+
+. gnome-autogen.sh
</ins></span></pre></div>
<a id="usersdevansGNOME3stabledportsgnomedevhelpfilespatchconfigurediff"></a>
<div class="delfile"><h4>Deleted: users/devans/GNOME-3/stable/dports/gnome/devhelp/files/patch-configure.diff (117652 => 117653)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/gnome/devhelp/files/patch-configure.diff        2014-03-07 05:09:28 UTC (rev 117652)
+++ users/devans/GNOME-3/stable/dports/gnome/devhelp/files/patch-configure.diff        2014-03-07 05:32:48 UTC (rev 117653)
</span><span class="lines">@@ -1,14 +0,0 @@
</span><del>---- configure.orig        2013-09-23 09:27:38.000000000 -0700
-+++ configure        2013-11-03 03:21:44.000000000 -0800
-@@ -13351,9 +13351,9 @@



--  PYTHON_PREFIX='${prefix}'
-+  PYTHON_PREFIX=`$PYTHON -c 'import sys; print sys.prefix;'`

--  PYTHON_EXEC_PREFIX='${exec_prefix}'
-+  PYTHON_EXEC_PREFIX=`$PYTHON -c 'import sys; print sys.exec_prefix;'`



</del></span></pre></div>
<a id="usersdevansGNOME3stabledportsgnomeepiphany"></a>
<div class="propset"><h4>Property changes: users/devans/GNOME-3/stable/dports/gnome/epiphany</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4>Modified: svn:mergeinfo</h4></div>
<span class="cx">/trunk/dports/gnome/epiphany:108265-117326
</span><span class="cx">/users/rmstonecipher/gnome/epiphany:102363-103172
</span><span class="cx">   + /branches/mld-qt-481/dports/gnome/epiphany:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
</span><span class="cx">/trunk/dports/gnome/epiphany:108265-117652
</span><span class="cx">/users/rmstonecipher/gnome/epiphany:102363-103172
</span></div>

</body>
</html>