[136626] users/devans/GNOME-3/unstable/dports/gnome/evolution-data-server
devans at macports.org
devans at macports.org
Sat May 23 07:52:33 PDT 2015
Revision: 136626
https://trac.macports.org/changeset/136626
Author: devans at macports.org
Date: 2015-05-23 07:52:33 -0700 (Sat, 23 May 2015)
Log Message:
-----------
GNOME-3/unstable: evolution-data-server, sync with stable, update to version 3.17.1.
Modified Paths:
--------------
users/devans/GNOME-3/unstable/dports/gnome/evolution-data-server/Portfile
users/devans/GNOME-3/unstable/dports/gnome/evolution-data-server/files/patch-configure.ac.diff
Added Paths:
-----------
users/devans/GNOME-3/unstable/dports/gnome/evolution-data-server/files/autogen.sh
Property Changed:
----------------
users/devans/GNOME-3/unstable/dports/gnome/evolution-data-server/
Property changes on: users/devans/GNOME-3/unstable/dports/gnome/evolution-data-server
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/dports/gnome/evolution-data-server:108265-128059
/users/devans/GNOME-3/stable/dports/gnome/evolution-data-server:119490-132141
/users/devans/GNOME-3/unstable/dports/gnome/evolution-data-server:114069-118152
+ /trunk/dports/gnome/evolution-data-server:108265-128059
/users/devans/GNOME-3/stable/dports/gnome/evolution-data-server:119490-136490
/users/devans/GNOME-3/unstable/dports/gnome/evolution-data-server:114069-118152
Modified: users/devans/GNOME-3/unstable/dports/gnome/evolution-data-server/Portfile
===================================================================
--- users/devans/GNOME-3/unstable/dports/gnome/evolution-data-server/Portfile 2015-05-23 14:52:30 UTC (rev 136625)
+++ users/devans/GNOME-3/unstable/dports/gnome/evolution-data-server/Portfile 2015-05-23 14:52:33 UTC (rev 136626)
@@ -5,7 +5,7 @@
PortGroup gobject_introspection 1.0
name evolution-data-server
-version 3.15.91
+version 3.17.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 \
@@ -19,13 +19,16 @@
use_xz yes
-checksums rmd160 5ec9b7822cc3b44f77a9d2e9dc5d1462b6a8a703 \
- sha256 8fcf4a0a6c45c4ee509c792ea05b117a58331b7a7d1d9009e2d30e7fe33d39f3
+checksums rmd160 44e1aa4f37e8933fc9ef1018169fd2e046e78385 \
+ sha256 8117f93bcc26d5ba2dde33fa44a046142feba9b4e2c7533c49c66d1058b7d668
depends_build port:pkgconfig \
+ port:intltool \
+ port:gtk-doc \
port:gnome-common \
- port:intltool \
- port:gtk-doc
+ port:autoconf \
+ port:automake \
+ port:libtool
depends_lib port:gtk3 \
port:libxml2 \
@@ -44,19 +47,18 @@
port:db46 \
port:icu
+gobject_introspection yes
+
patchfiles patch-configure.ac.diff \
patch-addressbook-libebook-contacts-e-phone-number-private.cpp.diff
-gobject_introspection yes
+# reconfigure using upstream autogen.sh for intltool 0.51 compatibility
-# update m4/intltool.m4 and autoreconf
-
-pre-configure {
- copy -force ${prefix}/share/aclocal/intltool.m4 ${worksrcpath}/m4
+post-patch {
+ xinstall -m 755 ${filespath}/autogen.sh ${worksrcpath}
}
-use_autoreconf yes
-autoreconf.args -fvi
+configure.cmd ./autogen.sh
configure.env-append \
DB_CFLAGS="-I${prefix}/include/db46" \
@@ -89,6 +91,8 @@
configure.args-append --with-phonenumber=${prefix}/lib
}
+default_variants +phonenumber
+
post-activate {
system "${prefix}/bin/glib-compile-schemas ${prefix}/share/glib-2.0/schemas"
}
Copied: users/devans/GNOME-3/unstable/dports/gnome/evolution-data-server/files/autogen.sh (from rev 136490, users/devans/GNOME-3/stable/dports/gnome/evolution-data-server/files/autogen.sh)
===================================================================
--- users/devans/GNOME-3/unstable/dports/gnome/evolution-data-server/files/autogen.sh (rev 0)
+++ users/devans/GNOME-3/unstable/dports/gnome/evolution-data-server/files/autogen.sh 2015-05-23 14:52:33 UTC (rev 136626)
@@ -0,0 +1,26 @@
+#!/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
Modified: users/devans/GNOME-3/unstable/dports/gnome/evolution-data-server/files/patch-configure.ac.diff
===================================================================
--- users/devans/GNOME-3/unstable/dports/gnome/evolution-data-server/files/patch-configure.ac.diff 2015-05-23 14:52:30 UTC (rev 136625)
+++ users/devans/GNOME-3/unstable/dports/gnome/evolution-data-server/files/patch-configure.ac.diff 2015-05-23 14:52:33 UTC (rev 136626)
@@ -1,5 +1,5 @@
---- configure.ac.orig 2015-02-10 08:19:57.000000000 -0800
-+++ configure.ac 2015-02-19 17:39:19.000000000 -0800
+--- 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 @@
-Wnested-externs"
@@ -24,10 +24,10 @@
if test "x$with_libdb" != "xno" ; then
if test "x$with_libdb" != "xyes" ; then
-- 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"
+- 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"
else
if test -z "$DB_CFLAGS" -a -z "$DB_LIBS"; then
- DB_CFLAGS=""
+ DB_CFLAGS="$CFLAGS"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150523/c90a1d9f/attachment.html>
More information about the macports-changes
mailing list