[136153] trunk/dports/gnome/evolution-data-server

devans at macports.org devans at macports.org
Mon May 11 15:36:50 PDT 2015


Revision: 136153
          https://trac.macports.org/changeset/136153
Author:   devans at macports.org
Date:     2015-05-11 15:36:50 -0700 (Mon, 11 May 2015)
Log Message:
-----------
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.

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

Added Paths:
-----------
    trunk/dports/gnome/evolution-data-server/files/autogen.sh

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-132837
/users/devans/GNOME-3/unstable/dports/gnome/evolution-data-server:114069-118152
   + /users/devans/GNOME-3/stable/dports/gnome/evolution-data-server:108269-136044
/users/devans/GNOME-3/unstable/dports/gnome/evolution-data-server:114069-118152,119491-134403

Modified: trunk/dports/gnome/evolution-data-server/Portfile
===================================================================
--- 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)
@@ -5,8 +5,7 @@
 PortGroup           gobject_introspection 1.0
 
 name                evolution-data-server
-version             3.12.11
-revision            1
+version             3.16.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 \
@@ -20,13 +19,16 @@
 
 use_xz              yes
 
-checksums           rmd160  96acb4edf615fae95a92055cc970ae2efc838907 \
-                    sha256  59023d2cf92e36b69c1f83b2e56a0ba037754982a23cb06f35f6cc5de7a12201
+checksums           rmd160  005e4150c944d853050846d219e4566448e0e613 \
+                    sha256  04eedf170708c97ca807951f47e6d6f554bee94c35bc279201a54f64b744eb51
 
 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 \
@@ -45,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" \
@@ -83,7 +84,6 @@
 #
 
 universal_variant   no
-use_parallel_build  no
 
 variant phonenumber description {Phone number parsing/validation using libphonenumber} {
     depends_lib-append          port:libphonenumber-cpp
@@ -91,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: 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)
===================================================================
--- 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)
@@ -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: 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	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)
@@ -1,5 +1,5 @@
---- 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
+--- 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
 @@ -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

Modified: trunk/dports/gnome/evolution-data-server/files/patch-configure.ac.diff
===================================================================
--- 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)
@@ -1,6 +1,6 @@
---- 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 @@
+--- 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"
  
  proposed_cxx_warning_flags="$proposed_warning_flags
@@ -9,7 +9,7 @@
  
  AS_COMPILER_FLAGS(WARNING_FLAGS, [$proposed_c_warning_flags])
  AC_SUBST(WARNING_FLAGS)
-@@ -314,8 +314,8 @@
+@@ -328,8 +328,8 @@
  
  dnl This must appear after AC_CANONICAL_HOST, which defines $host.
  case "$host" in
@@ -20,14 +20,14 @@
  	;;
  *)
  	LDFLAGS="$LDFLAGS -Wl,--no-undefined"
-@@ -606,8 +606,8 @@
+@@ -634,8 +634,8 @@
  
  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/20150511/4adc1db2/attachment.html>


More information about the macports-changes mailing list