<!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>[147377] trunk/dports/gnome/gnome-online-accounts</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/147377">147377</a></dd>
<dt>Author</dt> <dd>devans@macports.org</dd>
<dt>Date</dt> <dd>2016-04-02 14:30:57 -0700 (Sat, 02 Apr 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>gnome-online-accounts: update to version 3.20.0, update autogen.sh from upstream git master.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsgnomegnomeonlineaccountsPortfile">trunk/dports/gnome/gnome-online-accounts/Portfile</a></li>
<li><a href="#trunkdportsgnomegnomeonlineaccountsfilesautogensh">trunk/dports/gnome/gnome-online-accounts/files/autogen.sh</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#trunkdportsgnomegnomeonlineaccounts">trunk/dports/gnome/gnome-online-accounts/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsgnomegnomeonlineaccounts"></a>
<div class="propset"><h4>Property changes: trunk/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">/users/devans/GNOME-3/unstable/dports/gnome/gnome-online-accounts:114069-118152,119584-125723,128305-134400
</span><span class="cx"> + /users/devans/GNOME-3/stable/dports/gnome/gnome-online-accounts:113175-147292
</span><span class="cx">/users/devans/GNOME-3/unstable/dports/gnome/gnome-online-accounts:114069-118152,119584-125723,128305-134400,145186-146944
</span><a id="trunkdportsgnomegnomeonlineaccountsPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/gnome/gnome-online-accounts/Portfile (147376 => 147377)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gnome/gnome-online-accounts/Portfile 2016-04-02 21:24:30 UTC (rev 147376)
+++ trunk/dports/gnome/gnome-online-accounts/Portfile 2016-04-02 21:30:57 UTC (rev 147377)
</span><span class="lines">@@ -7,7 +7,7 @@
</span><span class="cx"> name gnome-online-accounts
</span><span class="cx">
</span><span class="cx"> # version 3.16.0+ requires webkit2gtk-4.0
</span><del>-version 3.18.4
</del><ins>+version 3.20.0
</ins><span class="cx">
</span><span class="cx"> license LGPL-2
</span><span class="cx"> set branch [join [lrange [split ${version} .] 0 1] .]
</span><span class="lines">@@ -21,8 +21,8 @@
</span><span class="cx">
</span><span class="cx"> use_xz yes
</span><span class="cx">
</span><del>-checksums rmd160 f4e1094edd2db9417ff379aca6b32a44d101602e \
- sha256 9f23460aa6b1d8a63a8f3e979cba791cc88b5e07116f07da59fdcea09d79c74d
</del><ins>+checksums rmd160 6025e01b80362a437b480570228af44570cd7729 \
+ sha256 c98233914c455dc21f8c73904dd2881bee6bfa117a5bdc573ba3a8550c36a460
</ins><span class="cx">
</span><span class="cx"> depends_build port:pkgconfig \
</span><span class="cx"> port:intltool \
</span><span class="lines">@@ -93,8 +93,10 @@
</span><span class="cx"> livecheck.type none
</span><span class="cx"> } else {
</span><span class="cx"> # reconfigure using upstream autogen.sh for intltool 0.51 compatibility
</span><ins>+ # delete m4/glib-gettext.m4 to force replacement with current version
</ins><span class="cx"> post-patch {
</span><span class="cx"> xinstall -m 755 ${filespath}/autogen.sh ${worksrcpath}
</span><ins>+ delete ${worksrcpath}/m4/glib-gettext.m4
</ins><span class="cx"> }
</span><span class="cx"> configure.cmd ./autogen.sh
</span><span class="cx"> depends_lib-append path:lib/pkgconfig/webkit2gtk-4.0.pc:webkit2-gtk
</span></span></pre></div>
<a id="trunkdportsgnomegnomeonlineaccountsfilesautogensh"></a>
<div class="modfile"><h4>Modified: trunk/dports/gnome/gnome-online-accounts/files/autogen.sh (147376 => 147377)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gnome/gnome-online-accounts/files/autogen.sh 2016-04-02 21:24:30 UTC (rev 147376)
+++ trunk/dports/gnome/gnome-online-accounts/files/autogen.sh 2016-04-02 21:30:57 UTC (rev 147377)
</span><span class="lines">@@ -1,24 +1,45 @@
</span><span class="cx"> #!/bin/sh
</span><span class="cx"> # Run this to generate all the initial makefiles, etc.
</span><ins>+test -n "$srcdir" || srcdir=$(dirname "$0")
+test -n "$srcdir" || srcdir=.
</ins><span class="cx">
</span><del>-srcdir=`dirname $0`
-test -z "$srcdir" && srcdir=.
</del><ins>+olddir=$(pwd)
</ins><span class="cx">
</span><del>-PKG_NAME="goa"
</del><ins>+cd $srcdir
</ins><span class="cx">
</span><del>-(test -f $srcdir/src/Makefile.am) || {
- echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
- echo " top-level $PKG_NAME directory"
- exit 1
</del><ins>+(test -f configure.ac) || {
+ echo "*** ERROR: Directory '$srcdir' does not look like the top-level project directory ***"
+ exit 1
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-which gnome-autogen.sh || {
- echo "You need to install gnome-common"
- exit 1
-}
</del><ins>+# shellcheck disable=SC2016
+PKG_NAME=$(autoconf --trace 'AC_INIT:$1' configure.ac)
</ins><span class="cx">
</span><ins>+if [ "$#" = 0 -a "x$NOCONFIGURE" = "x" ]; then
+ echo "*** WARNING: I am going to run 'configure' with no arguments." >&2
+ echo "*** If you wish to pass any to it, please specify them on the" >&2
+ echo "*** '$0' command line." >&2
+ echo "" >&2
+fi
+
+# git submodule update --init --recursive
+
</ins><span class="cx"> cd telepathy-account-widgets
</span><del>-sh autogen.sh --no-configure
</del><ins>+NOCONFIGURE=1 sh autogen.sh
</ins><span class="cx"> cd ..
</span><span class="cx">
</span><del>-. gnome-autogen.sh "$@"
</del><ins>+aclocal --install --force || exit 1
+gtkdocize --copy || exit 1
+intltoolize --force --copy --automake || exit 1
+autoreconf --verbose --force --install || exit 1
+
+cd "$olddir"
+if [ "$NOCONFIGURE" = "" ]; then
+ $srcdir/configure "$@" || exit 1
+
+ if [ "$1" = "--help" ]; then exit 0 else
+ echo "Now type 'make' to compile $PKG_NAME" || exit 1
+ fi
+else
+ echo "Skipping configure process."
+fi
</ins></span></pre>
</div>
</div>
</body>
</html>