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

[devans at macports.org]

Revision: 70844
          http://trac.macports.org/changeset/70844
Author:   devans at macports.org
Date:     2010-08-23 00:15:07 -0700 (Mon, 23 Aug 2010)
Log Message:
-----------
evolution-data-server: update to version 2.30.3 with maintainers approval (#26207).

Modified Paths:
--------------
    trunk/dports/gnome/evolution-data-server/Portfile

Added Paths:
-----------
    trunk/dports/gnome/evolution-data-server/files/patch-configure.ac.diff

Removed Paths:
-------------
    trunk/dports/gnome/evolution-data-server/files/patch-configure.in.diff

Modified: trunk/dports/gnome/evolution-data-server/Portfile
===================================================================
--- trunk/dports/gnome/evolution-data-server/Portfile	2010-08-23 05:36:04 UTC (rev 70843)
+++ trunk/dports/gnome/evolution-data-server/Portfile	2010-08-23 07:15:07 UTC (rev 70844)
@@ -4,7 +4,7 @@
 PortSystem 1.0
 
 name            evolution-data-server
-version         2.26.3
+version         2.30.3
 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 \
@@ -15,34 +15,36 @@
 homepage        http://www.gnome.org/
 master_sites    gnome:sources/${name}/${branch}/
 
-checksums       md5     01205605a598253bc227ff360c7c3dad \
-                sha1    a9406b748d5a002df9570d17c91066575f2ba408 \
-                rmd160  83f68a464a0cfb50511f33e662d8a24ede42b9e6
+checksums       md5     095bac0a80043d57d00f64319f3cbdbb \
+                sha1    449d3e7a9b19768d5a792434ca5d55c9d2496993 \
+                rmd160  2d4dc2fd6b8dfdc013042400b382f4684e642425
 
 depends_build   port:pkgconfig \
                 port:intltool \
                 port:p5-xml-parser \
                 port:gtk-doc
 
-depends_lib     port:libgnomeui \
+depends_lib     port:gconf \
+                port:libgnome-keyring \
                 port:libgweather \
                 port:libical \
-                port:nss
+                port:nss \
+                port:gnuregex \
+                port:db46
 
 use_bzip2       yes
 
-patchfiles      patch-configure.in.diff
+patchfiles      patch-configure.ac.diff
 
-use_autoconf    yes
+use_autoreconf    yes
+autoreconf.args  -fvi
 
 configure.args  \
         --enable-static \
-        --enable-nss \
         --enable-smime \
         --enable-gnome-keyring \
         --enable-ipv6 \
         --enable-nntp \
-        --with-libiconv=${prefix} \
         --with-nspr-includes=${prefix}/include/nspr  \
         --with-nspr-libs=${prefix}/lib/nspr  \
         --with-nss-includes=${prefix}/include/nss \
@@ -50,6 +52,11 @@
         --with-krb5=/usr \
         --disable-schemas-install
 
+#
+# port nss is not universal
+#
+universal_variant no
+
 platform darwin 8 {
     post-patch {
         reinplace "s|#include <stdio.h>|#include <stdio.h>\\\n#include <sys/types.h>|g" \

Added: trunk/dports/gnome/evolution-data-server/files/patch-configure.ac.diff
===================================================================
--- trunk/dports/gnome/evolution-data-server/files/patch-configure.ac.diff	                        (rev 0)
+++ trunk/dports/gnome/evolution-data-server/files/patch-configure.ac.diff	2010-08-23 07:15:07 UTC (rev 70844)
@@ -0,0 +1,33 @@
+--- configure.ac.orig	2010-06-22 12:00:20.000000000 -0700
++++ configure.ac	2010-08-22 13:35:51.000000000 -0700
+@@ -181,7 +181,7 @@
+ AM_CPPFLAGS="$WARNING_FLAGS -fno-strict-aliasing"
+ AC_SUBST(AM_CPPFLAGS)
+ 
+-LDFLAGS="$LDFLAGS -Wl,--no-undefined"
++dnl LDFLAGS="$LDFLAGS -Wl,--no-undefined"
+ 
+ dnl ******************************
+ dnl Initialize maintainer mode
+@@ -301,8 +301,8 @@
+ dnl ******************************
+ dnl regex check
+ dnl ******************************
+-AC_CHECK_FUNCS(regexec,,[AC_CHECK_LIB(regex,regexec,
+-			[REGEX_LIBS=-lregex
++AC_CHECK_FUNCS(regexec,,[AC_CHECK_LIB(gnuregex,regexec,
++			[REGEX_LIBS=-lgnuregex
+ 			AC_DEFINE(HAVE_REGEXEC,1,[Define to 1 if you have the regexec function.])],
+ 			[AC_MSG_ERROR([No regex library found])])])
+ AC_SUBST(REGEX_LIBS)
+@@ -315,8 +315,8 @@
+ 	[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

Deleted: trunk/dports/gnome/evolution-data-server/files/patch-configure.in.diff
===================================================================
--- trunk/dports/gnome/evolution-data-server/files/patch-configure.in.diff	2010-08-23 05:36:04 UTC (rev 70843)
+++ trunk/dports/gnome/evolution-data-server/files/patch-configure.in.diff	2010-08-23 07:15:07 UTC (rev 70844)
@@ -1,16 +0,0 @@
---- configure.in.orig	2009-04-27 08:32:48.000000000 -0700
-+++ configure.in	2009-04-27 08:34:00.000000000 -0700
-@@ -316,12 +316,10 @@
- #include <iconv.h>
- #include <stdlib.h>],[
- 
--int main (int argc, char **argv)
--{
- 	iconv_t cd;
- 	cd = iconv_open ("UTF-8", "ISO-8859-1");
- 	exit (0);
--}
-+
- ], ac_cv_libiconv=yes, ac_cv_libiconv=no))
- if test $ac_cv_libiconv = yes; then
- 	ICONV_LIBS="$ICONV_LIBS -liconv"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100823/9e0cc7a7/attachment.html>