diff --git a/x11/gnome3/databases/evolution-data-server/Makefile b/x11/gnome3/databases/evolution-data-server/Makefile index e0e284eef96..40620479426 100644 --- a/x11/gnome3/databases/evolution-data-server/Makefile +++ b/x11/gnome3/databases/evolution-data-server/Makefile @@ -1,11 +1,11 @@ -# $OpenBSD: Makefile,v 1.1.1.1 2011/05/17 17:07:32 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.2 2011/05/23 11:52:56 jasper Exp $ SHARED_ONLY= Yes COMMENT= unified backend for PIM programs GNOME_PROJECT= evolution-data-server -GNOME_VERSION= 3.0.1 +GNOME_VERSION= 3.0.2 CATEGORIES= databases @@ -62,6 +62,7 @@ YACC= bison CONFIGURE_STYLE= gnu CONFIGURE_ARGS= ${CONFIGURE_SHARED} \ --disable-gtk-doc \ + --disable-vala-bindings \ --enable-introspection \ --enable-ssl \ --enable-smime \ diff --git a/x11/gnome3/databases/evolution-data-server/distinfo b/x11/gnome3/databases/evolution-data-server/distinfo index dec9f66bd1a..f0664dd716a 100644 --- a/x11/gnome3/databases/evolution-data-server/distinfo +++ b/x11/gnome3/databases/evolution-data-server/distinfo @@ -1,5 +1,5 @@ -MD5 (evolution-data-server-3.0.1.tar.bz2) = VsNQ92XEL484EUD/rPVS5w== -RMD160 (evolution-data-server-3.0.1.tar.bz2) = /XoE16V58ZCgE346iPXKeS/03kk= -SHA1 (evolution-data-server-3.0.1.tar.bz2) = domsuGHauU+U1MqX9Mcj7x5W3Ko= -SHA256 (evolution-data-server-3.0.1.tar.bz2) = hZK+lAJ6mEisGGcKDobkjoV1Oc0oE+s0XtoKzhlojdA= -SIZE (evolution-data-server-3.0.1.tar.bz2) = 4397721 +MD5 (evolution-data-server-3.0.2.tar.bz2) = iVGN4zyldhvZlGzrVsI0aA== +RMD160 (evolution-data-server-3.0.2.tar.bz2) = nRVqta2U0oGI7TvAanKzc/qEMxw= +SHA1 (evolution-data-server-3.0.2.tar.bz2) = ufsZLgYje0uwqJDEOyZEvk2yok4= +SHA256 (evolution-data-server-3.0.2.tar.bz2) = 6KMCQWcFZym2TupfruVwviFevVxG0uDyaeWtf1X/viE= +SIZE (evolution-data-server-3.0.2.tar.bz2) = 4419303 diff --git a/x11/gnome3/databases/evolution-data-server/patches/patch-calendar_libedata-cal_Makefile_in b/x11/gnome3/databases/evolution-data-server/patches/patch-calendar_libedata-cal_Makefile_in index a27bf30e36b..7a6f72339c4 100644 --- a/x11/gnome3/databases/evolution-data-server/patches/patch-calendar_libedata-cal_Makefile_in +++ b/x11/gnome3/databases/evolution-data-server/patches/patch-calendar_libedata-cal_Makefile_in @@ -1,7 +1,7 @@ -$OpenBSD: patch-calendar_libedata-cal_Makefile_in,v 1.1.1.1 2011/05/17 17:07:32 ajacoutot Exp $ ---- calendar/libedata-cal/Makefile.in.orig Sun Apr 24 19:39:38 2011 -+++ calendar/libedata-cal/Makefile.in Tue May 17 13:41:51 2011 -@@ -614,8 +614,7 @@ test_intervaltree_coverage_LDADD = \ +$OpenBSD: patch-calendar_libedata-cal_Makefile_in,v 1.2 2011/05/23 11:52:56 jasper Exp $ +--- calendar/libedata-cal/Makefile.in.orig Mon May 23 06:13:17 2011 ++++ calendar/libedata-cal/Makefile.in Mon May 23 13:28:26 2011 +@@ -620,8 +620,7 @@ test_intervaltree_coverage_LDADD = \ libedata-cal-1.2.la \ $(top_builddir)/calendar/libecal/libecal-1.2.la \ $(top_builddir)/libedataserver/libedataserver-1.2.la \ diff --git a/x11/gnome3/databases/evolution-data-server/patches/patch-configure b/x11/gnome3/databases/evolution-data-server/patches/patch-configure index 6d65bcc86d2..0956d0285a1 100644 --- a/x11/gnome3/databases/evolution-data-server/patches/patch-configure +++ b/x11/gnome3/databases/evolution-data-server/patches/patch-configure @@ -1,10 +1,11 @@ -$OpenBSD: patch-configure,v 1.1.1.1 2011/05/17 17:07:32 ajacoutot Exp $ +$OpenBSD: patch-configure,v 1.2 2011/05/23 11:52:56 jasper Exp $ -"$host" fails for some reason. +- "$host" fails for some reason. +- distfile is missing vala/ directory (#650845) ---- configure.orig Sun Apr 24 19:39:33 2011 -+++ configure Tue May 17 14:39:47 2011 -@@ -4472,13 +4472,6 @@ AM_CPPFLAGS="$WARNING_FLAGS -fno-strict-aliasing" +--- configure.orig Mon May 23 06:13:12 2011 ++++ configure Mon May 23 13:38:48 2011 +@@ -4548,13 +4548,6 @@ AM_CPPFLAGS="$WARNING_FLAGS -fno-strict-aliasing" @@ -18,7 +19,7 @@ $OpenBSD: patch-configure,v 1.1.1.1 2011/05/17 17:07:32 ajacoutot Exp $ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 -@@ -15374,6 +15367,13 @@ fi +@@ -15539,6 +15532,13 @@ fi $as_echo "#define _WIN32_WINNT 0x501" >>confdefs.h ;; @@ -32,7 +33,7 @@ $OpenBSD: patch-configure,v 1.1.1.1 2011/05/17 17:07:32 ajacoutot Exp $ *) os_win32='no' NO_UNDEFINED='' -@@ -17358,7 +17358,7 @@ $as_echo_n "checking for Kerberos 5... " >&6; } +@@ -17523,7 +17523,7 @@ $as_echo_n "checking for Kerberos 5... " >&6; } LIBS_save="$LIBS" mitlibs="-lkrb5 -lk5crypto -lcom_err -lgssapi_krb5" @@ -41,3 +42,12 @@ $OpenBSD: patch-configure,v 1.1.1.1 2011/05/17 17:07:32 ajacoutot Exp $ sunlibs="-lkrb5 -lgss" if test "${ac_cv_lib_kerberos5+set}" = set; then : $as_echo_n "(cached) " >&6 +@@ -20482,7 +20482,7 @@ export privlibdir + export privincludedir + export privdatadir + +-ac_config_files="$ac_config_files Makefile evolution-data-server-zip evolution-data-server.pc addressbook/Makefile addressbook/libebook/Makefile addressbook/libebook/libebook.pc addressbook/libedata-book/Makefile addressbook/libedata-book/libedata-book.pc addressbook/libegdbus/Makefile addressbook/backends/Makefile addressbook/backends/file/Makefile addressbook/backends/vcf/Makefile addressbook/backends/ldap/Makefile addressbook/backends/google/Makefile addressbook/backends/groupwise/Makefile addressbook/backends/webdav/Makefile addressbook/tests/Makefile addressbook/tests/ebook/Makefile addressbook/tests/vcard/Makefile art/Makefile calendar/Makefile calendar/libecal/Makefile calendar/libecal/libecal.pc calendar/libedata-cal/Makefile calendar/libedata-cal/libedata-cal.pc calendar/libegdbus/Makefile calendar/backends/Makefile calendar/backends/caldav/Makefile calendar/backends/file/Makefile calendar/backends/groupwise/Makefile calendar/backends/http/Makefile calendar/backends/contacts/Makefile calendar/backends/weather/Makefile calendar/tests/Makefile calendar/tests/ecal/Makefile camel/Makefile camel/providers/Makefile camel/providers/groupwise/Makefile camel/providers/imap/Makefile camel/providers/imapx/Makefile camel/providers/local/Makefile camel/providers/nntp/Makefile camel/providers/pop3/Makefile camel/providers/sendmail/Makefile camel/providers/smtp/Makefile camel/tests/Makefile camel/tests/folder/Makefile camel/tests/lib/Makefile camel/tests/message/Makefile camel/tests/mime-filter/Makefile camel/tests/misc/Makefile camel/tests/smime/Makefile camel/camel.pc camel/camel-provider.pc libebackend/Makefile libebackend/libebackend.pc libedataserver/Makefile libedataserver/eds-version.h libedataserver/libedataserver.pc libedataserverui/Makefile libedataserverui/libedataserverui.pc servers/Makefile servers/groupwise/Makefile servers/groupwise/libegroupwise.pc docs/Makefile docs/reference/Makefile docs/reference/addressbook/Makefile docs/reference/addressbook/libebook/Makefile docs/reference/addressbook/libedata-book/Makefile docs/reference/calendar/Makefile docs/reference/calendar/libecal/Makefile docs/reference/calendar/libedata-cal/Makefile docs/reference/camel/Makefile docs/reference/libedataserver/Makefile docs/reference/libedataserverui/Makefile docs/reference/libebackend/Makefile po/Makefile.in vala/Makefile" ++ac_config_files="$ac_config_files Makefile evolution-data-server-zip evolution-data-server.pc addressbook/Makefile addressbook/libebook/Makefile addressbook/libebook/libebook.pc addressbook/libedata-book/Makefile addressbook/libedata-book/libedata-book.pc addressbook/libegdbus/Makefile addressbook/backends/Makefile addressbook/backends/file/Makefile addressbook/backends/vcf/Makefile addressbook/backends/ldap/Makefile addressbook/backends/google/Makefile addressbook/backends/groupwise/Makefile addressbook/backends/webdav/Makefile addressbook/tests/Makefile addressbook/tests/ebook/Makefile addressbook/tests/vcard/Makefile art/Makefile calendar/Makefile calendar/libecal/Makefile calendar/libecal/libecal.pc calendar/libedata-cal/Makefile calendar/libedata-cal/libedata-cal.pc calendar/libegdbus/Makefile calendar/backends/Makefile calendar/backends/caldav/Makefile calendar/backends/file/Makefile calendar/backends/groupwise/Makefile calendar/backends/http/Makefile calendar/backends/contacts/Makefile calendar/backends/weather/Makefile calendar/tests/Makefile calendar/tests/ecal/Makefile camel/Makefile camel/providers/Makefile camel/providers/groupwise/Makefile camel/providers/imap/Makefile camel/providers/imapx/Makefile camel/providers/local/Makefile camel/providers/nntp/Makefile camel/providers/pop3/Makefile camel/providers/sendmail/Makefile camel/providers/smtp/Makefile camel/tests/Makefile camel/tests/folder/Makefile camel/tests/lib/Makefile camel/tests/message/Makefile camel/tests/mime-filter/Makefile camel/tests/misc/Makefile camel/tests/smime/Makefile camel/camel.pc camel/camel-provider.pc libebackend/Makefile libebackend/libebackend.pc libedataserver/Makefile libedataserver/eds-version.h libedataserver/libedataserver.pc libedataserverui/Makefile libedataserverui/libedataserverui.pc servers/Makefile servers/groupwise/Makefile servers/groupwise/libegroupwise.pc docs/Makefile docs/reference/Makefile docs/reference/addressbook/Makefile docs/reference/addressbook/libebook/Makefile docs/reference/addressbook/libedata-book/Makefile docs/reference/calendar/Makefile docs/reference/calendar/libecal/Makefile docs/reference/calendar/libedata-cal/Makefile docs/reference/camel/Makefile docs/reference/libedataserver/Makefile docs/reference/libedataserverui/Makefile docs/reference/libebackend/Makefile po/Makefile.in" + + cat >confcache <<\_ACEOF + # This file is a shell script that caches the results of configure diff --git a/x11/gnome3/databases/evolution-data-server/pkg/PLIST b/x11/gnome3/databases/evolution-data-server/pkg/PLIST index dec2405f795..b279bcd6b83 100644 --- a/x11/gnome3/databases/evolution-data-server/pkg/PLIST +++ b/x11/gnome3/databases/evolution-data-server/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.1.1.1 2011/05/17 17:07:32 ajacoutot Exp $ +@comment $OpenBSD: PLIST,v 1.2 2011/05/23 11:52:56 jasper Exp $ include/evolution-data-server-${R}/ include/evolution-data-server-${R}/camel/ include/evolution-data-server-${R}/camel/camel-address.h @@ -287,6 +287,7 @@ lib/evolution-data-server/camel-providers/libcamelsendmail.urls @comment lib/evolution-data-server/camel-providers/libcamelsmtp.la lib/evolution-data-server/camel-providers/libcamelsmtp.so lib/evolution-data-server/camel-providers/libcamelsmtp.urls +lib/girepository-1.0/EBook-1.2.typelib lib/girepository-1.0/ECalendar-1.2.typelib lib/girepository-1.0/EDataServer-1.2.typelib lib/libcamel-1.2.a @@ -340,6 +341,7 @@ share/dbus-1/services/org.gnome.evolution.dataserver.AddressBook.service share/dbus-1/services/org.gnome.evolution.dataserver.Calendar.service share/evolution-data-server-${R}/ share/evolution-data-server-${R}/evolutionperson.schema +share/gir-1.0/EBook-1.2.gir share/gir-1.0/ECalendar-1.2.gir share/gir-1.0/EDataServer-1.2.gir share/gtk-doc/html/camel/ @@ -472,7 +474,6 @@ share/gtk-doc/html/camel/camel-camel-url-scanner.html share/gtk-doc/html/camel/camel-camel-url.html share/gtk-doc/html/camel/camel-camel-utf8.html share/gtk-doc/html/camel/camel-camel.html -share/gtk-doc/html/camel/camel.devhelp share/gtk-doc/html/camel/camel.devhelp2 share/gtk-doc/html/camel/classes.html share/gtk-doc/html/camel/home.png @@ -530,7 +531,6 @@ share/gtk-doc/html/libebook/libebook-EAddressWestern.html share/gtk-doc/html/libebook/libebook-ENameWestern.html share/gtk-doc/html/libebook/libebook-e-book-query.html share/gtk-doc/html/libebook/libebook-e-book-types.html -share/gtk-doc/html/libebook/libebook.devhelp share/gtk-doc/html/libebook/libebook.devhelp2 share/gtk-doc/html/libebook/right.png share/gtk-doc/html/libebook/style.css