<pre style='margin:0'>
David B. Evans (dbevans) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/26596ecaf502c8c61f9b97493432dff9258761ed">https://github.com/macports/macports-ports/commit/26596ecaf502c8c61f9b97493432dff9258761ed</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 26596ec evolution-data-server: update to version 3.24.6
</span>26596ec is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 26596ecaf502c8c61f9b97493432dff9258761ed
</span>Author: David B. Evans <devans@macports.org>
AuthorDate: Fri Sep 8 20:16:39 2017 -0700
<span style='display:block; white-space:pre;color:#404040;'> evolution-data-server: update to version 3.24.6
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Now builds using cmake.
</span>---
gnome/evolution-data-server/Portfile | 99 ++++++++++------------
gnome/evolution-data-server/files/autogen.sh | 43 ----------
...bebook-contacts-e-phone-number-private.cpp.diff | 6 +-
.../files/patch-configure.ac.diff | 22 -----
4 files changed, 50 insertions(+), 120 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/evolution-data-server/Portfile b/gnome/evolution-data-server/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 486c23d..9a19448 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/evolution-data-server/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/evolution-data-server/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +1,12 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:filetype=tcl:et:sw=4:ts=4:sts=4
PortSystem 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup gobject_introspection 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup cmake 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+cmake.out_of_source yes
</span>
name evolution-data-server
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 3.22.6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 3.24.6
</span> set branch [join [lrange [split ${version} .] 0 1] .]
description Addressbook and calender libs for GNOME.
long_description Evolution Data Server provides a central location for \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19,65 +20,53 @@ master_sites gnome:sources/${name}/${branch}/
</span>
use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 8099c4b54384f2c8981c9680d68263deed5378ba \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 0a69b9d2c03f7a6f68abbd7c7f8c76d333aca9e6102e796d88daed3284e91ca6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 4670d4d49b779da967402455991b232f5c35a2d8 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 058040214c9362e5e0f7592455418813da28b533b9ff2d6e2d868c39e580189e
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build port:pkgconfig \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:intltool \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:gtk-doc \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:gnome-common \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:autoconf \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:automake \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libtool
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:pkgconfig \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:intltool
</span>
depends_lib port:gtk3 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libxml2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libsoup \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libsecret \
</span> port:gcr \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gnome-online-accounts \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gobject-introspection \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:icu \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:kerberos5 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libgdata \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libgweather \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libical \
</span> port:libiconv \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libsecret \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libsoup \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libxml2 \
</span> port:nss \
port:nspr \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libgweather \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libical \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libgdata \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:gnome-online-accounts \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:openldap \
</span> port:sqlite3 \
port:vala \
port:db53 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:icu
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-gobject_introspection yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-configure.ac.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-addressbook-libebook-contacts-e-phone-number-private.cpp.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# reconfigure using upstream autogen.sh for intltool 0.51 compatibility
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 755 ${filespath}/autogen.sh ${worksrcpath}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.cmd ./autogen.sh
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.env-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DB_CFLAGS="-I${prefix}/include/db53" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DB_LIBS="-L${prefix}/lib/db53 -ldb"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args --enable-smime \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-ipv6 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-weather \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-google \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-goa \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-vala-bindings \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-nspr-includes=${prefix}/include/nspr \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-nspr-libs=${prefix}/lib/nspr \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-nss-includes=${prefix}/include/nss \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-nss-libs=${prefix}/lib/nss \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-krb5=/usr \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-uoa \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-silent-rules \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-schemas-compile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-addressbook-libebook-contacts-e-phone-number-private.cpp.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DENABLE_SCHEMAS_COMPILE=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DENABLE_GTK_DOC=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DENABLE_UOA=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DWITH_OPENLDAP=${prefix} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DENABLE_INSTALLED_TESTS=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DENABLE_INTROSPECTION=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DENABLE_SMIME=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DENABLE_GTK=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DENABLE_GOOGLE_AUTH=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DENABLE_EXAMPLES=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DENABLE_GOA=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DENABLE_IPV6=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DENABLE_WEATHER=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DENABLE_GOOGLE=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DENABLE_VALA_BINDINGS=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DWITH_LIBDB_CFLAGS="-I${prefix}/include/db53" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DWITH_LIBDB_LIBS="-L${prefix}/lib/db53 -ldb"
</span>
#
# port nss is not universal
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -85,14 +74,20 @@ configure.args --enable-smime \
</span>
universal_variant no
<span style='display:block; white-space:pre;background:#e0ffe0;'>+use_parallel_build no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> variant phonenumber description {Phone number parsing/validation using libphonenumber} {
depends_lib-append port:libphonenumber-cpp
configure.cxxflags-append -DI18N_PHONENUMBERS_USE_BOOST
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-phonenumber=${prefix}/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -DWITH_PHONENUMBER=ON
</span> }
default_variants +phonenumber
<span style='display:block; white-space:pre;background:#e0ffe0;'>+post-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ${prefix}/lib/evolution-data-server/libedbus-private.dylib ${destroot}${prefix}/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> post-activate {
system "${prefix}/bin/glib-compile-schemas ${prefix}/share/glib-2.0/schemas"
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/evolution-data-server/files/autogen.sh b/gnome/evolution-data-server/files/autogen.sh
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 234387c..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/evolution-data-server/files/autogen.sh
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,43 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#!/bin/sh
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Run this to generate all the initial makefiles, etc.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-srcdir=`dirname $0`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-test -z "$srcdir" && srcdir=.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-(test -f $srcdir/configure.ac \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- && test -f $srcdir/ChangeLog \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- && test -d $srcdir/calendar) || {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo " top-level evolution-data-server directory"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- exit 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-olddir=`pwd`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-cd $srcdir
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-check_exists() {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- variable=`which $1`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test -z $variable; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "*** No $1 found, please intall it ***" >&2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- exit 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-check_exists aclocal
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-check_exists autoreconf
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-check_exists gtkdocize
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-check_exists intltoolize
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-m4dir=`autoconf --trace 'AC_CONFIG_MACRO_DIR:$1'`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if [ -n "$m4dir" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mkdir -p $m4dir
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-aclocal -I m4 || exit $?
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-gtkdocize --copy || exit $?
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-intltoolize --force --copy --automake || exit $?
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-autoreconf --verbose --force --install -Wno-portability || exit $?
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-cd $olddir
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-test -n "$NOCONFIGURE" || "$srcdir/configure" --disable-maintainer-mode "$@"
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/evolution-data-server/files/patch-addressbook-libebook-contacts-e-phone-number-private.cpp.diff b/gnome/evolution-data-server/files/patch-addressbook-libebook-contacts-e-phone-number-private.cpp.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 50b69b9..1934386 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/evolution-data-server/files/patch-addressbook-libebook-contacts-e-phone-number-private.cpp.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/evolution-data-server/files/patch-addressbook-libebook-contacts-e-phone-number-private.cpp.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- addressbook/libebook-contacts/e-phone-number-private.cpp.orig 2014-11-19 05:53:26.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ addressbook/libebook-contacts/e-phone-number-private.cpp 2014-11-28 13:09:52.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -120,9 +120,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/addressbook/libebook-contacts/e-phone-number-private.cpp.orig 2014-11-19 05:53:26.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/addressbook/libebook-contacts/e-phone-number-private.cpp 2014-11-28 13:09:52.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -118,9 +118,13 @@
</span> /* Extract two-letter country code from current locale id if needed.
* From outside this is a C library, so we better consult the
* C infrastructure instead of std::locale, which might divert. */
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/evolution-data-server/files/patch-configure.ac.diff b/gnome/evolution-data-server/files/patch-configure.ac.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index bf0484b..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/evolution-data-server/files/patch-configure.ac.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,22 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.ac.orig 2016-06-24 02:29:17.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure.ac 2016-07-19 00:11:26.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -227,7 +227,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $append_c_warning_flags"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- proposed_cxx_warning_flags="$proposed_warning_flags
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- -Wabi -Wnoexcept"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ -Wabi"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AS_COMPILER_FLAGS(WARNING_FLAGS, [$proposed_c_warning_flags])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_SUBST(WARNING_FLAGS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -680,8 +680,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test "x$with_libdb" != "xno" ; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test "x$with_libdb" != "xyes" ; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- DB_CFLAGS="$CFLAGS -I$with_libdb/include"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- DB_LIBS="$LIBS -L$with_libdb/lib -ldb"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ DB_CFLAGS="-I$prefix/include/db53"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ DB_LIBS="-L$prefix/lib/db53 -ldb"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test -z "$DB_CFLAGS" -a -z "$DB_LIBS"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DB_CFLAGS="$CFLAGS"
</span></pre><pre style='margin:0'>
</pre>