[118899] trunk/dports/gnome/evolution-data-server
devans at macports.org
devans at macports.org
Sun Apr 13 16:49:34 PDT 2014
Revision: 118899
https://trac.macports.org/changeset/118899
Author: devans at macports.org
Date: 2014-04-13 16:49:34 -0700 (Sun, 13 Apr 2014)
Log Message:
-----------
evolution-data-server: update to version 3.12.1.
Modified Paths:
--------------
trunk/dports/gnome/evolution-data-server/Portfile
trunk/dports/gnome/evolution-data-server/files/patch-addressbook-libebook-contacts-e-phone-number-private.cpp.diff
trunk/dports/gnome/evolution-data-server/files/patch-configure.ac.diff
Removed Paths:
-------------
trunk/dports/gnome/evolution-data-server/files/patch-calendar-libedata-cal-e-cal-backend-intervaltree.c.diff
Property Changed:
----------------
trunk/dports/gnome/evolution-data-server/
Property changes on: trunk/dports/gnome/evolution-data-server
___________________________________________________________________
Modified: svn:mergeinfo
- /users/devans/GNOME-3/stable/dports/gnome/evolution-data-server:108269-113174
+ /users/devans/GNOME-3/stable/dports/gnome/evolution-data-server:108269-118732
/users/devans/GNOME-3/unstable/dports/gnome/evolution-data-server:114069-118152
Modified: trunk/dports/gnome/evolution-data-server/Portfile
===================================================================
--- trunk/dports/gnome/evolution-data-server/Portfile 2014-04-13 23:49:25 UTC (rev 118898)
+++ trunk/dports/gnome/evolution-data-server/Portfile 2014-04-13 23:49:34 UTC (rev 118899)
@@ -4,7 +4,7 @@
PortSystem 1.0
name evolution-data-server
-version 3.10.4
+version 3.12.1
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 \
@@ -18,8 +18,8 @@
use_xz yes
-checksums rmd160 9bcb9c1bd882bca58e6d3f26767de86251b53966 \
- sha256 5c2d5e19af19ecfa81f31306411ab6155c3c62cf407d5a5aaa675a8ce940fa2d
+checksums rmd160 9f95a5093cfaea2a78b217fbc0928eeb03c858fc \
+ sha256 8c794d7f3e5241cc8856ab1d9fccab29487c575d3a3b7d9b884064864b96caa3
depends_build port:pkgconfig \
port:gnome-common \
@@ -40,10 +40,10 @@
port:gnome-online-accounts \
port:gobject-introspection \
port:sqlite3 \
- port:vala
+ port:vala \
+ port:db46
patchfiles patch-configure.ac.diff \
- patch-calendar-libedata-cal-e-cal-backend-intervaltree.c.diff \
patch-addressbook-libebook-contacts-e-phone-number-private.cpp.diff
# update m4/intltool.m4 and autoreconf
@@ -55,9 +55,12 @@
use_autoreconf yes
autoreconf.args -fvi
+configure.env-append \
+ DB_CFLAGS="-I${prefix}/include/db46" \
+ DB_LIBS="-L${prefix}/lib/db46 -ldb"
+
configure.args --enable-smime \
--enable-ipv6 \
- --enable-nntp \
--enable-weather \
--enable-google \
--enable-goa \
Modified: trunk/dports/gnome/evolution-data-server/files/patch-addressbook-libebook-contacts-e-phone-number-private.cpp.diff
===================================================================
--- trunk/dports/gnome/evolution-data-server/files/patch-addressbook-libebook-contacts-e-phone-number-private.cpp.diff 2014-04-13 23:49:25 UTC (rev 118898)
+++ trunk/dports/gnome/evolution-data-server/files/patch-addressbook-libebook-contacts-e-phone-number-private.cpp.diff 2014-04-13 23:49:34 UTC (rev 118899)
@@ -1,6 +1,6 @@
---- addressbook/libebook-contacts/e-phone-number-private.cpp.orig 2013-08-27 02:10:57.000000000 -0700
-+++ addressbook/libebook-contacts/e-phone-number-private.cpp 2013-08-27 02:16:53.000000000 -0700
-@@ -122,9 +122,13 @@
+--- 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
+@@ -120,9 +120,13 @@
/* 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. */
Deleted: trunk/dports/gnome/evolution-data-server/files/patch-calendar-libedata-cal-e-cal-backend-intervaltree.c.diff
===================================================================
--- trunk/dports/gnome/evolution-data-server/files/patch-calendar-libedata-cal-e-cal-backend-intervaltree.c.diff 2014-04-13 23:49:25 UTC (rev 118898)
+++ trunk/dports/gnome/evolution-data-server/files/patch-calendar-libedata-cal-e-cal-backend-intervaltree.c.diff 2014-04-13 23:49:34 UTC (rev 118899)
@@ -1,11 +0,0 @@
---- calendar/libedata-cal/e-cal-backend-intervaltree.c.orig 2013-08-23 13:52:14.000000000 -0700
-+++ calendar/libedata-cal/e-cal-backend-intervaltree.c 2013-08-23 13:52:33.000000000 -0700
-@@ -26,7 +26,7 @@
-
- #include <stdio.h>
- #include <string.h>
--#include <malloc.h>
-+#include <malloc/malloc.h>
-
- #include "e-cal-backend-intervaltree.h"
-
Modified: trunk/dports/gnome/evolution-data-server/files/patch-configure.ac.diff
===================================================================
--- trunk/dports/gnome/evolution-data-server/files/patch-configure.ac.diff 2014-04-13 23:49:25 UTC (rev 118898)
+++ trunk/dports/gnome/evolution-data-server/files/patch-configure.ac.diff 2014-04-13 23:49:34 UTC (rev 118899)
@@ -1,6 +1,6 @@
---- configure.ac.orig 2013-12-08 18:41:02.000000000 -0800
-+++ configure.ac 2014-02-10 16:57:44.000000000 -0800
-@@ -322,8 +322,8 @@
+--- configure.ac.orig 2014-01-17 12:19:46.000000000 -0800
++++ configure.ac 2014-02-10 20:05:35.000000000 -0800
+@@ -317,8 +317,8 @@
dnl This must appear after AC_CANONICAL_HOST, which defines $host.
case "$host" in
@@ -11,14 +11,14 @@
;;
*)
LDFLAGS="$LDFLAGS -Wl,--no-undefined"
-@@ -546,8 +546,8 @@
+@@ -605,8 +605,8 @@
+ AS_HELP_STRING([--with-libdb=PREFIX],
[Prefix where libdb is installed]),
- [libdb_prefix="$withval"], [libdb_prefix='${prefix}'])
-
--DB_CFLAGS="-I$libdb_prefix/include"
--DB_LIBS="-L$libdb_prefix/lib -ldb"
-+DB_CFLAGS="-I$prefix/include/db46"
-+DB_LIBS="-L$prefix/lib/db46 -ldb"
-
- AC_MSG_CHECKING([Berkeley DB])
- save_cflags=$CFLAGS; CFLAGS=$DB_CFLAGS
+ [
+- DB_CFLAGS="-I$withval/include"
+- DB_LIBS="-L$withval/lib -ldb"
++ DB_CFLAGS="-I$prefix/include/db46"
++ DB_LIBS="-L$prefix/lib/db46 -ldb"
+ ],
+ [
+ if test -z "$DB_CFLAGS" -a -z "$DB_LIBS"; then
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140413/38137c9a/attachment.html>
More information about the macports-changes
mailing list