[Midnightbsd-cvs] mports: databases/evolution-data-server: Update to 2.22.x

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Sun Jun 22 22:02:44 EDT 2008


Log Message:
-----------
Update to 2.22.x

Modified Files:
--------------
    mports/databases/evolution-data-server:
        Makefile (r1.3 -> r1.4)
        distinfo (r1.1 -> r1.2)
        pkg-plist (r1.1 -> r1.2)
    mports/databases/evolution-data-server/files:
        patch-addressbook_backends_ldap_e-book-backend-ldap.c (r1.1 -> r1.2)
        patch-calendar_libical_src_libical_icaltz-util.c (r1.1 -> r1.2)
        patch-configure (r1.1 -> r1.2)

Removed Files:
-------------
    mports/databases/evolution-data-server/files:
        patch-Makefile.in

-------------- next part --------------
Index: pkg-plist
===================================================================
RCS file: /home/cvs/mports/databases/evolution-data-server/pkg-plist,v
retrieving revision 1.1
retrieving revision 1.2
diff -L databases/evolution-data-server/pkg-plist -L databases/evolution-data-server/pkg-plist -u -r1.1 -r1.2
--- databases/evolution-data-server/pkg-plist
+++ databases/evolution-data-server/pkg-plist
@@ -148,6 +148,10 @@
 include/evolution-data-server-%%VERSION%%/exchange/exchange-oof.h
 include/evolution-data-server-%%VERSION%%/exchange/exchange-types.h
 include/evolution-data-server-%%VERSION%%/exchange/mapi.h
+include/evolution-data-server-%%VERSION%%/google/gdata-google/gdata-google-service.h
+include/evolution-data-server-%%VERSION%%/google/gdata/gdata-entry.h
+include/evolution-data-server-%%VERSION%%/google/gdata/gdata-feed.h
+include/evolution-data-server-%%VERSION%%/google/gdata/gdata-service-iface.h
 include/evolution-data-server-%%VERSION%%/groupwise/e-gw-connection.h
 include/evolution-data-server-%%VERSION%%/groupwise/e-gw-container.h
 include/evolution-data-server-%%VERSION%%/groupwise/e-gw-filter.h
@@ -156,6 +160,8 @@
 include/evolution-data-server-%%VERSION%%/groupwise/e-gw-proxy.h
 include/evolution-data-server-%%VERSION%%/groupwise/e-gw-recur-utils.h
 include/evolution-data-server-%%VERSION%%/groupwise/e-gw-sendoptions.h
+include/evolution-data-server-%%VERSION%%/groupwise/soup-soap-message.h
+include/evolution-data-server-%%VERSION%%/groupwise/soup-soap-response.h
 include/evolution-data-server-%%VERSION%%/libebook/e-address-western.h
 include/evolution-data-server-%%VERSION%%/libebook/e-book-query.h
 include/evolution-data-server-%%VERSION%%/libebook/e-book-types.h
@@ -224,6 +230,7 @@
 include/evolution-data-server-%%VERSION%%/libedataserver/md5-utils.h
 include/evolution-data-server-%%VERSION%%/libedataserverui/e-book-auth-util.h
 include/evolution-data-server-%%VERSION%%/libedataserverui/e-categories-dialog.h
+include/evolution-data-server-%%VERSION%%/libedataserverui/e-cell-renderer-color.h
 include/evolution-data-server-%%VERSION%%/libedataserverui/e-contact-store.h
 include/evolution-data-server-%%VERSION%%/libedataserverui/e-destination-store.h
 include/evolution-data-server-%%VERSION%%/libedataserverui/e-name-selector-dialog.h
@@ -232,6 +239,7 @@
 include/evolution-data-server-%%VERSION%%/libedataserverui/e-name-selector-model.h
 include/evolution-data-server-%%VERSION%%/libedataserverui/e-name-selector.h
 include/evolution-data-server-%%VERSION%%/libedataserverui/e-passwords.h
+include/evolution-data-server-%%VERSION%%/libedataserverui/e-source-combo-box.h
 include/evolution-data-server-%%VERSION%%/libedataserverui/e-source-option-menu.h
 include/evolution-data-server-%%VERSION%%/libedataserverui/e-source-selector-dialog.h
 include/evolution-data-server-%%VERSION%%/libedataserverui/e-source-selector.h
@@ -338,6 +346,9 @@
 lib/evolution-data-server-%%EVO_VERSION%%/extensions/libecalbackendfile.a
 lib/evolution-data-server-%%EVO_VERSION%%/extensions/libecalbackendfile.la
 lib/evolution-data-server-%%EVO_VERSION%%/extensions/libecalbackendfile.so
+lib/evolution-data-server-%%EVO_VERSION%%/extensions/libecalbackendgoogle.a
+lib/evolution-data-server-%%EVO_VERSION%%/extensions/libecalbackendgoogle.la
+lib/evolution-data-server-%%EVO_VERSION%%/extensions/libecalbackendgoogle.so
 lib/evolution-data-server-%%EVO_VERSION%%/extensions/libecalbackendgroupwise.a
 lib/evolution-data-server-%%EVO_VERSION%%/extensions/libecalbackendgroupwise.la
 lib/evolution-data-server-%%EVO_VERSION%%/extensions/libecalbackendgroupwise.so
@@ -350,11 +361,11 @@
 lib/libcamel-%%EVO_VERSION%%.a
 lib/libcamel-%%EVO_VERSION%%.la
 lib/libcamel-%%EVO_VERSION%%.so
-lib/libcamel-%%EVO_VERSION%%.so.10
+lib/libcamel-%%EVO_VERSION%%.so.11
 lib/libcamel-provider-%%EVO_VERSION%%.a
 lib/libcamel-provider-%%EVO_VERSION%%.la
 lib/libcamel-provider-%%EVO_VERSION%%.so
-lib/libcamel-provider-%%EVO_VERSION%%.so.10
+lib/libcamel-provider-%%EVO_VERSION%%.so.11
 lib/libebook-%%EVO_VERSION%%.a
 lib/libebook-%%EVO_VERSION%%.la
 lib/libebook-%%EVO_VERSION%%.so
@@ -387,6 +398,14 @@
 lib/libexchange-storage-%%EVO_VERSION%%.la
 lib/libexchange-storage-%%EVO_VERSION%%.so
 lib/libexchange-storage-%%EVO_VERSION%%.so.3
+lib/libgdata-%%EVO_VERSION%%.a
+lib/libgdata-%%EVO_VERSION%%.la
+lib/libgdata-%%EVO_VERSION%%.so
+lib/libgdata-%%EVO_VERSION%%.so.1
+lib/libgdata-google-%%EVO_VERSION%%.a
+lib/libgdata-google-%%EVO_VERSION%%.la
+lib/libgdata-google-%%EVO_VERSION%%.so
+lib/libgdata-google-%%EVO_VERSION%%.so.1
 libdata/bonobo/servers/GNOME_Evolution_DataServer_%%EVO_VERSION%%.server
 libdata/pkgconfig/camel-%%EVO_VERSION%%.pc
 libdata/pkgconfig/camel-provider-%%EVO_VERSION%%.pc
@@ -399,9 +418,245 @@
 libdata/pkgconfig/libedataserverui-%%EVO_VERSION%%.pc
 libdata/pkgconfig/libegroupwise-%%EVO_VERSION%%.pc
 libdata/pkgconfig/libexchange-storage-%%EVO_VERSION%%.pc
+libdata/pkgconfig/libgdata-%%EVO_VERSION%%.pc
+libdata/pkgconfig/libgdata-google-%%EVO_VERSION%%.pc
 libexec/camel-index-control-%%EVO_VERSION%%
 libexec/camel-lock-helper-%%EVO_VERSION%%
 libexec/evolution-data-server-%%VERSION%%
+share/doc/camel/Addresses.html
+share/doc/camel/ClassTree.html
+share/doc/camel/Crypto.html
+share/doc/camel/Filters.html
+share/doc/camel/Folders.html
+share/doc/camel/Fundamentals.html
+share/doc/camel/MIME.html
+share/doc/camel/Services.html
+share/doc/camel/Streams.html
+share/doc/camel/camel-CamelAddress.html
+share/doc/camel/camel-CamelCipherContext.html
+share/doc/camel/camel-CamelDataWrapper.html
+share/doc/camel/camel-CamelFolder.html
+share/doc/camel/camel-CamelFolderSummary.html
+share/doc/camel/camel-CamelGpgContext.html
+share/doc/camel/camel-CamelInternetAddress.html
+share/doc/camel/camel-CamelMedium.html
+share/doc/camel/camel-CamelMimeFilter.html
+share/doc/camel/camel-CamelMimeFilterBasic.html
+share/doc/camel/camel-CamelMimeFilterBestenc.html
+share/doc/camel/camel-CamelMimeFilterCRLF.html
+share/doc/camel/camel-CamelMimeFilterCanon.html
+share/doc/camel/camel-CamelMimeFilterCharset.html
+share/doc/camel/camel-CamelMimeFilterEnriched.html
+share/doc/camel/camel-CamelMimeFilterFrom.html
+share/doc/camel/camel-CamelMimeFilterHTML.html
+share/doc/camel/camel-CamelMimeFilterIndex.html
+share/doc/camel/camel-CamelMimeFilterPgp.html
+share/doc/camel/camel-CamelMimeFilterSave.html
+share/doc/camel/camel-CamelMimeFilterToHTML.html
+share/doc/camel/camel-CamelMimeFilterWindows.html
+share/doc/camel/camel-CamelMimeFilterYenc.html
+share/doc/camel/camel-CamelMimeMessage.html
+share/doc/camel/camel-CamelMimeParser.html
+share/doc/camel/camel-CamelMimePart.html
+share/doc/camel/camel-CamelMultipart.html
+share/doc/camel/camel-CamelMultipartEncrypted.html
+share/doc/camel/camel-CamelMultipartSigned.html
+share/doc/camel/camel-CamelObject.html
+share/doc/camel/camel-CamelOfflineFolder.html
+share/doc/camel/camel-CamelOfflineJournal.html
+share/doc/camel/camel-CamelOfflineStore.html
+share/doc/camel/camel-CamelSasl.html
+share/doc/camel/camel-CamelSaslAnonymous.html
+share/doc/camel/camel-CamelSaslCramMd5.html
+share/doc/camel/camel-CamelSaslDigestMd5.html
+share/doc/camel/camel-CamelSaslGssapi.html
+share/doc/camel/camel-CamelSaslKerberos4.html
+share/doc/camel/camel-CamelSaslLogin.html
+share/doc/camel/camel-CamelSaslNTLM.html
+share/doc/camel/camel-CamelSaslPlain.html
+share/doc/camel/camel-CamelSeekableStream.html
+share/doc/camel/camel-CamelSeekableSubstream.html
+share/doc/camel/camel-CamelService.html
+share/doc/camel/camel-CamelSession.html
+share/doc/camel/camel-CamelStore.html
+share/doc/camel/camel-CamelStoreSummary.html
+share/doc/camel/camel-CamelStream.html
+share/doc/camel/camel-CamelStreamBuffer.html
+share/doc/camel/camel-CamelStreamFilter.html
+share/doc/camel/camel-CamelStreamFs.html
+share/doc/camel/camel-CamelStreamMem.html
+share/doc/camel/camel-CamelStreamNull.html
+share/doc/camel/camel-CamelStreamVFS.html
+share/doc/camel/camel-CamelTcpStream.html
+share/doc/camel/camel-CamelTcpStreamRaw.html
+share/doc/camel/camel-CamelTcpStreamSSL.html
+share/doc/camel/camel-CamelTransport.html
+share/doc/camel/camel-CamelVTrashFolder.html
+share/doc/camel/camel-CamelVeeFolder.html
+share/doc/camel/camel-camel-exception.html
+share/doc/camel/camel-camel-operation.html
+share/doc/camel/camel-camel-provider.html
+share/doc/camel/camel-camel-url.html
+share/doc/camel/camel.devhelp
+share/doc/camel/camel.devhelp2
+share/doc/camel/classes.html
+share/doc/camel/home.png
+share/doc/camel/index.html
+share/doc/camel/index.sgml
+share/doc/camel/ix01.html
+share/doc/camel/left.png
+share/doc/camel/right.png
+share/doc/camel/style.css
+share/doc/camel/up.png
+share/doc/libebook/EBook.html
+share/doc/libebook/EBookListener.html
+share/doc/libebook/EBookView.html
+share/doc/libebook/EBookViewListener.html
+share/doc/libebook/EContact.html
+share/doc/libebook/EDestination.html
+share/doc/libebook/EVCard.html
+share/doc/libebook/ch01.html
+share/doc/libebook/home.png
+share/doc/libebook/index.html
+share/doc/libebook/index.sgml
+share/doc/libebook/ix01.html
+share/doc/libebook/left.png
+share/doc/libebook/libebook-EAddressWestern.html
+share/doc/libebook/libebook-ENameWestern.html
+share/doc/libebook/libebook-e-book-query.html
+share/doc/libebook/libebook-e-book-types.html
+share/doc/libebook/libebook.devhelp
+share/doc/libebook/libebook.devhelp2
+share/doc/libebook/right.png
+share/doc/libebook/style.css
+share/doc/libebook/up.png
+share/doc/libecal/ECal.html
+share/doc/libecal/ECalComponent.html
+share/doc/libecal/ECalListener.html
+share/doc/libecal/ECalView.html
+share/doc/libecal/ECalViewListener.html
+share/doc/libecal/ch01.html
+share/doc/libecal/home.png
+share/doc/libecal/index.html
+share/doc/libecal/index.sgml
+share/doc/libecal/ix01.html
+share/doc/libecal/left.png
+share/doc/libecal/libecal-e-cal-recur.html
+share/doc/libecal/libecal-e-cal-time-util.html
+share/doc/libecal/libecal-e-cal-types.html
+share/doc/libecal/libecal-e-cal-util.html
+share/doc/libecal/libecal.devhelp
+share/doc/libecal/libecal.devhelp2
+share/doc/libecal/right.png
+share/doc/libecal/style.css
+share/doc/libecal/up.png
+share/doc/libedata-book/EBookBackend.html
+share/doc/libedata-book/EBookBackendCache.html
+share/doc/libedata-book/EBookBackendFactory.html
+share/doc/libedata-book/EBookBackendSExp.html
+share/doc/libedata-book/EBookBackendSummary.html
+share/doc/libedata-book/EBookBackendSync.html
+share/doc/libedata-book/EDataBook.html
+share/doc/libedata-book/EDataBookView.html
+share/doc/libedata-book/ch01.html
+share/doc/libedata-book/home.png
+share/doc/libedata-book/index.html
+share/doc/libedata-book/index.sgml
+share/doc/libedata-book/ix01.html
+share/doc/libedata-book/left.png
+share/doc/libedata-book/libedata-book-EDataBookFactory.html
+share/doc/libedata-book/libedata-book-e-book-backend-db-cache.html
+share/doc/libedata-book/libedata-book-ximian-vcard.html
+share/doc/libedata-book/libedata-book.devhelp
+share/doc/libedata-book/libedata-book.devhelp2
+share/doc/libedata-book/right.png
+share/doc/libedata-book/style.css
+share/doc/libedata-book/up.png
+share/doc/libedata-cal/ECalBackend.html
+share/doc/libedata-cal/ECalBackendCache.html
+share/doc/libedata-cal/ECalBackendFactory.html
+share/doc/libedata-cal/ECalBackendSExp.html
+share/doc/libedata-cal/ECalBackendSync.html
+share/doc/libedata-cal/EDataCal.html
+share/doc/libedata-cal/EDataCalFactory.html
+share/doc/libedata-cal/EDataCalView.html
+share/doc/libedata-cal/ch01.html
+share/doc/libedata-cal/home.png
+share/doc/libedata-cal/index.html
+share/doc/libedata-cal/index.sgml
+share/doc/libedata-cal/ix01.html
+share/doc/libedata-cal/left.png
+share/doc/libedata-cal/libedata-cal-e-cal-backend-util.html
+share/doc/libedata-cal/libedata-cal.devhelp
+share/doc/libedata-cal/libedata-cal.devhelp2
+share/doc/libedata-cal/right.png
+share/doc/libedata-cal/style.css
+share/doc/libedata-cal/up.png
+share/doc/libedataserver/EAccount.html
+share/doc/libedataserver/EAccountList.html
+share/doc/libedataserver/EComponentListener.html
+share/doc/libedataserver/EFileCache.html
+share/doc/libedataserver/EIterator.html
+share/doc/libedataserver/EList.html
+share/doc/libedataserver/EListIterator.html
+share/doc/libedataserver/ESource.html
+share/doc/libedataserver/ESourceGroup.html
+share/doc/libedataserver/ESourceList.html
+share/doc/libedataserver/ch01.html
+share/doc/libedataserver/home.png
+share/doc/libedataserver/index.html
+share/doc/libedataserver/index.sgml
+share/doc/libedataserver/ix01.html
+share/doc/libedataserver/left.png
+share/doc/libedataserver/libedataserver-EFlag.html
+share/doc/libedataserver/libedataserver-ESExp.html
+share/doc/libedataserver/libedataserver-e-categories.html
+share/doc/libedataserver/libedataserver-e-data-server-module.html
+share/doc/libedataserver/libedataserver-e-db3-utils.html
+share/doc/libedataserver/libedataserver-e-dbhash.html
+share/doc/libedataserver/libedataserver-e-iconv.html
+share/doc/libedataserver/libedataserver-e-memory.html
+share/doc/libedataserver/libedataserver-e-msgport.html
+share/doc/libedataserver/libedataserver-e-time-utils.html
+share/doc/libedataserver/libedataserver-e-trie.html
+share/doc/libedataserver/libedataserver-e-uid.html
+share/doc/libedataserver/libedataserver-e-url.html
+share/doc/libedataserver/libedataserver-e-util.html
+share/doc/libedataserver/libedataserver-e-xml-hash-utils.html
+share/doc/libedataserver/libedataserver-md5-utils.html
+share/doc/libedataserver/libedataserver.devhelp
+share/doc/libedataserver/libedataserver.devhelp2
+share/doc/libedataserver/right.png
+share/doc/libedataserver/style.css
+share/doc/libedataserver/up.png
+share/doc/libedataserverui/ECategoriesDialog.html
+share/doc/libedataserverui/EContactStore.html
+share/doc/libedataserverui/EDestinationStore.html
+share/doc/libedataserverui/ENameSelector.html
+share/doc/libedataserverui/ENameSelectorDialog.html
+share/doc/libedataserverui/ENameSelectorEntry.html
+share/doc/libedataserverui/ENameSelectorList.html
+share/doc/libedataserverui/ENameSelectorModel.html
+share/doc/libedataserverui/ESourceComboBox.html
+share/doc/libedataserverui/ESourceOptionMenu.html
+share/doc/libedataserverui/ESourceSelector.html
+share/doc/libedataserverui/ESourceSelectorDialog.html
+share/doc/libedataserverui/ETreeModelGenerator.html
+share/doc/libedataserverui/ch01.html
+share/doc/libedataserverui/home.png
+share/doc/libedataserverui/index.html
+share/doc/libedataserverui/index.sgml
+share/doc/libedataserverui/ix01.html
+share/doc/libedataserverui/left.png
+share/doc/libedataserverui/libedataserverui-ECellRendererColor.html
+share/doc/libedataserverui/libedataserverui-e-book-auth-util.html
+share/doc/libedataserverui/libedataserverui-e-data-server-ui-marshal.html
+share/doc/libedataserverui/libedataserverui-e-passwords.html
+share/doc/libedataserverui/libedataserverui.devhelp
+share/doc/libedataserverui/libedataserverui.devhelp2
+share/doc/libedataserverui/right.png
+share/doc/libedataserverui/style.css
+share/doc/libedataserverui/up.png
 share/evolution-data-server-%%VERSION%%/evolutionperson.schema
 share/evolution-data-server-%%VERSION%%/glade/e-categories-dialog.glade
 share/evolution-data-server-%%VERSION%%/glade/e-name-selector-dialog.glade
@@ -446,6 +701,7 @@
 share/locale/it/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
 share/locale/ja/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
 share/locale/ka/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
+share/locale/kn/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
 share/locale/ko/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
 share/locale/ku/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
 share/locale/lt/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
@@ -468,6 +724,7 @@
 share/locale/ro/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
 share/locale/ru/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
 share/locale/rw/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
+share/locale/si/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
 share/locale/sk/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
 share/locale/sl/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
 share/locale/sq/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
@@ -508,6 +765,13 @@
 @dirrm share/evolution-data-server-%%VERSION%%/weather
 @dirrm share/evolution-data-server-%%VERSION%%/glade
 @dirrm share/evolution-data-server-%%VERSION%%
+ at dirrm share/doc/libedataserverui
+ at dirrm share/doc/libedataserver
+ at dirrm share/doc/libedata-cal
+ at dirrm share/doc/libedata-book
+ at dirrm share/doc/libecal
+ at dirrm share/doc/libebook
+ at dirrm share/doc/camel
 @dirrm lib/evolution-data-server-%%EVO_VERSION%%/extensions
 @dirrm lib/evolution-data-server-%%EVO_VERSION%%/camel-providers
 @dirrm lib/evolution-data-server-%%EVO_VERSION%%
@@ -519,6 +783,9 @@
 @dirrm include/evolution-data-server-%%VERSION%%/libecal
 @dirrm include/evolution-data-server-%%VERSION%%/libebook
 @dirrm include/evolution-data-server-%%VERSION%%/groupwise
+ at dirrm include/evolution-data-server-%%VERSION%%/google/gdata-google
+ at dirrm include/evolution-data-server-%%VERSION%%/google/gdata
+ at dirrm include/evolution-data-server-%%VERSION%%/google
 @dirrm include/evolution-data-server-%%VERSION%%/exchange
 @dirrm include/evolution-data-server-%%VERSION%%/camel
 @dirrm include/evolution-data-server-%%VERSION%%
@@ -528,6 +795,8 @@
 @dirrmtry share/locale/xh
 @dirrmtry share/locale/te/LC_MESSAGES
 @dirrmtry share/locale/te
+ at dirrmtry share/locale/si/LC_MESSAGES
+ at dirrmtry share/locale/si
 @dirrmtry share/locale/rw/LC_MESSAGES
 @dirrmtry share/locale/rw
 @dirrmtry share/locale/oc/LC_MESSAGES
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/databases/evolution-data-server/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -L databases/evolution-data-server/Makefile -L databases/evolution-data-server/Makefile -u -r1.3 -r1.4
--- databases/evolution-data-server/Makefile
+++ databases/evolution-data-server/Makefile
@@ -1,17 +1,12 @@
 # New ports collection makefile for:	evolution-data-server
-# Date created:				09 December 2003
-# Whom:					Joe Marcus Clarke <marcus at FreeBSD.org>
 #
 # $MidnightBSD$
-# $FreeBSD: ports/databases/evolution-data-server/Makefile,v 1.45 2008/01/14 19:19:18 marcus Exp $
-#   $MCom: ports-stable/databases/evolution-data-server/Makefile,v 1.3 2007/11/30 20:10:35 marcus Exp $
 #
 
 PORTNAME=	evolution-data-server
-PORTVERSION=	1.12.3
+PORTVERSION=	2.22.2
 CATEGORIES=	databases gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	ports at MidnightBSD.org
@@ -26,12 +21,12 @@
 USE_GMAKE=	yes
 USE_BISON=	build
 USE_GETTEXT=	yes
-USE_XLIB=	yes
+USE_XORG=	x11
 USE_GNOME=	gnomeprefix gnomehack intlhack gnometarget libgnomeui \
 		ltverhack
 USE_OPENLDAP=	yes
 USE_AUTOTOOLS=	libtool:15
-USE_BDB=	41
+USE_BDB=	41+
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--enable-static \
 		--enable-nss=yes \
@@ -40,7 +35,7 @@
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${BDB_INCLUDE_DIR} ${PTHREAD_CFLAGS}" \
 		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
 
-PLIST_SUB=	VERSION="1.12" EVO_VERSION="1.2"
+PLIST_SUB=	VERSION="2.22" EVO_VERSION="1.2"
 
 OPTIONS=	IMAP4	"Enable experimental IMAP4 backend" off
 
@@ -50,8 +45,10 @@
 HEIMDAL_HOME?=	${LOCALBASE}
 LIB_DEPENDS+=		krb5:${PORTSDIR}/security/heimdal
 CONFIGURE_ARGS+=	--with-krb5=${HEIMDAL_HOME} --with-krb5-includes=${HEIMDAL_HOME}/include
+KRB5_LIB=		`${HEIMDAL_HOME}/bin/krb5-config --libs`
 .elif !defined(NO_KERBEROS)
 CONFIGURE_ARGS+=        --with-krb5=/usr
+KRB5_LIB=		`/usr/bin/krb5-config gssapi --libs`
 .endif
 
 .if defined(WITH_IMAP4) || defined(PACKAGE_BUILDING)
@@ -61,8 +58,16 @@
 PLIST_SUB+=		IMAP4="@comment "
 .endif
 
+EDS_BDB_MSG=	"!!!WARNING!!!: Berkeley Database version is ${BDB_VER}.  If this is an upgrade, you may experience problems if you or any other Evolution-data-server users were previously using BDB_VER 41."
+
+pre-everything::
+	@if [ x"${BDB_VER}" != x"41" ]; then \
+		${ECHO_MSG} ${EDS_BDB_MSG} | ${FMT} 75 79 ; \
+	fi
+
 post-patch:
-	@${REINPLACE_CMD} -e 's|-ldb|-l${BDB_LIB_NAME}|g' \
-		${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|-ldb|-l${BDB_LIB_NAME}|g ; \
+		s|heimlibs=".*"|heimlibs="${KRB5_LIB}"|g' \
+			${WRKSRC}/configure
 
 .include <bsd.port.post.mk>
Index: distinfo
===================================================================
RCS file: /home/cvs/mports/databases/evolution-data-server/distinfo,v
retrieving revision 1.1
retrieving revision 1.2
diff -L databases/evolution-data-server/distinfo -L databases/evolution-data-server/distinfo -u -r1.1 -r1.2
--- databases/evolution-data-server/distinfo
+++ databases/evolution-data-server/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/evolution-data-server-1.12.3.tar.bz2) = 9a04e379c34ad538764866dfd4eb2931
-SHA256 (gnome2/evolution-data-server-1.12.3.tar.bz2) = e2d9038e3cd115ea5af2f3b7d381f5803c62d1ec36206e5a1bea0f823d25fab5
-SIZE (gnome2/evolution-data-server-1.12.3.tar.bz2) = 7447166
+MD5 (gnome2/evolution-data-server-2.22.2.tar.bz2) = 4f00c92faf5fa85f3a141ebca401fc52
+SHA256 (gnome2/evolution-data-server-2.22.2.tar.bz2) = dc86b3f61cc4f9db08012deee692774562cfc93a3313298517fca8639a6eb3de
+SIZE (gnome2/evolution-data-server-2.22.2.tar.bz2) = 7613774
Index: patch-configure
===================================================================
RCS file: /home/cvs/mports/databases/evolution-data-server/files/patch-configure,v
retrieving revision 1.1
retrieving revision 1.2
diff -L databases/evolution-data-server/files/patch-configure -L databases/evolution-data-server/files/patch-configure -u -r1.1 -r1.2
--- databases/evolution-data-server/files/patch-configure
+++ databases/evolution-data-server/files/patch-configure
@@ -24,15 +24,6 @@
  
  int
  main ()
-@@ -28982,7 +28990,7 @@ if test "x${with_krb5}" != "xno"; then
- 	LDFLAGS_save="$LDFLAGS"
- 
- 	mitlibs="-lkrb5 -lk5crypto -lcom_err -lgssapi_krb5"
--	heimlibs="-lkrb5 -lcrypto -lasn1 -lcom_err -lroken -lgssapi"
-+	heimlibs="-lkrb5 -lcrypto -lasn1 -lcom_err -lroken -lgssapi -lcrypt"
- 	sunlibs="-lkrb5 -lgss"
- 	{ echo "$as_me:$LINENO: checking for Kerberos 5" >&5
- echo $ECHO_N "checking for Kerberos 5... $ECHO_C" >&6; }
 @@ -33825,7 +33833,7 @@ idldir='${datadir}'/idl/evolution-data-s
  imagesdir='${datadir}'/pixmaps/evolution-data-server
  
Index: patch-addressbook_backends_ldap_e-book-backend-ldap.c
===================================================================
RCS file: /home/cvs/mports/databases/evolution-data-server/files/patch-addressbook_backends_ldap_e-book-backend-ldap.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -L databases/evolution-data-server/files/patch-addressbook_backends_ldap_e-book-backend-ldap.c -L databases/evolution-data-server/files/patch-addressbook_backends_ldap_e-book-backend-ldap.c -u -r1.1 -r1.2
--- databases/evolution-data-server/files/patch-addressbook_backends_ldap_e-book-backend-ldap.c
+++ databases/evolution-data-server/files/patch-addressbook_backends_ldap_e-book-backend-ldap.c
@@ -1,6 +1,6 @@
---- addressbook/backends/ldap/e-book-backend-ldap.c.orig	Fri Sep  9 16:06:37 2005
-+++ addressbook/backends/ldap/e-book-backend-ldap.c	Fri Sep  9 16:08:21 2005
-@@ -301,8 +301,8 @@ struct prop_info {
+--- addressbook/backends/ldap/e-book-backend-ldap.c.orig	2007-12-14 15:23:50.000000000 +0100
++++ addressbook/backends/ldap/e-book-backend-ldap.c	2007-12-21 11:29:01.000000000 +0100
+@@ -358,8 +358,8 @@
  
  	/* misc fields */
  	STRING_PROP    (E_CONTACT_HOMEPAGE_URL,  "labeledURI"),
@@ -8,6 +8,6 @@
 -	STRING_PROP    (E_CONTACT_NICKNAME,    "displayName"),
 +	/* map nickname to nickname */
 +	STRING_PROP    (E_CONTACT_NICKNAME,    "nickname"),
- 	E_STRING_PROP  (E_CONTACT_SPOUSE,      "spouseName"), 
- 	E_STRING_PROP  (E_CONTACT_NOTE,        "note"), 
- 	E_COMPLEX_PROP (E_CONTACT_ANNIVERSARY, "anniversary", anniversary_populate, anniversary_ber, anniversary_compare), 
+ 	E_STRING_PROP  (E_CONTACT_SPOUSE,      "spouseName"),
+ 	E_STRING_PROP  (E_CONTACT_NOTE,        "note"),
+ 	E_COMPLEX_PROP (E_CONTACT_ANNIVERSARY, "anniversary", anniversary_populate, anniversary_ber, anniversary_compare),
--- databases/evolution-data-server/files/patch-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig	2008-01-14 19:13:06.000000000 -0500
-+++ Makefile.in	2008-01-14 19:13:15.000000000 -0500
-@@ -353,7 +353,7 @@ AUTOMAKE_OPTIONS = 1.6
- DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
- @WITH_LIBDB_FALSE at LIBDB = libdb
- @ENABLE_CALENDAR_TRUE at CALENDAR_DIR = calendar
--SUBDIRS = $(LIBDB) win32 libedataserver servers camel addressbook $(CALENDAR_DIR) libedataserverui src docs art po
-+SUBDIRS = $(LIBDB) win32 libedataserver servers camel addressbook $(CALENDAR_DIR) libedataserverui src art po
- DIST_SUBDIRS = win32 libedataserver servers camel addressbook calendar libedataserverui src docs art po
- changelogs = \
- 	ChangeLog
Index: patch-calendar_libical_src_libical_icaltz-util.c
===================================================================
RCS file: /home/cvs/mports/databases/evolution-data-server/files/patch-calendar_libical_src_libical_icaltz-util.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -L databases/evolution-data-server/files/patch-calendar_libical_src_libical_icaltz-util.c -L databases/evolution-data-server/files/patch-calendar_libical_src_libical_icaltz-util.c -u -r1.1 -r1.2
--- databases/evolution-data-server/files/patch-calendar_libical_src_libical_icaltz-util.c
+++ databases/evolution-data-server/files/patch-calendar_libical_src_libical_icaltz-util.c
@@ -1,5 +1,5 @@
---- calendar/libical/src/libical/icaltz-util.c.orig	2007-11-25 21:29:25.000000000 -0500
-+++ calendar/libical/src/libical/icaltz-util.c	2008-01-07 20:24:12.000000000 -0500
+--- calendar/libical/src/libical/icaltz-util.c.orig	2007-08-24 02:48:28.000000000 -0400
++++ calendar/libical/src/libical/icaltz-util.c	2007-08-27 16:23:59.000000000 -0400
 @@ -23,6 +23,15 @@
  #include <string.h>
  #if defined(sun) && defined(__SVR4)
@@ -16,27 +16,3 @@
  #else
  #include <byteswap.h>
  #include <endian.h>
-@@ -328,7 +337,10 @@ icaltzutil_fetch_timezone (const char *l
- 		icalprop = icalproperty_new_tzname (types [zidx].zname);
- 		icalcomponent_add_property (std_comp, icalprop);
- 
--		trans = transitions [stdidx] + types [zidx].gmtoff;
-+		if (num_trans)
-+			trans = transitions [stdidx] + types [zidx].gmtoff;
-+		else
-+			trans = types [zidx].gmtoff;
- 		icaltime = icaltime_from_timet (trans, 0);
- 		dtstart = icaltime;
- 		dtstart.year = 1970;
-@@ -369,7 +381,10 @@ icaltzutil_fetch_timezone (const char *l
- 		icalprop = icalproperty_new_tzname (types [zidx].zname);
- 		icalcomponent_add_property (dst_comp, icalprop);
- 
--		trans = transitions [dstidx] + types [zidx].gmtoff;
-+		if (num_trans)
-+			trans = transitions [dstidx] + types [zidx].gmtoff;
-+		else
-+			trans = types [zidx].gmtoff;
- 		icaltime = icaltime_from_timet (trans, 0);
- 		dtstart = icaltime;
- 		dtstart.year = 1970;


More information about the Midnightbsd-cvs mailing list