<!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>[117598] users/devans/GNOME-3/stable/dports</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/117598">117598</a></dd>
<dt>Author</dt> <dd>devans@macports.org</dd>
<dt>Date</dt> <dd>2014-03-04 11:52:01 -0800 (Tue, 04 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>GNOME3/stable/dports: sync GNOME ports with trunk to pick up recent intltool configuration fixes.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#usersdevansGNOME3stabledportsgnomeepiphanyPortfile">users/devans/GNOME-3/stable/dports/gnome/epiphany/Portfile</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomeevincePortfile">users/devans/GNOME-3/stable/dports/gnome/evince/Portfile</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomefilerollerPortfile">users/devans/GNOME-3/stable/dports/gnome/file-roller/Portfile</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomefolksPortfile">users/devans/GNOME-3/stable/dports/gnome/folks/Portfile</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomegcrPortfile">users/devans/GNOME-3/stable/dports/gnome/gcr/Portfile</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomegnomebackgroundsPortfile">users/devans/GNOME-3/stable/dports/gnome/gnome-backgrounds/Portfile</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomegnomecontrolcenterPortfile">users/devans/GNOME-3/stable/dports/gnome/gnome-control-center/Portfile</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomegnomedeveldocsPortfile">users/devans/GNOME-3/stable/dports/gnome/gnome-devel-docs/Portfile</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomegnomeiconthemeextrasPortfile">users/devans/GNOME-3/stable/dports/gnome/gnome-icon-theme-extras/Portfile</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomegnomeonlineaccountsPortfile">users/devans/GNOME-3/stable/dports/gnome/gnome-online-accounts/Portfile</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomegnomesettingsdaemonPortfile">users/devans/GNOME-3/stable/dports/gnome/gnome-settings-daemon/Portfile</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomegnometerminalPortfile">users/devans/GNOME-3/stable/dports/gnome/gnome-terminal/Portfile</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomegnometerminalfilespatchuuiddiff">users/devans/GNOME-3/stable/dports/gnome/gnome-terminal/files/patch-uuid.diff</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomegnomeuserdocsPortfile">users/devans/GNOME-3/stable/dports/gnome/gnome-user-docs/Portfile</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomegucharmapPortfile">users/devans/GNOME-3/stable/dports/gnome/gucharmap/Portfile</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomelibgnomekbdPortfile">users/devans/GNOME-3/stable/dports/gnome/libgnomekbd/Portfile</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomenautilusPortfile">users/devans/GNOME-3/stable/dports/gnome/nautilus/Portfile</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomeseahorsePortfile">users/devans/GNOME-3/stable/dports/gnome/seahorse/Portfile</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnometotemplparserPortfile">users/devans/GNOME-3/stable/dports/gnome/totem-pl-parser/Portfile</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomevinoPortfile">users/devans/GNOME-3/stable/dports/gnome/vino/Portfile</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomeyelpPortfile">users/devans/GNOME-3/stable/dports/gnome/yelp/Portfile</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomeyelptoolsPortfile">users/devans/GNOME-3/stable/dports/gnome/yelp-tools/Portfile</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomeyelpxslPortfile">users/devans/GNOME-3/stable/dports/gnome/yelp-xsl/Portfile</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomezenityPortfile">users/devans/GNOME-3/stable/dports/gnome/zenity/Portfile</a></li>
<li><a href="#usersdevansGNOME3stabledportsnetrygelPortfile">users/devans/GNOME-3/stable/dports/net/rygel/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#usersdevansGNOME3stabledportsgnomegnomecontrolcenterfilespatchusersloggedincheckdiff">users/devans/GNOME-3/stable/dports/gnome/gnome-control-center/files/patch-users-logged-in-check.diff</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnometotemplparserfilespatchconfigureacdiff">users/devans/GNOME-3/stable/dports/gnome/totem-pl-parser/files/patch-configure.ac.diff</a></li>
<li><a href="#usersdevansGNOME3stabledportsnetrygelfilespatchconfigureacdiff">users/devans/GNOME-3/stable/dports/net/rygel/files/patch-configure.ac.diff</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#usersdevansGNOME3stabledportsnetrygelfilespatchconfigurediff">users/devans/GNOME-3/stable/dports/net/rygel/files/patch-configure.diff</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#usersdevansGNOME3stabledportsgnomeepiphany">users/devans/GNOME-3/stable/dports/gnome/epiphany/</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomeevince">users/devans/GNOME-3/stable/dports/gnome/evince/</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomefileroller">users/devans/GNOME-3/stable/dports/gnome/file-roller/</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomefolks">users/devans/GNOME-3/stable/dports/gnome/folks/</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomegcr">users/devans/GNOME-3/stable/dports/gnome/gcr/</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomegnomebackgrounds">users/devans/GNOME-3/stable/dports/gnome/gnome-backgrounds/</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomegnomecontrolcenter">users/devans/GNOME-3/stable/dports/gnome/gnome-control-center/</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomegnomedeveldocs">users/devans/GNOME-3/stable/dports/gnome/gnome-devel-docs/</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomegnomeicontheme">users/devans/GNOME-3/stable/dports/gnome/gnome-icon-theme/</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomegnomeiconthemeextras">users/devans/GNOME-3/stable/dports/gnome/gnome-icon-theme-extras/</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomegnomekeyring">users/devans/GNOME-3/stable/dports/gnome/gnome-keyring/</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomegnomeonlineaccounts">users/devans/GNOME-3/stable/dports/gnome/gnome-online-accounts/</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomegnomesettingsdaemon">users/devans/GNOME-3/stable/dports/gnome/gnome-settings-daemon/</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomegnometerminal">users/devans/GNOME-3/stable/dports/gnome/gnome-terminal/</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomegnomeuserdocs">users/devans/GNOME-3/stable/dports/gnome/gnome-user-docs/</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomegucharmap">users/devans/GNOME-3/stable/dports/gnome/gucharmap/</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomelibgdata">users/devans/GNOME-3/stable/dports/gnome/libgdata/</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomelibgnomekbd">users/devans/GNOME-3/stable/dports/gnome/libgnomekbd/</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomenautilus">users/devans/GNOME-3/stable/dports/gnome/nautilus/</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomeseahorse">users/devans/GNOME-3/stable/dports/gnome/seahorse/</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnometotem">users/devans/GNOME-3/stable/dports/gnome/totem/</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnometotemplparser">users/devans/GNOME-3/stable/dports/gnome/totem-pl-parser/</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomevino">users/devans/GNOME-3/stable/dports/gnome/vino/</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomeyelp">users/devans/GNOME-3/stable/dports/gnome/yelp/</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomeyelptools">users/devans/GNOME-3/stable/dports/gnome/yelp-tools/</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomeyelpxsl">users/devans/GNOME-3/stable/dports/gnome/yelp-xsl/</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomezenity">users/devans/GNOME-3/stable/dports/gnome/zenity/</a></li>
<li><a href="#usersdevansGNOME3stabledportsnetrygel">users/devans/GNOME-3/stable/dports/net/rygel/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<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-116767
</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-117326
</span><span class="cx">/users/rmstonecipher/gnome/epiphany:102363-103172
</span><a id="usersdevansGNOME3stabledportsgnomeepiphanyPortfile"></a>
<div class="modfile"><h4>Modified: users/devans/GNOME-3/stable/dports/gnome/epiphany/Portfile (117597 => 117598)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/gnome/epiphany/Portfile 2014-03-04 19:24:27 UTC (rev 117597)
+++ users/devans/GNOME-3/stable/dports/gnome/epiphany/Portfile 2014-03-04 19:52:01 UTC (rev 117598)
</span><span class="lines">@@ -25,7 +25,8 @@
</span><span class="cx"> sha256 c18235ecceaa9c76e7d90d370861cb2bba45019e1e14391a00dac3d2e94a0db7
</span><span class="cx">
</span><span class="cx"> depends_build port:pkgconfig \
</span><del>- port:intltool
</del><ins>+ port:intltool \
+ port:gnome-common
</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">@@ -69,16 +70,22 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+# update m4/intltool.m4 and autoreconf
+
+pre-configure {
+ copy -force ${prefix}/share/aclocal/intltool.m4 ${worksrcpath}/m4
+ reinplace "s|--rpath=|-rpath |g" ${worksrcpath}/configure.ac
+}
+
+use_autoreconf yes
+autoreconf.args -fvi
+
</ins><span class="cx"> configure.cflags-append -Wno-format-nonliteral
</span><span class="cx">
</span><span class="cx"> configure.args --with-distributor-name=MacPorts \
</span><span class="cx"> --disable-schemas-compile \
</span><span class="cx"> --disable-tests
</span><span class="cx">
</span><del>-pre-configure {
- reinplace "s|--rpath=|-rpath |g" ${worksrcpath}/configure
-}
-
</del><span class="cx"> post-activate {
</span><span class="cx"> system "${prefix}/bin/update-desktop-database -q ${prefix}/share/applications"
</span><span class="cx"> system "${prefix}/bin/glib-compile-schemas ${prefix}/share/glib-2.0/schemas"
</span></span></pre></div>
<a id="usersdevansGNOME3stabledportsgnomeevince"></a>
<div class="propset"><h4>Property changes: users/devans/GNOME-3/stable/dports/gnome/evince</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/evince:108265-117324
</span><a id="usersdevansGNOME3stabledportsgnomeevincePortfile"></a>
<div class="modfile"><h4>Modified: users/devans/GNOME-3/stable/dports/gnome/evince/Portfile (117597 => 117598)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/gnome/evince/Portfile 2014-03-04 19:24:27 UTC (rev 117597)
+++ users/devans/GNOME-3/stable/dports/gnome/evince/Portfile 2014-03-04 19:52:01 UTC (rev 117598)
</span><span class="lines">@@ -22,12 +22,11 @@
</span><span class="cx"> checksums rmd160 4f53cfe7df43e4775b9d932b9a35db799a65669d \
</span><span class="cx"> sha256 b30dcc3a93dd3c682325e685061c48ccd800835af49578f4db813bbaf5f5e9af
</span><span class="cx">
</span><del>-depends_skip_archcheck gnome-settings-daemon
-
</del><span class="cx"> depends_build port:pkgconfig \
</span><span class="cx"> port:intltool \
</span><ins>+ port:itstool \
</ins><span class="cx"> port:yelp-tools \
</span><del>- port:itstool
</del><ins>+ port:gnome-common
</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">@@ -64,7 +63,13 @@
</span><span class="cx"> --enable-comics \
</span><span class="cx"> --enable-t1lib
</span><span class="cx">
</span><del>-# Teach glibtool about -stdlib=libc++
</del><ins>+# update m4/intltool.m4 and autoreconf
+# teach glibtool about -stdlib=libc++
+
+pre-configure {
+ copy -force ${prefix}/share/aclocal/intltool.m4 ${worksrcpath}/m4
+}
+
</ins><span class="cx"> use_autoreconf yes
</span><span class="cx"> autoreconf.args -fvi
</span><span class="cx">
</span></span></pre></div>
<a id="usersdevansGNOME3stabledportsgnomefileroller"></a>
<div class="propset"><h4>Property changes: users/devans/GNOME-3/stable/dports/gnome/file-roller</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/file-roller:108265-117439
</span><a id="usersdevansGNOME3stabledportsgnomefilerollerPortfile"></a>
<div class="modfile"><h4>Modified: users/devans/GNOME-3/stable/dports/gnome/file-roller/Portfile (117597 => 117598)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/gnome/file-roller/Portfile 2014-03-04 19:24:27 UTC (rev 117597)
+++ users/devans/GNOME-3/stable/dports/gnome/file-roller/Portfile 2014-03-04 19:52:01 UTC (rev 117598)
</span><span class="lines">@@ -46,16 +46,21 @@
</span><span class="cx">
</span><span class="cx"> patchfiles patch-src-fr-command-lrzip.c.diff
</span><span class="cx">
</span><ins>+# update m4/intltool.m4 and autoreconf
+
+pre-configure {
+ copy -force ${prefix}/share/aclocal/intltool.m4 ${worksrcpath}/m4
+}
+
+use_autoreconf yes
+autoreconf.args -fvi
+
</ins><span class="cx"> configure.args --with-smclient=xsmp \
</span><span class="cx"> --disable-nautilus-actions \
</span><span class="cx"> --disable-packagekit \
</span><span class="cx"> --disable-schemas-compile \
</span><span class="cx"> --disable-silent-rules
</span><span class="cx">
</span><del>-# Don't do intltool's INTLTOOL_PERL dance
-use_autoreconf yes
-autoreconf.args -fvi
-
</del><span class="cx"> variant nautilus description {Build optional nautilus context menu actions} {
</span><span class="cx"> configure.args-delete --disable-nautilus-actions
</span><span class="cx"> depends_lib-append port:nautilus
</span></span></pre></div>
<a id="usersdevansGNOME3stabledportsgnomefolks"></a>
<div class="propset"><h4>Property changes: users/devans/GNOME-3/stable/dports/gnome/folks</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="addfile"><h4>Added: svn:mergeinfo</h4></div>
<span class="cx">/trunk/dports/gnome/folks:108265-117310
</span><span class="cx">/users/rmstonecipher/gnome/folks:102363-103172
</span><a id="usersdevansGNOME3stabledportsgnomefolksPortfile"></a>
<div class="modfile"><h4>Modified: users/devans/GNOME-3/stable/dports/gnome/folks/Portfile (117597 => 117598)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/gnome/folks/Portfile 2014-03-04 19:24:27 UTC (rev 117597)
+++ users/devans/GNOME-3/stable/dports/gnome/folks/Portfile 2014-03-04 19:52:01 UTC (rev 117598)
</span><span class="lines">@@ -43,6 +43,15 @@
</span><span class="cx"> port:libxml2 \
</span><span class="cx"> port:vala
</span><span class="cx">
</span><ins>+# update m4/intltool.m4 and autoreconf
+
+pre-configure {
+ copy -force ${prefix}/share/aclocal/intltool.m4 ${worksrcpath}/m4
+}
+
+use_autoreconf yes
+autoreconf.args -fvi
+
</ins><span class="cx"> configure.args --disable-eds-backend \
</span><span class="cx"> --disable-bluez-backend \
</span><span class="cx"> --enable-libsocialweb-backend=yes \
</span></span></pre></div>
<a id="usersdevansGNOME3stabledportsgnomegcr"></a>
<div class="propset"><h4>Property changes: users/devans/GNOME-3/stable/dports/gnome/gcr</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/gcr:113249-117311
</span><a id="usersdevansGNOME3stabledportsgnomegcrPortfile"></a>
<div class="modfile"><h4>Modified: users/devans/GNOME-3/stable/dports/gnome/gcr/Portfile (117597 => 117598)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/gnome/gcr/Portfile 2014-03-04 19:24:27 UTC (rev 117597)
+++ users/devans/GNOME-3/stable/dports/gnome/gcr/Portfile 2014-03-04 19:52:01 UTC (rev 117598)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx">
</span><span class="cx"> name gcr
</span><span class="cx"> version 3.10.1
</span><del>-revision 1
</del><ins>+revision 2
</ins><span class="cx"> license LGPL-2
</span><span class="cx"> set branch [join [lrange [split ${version} .] 0 1] .]
</span><span class="cx"> description GCR is a library for displaying certificates, and crypto UI, accessing \
</span><span class="lines">@@ -36,14 +36,25 @@
</span><span class="cx"> port:gobject-introspection \
</span><span class="cx"> port:p11-kit \
</span><span class="cx"> port:libgcrypt \
</span><del>- port:gnupg
</del><ins>+ port:gnupg \
+ port:vala
</ins><span class="cx">
</span><span class="cx"> patchfiles patch-egg-egg-asn1x.h.diff \
</span><span class="cx"> patch-egg-egg-armor.c.diff \
</span><span class="cx"> patch-ui-gcr.pc.in.diff \
</span><span class="cx"> patch-ui-gcr-ui.pc.in.diff
</span><span class="cx">
</span><ins>+# update build/m4/intltool.m4 and autoreconf
+
+pre-configure {
+ copy -force ${prefix}/share/aclocal/intltool.m4 ${worksrcpath}/build/m4
+}
+
+use_autoreconf yes
+autoreconf.args -fvi
+
</ins><span class="cx"> configure.args --enable-introspection=yes \
</span><ins>+ --enable-vala=yes \
</ins><span class="cx"> --disable-schemas-compile \
</span><span class="cx"> --disable-update-mime \
</span><span class="cx"> --disable-update-icon-cache \
</span></span></pre></div>
<a id="usersdevansGNOME3stabledportsgnomegnomebackgrounds"></a>
<div class="propset"><h4>Property changes: users/devans/GNOME-3/stable/dports/gnome/gnome-backgrounds</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="addfile"><h4>Added: svn:mergeinfo</h4></div>
<span class="cx">/trunk/dports/gnome/gnome-backgrounds:108265-117320
</span><span class="cx">/users/rmstonecipher/gnome/gnome-backgrounds:102363-103172
</span><a id="usersdevansGNOME3stabledportsgnomegnomebackgroundsPortfile"></a>
<div class="modfile"><h4>Modified: users/devans/GNOME-3/stable/dports/gnome/gnome-backgrounds/Portfile (117597 => 117598)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/gnome/gnome-backgrounds/Portfile 2014-03-04 19:24:27 UTC (rev 117597)
+++ users/devans/GNOME-3/stable/dports/gnome/gnome-backgrounds/Portfile 2014-03-04 19:52:01 UTC (rev 117598)
</span><span class="lines">@@ -27,4 +27,15 @@
</span><span class="cx"> depends_build port:intltool \
</span><span class="cx"> port:gettext
</span><span class="cx">
</span><ins>+depends_lib path:lib/pkgconfig/glib-2.0.pc:glib2
+
+# update m4/intltool.m4 and autoreconf
+
+pre-configure {
+ copy -force ${prefix}/share/aclocal/intltool.m4 ${worksrcpath}/m4
+}
+
+use_autoreconf yes
+autoreconf.args -fvi
+
</ins><span class="cx"> livecheck.type gnome
</span></span></pre></div>
<a id="usersdevansGNOME3stabledportsgnomegnomecontrolcenter"></a>
<div class="propset"><h4>Property changes: users/devans/GNOME-3/stable/dports/gnome/gnome-control-center</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="addfile"><h4>Added: svn:mergeinfo</h4></div>
<span class="cx">/trunk/dports/gnome/gnome-control-center:108265-117321
</span><span class="cx">/users/rmstonecipher/gnome/gnome-control-center:102363-103172
</span><a id="usersdevansGNOME3stabledportsgnomegnomecontrolcenterPortfile"></a>
<div class="modfile"><h4>Modified: users/devans/GNOME-3/stable/dports/gnome/gnome-control-center/Portfile (117597 => 117598)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/gnome/gnome-control-center/Portfile 2014-03-04 19:24:27 UTC (rev 117597)
+++ users/devans/GNOME-3/stable/dports/gnome/gnome-control-center/Portfile 2014-03-04 19:52:01 UTC (rev 117598)
</span><span class="lines">@@ -54,10 +54,20 @@
</span><span class="cx">
</span><span class="cx"> # color panel disabled by patch, dependency colord requires libudev
</span><span class="cx">
</span><del>-patchfiles patch-disable-color-panel.diff \
</del><ins>+# patch-output-is-laptop.diff \
+# patch-background-linker-fix.diff \
+# patch-background-libsocialweb.diff \
+
+patchfiles \
+ patch-users-logged-in-check.diff \
+ patch-disable-color-panel.diff \
</ins><span class="cx"> patch-disable-shell-test-hostname.diff \
</span><span class="cx"> patch-panels-user-accounts.diff
</span><span class="cx">
</span><ins>+pre-configure {
+ copy -force ${prefix}/share/aclocal/intltool.m4 ${worksrcpath}/m4
+}
+
</ins><span class="cx"> use_autoreconf yes
</span><span class="cx"> autoreconf.args -fvi
</span><span class="cx">
</span></span></pre></div>
<a id="usersdevansGNOME3stabledportsgnomegnomecontrolcenterfilespatchusersloggedincheckdifffromrev117321trunkdportsgnomegnomecontrolcenterfilespatchusersloggedincheckdiff"></a>
<div class="copfile"><h4>Copied: users/devans/GNOME-3/stable/dports/gnome/gnome-control-center/files/patch-users-logged-in-check.diff (from rev 117321, trunk/dports/gnome/gnome-control-center/files/patch-users-logged-in-check.diff) (0 => 117598)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/gnome/gnome-control-center/files/patch-users-logged-in-check.diff (rev 0)
+++ users/devans/GNOME-3/stable/dports/gnome/gnome-control-center/files/patch-users-logged-in-check.diff 2014-03-04 19:52:01 UTC (rev 117598)
</span><span class="lines">@@ -0,0 +1,29 @@
</span><ins>+From b9836c120a94c21f6d2eb8bc706408741b16b346 Mon Sep 17 00:00:00 2001
+From: Matthias Clasen <mclasen@redhat.com>
+Date: Fri, 10 Jan 2014 17:52:37 +0000
+Subject: users: Improve logged-in check when deleting users
+
+When deleting a user account, we try to check if the user is
+still logged in, but we are using an accountsservice API that
+ignores console logins. But deleting a user that is logged
+in on the console is just as bad, so use
+act_user_is_logged_in_anywhere instead, which includes console
+logins.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=721951
+---
+diff --git a/panels/user-accounts/um-user-panel.c b/panels/user-accounts/um-user-panel.c
+index 2c02520..058eaad 100644
+--- panels/user-accounts/um-user-panel.c
++++ panels/user-accounts/um-user-panel.c
+@@ -478,7 +478,7 @@ delete_user (GtkButton *button, CcUserPanelPrivate *d)
+ g_signal_connect (dialog, "response",
+ G_CALLBACK (gtk_widget_destroy), NULL);
+ }
+- else if (act_user_is_logged_in (user)) {
++ else if (act_user_is_logged_in_anywhere (user)) {
+ dialog = gtk_message_dialog_new (GTK_WINDOW (gtk_widget_get_toplevel (d->main_box)),
+ 0,
+ GTK_MESSAGE_INFO,
+--
+cgit v0.9.2
</ins></span></pre></div>
<a id="usersdevansGNOME3stabledportsgnomegnomedeveldocs"></a>
<div class="propset"><h4>Property changes: users/devans/GNOME-3/stable/dports/gnome/gnome-devel-docs</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="addfile"><h4>Added: svn:mergeinfo</h4></div>
<span class="cx">/trunk/dports/gnome/gnome-devel-docs:108265-117303
</span><span class="cx">/users/rmstonecipher/gnome/gnome-devel-docs:102363-103172
</span><a id="usersdevansGNOME3stabledportsgnomegnomedeveldocsPortfile"></a>
<div class="modfile"><h4>Modified: users/devans/GNOME-3/stable/dports/gnome/gnome-devel-docs/Portfile (117597 => 117598)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/gnome/gnome-devel-docs/Portfile 2014-03-04 19:24:27 UTC (rev 117597)
+++ users/devans/GNOME-3/stable/dports/gnome/gnome-devel-docs/Portfile 2014-03-04 19:52:01 UTC (rev 117598)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx"> PortSystem 1.0
</span><span class="cx">
</span><span class="cx"> name gnome-devel-docs
</span><del>-version 3.10.2
</del><ins>+version 3.10.3
</ins><span class="cx"> license GFDL-1.1
</span><span class="cx"> set branch [join [lrange [split ${version} .] 0 1] .]
</span><span class="cx"> description The GNOME Developer Documentation Package
</span><span class="lines">@@ -26,14 +26,12 @@
</span><span class="cx">
</span><span class="cx"> use_xz yes
</span><span class="cx">
</span><del>-checksums rmd160 729d2091752f6abcbd23c5af942448d955c9eb11 \
- sha256 5f31700dec79504c486de5705b740089631c1b35cf97990b025d541859622e9a
</del><ins>+checksums rmd160 403eda4d6158556e5859c8eafc81423f599103ad \
+ sha256 746839d741538c5b4c0f0f8d3200375b28010d8d9bb1f9513ace69e7cc13b450
</ins><span class="cx">
</span><span class="cx"> depends_build port:itstool \
</span><span class="cx"> port:libxml2
</span><span class="cx">
</span><del>-patchfiles patch-work-around-itstool-bz715116.diff
-
</del><span class="cx"> configure.args --disable-silent-rules
</span><span class="cx">
</span><span class="cx"> livecheck.type gnome
</span></span></pre></div>
<a id="usersdevansGNOME3stabledportsgnomegnomeicontheme"></a>
<div class="propset"><h4>Property changes: users/devans/GNOME-3/stable/dports/gnome/gnome-icon-theme</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="addfile"><h4>Added: svn:mergeinfo</h4></div>
<span class="cx">/trunk/dports/gnome/gnome-icon-theme:108265-117327
</span><span class="cx">/users/rmstonecipher/gnome/gnome-icon-theme:102363-103172
</span><a id="usersdevansGNOME3stabledportsgnomegnomeiconthemeextras"></a>
<div class="propset"><h4>Property changes: users/devans/GNOME-3/stable/dports/gnome/gnome-icon-theme-extras</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="addfile"><h4>Added: svn:mergeinfo</h4></div>
<a id="usersdevansGNOME3stabledportsgnomegnomeiconthemeextrasPortfile"></a>
<div class="modfile"><h4>Modified: users/devans/GNOME-3/stable/dports/gnome/gnome-icon-theme-extras/Portfile (117597 => 117598)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/gnome/gnome-icon-theme-extras/Portfile 2014-03-04 19:24:27 UTC (rev 117597)
+++ users/devans/GNOME-3/stable/dports/gnome/gnome-icon-theme-extras/Portfile 2014-03-04 19:52:01 UTC (rev 117598)
</span><span class="lines">@@ -23,8 +23,7 @@
</span><span class="cx"> checksums rmd160 04edfd0998a5ba470885f84eae05d1da72f6f758 \
</span><span class="cx"> sha256 93aaaadf40c85ebc42232a4d8e45ca507754b8e1271e797bbcdaded52bd03ec7
</span><span class="cx">
</span><del>-depends_build port:intltool \
- port:pkgconfig \
</del><ins>+depends_build port:pkgconfig \
</ins><span class="cx"> port:icon-naming-utils \
</span><span class="cx"> port:gtk3
</span><span class="cx">
</span></span></pre></div>
<a id="usersdevansGNOME3stabledportsgnomegnomekeyring"></a>
<div class="propset"><h4>Property changes: users/devans/GNOME-3/stable/dports/gnome/gnome-keyring</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4>Modified: svn:mergeinfo</h4></div>
<span class="cx">/users/rmstonecipher/gnome/gnome-keyring:102363-103172
</span><span class="cx"> + /branches/mld-qt-481/dports/gnome/gnome-keyring:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
</span><span class="cx">/trunk/dports/gnome/gnome-keyring:108265-117330
</span><span class="cx">/users/rmstonecipher/gnome/gnome-keyring:102363-103172
</span><a id="usersdevansGNOME3stabledportsgnomegnomeonlineaccounts"></a>
<div class="propset"><h4>Property changes: users/devans/GNOME-3/stable/dports/gnome/gnome-online-accounts</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/gnome-online-accounts:113257-117452
</span><a id="usersdevansGNOME3stabledportsgnomegnomeonlineaccountsPortfile"></a>
<div class="modfile"><h4>Modified: users/devans/GNOME-3/stable/dports/gnome/gnome-online-accounts/Portfile (117597 => 117598)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/gnome/gnome-online-accounts/Portfile 2014-03-04 19:24:27 UTC (rev 117597)
+++ users/devans/GNOME-3/stable/dports/gnome/gnome-online-accounts/Portfile 2014-03-04 19:52:01 UTC (rev 117598)
</span><span class="lines">@@ -23,7 +23,8 @@
</span><span class="cx">
</span><span class="cx"> depends_build port:pkgconfig \
</span><span class="cx"> port:intltool \
</span><del>- port:gtk-doc
</del><ins>+ port:gtk-doc \
+ port:gnome-common
</ins><span class="cx">
</span><span class="cx"> depends_lib port:gtk3 \
</span><span class="cx"> path:lib/pkgconfig/webkitgtk-3.0.pc:webkit-gtk3 \
</span><span class="lines">@@ -38,6 +39,11 @@
</span><span class="cx">
</span><span class="cx"> patchfiles patch-return-val-if-fail.diff
</span><span class="cx">
</span><ins>+# autoreconf with MacPorts intltool.m4
+
+use_autoreconf yes
+autoreconf.args -fvi
+
</ins><span class="cx"> configure.cflags-append -Wno-format-nonliteral
</span><span class="cx"> configure.args --enable-introspection=yes
</span><span class="cx">
</span><span class="lines">@@ -63,4 +69,3 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> livecheck.type gnome
</span><del>-
</del></span></pre></div>
<a id="usersdevansGNOME3stabledportsgnomegnomesettingsdaemon"></a>
<div class="propset"><h4>Property changes: users/devans/GNOME-3/stable/dports/gnome/gnome-settings-daemon</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/gnome-settings-daemon:108265-117360
</span><a id="usersdevansGNOME3stabledportsgnomegnomesettingsdaemonPortfile"></a>
<div class="modfile"><h4>Modified: users/devans/GNOME-3/stable/dports/gnome/gnome-settings-daemon/Portfile (117597 => 117598)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/gnome/gnome-settings-daemon/Portfile 2014-03-04 19:24:27 UTC (rev 117597)
+++ users/devans/GNOME-3/stable/dports/gnome/gnome-settings-daemon/Portfile 2014-03-04 19:52:01 UTC (rev 117598)
</span><span class="lines">@@ -2,6 +2,7 @@
</span><span class="cx"> # $Id$
</span><span class="cx">
</span><span class="cx"> PortSystem 1.0
</span><ins>+PortGroup active_variants 1.1
</ins><span class="cx">
</span><span class="cx"> name gnome-settings-daemon
</span><span class="cx"> version 3.10.2
</span><span class="lines">@@ -44,6 +45,9 @@
</span><span class="cx"> port:xorg-libXrandr \
</span><span class="cx"> port:xorg-libxkbfile
</span><span class="cx">
</span><ins>+# Without libcanberra +x11 gnome-settings-daemon will fail to find the libcanberra-gtk3 package, aborting configure
+require_active_variants port:libcanberra x11
+
</ins><span class="cx"> #
</span><span class="cx"> # the following plugins are disabled by patch
</span><span class="cx"> #
</span></span></pre></div>
<a id="usersdevansGNOME3stabledportsgnomegnometerminal"></a>
<div class="propset"><h4>Property changes: users/devans/GNOME-3/stable/dports/gnome/gnome-terminal</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="addfile"><h4>Added: svn:mergeinfo</h4></div>
<span class="cx">/users/rmstonecipher/gnome/gnome-terminal:102363-103172
</span><a id="usersdevansGNOME3stabledportsgnomegnometerminalPortfile"></a>
<div class="modfile"><h4>Modified: users/devans/GNOME-3/stable/dports/gnome/gnome-terminal/Portfile (117597 => 117598)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/gnome/gnome-terminal/Portfile 2014-03-04 19:24:27 UTC (rev 117597)
+++ users/devans/GNOME-3/stable/dports/gnome/gnome-terminal/Portfile 2014-03-04 19:52:01 UTC (rev 117598)
</span><span class="lines">@@ -24,7 +24,9 @@
</span><span class="cx"> depends_build port:pkgconfig \
</span><span class="cx"> port:intltool \
</span><span class="cx"> port:itstool \
</span><del>- port:libxml2
</del><ins>+ port:yelp-tools \
+ port:libxml2 \
+ port:gnome-common
</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">@@ -44,6 +46,15 @@
</span><span class="cx"> patch-gschema.xml.in.diff \
</span><span class="cx"> no-dupfd_cloexec.patch
</span><span class="cx">
</span><ins>+# update m4/intltool.m4 and autoreconf
+
+pre-configure {
+ copy -force ${prefix}/share/aclocal/intltool.m4 ${worksrcpath}/m4
+}
+
+use_autoreconf yes
+autoreconf.args -fvi
+
</ins><span class="cx"> configure.args --with-gtk=3.0 \
</span><span class="cx"> --disable-migration \
</span><span class="cx"> --disable-silent-rules \
</span></span></pre></div>
<a id="usersdevansGNOME3stabledportsgnomegnometerminalfilespatchuuiddiff"></a>
<div class="modfile"><h4>Modified: users/devans/GNOME-3/stable/dports/gnome/gnome-terminal/files/patch-uuid.diff (117597 => 117598)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/gnome/gnome-terminal/files/patch-uuid.diff 2014-03-04 19:24:27 UTC (rev 117597)
+++ users/devans/GNOME-3/stable/dports/gnome/gnome-terminal/files/patch-uuid.diff 2014-03-04 19:52:01 UTC (rev 117598)
</span><span class="lines">@@ -34,153 +34,13 @@
</span><span class="cx"> #include <dconf.h>
</span><span class="cx">
</span><span class="cx"> #include "terminal-type-builtins.h"
</span><del>---- configure.orig 2013-10-14 12:28:06.000000000 -0700
-+++ configure 2013-11-25 18:05:42.000000000 -0800
-@@ -13128,7 +13128,6 @@
- gtk+-\$GTK_API_VERSION >= \$GTK_REQUIRED
- gsettings-desktop-schemas >= \$GSETTINGS_DESKTOP_SCHEMAS_REQUIRED
- dconf >= \$DCONF_REQUIRED
-- uuid
- \$PLATFORM_DEPS\""; } >&5
- ($PKG_CONFIG --exists --print-errors "vte$VTE_PC_VERSION >= $VTE_REQUIRED
- glib-2.0 >= $GLIB_REQUIRED
-@@ -13136,7 +13135,6 @@
</del><ins>+--- configure.ac.orig 2014-02-24 14:08:39.000000000 -0800
++++ configure.ac 2014-02-24 14:08:49.000000000 -0800
+@@ -82,7 +82,6 @@
</ins><span class="cx"> gtk+-$GTK_API_VERSION >= $GTK_REQUIRED
</span><span class="cx"> gsettings-desktop-schemas >= $GSETTINGS_DESKTOP_SCHEMAS_REQUIRED
</span><span class="cx"> dconf >= $DCONF_REQUIRED
</span><span class="cx"> - uuid
</span><del>- $PLATFORM_DEPS") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-@@ -13147,7 +13145,6 @@
- gtk+-$GTK_API_VERSION >= $GTK_REQUIRED
- gsettings-desktop-schemas >= $GSETTINGS_DESKTOP_SCHEMAS_REQUIRED
- dconf >= $DCONF_REQUIRED
-- uuid
- $PLATFORM_DEPS" 2>/dev/null`
- test "x$?" != "x0" && pkg_failed=yes
- else
-@@ -13166,7 +13163,6 @@
- gtk+-\$GTK_API_VERSION >= \$GTK_REQUIRED
- gsettings-desktop-schemas >= \$GSETTINGS_DESKTOP_SCHEMAS_REQUIRED
- dconf >= \$DCONF_REQUIRED
-- uuid
- \$PLATFORM_DEPS\""; } >&5
- ($PKG_CONFIG --exists --print-errors "vte$VTE_PC_VERSION >= $VTE_REQUIRED
- glib-2.0 >= $GLIB_REQUIRED
-@@ -13174,7 +13170,6 @@
- gtk+-$GTK_API_VERSION >= $GTK_REQUIRED
- gsettings-desktop-schemas >= $GSETTINGS_DESKTOP_SCHEMAS_REQUIRED
- dconf >= $DCONF_REQUIRED
-- uuid
- $PLATFORM_DEPS") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-@@ -13185,7 +13180,6 @@
- gtk+-$GTK_API_VERSION >= $GTK_REQUIRED
- gsettings-desktop-schemas >= $GSETTINGS_DESKTOP_SCHEMAS_REQUIRED
- dconf >= $DCONF_REQUIRED
-- uuid
- $PLATFORM_DEPS" 2>/dev/null`
- test "x$?" != "x0" && pkg_failed=yes
- else
-@@ -13213,7 +13207,6 @@
- gtk+-$GTK_API_VERSION >= $GTK_REQUIRED
- gsettings-desktop-schemas >= $GSETTINGS_DESKTOP_SCHEMAS_REQUIRED
- dconf >= $DCONF_REQUIRED
-- uuid
- $PLATFORM_DEPS" 2>&1`
- else
- TERM_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "vte$VTE_PC_VERSION >= $VTE_REQUIRED
-@@ -13222,7 +13215,6 @@
- gtk+-$GTK_API_VERSION >= $GTK_REQUIRED
- gsettings-desktop-schemas >= $GSETTINGS_DESKTOP_SCHEMAS_REQUIRED
- dconf >= $DCONF_REQUIRED
-- uuid
- $PLATFORM_DEPS" 2>&1`
- fi
- # Put the nasty error message in config.log where it belongs
-@@ -13234,7 +13226,6 @@
- gtk+-$GTK_API_VERSION >= $GTK_REQUIRED
- gsettings-desktop-schemas >= $GSETTINGS_DESKTOP_SCHEMAS_REQUIRED
- dconf >= $DCONF_REQUIRED
-- uuid
- $PLATFORM_DEPS) were not met:
</del><ins>+ $PLATFORM_DEPS])
</ins><span class="cx">
</span><del>- $TERM_PKG_ERRORS
-@@ -13574,13 +13565,13 @@
- vte\$VTE_PC_VERSION >= \$VTE_REQUIRED
- gconf-2.0 >= \$GCONF_REQUIRED
- dconf >= \$DCONF_REQUIRED
-- uuid\""; } >&5
-+ \""; } >&5
- ($PKG_CONFIG --exists --print-errors "
- gio-2.0 >= $GIO_REQUIRED
- vte$VTE_PC_VERSION >= $VTE_REQUIRED
- gconf-2.0 >= $GCONF_REQUIRED
- dconf >= $DCONF_REQUIRED
-- uuid") 2>&5
-+ ") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
-@@ -13589,7 +13580,7 @@
- vte$VTE_PC_VERSION >= $VTE_REQUIRED
- gconf-2.0 >= $GCONF_REQUIRED
- dconf >= $DCONF_REQUIRED
-- uuid" 2>/dev/null`
-+ " 2>/dev/null`
- test "x$?" != "x0" && pkg_failed=yes
- else
- pkg_failed=yes
-@@ -13606,13 +13597,13 @@
- vte\$VTE_PC_VERSION >= \$VTE_REQUIRED
- gconf-2.0 >= \$GCONF_REQUIRED
- dconf >= \$DCONF_REQUIRED
-- uuid\""; } >&5
-+ \""; } >&5
- ($PKG_CONFIG --exists --print-errors "
- gio-2.0 >= $GIO_REQUIRED
- vte$VTE_PC_VERSION >= $VTE_REQUIRED
- gconf-2.0 >= $GCONF_REQUIRED
- dconf >= $DCONF_REQUIRED
-- uuid") 2>&5
-+ ") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
-@@ -13621,7 +13612,7 @@
- vte$VTE_PC_VERSION >= $VTE_REQUIRED
- gconf-2.0 >= $GCONF_REQUIRED
- dconf >= $DCONF_REQUIRED
-- uuid" 2>/dev/null`
-+ " 2>/dev/null`
- test "x$?" != "x0" && pkg_failed=yes
- else
- pkg_failed=yes
-@@ -13647,14 +13638,14 @@
- vte$VTE_PC_VERSION >= $VTE_REQUIRED
- gconf-2.0 >= $GCONF_REQUIRED
- dconf >= $DCONF_REQUIRED
-- uuid" 2>&1`
-+ " 2>&1`
- else
- MIGRATOR_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "
- gio-2.0 >= $GIO_REQUIRED
- vte$VTE_PC_VERSION >= $VTE_REQUIRED
- gconf-2.0 >= $GCONF_REQUIRED
- dconf >= $DCONF_REQUIRED
-- uuid" 2>&1`
-+ " 2>&1`
- fi
- # Put the nasty error message in config.log where it belongs
- echo "$MIGRATOR_PKG_ERRORS" >&5
-@@ -13664,7 +13655,7 @@
- vte$VTE_PC_VERSION >= $VTE_REQUIRED
- gconf-2.0 >= $GCONF_REQUIRED
- dconf >= $DCONF_REQUIRED
-- uuid) were not met:
-+ ) were not met:
-
- $MIGRATOR_PKG_ERRORS
-
</del><ins>+ # DConf broke API without changing the pkgconfig name
</ins></span></pre></div>
<a id="usersdevansGNOME3stabledportsgnomegnomeuserdocs"></a>
<div class="propset"><h4>Property changes: users/devans/GNOME-3/stable/dports/gnome/gnome-user-docs</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="addfile"><h4>Added: svn:mergeinfo</h4></div>
<span class="cx">/trunk/dports/gnome/gnome-user-docs:108265-117330
</span><span class="cx">/users/rmstonecipher/gnome/gnome-user-docs:102363-103172
</span><a id="usersdevansGNOME3stabledportsgnomegnomeuserdocsPortfile"></a>
<div class="modfile"><h4>Modified: users/devans/GNOME-3/stable/dports/gnome/gnome-user-docs/Portfile (117597 => 117598)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/gnome/gnome-user-docs/Portfile 2014-03-04 19:24:27 UTC (rev 117597)
+++ users/devans/GNOME-3/stable/dports/gnome/gnome-user-docs/Portfile 2014-03-04 19:52:01 UTC (rev 117598)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx"> PortSystem 1.0
</span><span class="cx">
</span><span class="cx"> name gnome-user-docs
</span><del>-version 3.10.2
</del><ins>+version 3.10.3
</ins><span class="cx"> set branch [join [lrange [split ${version} .] 0 1] .]
</span><span class="cx"> description End-user documentation for GNOME3
</span><span class="cx"> long_description \
</span><span class="lines">@@ -23,8 +23,8 @@
</span><span class="cx">
</span><span class="cx"> use_xz yes
</span><span class="cx">
</span><del>-checksums sha256 a733828428e827fa40f2a240b13447917b2d71f1dce03365ef0344c52476b4d7 \
- rmd160 31a889c314348d6647730452498877014318af5e
</del><ins>+checksums sha256 960b6373ea52e41e3deb3501930e024005b29d2cc958bfadc87450a291d2a905 \
+ rmd160 b703b4cc3a64666d103cf0133064f1ae676064d6
</ins><span class="cx">
</span><span class="cx"> depends_build port:pkgconfig \
</span><span class="cx"> port:libxml2 \
</span></span></pre></div>
<a id="usersdevansGNOME3stabledportsgnomegucharmap"></a>
<div class="propset"><h4>Property changes: users/devans/GNOME-3/stable/dports/gnome/gucharmap</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/gucharmap:108265-116177
</span><span class="cx">/users/rmstonecipher/gnome/gucharmap:102363-103172
</span><span class="cx"> + /branches/mld-qt-481/dports/gnome/gucharmap:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
</span><span class="cx">/trunk/dports/gnome/gucharmap:108265-117387
</span><span class="cx">/users/rmstonecipher/gnome/gucharmap:102363-103172
</span><a id="usersdevansGNOME3stabledportsgnomegucharmapPortfile"></a>
<div class="modfile"><h4>Modified: users/devans/GNOME-3/stable/dports/gnome/gucharmap/Portfile (117597 => 117598)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/gnome/gucharmap/Portfile 2014-03-04 19:24:27 UTC (rev 117597)
+++ users/devans/GNOME-3/stable/dports/gnome/gucharmap/Portfile 2014-03-04 19:52:01 UTC (rev 117598)
</span><span class="lines">@@ -24,6 +24,8 @@
</span><span class="cx"> depends_build port:pkgconfig \
</span><span class="cx"> port:intltool \
</span><span class="cx"> port:itstool \
</span><ins>+ port:gnome-common \
+ port:yelp-tools \
</ins><span class="cx"> port:gtk-doc
</span><span class="cx">
</span><span class="cx"> depends_lib port:desktop-file-utils \
</span><span class="lines">@@ -34,6 +36,15 @@
</span><span class="cx"> depends_run port:gnome-settings-daemon \
</span><span class="cx"> port:yelp
</span><span class="cx">
</span><ins>+# update m4/intltool.m4 and autoreconf
+
+pre-configure {
+ copy -force ${prefix}/share/aclocal/intltool.m4 ${worksrcpath}/m4
+}
+
+use_autoreconf yes
+autoreconf.args -fvi
+
</ins><span class="cx"> use_parallel_build no
</span><span class="cx">
</span><span class="cx"> configure.args --with-gtk=3.0 \
</span></span></pre></div>
<a id="usersdevansGNOME3stabledportsgnomelibgdata"></a>
<div class="propset"><h4>Property changes: users/devans/GNOME-3/stable/dports/gnome/libgdata</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="addfile"><h4>Added: svn:mergeinfo</h4></div>
<span class="cx">/trunk/dports/gnome/libgdata:108265-117388
</span><span class="cx">/users/rmstonecipher/gnome/libgdata:102363-103172
</span><a id="usersdevansGNOME3stabledportsgnomelibgnomekbd"></a>
<div class="propset"><h4>Property changes: users/devans/GNOME-3/stable/dports/gnome/libgnomekbd</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/libgnomekbd:108265-116176
</span><span class="cx">/users/rmstonecipher/gnome/libgnomekbd:102363-103172
</span><span class="cx"> + /branches/mld-qt-481/dports/gnome/libgnomekbd:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
</span><span class="cx">/trunk/dports/gnome/libgnomekbd:108265-117389
</span><span class="cx">/users/rmstonecipher/gnome/libgnomekbd:102363-103172
</span><a id="usersdevansGNOME3stabledportsgnomelibgnomekbdPortfile"></a>
<div class="modfile"><h4>Modified: users/devans/GNOME-3/stable/dports/gnome/libgnomekbd/Portfile (117597 => 117598)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/gnome/libgnomekbd/Portfile 2014-03-04 19:24:27 UTC (rev 117597)
+++ users/devans/GNOME-3/stable/dports/gnome/libgnomekbd/Portfile 2014-03-04 19:52:01 UTC (rev 117598)
</span><span class="lines">@@ -24,13 +24,23 @@
</span><span class="cx"> sha256 c41ea5b0f64da470925ba09f9f1b46b26b82d4e433e594b2c71eab3da8856a09
</span><span class="cx">
</span><span class="cx"> depends_build port:pkgconfig \
</span><del>- port:intltool
</del><ins>+ port:intltool \
+ port:gnome-common
</ins><span class="cx">
</span><span class="cx"> depends_lib port:desktop-file-utils \
</span><span class="cx"> port:gtk3 \
</span><span class="cx"> port:libxklavier \
</span><span class="cx"> port:gobject-introspection
</span><span class="cx">
</span><ins>+# update m4/intltool.m4 and autoreconf
+
+pre-configure {
+ copy -force ${prefix}/share/aclocal/intltool.m4 ${worksrcpath}/m4
+}
+
+use_autoreconf yes
+autoreconf.args -fvi
+
</ins><span class="cx"> configure.args --enable-introspection \
</span><span class="cx"> --without-x \
</span><span class="cx"> --disable-schemas-compile \
</span></span></pre></div>
<a id="usersdevansGNOME3stabledportsgnomenautilus"></a>
<div class="propset"><h4>Property changes: users/devans/GNOME-3/stable/dports/gnome/nautilus</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/nautilus:108265-115773
</span><span class="cx">/users/rmstonecipher/gnome/nautilus:102363-103172
</span><span class="cx"> + /branches/mld-qt-481/dports/gnome/nautilus:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
</span><span class="cx">/trunk/dports/gnome/nautilus:108265-117423
</span><span class="cx">/users/rmstonecipher/gnome/nautilus:102363-103172
</span><a id="usersdevansGNOME3stabledportsgnomenautilusPortfile"></a>
<div class="modfile"><h4>Modified: users/devans/GNOME-3/stable/dports/gnome/nautilus/Portfile (117597 => 117598)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/gnome/nautilus/Portfile 2014-03-04 19:24:27 UTC (rev 117597)
+++ users/devans/GNOME-3/stable/dports/gnome/nautilus/Portfile 2014-03-04 19:52:01 UTC (rev 117598)
</span><span class="lines">@@ -42,6 +42,15 @@
</span><span class="cx">
</span><span class="cx"> depends_run port:gnome-settings-daemon
</span><span class="cx">
</span><ins>+# update m4/intltool.m4 and autoreconf
+
+pre-configure {
+ copy -force ${prefix}/share/aclocal/intltool.m4 ${worksrcpath}/m4
+}
+
+use_autoreconf yes
+autoreconf.args -fvi
+
</ins><span class="cx"> configure.args --enable-introspection=yes \
</span><span class="cx"> --enable-tracker=no \
</span><span class="cx"> --disable-packagekit \
</span></span></pre></div>
<a id="usersdevansGNOME3stabledportsgnomeseahorse"></a>
<div class="propset"><h4>Property changes: users/devans/GNOME-3/stable/dports/gnome/seahorse</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="addfile"><h4>Added: svn:mergeinfo</h4></div>
<span class="cx">/trunk/dports/gnome/seahorse:108265-117440
</span><span class="cx">/users/rmstonecipher/gnome/seahorse:102363-103172
</span><a id="usersdevansGNOME3stabledportsgnomeseahorsePortfile"></a>
<div class="modfile"><h4>Modified: users/devans/GNOME-3/stable/dports/gnome/seahorse/Portfile (117597 => 117598)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/gnome/seahorse/Portfile 2014-03-04 19:24:27 UTC (rev 117597)
+++ users/devans/GNOME-3/stable/dports/gnome/seahorse/Portfile 2014-03-04 19:52:01 UTC (rev 117598)
</span><span class="lines">@@ -26,7 +26,9 @@
</span><span class="cx">
</span><span class="cx"> depends_build port:pkgconfig \
</span><span class="cx"> port:intltool \
</span><del>- port:itstool
</del><ins>+ port:itstool \
+ port:yelp-tools \
+ port:gnome-common
</ins><span class="cx">
</span><span class="cx"> depends_lib port:desktop-file-utils \
</span><span class="cx"> port:gtk3 \
</span><span class="lines">@@ -48,6 +50,15 @@
</span><span class="cx"> --disable-schemas-compile \
</span><span class="cx"> --disable-silent-rules
</span><span class="cx">
</span><ins>+# update m4/intltool.m4 and autoreconf
+
+pre-configure {
+ copy -force ${prefix}/share/aclocal/intltool.m4 ${worksrcpath}/m4
+}
+
+use_autoreconf yes
+autoreconf.args -fvi
+
</ins><span class="cx"> post-activate {
</span><span class="cx"> system "${prefix}/bin/update-desktop-database -q ${prefix}/share/applications"
</span><span class="cx"> system "${prefix}/bin/gtk-update-icon-cache-3.0 -f -t ${prefix}/share/icons/hicolor"
</span></span></pre></div>
<a id="usersdevansGNOME3stabledportsgnometotem"></a>
<div class="propset"><h4>Property changes: users/devans/GNOME-3/stable/dports/gnome/totem</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/totem:108265-117246
</span><a id="usersdevansGNOME3stabledportsgnometotemplparser"></a>
<div class="propset"><h4>Property changes: users/devans/GNOME-3/stable/dports/gnome/totem-pl-parser</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="addfile"><h4>Added: svn:mergeinfo</h4></div>
<span class="cx">/trunk/dports/gnome/totem-pl-parser:108265-117245
</span><span class="cx">/users/rmstonecipher/gnome/totem-pl-parser:102363-103172
</span><a id="usersdevansGNOME3stabledportsgnometotemplparserPortfile"></a>
<div class="modfile"><h4>Modified: users/devans/GNOME-3/stable/dports/gnome/totem-pl-parser/Portfile (117597 => 117598)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/gnome/totem-pl-parser/Portfile 2014-03-04 19:24:27 UTC (rev 117597)
+++ users/devans/GNOME-3/stable/dports/gnome/totem-pl-parser/Portfile 2014-03-04 19:52:01 UTC (rev 117598)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx"> PortSystem 1.0
</span><span class="cx">
</span><span class="cx"> name totem-pl-parser
</span><del>-version 3.10.0
</del><ins>+version 3.10.1
</ins><span class="cx"> set branch [join [lrange [split ${version} .] 0 1] .]
</span><span class="cx"> categories gnome
</span><span class="cx"> license LGPL-2+
</span><span class="lines">@@ -20,11 +20,12 @@
</span><span class="cx">
</span><span class="cx"> use_xz yes
</span><span class="cx">
</span><del>-checksums rmd160 f0cb5f798daaa678e9d17b06c7fe31c10ca939dc \
- sha256 87eac3fdf2b632dfac0edda07906a3e84f1ce4442b8127394414020dafe41aa9
</del><ins>+checksums rmd160 eb1a3a59f1c994c50d8332e716c8cfd98ee53f13 \
+ sha256 13d20222e7230eff1b22acc2b6b54d3c910590782a3ac39b859857407fb5e413
</ins><span class="cx">
</span><span class="cx"> depends_build port:pkgconfig \
</span><del>- port:intltool
</del><ins>+ port:intltool \
+ port:gnome-common
</ins><span class="cx">
</span><span class="cx"> depends_lib port:libsoup \
</span><span class="cx"> port:libarchive \
</span><span class="lines">@@ -34,8 +35,18 @@
</span><span class="cx"> port:gmime \
</span><span class="cx"> port:gobject-introspection
</span><span class="cx">
</span><del>-patchfiles patch-plparse-plparser.symbols.diff
</del><ins>+patchfiles patch-plparse-plparser.symbols.diff \
+ patch-configure.ac.diff
</ins><span class="cx">
</span><ins>+# update m4/intltool.m4 and autoreconf
+
+pre-configure {
+ copy -force ${prefix}/share/aclocal/intltool.m4 ${worksrcpath}/m4
+}
+
+use_autoreconf yes
+autoreconf.args -fvi
+
</ins><span class="cx"> configure.args --enable-introspection=yes \
</span><span class="cx"> --enable-libarchive \
</span><span class="cx"> --enable-libgcrypt \
</span></span></pre></div>
<a id="usersdevansGNOME3stabledportsgnometotemplparserfilespatchconfigureacdifffromrev117245trunkdportsgnometotemplparserfilespatchconfigureacdiff"></a>
<div class="copfile"><h4>Copied: users/devans/GNOME-3/stable/dports/gnome/totem-pl-parser/files/patch-configure.ac.diff (from rev 117245, trunk/dports/gnome/totem-pl-parser/files/patch-configure.ac.diff) (0 => 117598)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/gnome/totem-pl-parser/files/patch-configure.ac.diff (rev 0)
+++ users/devans/GNOME-3/stable/dports/gnome/totem-pl-parser/files/patch-configure.ac.diff 2014-03-04 19:52:01 UTC (rev 117598)
</span><span class="lines">@@ -0,0 +1,17 @@
</span><ins>+--- configure.ac.orig 2014-02-19 15:15:07.000000000 -0800
++++ configure.ac 2014-02-19 15:19:33.000000000 -0800
+@@ -8,12 +8,13 @@ AC_INIT([totem-pl-parser],
+ [totem_version_major.totem_version_minor.totem_version_micro],
+ [http://bugzilla.gnome.org/enter_bug.cgi?product=totem-pl-parser&component=General])
+
++AM_INIT_AUTOMAKE([1.9 dist-xz no-dist-gzip check-news subdir-objects])
++
+ AC_CONFIG_SRCDIR([plparse/totem-pl-parser.c])
+ AC_CONFIG_HEADERS([config.h])
+ AC_CONFIG_MACRO_DIR([m4])
+ AC_USE_SYSTEM_EXTENSIONS
+
+-AM_INIT_AUTOMAKE([1.9 dist-xz no-dist-gzip check-news subdir-objects])
+ AM_MAINTAINER_MODE([enable])
+
+ # Enable silent build when available (Automake 1.11)
</ins></span></pre></div>
<a id="usersdevansGNOME3stabledportsgnomevino"></a>
<div class="propset"><h4>Property changes: users/devans/GNOME-3/stable/dports/gnome/vino</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="addfile"><h4>Added: svn:mergeinfo</h4></div>
<span class="cx">/trunk/dports/gnome/vino:108265-117436
</span><span class="cx">/users/rmstonecipher/gnome/vino:102363-103172
</span><a id="usersdevansGNOME3stabledportsgnomevinoPortfile"></a>
<div class="modfile"><h4>Modified: users/devans/GNOME-3/stable/dports/gnome/vino/Portfile (117597 => 117598)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/gnome/vino/Portfile 2014-03-04 19:24:27 UTC (rev 117597)
+++ users/devans/GNOME-3/stable/dports/gnome/vino/Portfile 2014-03-04 19:52:01 UTC (rev 117598)
</span><span class="lines">@@ -21,7 +21,8 @@
</span><span class="cx"> sha256 faf10d667c43d00cd37dc6343b44012456de9d2e39d8ce679c719e65d2dfbe46
</span><span class="cx">
</span><span class="cx"> depends_build port:pkgconfig \
</span><del>- port:intltool
</del><ins>+ port:intltool \
+ port:gnome-common
</ins><span class="cx">
</span><span class="cx"> depends_lib port:desktop-file-utils \
</span><span class="cx"> port:gtk3 \
</span><span class="lines">@@ -38,6 +39,15 @@
</span><span class="cx"> port:jpeg \
</span><span class="cx"> port:zlib
</span><span class="cx">
</span><ins>+# update m4/intltool.m4 and autoreconf
+
+pre-configure {
+ copy -force ${prefix}/share/aclocal/intltool.m4 ${worksrcpath}/m4
+}
+
+use_autoreconf yes
+autoreconf.args -fvi
+
</ins><span class="cx"> configure.cflags-append \
</span><span class="cx"> -Wno-format-nonliteral
</span><span class="cx">
</span></span></pre></div>
<a id="usersdevansGNOME3stabledportsgnomeyelp"></a>
<div class="propset"><h4>Property changes: users/devans/GNOME-3/stable/dports/gnome/yelp</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/yelp:108265-115773
</span><span class="cx">/users/rmstonecipher/gnome/yelp:102363-103172
</span><span class="cx"> + /branches/mld-qt-481/dports/gnome/yelp:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
</span><span class="cx">/trunk/dports/gnome/yelp:108265-117591
</span><span class="cx">/users/rmstonecipher/gnome/yelp:102363-103172
</span><a id="usersdevansGNOME3stabledportsgnomeyelpPortfile"></a>
<div class="modfile"><h4>Modified: users/devans/GNOME-3/stable/dports/gnome/yelp/Portfile (117597 => 117598)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/gnome/yelp/Portfile 2014-03-04 19:24:27 UTC (rev 117597)
+++ users/devans/GNOME-3/stable/dports/gnome/yelp/Portfile 2014-03-04 19:52:01 UTC (rev 117598)
</span><span class="lines">@@ -4,8 +4,7 @@
</span><span class="cx"> PortSystem 1.0
</span><span class="cx">
</span><span class="cx"> name yelp
</span><del>-version 3.10.1
-revision 1
</del><ins>+version 3.10.2
</ins><span class="cx"> license GPL-2
</span><span class="cx"> set branch [join [lrange [split ${version} .] 0 1] .]
</span><span class="cx"> description Help browser for GNOME.
</span><span class="lines">@@ -22,14 +21,15 @@
</span><span class="cx">
</span><span class="cx"> use_xz yes
</span><span class="cx">
</span><del>-checksums rmd160 dcb874dd98611968ffe3e8d42a3514af1fecf0ca \
- sha256 17736479b7d0b1128c7d6cb3073f2b09e4bbc82670731b2a0d3a3219a520f816
</del><ins>+checksums rmd160 9245b27ca92ed49064c369bff78734b17e168d51 \
+ sha256 31cdff0df058fd42752808b6454b774281505f42695ee8b20891eb1332c34338
</ins><span class="cx">
</span><span class="cx"> depends_skip_archcheck gnome-settings-daemon
</span><span class="cx">
</span><span class="cx"> depends_build port:pkgconfig \
</span><span class="cx"> port:intltool \
</span><del>- port:itstool
</del><ins>+ port:itstool \
+ port:gnome-common
</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">@@ -49,6 +49,15 @@
</span><span class="cx"> depends_run port:gnome-user-docs \
</span><span class="cx"> port:gnome-settings-daemon
</span><span class="cx">
</span><ins>+# update m4/intltool.m4 and autoreconf
+
+pre-configure {
+ copy -force ${prefix}/share/aclocal/intltool.m4 ${worksrcpath}/m4
+}
+
+use_autoreconf yes
+autoreconf.args -fvi
+
</ins><span class="cx"> configure.args --x-includes=${prefix}/include \
</span><span class="cx"> --x-libraries=${prefix}/lib \
</span><span class="cx"> --disable-schemas-compile \
</span></span></pre></div>
<a id="usersdevansGNOME3stabledportsgnomeyelptools"></a>
<div class="propset"><h4>Property changes: users/devans/GNOME-3/stable/dports/gnome/yelp-tools</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="addfile"><h4>Added: svn:mergeinfo</h4></div>
<a id="usersdevansGNOME3stabledportsgnomeyelptoolsPortfile"></a>
<div class="modfile"><h4>Modified: users/devans/GNOME-3/stable/dports/gnome/yelp-tools/Portfile (117597 => 117598)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/gnome/yelp-tools/Portfile 2014-03-04 19:24:27 UTC (rev 117597)
+++ users/devans/GNOME-3/stable/dports/gnome/yelp-tools/Portfile 2014-03-04 19:52:01 UTC (rev 117598)
</span><span class="lines">@@ -24,7 +24,6 @@
</span><span class="cx"> supported_archs noarch
</span><span class="cx">
</span><span class="cx"> depends_build port:pkgconfig \
</span><del>- port:intltool \
</del><span class="cx"> port:itstool \
</span><span class="cx"> port:libxslt \
</span><span class="cx"> port:libxml2
</span></span></pre></div>
<a id="usersdevansGNOME3stabledportsgnomeyelpxsl"></a>
<div class="propset"><h4>Property changes: users/devans/GNOME-3/stable/dports/gnome/yelp-xsl</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="addfile"><h4>Added: svn:mergeinfo</h4></div>
<span class="cx">/trunk/dports/gnome/yelp-xsl:108265-117431
</span><span class="cx">/users/rmstonecipher/gnome/yelp-xsl:102363-103172
</span><a id="usersdevansGNOME3stabledportsgnomeyelpxslPortfile"></a>
<div class="modfile"><h4>Modified: users/devans/GNOME-3/stable/dports/gnome/yelp-xsl/Portfile (117597 => 117598)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/gnome/yelp-xsl/Portfile 2014-03-04 19:24:27 UTC (rev 117597)
+++ users/devans/GNOME-3/stable/dports/gnome/yelp-xsl/Portfile 2014-03-04 19:52:01 UTC (rev 117598)
</span><span class="lines">@@ -30,6 +30,15 @@
</span><span class="cx"> port:libxslt \
</span><span class="cx"> port:libxml2
</span><span class="cx">
</span><ins>+# update m4/intltool.m4 and autoreconf
+
+pre-configure {
+ copy -force ${prefix}/share/aclocal/intltool.m4 ${worksrcpath}/m4
+}
+
+use_autoreconf yes
+autoreconf.args -fvi
+
</ins><span class="cx"> post-activate {
</span><span class="cx"> system "${prefix}/bin/gtk-update-icon-cache-3.0 -f -t ${prefix}/share/icons/hicolor"
</span><span class="cx"> }
</span></span></pre></div>
<a id="usersdevansGNOME3stabledportsgnomezenity"></a>
<div class="propset"><h4>Property changes: users/devans/GNOME-3/stable/dports/gnome/zenity</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/zenity:108265-115773
</span><span class="cx">/users/rmstonecipher/gnome/zenity:102363-103172
</span><span class="cx"> + /branches/mld-qt-481/dports/gnome/zenity:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
</span><span class="cx">/trunk/dports/gnome/zenity:108265-117452
</span><span class="cx">/users/rmstonecipher/gnome/zenity:102363-103172
</span><a id="usersdevansGNOME3stabledportsgnomezenityPortfile"></a>
<div class="modfile"><h4>Modified: users/devans/GNOME-3/stable/dports/gnome/zenity/Portfile (117597 => 117598)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/gnome/zenity/Portfile 2014-03-04 19:24:27 UTC (rev 117597)
+++ users/devans/GNOME-3/stable/dports/gnome/zenity/Portfile 2014-03-04 19:52:01 UTC (rev 117598)
</span><span class="lines">@@ -32,7 +32,12 @@
</span><span class="cx"> port:libnotify \
</span><span class="cx"> path:lib/pkgconfig/webkitgtk-3.0.pc:webkit-gtk3
</span><span class="cx">
</span><del>-# Don't do intltool's INTLTOOL_PERL dance
</del><ins>+# update m4/intltool.m4 and autoreconf
+
+pre-configure {
+ copy -force ${prefix}/share/aclocal/intltool.m4 ${worksrcpath}/m4
+}
+
</ins><span class="cx"> use_autoreconf yes
</span><span class="cx"> autoreconf.args -fvi
</span><span class="cx">
</span></span></pre></div>
<a id="usersdevansGNOME3stabledportsnetrygel"></a>
<div class="propset"><h4>Property changes: users/devans/GNOME-3/stable/dports/net/rygel</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/net/rygel:113316-117439
</span><a id="usersdevansGNOME3stabledportsnetrygelPortfile"></a>
<div class="modfile"><h4>Modified: users/devans/GNOME-3/stable/dports/net/rygel/Portfile (117597 => 117598)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/net/rygel/Portfile 2014-03-04 19:24:27 UTC (rev 117597)
+++ users/devans/GNOME-3/stable/dports/net/rygel/Portfile 2014-03-04 19:52:01 UTC (rev 117598)
</span><span class="lines">@@ -38,9 +38,18 @@
</span><span class="cx">
</span><span class="cx"> depends_run port:gnome-settings-daemon
</span><span class="cx">
</span><del>-patchfiles patch-configure.diff \
</del><ins>+patchfiles patch-configure.ac.diff \
</ins><span class="cx"> patch-return.diff
</span><span class="cx">
</span><ins>+# update m4/intltool.m4 and autoreconf
+
+pre-configure {
+ copy -force ${prefix}/share/aclocal/intltool.m4 ${worksrcpath}/m4
+}
+
+use_autoreconf yes
+autoreconf.args -fvi
+
</ins><span class="cx"> configure.args --disable-silent-rules \
</span><span class="cx"> --enable-tracker-plugin=no
</span><span class="cx">
</span></span></pre></div>
<a id="usersdevansGNOME3stabledportsnetrygelfilespatchconfigureacdifffromrev117439trunkdportsnetrygelfilespatchconfigureacdiff"></a>
<div class="copfile"><h4>Copied: users/devans/GNOME-3/stable/dports/net/rygel/files/patch-configure.ac.diff (from rev 117439, trunk/dports/net/rygel/files/patch-configure.ac.diff) (0 => 117598)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/net/rygel/files/patch-configure.ac.diff (rev 0)
+++ users/devans/GNOME-3/stable/dports/net/rygel/files/patch-configure.ac.diff 2014-03-04 19:52:01 UTC (rev 117598)
</span><span class="lines">@@ -0,0 +1,20 @@
</span><ins>+--- configure.ac.orig 2013-12-22 03:32:37.000000000 -0800
++++ configure.ac 2014-02-26 00:43:42.000000000 -0800
+@@ -43,7 +43,7 @@
+ GSTPBU_REQUIRED=1.0
+ GIO_REQUIRED=2.26
+ GEE_REQUIRED=0.8.0
+-UUID_REQUIRED=1.41.3
++UUID_REQUIRED=1.6.2
+ LIBSOUP_REQUIRED=2.34.0
+ GTK_REQUIRED=3.0
+
+@@ -387,7 +387,7 @@
+ AM_CONDITIONAL(ENABLE_VALADOC, test x$found_valadoc = xyes)
+
+ AC_SUBST([RYGEL_PLUGIN_LINKER_FLAGS],
+- ["-module -avoid-version -Wl,-z,defs"])
++ ["-module -avoid-version"])
+ AC_SUBST([RYGEL_PLUGIN_DIR],
+ [${libdir}/rygel-2.0/plugins])
+ AC_SUBST([RYGEL_MEDIA_ENGINE_DIR],
</ins></span></pre></div>
<a id="usersdevansGNOME3stabledportsnetrygelfilespatchconfigurediff"></a>
<div class="delfile"><h4>Deleted: users/devans/GNOME-3/stable/dports/net/rygel/files/patch-configure.diff (117597 => 117598)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/net/rygel/files/patch-configure.diff 2014-03-04 19:24:27 UTC (rev 117597)
+++ users/devans/GNOME-3/stable/dports/net/rygel/files/patch-configure.diff 2014-03-04 19:52:01 UTC (rev 117598)
</span><span class="lines">@@ -1,20 +0,0 @@
</span><del>---- configure.orig 2013-11-11 11:26:23.000000000 -0800
-+++ configure 2013-11-16 12:02:53.000000000 -0800
-@@ -12902,7 +12902,7 @@
- GSTPBU_REQUIRED=1.0
- GIO_REQUIRED=2.26
- GEE_REQUIRED=0.8.0
--UUID_REQUIRED=1.41.3
-+UUID_REQUIRED=1.6.2
- LIBSOUP_REQUIRED=2.34.0
- GTK_REQUIRED=3.0
-
-@@ -17584,7 +17584,7 @@
- fi
-
-
--RYGEL_PLUGIN_LINKER_FLAGS="-module -avoid-version -Wl,-z,defs"
-+RYGEL_PLUGIN_LINKER_FLAGS="-module -avoid-version"
-
- RYGEL_PLUGIN_DIR=${libdir}/rygel-2.0/plugins
-
</del></span></pre>
</div>
</div>
</body>
</html>