<!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>[136153] trunk/dports/gnome/evolution-data-server</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/136153">136153</a></dd>
<dt>Author</dt> <dd>devans@macports.org</dd>
<dt>Date</dt> <dd>2015-05-11 15:36:50 -0700 (Mon, 11 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>evolution-data-server: update to version 3.16.1, reconfigure using upstream autogen.sh for intltool 0.51 compatibility, use parallel build, make +phonenumber default.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsgnomeevolutiondataserverPortfile">trunk/dports/gnome/evolution-data-server/Portfile</a></li>
<li><a href="#trunkdportsgnomeevolutiondataserverfilespatchaddressbooklibebookcontactsephonenumberprivatecppdiff">trunk/dports/gnome/evolution-data-server/files/patch-addressbook-libebook-contacts-e-phone-number-private.cpp.diff</a></li>
<li><a href="#trunkdportsgnomeevolutiondataserverfilespatchconfigureacdiff">trunk/dports/gnome/evolution-data-server/files/patch-configure.ac.diff</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsgnomeevolutiondataserverfilesautogensh">trunk/dports/gnome/evolution-data-server/files/autogen.sh</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#trunkdportsgnomeevolutiondataserver">trunk/dports/gnome/evolution-data-server/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsgnomeevolutiondataserver"></a>
<div class="propset"><h4>Property changes: trunk/dports/gnome/evolution-data-server</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/evolution-data-server:114069-118152
</span><span class="cx"> + /users/devans/GNOME-3/stable/dports/gnome/evolution-data-server:108269-136044
</span><span class="cx">/users/devans/GNOME-3/unstable/dports/gnome/evolution-data-server:114069-118152,119491-134403
</span><a id="trunkdportsgnomeevolutiondataserverPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/gnome/evolution-data-server/Portfile (136152 => 136153)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gnome/evolution-data-server/Portfile 2015-05-11 22:36:48 UTC (rev 136152)
+++ trunk/dports/gnome/evolution-data-server/Portfile 2015-05-11 22:36:50 UTC (rev 136153)
</span><span class="lines">@@ -5,8 +5,7 @@
</span><span class="cx"> PortGroup gobject_introspection 1.0
</span><span class="cx">
</span><span class="cx"> name evolution-data-server
</span><del>-version 3.12.11
-revision 1
</del><ins>+version 3.16.1
</ins><span class="cx"> set branch [join [lrange [split ${version} .] 0 1] .]
</span><span class="cx"> description Addressbook and calender libs for GNOME.
</span><span class="cx"> long_description Evolution Data Server provides a central location for \
</span><span class="lines">@@ -20,13 +19,16 @@
</span><span class="cx">
</span><span class="cx"> use_xz yes
</span><span class="cx">
</span><del>-checksums rmd160 96acb4edf615fae95a92055cc970ae2efc838907 \
- sha256 59023d2cf92e36b69c1f83b2e56a0ba037754982a23cb06f35f6cc5de7a12201
</del><ins>+checksums rmd160 005e4150c944d853050846d219e4566448e0e613 \
+ sha256 04eedf170708c97ca807951f47e6d6f554bee94c35bc279201a54f64b744eb51
</ins><span class="cx">
</span><span class="cx"> depends_build port:pkgconfig \
</span><ins>+ port:intltool \
+ port:gtk-doc \
</ins><span class="cx"> port:gnome-common \
</span><del>- port:intltool \
- port:gtk-doc
</del><ins>+ port:autoconf \
+ port:automake \
+ port:libtool
</ins><span class="cx">
</span><span class="cx"> depends_lib port:gtk3 \
</span><span class="cx"> port:libxml2 \
</span><span class="lines">@@ -45,19 +47,18 @@
</span><span class="cx"> port:db46 \
</span><span class="cx"> port:icu
</span><span class="cx">
</span><ins>+gobject_introspection yes
+
</ins><span class="cx"> patchfiles patch-configure.ac.diff \
</span><span class="cx"> patch-addressbook-libebook-contacts-e-phone-number-private.cpp.diff
</span><span class="cx">
</span><del>-gobject_introspection yes
</del><ins>+# reconfigure using upstream autogen.sh for intltool 0.51 compatibility
</ins><span class="cx">
</span><del>-# update m4/intltool.m4 and autoreconf
-
-pre-configure {
- copy -force ${prefix}/share/aclocal/intltool.m4 ${worksrcpath}/m4
</del><ins>+post-patch {
+ xinstall -m 755 ${filespath}/autogen.sh ${worksrcpath}
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-use_autoreconf yes
-autoreconf.args -fvi
</del><ins>+configure.cmd ./autogen.sh
</ins><span class="cx">
</span><span class="cx"> configure.env-append \
</span><span class="cx"> DB_CFLAGS="-I${prefix}/include/db46" \
</span><span class="lines">@@ -83,7 +84,6 @@
</span><span class="cx"> #
</span><span class="cx">
</span><span class="cx"> universal_variant no
</span><del>-use_parallel_build no
</del><span class="cx">
</span><span class="cx"> variant phonenumber description {Phone number parsing/validation using libphonenumber} {
</span><span class="cx"> depends_lib-append port:libphonenumber-cpp
</span><span class="lines">@@ -91,6 +91,8 @@
</span><span class="cx"> configure.args-append --with-phonenumber=${prefix}/lib
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+default_variants +phonenumber
+
</ins><span class="cx"> post-activate {
</span><span class="cx"> system "${prefix}/bin/glib-compile-schemas ${prefix}/share/glib-2.0/schemas"
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkdportsgnomeevolutiondataserverfilesautogenshfromrev136044usersdevansGNOME3stabledportsgnomeevolutiondataserverfilesautogensh"></a>
<div class="copfile"><h4>Copied: trunk/dports/gnome/evolution-data-server/files/autogen.sh (from rev 136044, users/devans/GNOME-3/stable/dports/gnome/evolution-data-server/files/autogen.sh) (0 => 136153)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gnome/evolution-data-server/files/autogen.sh (rev 0)
+++ trunk/dports/gnome/evolution-data-server/files/autogen.sh 2015-05-11 22:36:50 UTC (rev 136153)
</span><span class="lines">@@ -0,0 +1,26 @@
</span><ins>+#!/bin/sh
+# Run this to generate all the initial makefiles, etc.
+
+srcdir=`dirname $0`
+test -z "$srcdir" && srcdir=.
+
+PKG_NAME="evolution-data-server"
+REQUIRED_AUTOCONF_VERSION=2.58
+REQUIRED_AUTOMAKE_VERSION=1.10
+REQUIRED_LIBTOOL_VERSION=2.2
+REQUIRED_INTLTOOL_VERSION=0.35.5
+
+(test -f $srcdir/configure.ac \
+ && test -f $srcdir/ChangeLog \
+ && test -d $srcdir/calendar) || {
+ echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
+ echo " top-level $PKG_NAME directory"
+ exit 1
+}
+
+which gnome-autogen.sh || {
+ echo "You need to install gnome-common from the GNOME CVS"
+ exit 1
+}
+
+USE_GNOME2_MACROS=1 . gnome-autogen.sh
</ins></span></pre></div>
<a id="trunkdportsgnomeevolutiondataserverfilespatchaddressbooklibebookcontactsephonenumberprivatecppdiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/gnome/evolution-data-server/files/patch-addressbook-libebook-contacts-e-phone-number-private.cpp.diff (136152 => 136153)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gnome/evolution-data-server/files/patch-addressbook-libebook-contacts-e-phone-number-private.cpp.diff 2015-05-11 22:36:48 UTC (rev 136152)
+++ trunk/dports/gnome/evolution-data-server/files/patch-addressbook-libebook-contacts-e-phone-number-private.cpp.diff 2015-05-11 22:36:50 UTC (rev 136153)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><del>---- addressbook/libebook-contacts/e-phone-number-private.cpp.orig 2014-01-07 06:48:13.000000000 -0800
-+++ addressbook/libebook-contacts/e-phone-number-private.cpp 2014-01-24 13:56:09.000000000 -0800
</del><ins>+--- addressbook/libebook-contacts/e-phone-number-private.cpp.orig 2014-11-19 05:53:26.000000000 -0800
++++ addressbook/libebook-contacts/e-phone-number-private.cpp 2014-11-28 13:09:52.000000000 -0800
</ins><span class="cx"> @@ -120,9 +120,13 @@
</span><span class="cx"> /* Extract two-letter country code from current locale id if needed.
</span><span class="cx"> * From outside this is a C library, so we better consult the
</span></span></pre></div>
<a id="trunkdportsgnomeevolutiondataserverfilespatchconfigureacdiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/gnome/evolution-data-server/files/patch-configure.ac.diff (136152 => 136153)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gnome/evolution-data-server/files/patch-configure.ac.diff 2015-05-11 22:36:48 UTC (rev 136152)
+++ trunk/dports/gnome/evolution-data-server/files/patch-configure.ac.diff 2015-05-11 22:36:50 UTC (rev 136153)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><del>---- configure.ac.orig 2014-07-10 03:27:18.000000000 -0700
-+++ configure.ac 2014-07-14 15:07:11.000000000 -0700
-@@ -196,7 +196,7 @@
</del><ins>+--- configure.ac.orig 2015-03-16 02:33:45.000000000 -0700
++++ configure.ac 2015-03-24 16:26:43.000000000 -0700
+@@ -219,7 +219,7 @@
</ins><span class="cx"> -Wnested-externs"
</span><span class="cx">
</span><span class="cx"> proposed_cxx_warning_flags="$proposed_warning_flags
</span><span class="lines">@@ -9,7 +9,7 @@
</span><span class="cx">
</span><span class="cx"> AS_COMPILER_FLAGS(WARNING_FLAGS, [$proposed_c_warning_flags])
</span><span class="cx"> AC_SUBST(WARNING_FLAGS)
</span><del>-@@ -314,8 +314,8 @@
</del><ins>+@@ -328,8 +328,8 @@
</ins><span class="cx">
</span><span class="cx"> dnl This must appear after AC_CANONICAL_HOST, which defines $host.
</span><span class="cx"> case "$host" in
</span><span class="lines">@@ -20,14 +20,14 @@
</span><span class="cx"> ;
</span><span class="cx"> *)
</span><span class="cx"> LDFLAGS="$LDFLAGS -Wl,--no-undefined"
</span><del>-@@ -606,8 +606,8 @@
</del><ins>+@@ -634,8 +634,8 @@
</ins><span class="cx">
</span><span class="cx"> if test "x$with_libdb" != "xno" ; then
</span><span class="cx"> if test "x$with_libdb" != "xyes" ; then
</span><del>-- DB_CFLAGS="-I$with_libdb/include"
-- DB_LIBS="-L$with_libdb/lib -ldb"
-+ DB_CFLAGS="-I$prefix/include/db46"
-+ DB_LIBS="-L$prefix/lib/db46 -ldb"
</del><ins>+- DB_CFLAGS="$CFLAGS -I$with_libdb/include"
+- DB_LIBS="$LIBS -L$with_libdb/lib -ldb"
++ DB_CFLAGS="-I$prefix/include/db46"
++ DB_LIBS="-L$prefix/lib/db46 -ldb"
</ins><span class="cx"> else
</span><span class="cx"> if test -z "$DB_CFLAGS" -a -z "$DB_LIBS"; then
</span><del>- DB_CFLAGS=""
</del><ins>+ DB_CFLAGS="$CFLAGS"
</ins></span></pre>
</div>
</div>
</body>
</html>