Presenting GNOME 2.20.1 and all related works for FreeBSD. The official

GNOME 2.20 release notes can be found at
http://www.gnome.org/start/2.20/notes/en/ .  Beyond that, this update
includes the new GIMP 2.4 (courtesy of ahze).

The GNOME 2.20 update also includes a huge change in the FreeBSD GNOME
hierarchy.  We are now using the more standard DATADIR of ${PREFIX}/share
rather than ${PREFIX}/share/gnome. The result is that fewer patches and
hacks are needed to port GNOME components to FreeBSD.  This will mean some
user changes may be required, so be sure to read /usr/ports/UPDATING for
more details.

This release and the things we accomplished in it would not have been
possible without mezz's crazy idea to collapse DATADIR, and his persistence
to make it happen successfully.  Ahze and pav also deserve thanks for
their work on porting modules and testing the whole ball of wax on
pointyhat (respectively).

The FreeBSD GNOME team would also like to thank our various testers and
contributors:

Yasuda Keisuke
Frank Jahnke
Pawel Worach
Brian Gruber
Franz Klammer
Yuri Pankov
Nick Barkas
Cristian KLEIN
Tony Maher
Scot Hetzel
Martin Matuska (mm)
Benoit Dejean
Martin Wilke (miwi)
(And anyone else I may have missed)

PRs fixed in this release:

111272, 113470, 115995, 116338

34 files changed, 398 insertions, 1287 deletions

diff --git a/databases/evolution-data-server/Makefile b/databases/evolution-data-server/Makefile
index 14469b5f9242..2419ec666875 100644
--- a/databases/evolution-data-server/Makefile
+++ b/databases/evolution-data-server/Makefile
@@ -3,11 +3,11 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/databases/evolution-data-server/Makefile,v 1.112 2007/03/13 04:35:01 marcus Exp $
+#   $MCom: ports/databases/evolution-data-server/Makefile,v 1.129 2007/10/17 21:36:10 mezz Exp $
 #
 
 PORTNAME=	evolution-data-server
-PORTVERSION=	1.10.3.1
+PORTVERSION=	1.12.1
 PORTREVISION=	1
 CATEGORIES=	databases gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
@@ -35,12 +35,11 @@ USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--enable-static \
 		--enable-nss=yes \
 		--with-openldap=yes \
-		--with-krb5=/usr \
 		--with-libdb=${LOCALBASE}
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${BDB_INCLUDE_DIR} ${PTHREAD_CFLAGS}" \
 		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
 
-PLIST_SUB=	VERSION="1.10" EVO_VERSION="1.2"
+PLIST_SUB=	VERSION="1.12" EVO_VERSION="1.2"
 
 OPTIONS=	IMAP4	"Enable experimental IMAP4 backend" off
 
@@ -50,15 +49,12 @@ OPTIONS=	IMAP4	"Enable experimental IMAP4 backend" off
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-libedataserver_e-msgport.c
 .endif
 
-.if !defined(NO_KERBEROS) && exists(/usr/lib/libkrb5.so)
-CONFIGURE_ARGS+=	--with-krb5=/usr
-.else
+.if defined(HEIMDAL_HOME) || defined(WITH_HEIMDAL)
+HEIMDAL_HOME?=	${LOCALBASE}
 LIB_DEPENDS+=		krb5:${PORTSDIR}/security/heimdal
-.if defined(HEIMDAL_HOME)
 CONFIGURE_ARGS+=	--with-krb5=${HEIMDAL_HOME} --with-krb5-includes=${HEIMDAL_HOME}/include
-.else
-CONFIGURE_ARGS+=	--with-krb5=${LOCALBASE}
-.endif
+.elif !defined(NO_KERBEROS)
+CONFIGURE_ARGS+=        --with-krb5=/usr
 .endif
 
 .if defined(WITH_IMAP4) || defined(PACKAGE_BUILDING)
diff --git a/databases/evolution-data-server/distinfo b/databases/evolution-data-server/distinfo
index 169f3a9c63f6..3a13cbf7a019 100644
--- a/databases/evolution-data-server/distinfo
+++ b/databases/evolution-data-server/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/evolution-data-server-1.10.3.1.tar.bz2) = c6f804ac25f7c75dc9502b739bf99301
-SHA256 (gnome2/evolution-data-server-1.10.3.1.tar.bz2) = 60daa18544d5b4c675401acc36c4eb9b2ce137ff39e42a7ab603427f473b041f
-SIZE (gnome2/evolution-data-server-1.10.3.1.tar.bz2) = 7119022
+MD5 (gnome2/evolution-data-server-1.12.1.tar.bz2) = 5b4d855ed1ceaaab7db14b50133b5252
+SHA256 (gnome2/evolution-data-server-1.12.1.tar.bz2) = 1a9317da445dd09d7109f96b3b3a6a7bfa962117dd632ff9735bf7f730ff0079
+SIZE (gnome2/evolution-data-server-1.12.1.tar.bz2) = 7465117
diff --git a/databases/evolution-data-server/files/patch-calendar_libical_src_libical_icaltz-util.c b/databases/evolution-data-server/files/patch-calendar_libical_src_libical_icaltz-util.c
new file mode 100644
index 000000000000..766abb5425d9
--- /dev/null
+++ b/databases/evolution-data-server/files/patch-calendar_libical_src_libical_icaltz-util.c
@@ -0,0 +1,18 @@
+--- 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)
+ #include <sys/byteorder.h>
++#elif defined(__FreeBSD__)
++#include <sys/endian.h>
++#define __BYTE_ORDER            _BYTE_ORDER
++#define __LITTLE_ENDIAN         _LITTLE_ENDIAN
++#define __BIG_ENDIAN            _BIG_ENDIAN
++
++#define bswap_16                bswap16
++#define bswap_32                bswap32
++#define bswap_64                bswap64
+ #else
+ #include <byteswap.h>
+ #include <endian.h>
diff --git a/databases/evolution-data-server/files/patch-camel_camel-block-file.h b/databases/evolution-data-server/files/patch-camel_camel-block-file.h
new file mode 100644
index 000000000000..bb155e24ad65
--- /dev/null
+++ b/databases/evolution-data-server/files/patch-camel_camel-block-file.h
@@ -0,0 +1,10 @@
+--- camel/camel-block-file.h.orig	Tue May 15 01:48:42 2007
++++ camel/camel-block-file.h	Tue May 15 01:49:00 2007
+@@ -21,6 +21,7 @@
+ #ifndef _CAMEL_BLOCK_FILE_H
+ #define _CAMEL_BLOCK_FILE_H
+ 
++#include <sys/types.h>
+ #include <camel/camel-object.h>
+ #include <glib.h>
+ #include <libedataserver/e-msgport.h>
diff --git a/databases/evolution-data-server/files/patch-camel_providers_imap4_camel-imap4-specials.c b/databases/evolution-data-server/files/patch-camel_providers_imap4_camel-imap4-specials.c
new file mode 100644
index 000000000000..e00b57db0780
--- /dev/null
+++ b/databases/evolution-data-server/files/patch-camel_providers_imap4_camel-imap4-specials.c
@@ -0,0 +1,10 @@
+--- camel/providers/imap4/camel-imap4-specials.c.orig	Thu May 17 18:11:10 2007
++++ camel/providers/imap4/camel-imap4-specials.c	Thu May 17 18:11:17 2007
+@@ -22,6 +22,7 @@
+ #include <config.h>
+ #endif
+ 
++#include <glib.h>
+ #include <string.h>
+ 
+ #include "camel-imap4-specials.h"
diff --git a/databases/evolution-data-server/files/patch-camel_providers_imap4_camel-imap4-summary.c b/databases/evolution-data-server/files/patch-camel_providers_imap4_camel-imap4-summary.c
new file mode 100644
index 000000000000..55db1a65dcf0
--- /dev/null
+++ b/databases/evolution-data-server/files/patch-camel_providers_imap4_camel-imap4-summary.c
@@ -0,0 +1,19 @@
+--- camel/providers/imap4/camel-imap4-summary.c.orig	Mon May  7 01:01:31 2007
++++ camel/providers/imap4/camel-imap4-summary.c	Mon May  7 01:05:32 2007
+@@ -1148,6 +1148,7 @@ static CamelIMAP4Command *
+ imap4_summary_fetch_flags (CamelFolderSummary *summary)
+ {
+ 	CamelFolder *folder = summary->folder;
++	CamelIMAP4Summary *imap4_summary = (CamelIMAP4Summary *) summary;
+ 	struct imap4_fetch_all_t *fetch;
+ 	CamelMessageInfo *info[2];
+ 	CamelIMAP4Engine *engine;
+@@ -1479,7 +1480,7 @@ camel_imap4_summary_flush_updates (Camel
+ 		}
+ 	} else {
+ 		/* need to fetch new envelopes */
+-		first = scount + 1;
++		seqid = scount + 1;
+ 	}
+ 	
+ 	if (seqid != 0 && seqid <= imap4_summary->exists) {
diff --git a/databases/evolution-data-server/files/patch-configure b/databases/evolution-data-server/files/patch-configure
index f62645e708e2..1ef8d776b127 100644
--- a/databases/evolution-data-server/files/patch-configure
+++ b/databases/evolution-data-server/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	Tue Apr 10 23:42:25 2007
-+++ configure	Wed Apr 11 00:04:30 2007
-@@ -24550,6 +24550,14 @@ case "$host" in
+--- configure.orig	Mon Jun 18 23:55:48 2007
++++ configure	Mon Jun 18 23:56:20 2007
+@@ -24562,6 +24562,14 @@ case "$host" in
      # AC_CACHE_VAL(have_addrinfo, [have_addrinfo=yes])
      # AC_DEFINE(_WIN32_WINNT, 0x501, [To get getaddrinfo etc declarations])
      ;;
@@ -15,7 +15,7 @@
  *)  os_win32=no
      NO_UNDEFINED=''
      SOCKET_LIBS=''
-@@ -28749,7 +28758,7 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -28651,7 +28659,7 @@ cat >>conftest.$ac_ext <<_ACEOF
  		#include <sys/socket.h>
  		#include <netinet/in.h>
  		#include <netdb.h>
@@ -24,16 +24,16 @@
  
  int
  main ()
-@@ -29039,7 +29048,7 @@ if test "x${with_krb5}" != "xno"; then
+@@ -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; }
- if test "${ac_cv_lib_kerberos5+set}" = set; then
-@@ -33857,7 +33866,7 @@ idldir='${datadir}'/idl/evolution-data-s
+@@ -33825,7 +33833,7 @@ idldir='${datadir}'/idl/evolution-data-s
  imagesdir='${datadir}'/pixmaps/evolution-data-server
  
  
diff --git a/databases/evolution-data-server/files/patch-docs_reference_camel_Makefile.in b/databases/evolution-data-server/files/patch-docs_reference_camel_Makefile.in
new file mode 100644
index 000000000000..417b438a7b34
--- /dev/null
+++ b/databases/evolution-data-server/files/patch-docs_reference_camel_Makefile.in
@@ -0,0 +1,11 @@
+--- docs/reference/camel/Makefile.in.orig	2007-10-15 09:28:28.000000000 -0400
++++ docs/reference/camel/Makefile.in	2007-10-15 09:29:49.000000000 -0400
+@@ -123,7 +123,7 @@
+ GOBJECT_QUERY = @GOBJECT_QUERY@
+ GREP = @GREP@
+ HAVE_JW = @HAVE_JW@
+-HTML_DIR = $(datadir)/gtk-doc/html
++HTML_DIR = $(prefix)/share/doc
+ ICONV_CFLAGS = @ICONV_CFLAGS@
+ ICONV_LIBS = @ICONV_LIBS@
+ IDL_INCLUDES = @IDL_INCLUDES@
diff --git a/databases/evolution-data-server/files/patch-fix-maildir b/databases/evolution-data-server/files/patch-fix-maildir
deleted file mode 100644
index db2563e0e040..000000000000
--- a/databases/evolution-data-server/files/patch-fix-maildir
+++ /dev/null
@@ -1,141 +0,0 @@
-Index: camel/providers/local/camel-local-provider.c
-===================================================================
---- camel/providers/local/camel-local-provider.c	(revision 7830)
-+++ camel/providers/local/camel-local-provider.c	(working copy)
-@@ -56,7 +56,7 @@
- 	N_("For storing local mail in MH-like mail directories."),
- 	"mail",
- 	CAMEL_PROVIDER_IS_SOURCE | CAMEL_PROVIDER_IS_STORAGE | CAMEL_PROVIDER_IS_LOCAL,
--	CAMEL_URL_NEED_PATH | CAMEL_URL_PATH_IS_ABSOLUTE | CAMEL_URL_FRAGMENT_IS_PATH,
-+	CAMEL_URL_NEED_PATH | CAMEL_URL_NEED_PATH_DIR | CAMEL_URL_PATH_IS_ABSOLUTE | CAMEL_URL_FRAGMENT_IS_PATH,
- 	mh_conf_entries,
- 	/* ... */
- };
-@@ -74,7 +74,7 @@
- 	N_("For retrieving (moving) local mail from standard mbox-formatted spools into folders managed by Evolution."),
- 	"mail",
- 	CAMEL_PROVIDER_IS_SOURCE | CAMEL_PROVIDER_IS_STORAGE | CAMEL_PROVIDER_IS_LOCAL,
--	CAMEL_URL_NEED_PATH | CAMEL_URL_PATH_IS_ABSOLUTE | CAMEL_URL_FRAGMENT_IS_PATH,
-+	CAMEL_URL_NEED_PATH | CAMEL_URL_NEED_PATH_DIR |CAMEL_URL_PATH_IS_ABSOLUTE | CAMEL_URL_FRAGMENT_IS_PATH,
- 	mbox_conf_entries,
- 	/* ... */
- };
-@@ -96,7 +96,7 @@
- 	N_("For storing local mail in maildir directories."),
- 	"mail",
- 	CAMEL_PROVIDER_IS_SOURCE | CAMEL_PROVIDER_IS_STORAGE | CAMEL_PROVIDER_IS_LOCAL,
--	CAMEL_URL_NEED_PATH | CAMEL_URL_PATH_IS_ABSOLUTE | CAMEL_URL_FRAGMENT_IS_PATH,
-+	CAMEL_URL_NEED_PATH | CAMEL_URL_NEED_PATH_DIR | CAMEL_URL_PATH_IS_ABSOLUTE | CAMEL_URL_FRAGMENT_IS_PATH,
- 	maildir_conf_entries,
- 	/* ... */
- };
-@@ -110,9 +110,9 @@
- 	{ CAMEL_PROVIDER_CONF_END }
- };
- 
--static CamelProvider spool_provider = {
-+static CamelProvider spool_file_provider = {
- 	"spool",
--	N_("Standard Unix mbox spool or directory"),
-+	N_("Standard Unix mbox spool file"),
- 	N_("For reading and storing local mail in external standard mbox spool files.\nMay also be used to read a tree of Elm, Pine, or Mutt style folders."),
- 	"mail",
- 	CAMEL_PROVIDER_IS_SOURCE | CAMEL_PROVIDER_IS_STORAGE,
-@@ -121,6 +121,17 @@
- 	/* ... */
- };
- 
-+static CamelProvider spool_directory_provider = {
-+	"spooldir",
-+	N_("Standard Unix mbox spool directory"),
-+	N_("For reading and storing local mail in external standard mbox spool files.\nMay also be used to read a tree of Elm, Pine, or Mutt style folders."),
-+	"mail",
-+	CAMEL_PROVIDER_IS_SOURCE | CAMEL_PROVIDER_IS_STORAGE,
-+	CAMEL_URL_NEED_PATH | CAMEL_URL_NEED_PATH_DIR | CAMEL_URL_PATH_IS_ABSOLUTE | CAMEL_URL_FRAGMENT_IS_PATH,
-+	spool_conf_entries,
-+	/* ... */
-+};
-+
- #endif
- 
- /* build a canonical 'path' */
-@@ -234,13 +245,19 @@
- 	camel_provider_register(&mbox_provider);
- 
- #ifndef G_OS_WIN32
--	spool_conf_entries[0].value = path;  /* default path - same as mbox */
--	spool_provider.object_types[CAMEL_PROVIDER_STORE] = camel_spool_store_get_type ();
--	spool_provider.url_hash = local_url_hash;
--	spool_provider.url_equal = local_url_equal;
--	spool_provider.translation_domain = GETTEXT_PACKAGE;
--	camel_provider_register(&spool_provider);
--	
-+	spool_conf_entries[0].value = path;  /* default path - same as mbox; it's for both file and directory */
-+	spool_file_provider.object_types[CAMEL_PROVIDER_STORE] = camel_spool_store_get_type ();
-+	spool_file_provider.url_hash = local_url_hash;
-+	spool_file_provider.url_equal = local_url_equal;
-+	spool_file_provider.translation_domain = GETTEXT_PACKAGE;
-+	camel_provider_register(&spool_file_provider);
-+
-+	spool_directory_provider.object_types[CAMEL_PROVIDER_STORE] = camel_spool_store_get_type ();
-+	spool_directory_provider.url_hash = local_url_hash;
-+	spool_directory_provider.url_equal = local_url_equal;
-+	spool_directory_provider.translation_domain = GETTEXT_PACKAGE;
-+	camel_provider_register(&spool_directory_provider);
-+
- 	path = getenv("MAILDIR");
- 	maildir_conf_entries[0].value = path ? path : "";  /* default path */
- 	maildir_provider.object_types[CAMEL_PROVIDER_STORE] = camel_maildir_store_get_type ();
-Index: camel/providers/local/ChangeLog
-===================================================================
---- camel/providers/local/ChangeLog	(revision 7830)
-+++ camel/providers/local/ChangeLog	(working copy)
-@@ -1,3 +1,12 @@
-+2007-06-18  Milan Crha  <mcrha@redhat.com>
-+
-+	** Fix for bug #352346
-+
-+	* camel-local-provider.c: (camel_provider_module_init):
-+	New provider spool_file_provider with virtual protocol 'spooldir'
-+	and set CAMEL_URL_NEED_PATH_DIR; registering this provider
-+	as copy for spool files.
-+
- 2007-06-06  Jeffrey Stedfast  <fejj@novell.com>
- 
- 	Robustness fix while making sure the code would properly handle
-Index: camel/ChangeLog
-===================================================================
---- camel/ChangeLog	(revision 7830)
-+++ camel/ChangeLog	(working copy)
-@@ -1,3 +1,11 @@
-+2007-06-18  Milan Crha  <mcrha@redhat.com>
-+
-+	** Fix for bug #352346
-+
-+	* camel-provider.h: Added new constants CAMEL_URL_PART_PATH_DIR and
-+	CAMEL_URL_NEED_PATH_DIR; when CAMEL_URL_NEED_PATH_DIR is set, then
-+	in editor dialog is choosing file, without it directory.
-+
- 2007-06-14  Philip Van Hoof  <pvanhoof@gnome.org>
- 	
- 	* camel-net-utils.c: Memory leak fix
-Index: camel/camel-provider.h
-===================================================================
---- camel/camel-provider.h	(revision 7830)
-+++ camel/camel-provider.h	(working copy)
-@@ -81,6 +81,7 @@
- #define CAMEL_URL_PART_HOST	 (1 << 3)
- #define CAMEL_URL_PART_PORT	 (1 << 4)
- #define CAMEL_URL_PART_PATH	 (1 << 5)
-+#define CAMEL_URL_PART_PATH_DIR  (1 << 6)
- 
- #define CAMEL_URL_PART_NEED	       8
- #define CAMEL_URL_PART_HIDDEN	(CAMEL_URL_PART_NEED + 8)
-@@ -104,6 +105,7 @@
- #define CAMEL_URL_NEED_HOST	 (CAMEL_URL_PART_HOST << CAMEL_URL_PART_NEED)
- #define CAMEL_URL_NEED_PORT	 (CAMEL_URL_PART_PORT << CAMEL_URL_PART_NEED)
- #define CAMEL_URL_NEED_PATH	 (CAMEL_URL_PART_PATH << CAMEL_URL_PART_NEED)
-+#define CAMEL_URL_NEED_PATH_DIR  (CAMEL_URL_PART_PATH_DIR << CAMEL_URL_PART_NEED)
- 
- #define CAMEL_URL_HIDDEN_USER	 (CAMEL_URL_PART_USER << CAMEL_URL_PART_HIDDEN)
- #define CAMEL_URL_HIDDEN_AUTH	 (CAMEL_URL_PART_AUTH << CAMEL_URL_PART_HIDDEN)
diff --git a/databases/evolution-data-server/pkg-plist b/databases/evolution-data-server/pkg-plist
index 63069d805d71..9b0f302375eb 100644
--- a/databases/evolution-data-server/pkg-plist
+++ b/databases/evolution-data-server/pkg-plist
@@ -24,13 +24,16 @@ include/evolution-data-server-%%VERSION%%/camel/camel-folder-summary.h
 include/evolution-data-server-%%VERSION%%/camel/camel-folder-thread.h
 include/evolution-data-server-%%VERSION%%/camel/camel-folder.h
 include/evolution-data-server-%%VERSION%%/camel/camel-gpg-context.h
+include/evolution-data-server-%%VERSION%%/camel/camel-html-parser.h
 include/evolution-data-server-%%VERSION%%/camel/camel-http-stream.h
 include/evolution-data-server-%%VERSION%%/camel/camel-i18n.h
+include/evolution-data-server-%%VERSION%%/camel/camel-iconv.h
 include/evolution-data-server-%%VERSION%%/camel/camel-index.h
 include/evolution-data-server-%%VERSION%%/camel/camel-internet-address.h
 include/evolution-data-server-%%VERSION%%/camel/camel-junk-plugin.h
 include/evolution-data-server-%%VERSION%%/camel/camel-list-utils.h
 include/evolution-data-server-%%VERSION%%/camel/camel-lock-client.h
+include/evolution-data-server-%%VERSION%%/camel/camel-lock-helper.h
 include/evolution-data-server-%%VERSION%%/camel/camel-lock.h
 include/evolution-data-server-%%VERSION%%/camel/camel-medium.h
 include/evolution-data-server-%%VERSION%%/camel/camel-mime-filter-basic.h
@@ -60,6 +63,7 @@ include/evolution-data-server-%%VERSION%%/camel/camel-multipart-encrypted.h
 include/evolution-data-server-%%VERSION%%/camel/camel-multipart-signed.h
 include/evolution-data-server-%%VERSION%%/camel/camel-multipart.h
 include/evolution-data-server-%%VERSION%%/camel/camel-net-utils.h
+include/evolution-data-server-%%VERSION%%/camel/camel-news-address.h
 include/evolution-data-server-%%VERSION%%/camel/camel-nntp-address.h
 include/evolution-data-server-%%VERSION%%/camel/camel-object.h
 include/evolution-data-server-%%VERSION%%/camel/camel-offline-folder.h
@@ -67,6 +71,7 @@ include/evolution-data-server-%%VERSION%%/camel/camel-offline-journal.h
 include/evolution-data-server-%%VERSION%%/camel/camel-offline-store.h
 include/evolution-data-server-%%VERSION%%/camel/camel-operation.h
 include/evolution-data-server-%%VERSION%%/camel/camel-partition-table.h
+include/evolution-data-server-%%VERSION%%/camel/camel-process.h
 include/evolution-data-server-%%VERSION%%/camel/camel-provider.h
 include/evolution-data-server-%%VERSION%%/camel/camel-sasl-anonymous.h
 include/evolution-data-server-%%VERSION%%/camel/camel-sasl-cram-md5.h
@@ -112,7 +117,6 @@ include/evolution-data-server-%%VERSION%%/camel/camel-vtrash-folder.h
 include/evolution-data-server-%%VERSION%%/camel/camel.h
 include/evolution-data-server-%%VERSION%%/exchange/e-folder-exchange.h
 include/evolution-data-server-%%VERSION%%/exchange/e-folder.h
-include/evolution-data-server-%%VERSION%%/exchange/e-shell-marshal.h
 include/evolution-data-server-%%VERSION%%/exchange/e-storage.h
 include/evolution-data-server-%%VERSION%%/exchange/e2k-autoconfig.h
 include/evolution-data-server-%%VERSION%%/exchange/e2k-context.h
@@ -152,27 +156,20 @@ include/evolution-data-server-%%VERSION%%/groupwise/e-gw-message.h
 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%%/libebook/Evolution-DataServer-Addressbook.h
 include/evolution-data-server-%%VERSION%%/libebook/e-address-western.h
-include/evolution-data-server-%%VERSION%%/libebook/e-book-listener.h
 include/evolution-data-server-%%VERSION%%/libebook/e-book-query.h
 include/evolution-data-server-%%VERSION%%/libebook/e-book-types.h
-include/evolution-data-server-%%VERSION%%/libebook/e-book-view-listener.h
 include/evolution-data-server-%%VERSION%%/libebook/e-book-view.h
 include/evolution-data-server-%%VERSION%%/libebook/e-book.h
 include/evolution-data-server-%%VERSION%%/libebook/e-contact.h
 include/evolution-data-server-%%VERSION%%/libebook/e-destination.h
-include/evolution-data-server-%%VERSION%%/libebook/e-name-western-tables.h
 include/evolution-data-server-%%VERSION%%/libebook/e-name-western.h
 include/evolution-data-server-%%VERSION%%/libebook/e-vcard.h
-include/evolution-data-server-%%VERSION%%/libecal/Evolution-DataServer-Calendar.h
 include/evolution-data-server-%%VERSION%%/libecal/e-cal-component.h
-include/evolution-data-server-%%VERSION%%/libecal/e-cal-listener.h
 include/evolution-data-server-%%VERSION%%/libecal/e-cal-recur.h
 include/evolution-data-server-%%VERSION%%/libecal/e-cal-time-util.h
 include/evolution-data-server-%%VERSION%%/libecal/e-cal-types.h
 include/evolution-data-server-%%VERSION%%/libecal/e-cal-util.h
-include/evolution-data-server-%%VERSION%%/libecal/e-cal-view-listener.h
 include/evolution-data-server-%%VERSION%%/libecal/e-cal-view.h
 include/evolution-data-server-%%VERSION%%/libecal/e-cal.h
 include/evolution-data-server-%%VERSION%%/libedata-book/Evolution-DataServer-Addressbook.h
@@ -207,6 +204,7 @@ include/evolution-data-server-%%VERSION%%/libedataserver/e-data-server-util.h
 include/evolution-data-server-%%VERSION%%/libedataserver/e-db3-utils.h
 include/evolution-data-server-%%VERSION%%/libedataserver/e-dbhash.h
 include/evolution-data-server-%%VERSION%%/libedataserver/e-file-cache.h
+include/evolution-data-server-%%VERSION%%/libedataserver/e-flag.h
 include/evolution-data-server-%%VERSION%%/libedataserver/e-iconv.h
 include/evolution-data-server-%%VERSION%%/libedataserver/e-iterator.h
 include/evolution-data-server-%%VERSION%%/libedataserver/e-list-iterator.h
@@ -274,6 +272,7 @@ include/evolution-data-server-%%VERSION%%/libical/icalssyacc.h
 include/evolution-data-server-%%VERSION%%/libical/icaltime.h
 include/evolution-data-server-%%VERSION%%/libical/icaltimezone.h
 include/evolution-data-server-%%VERSION%%/libical/icaltypes.h
+include/evolution-data-server-%%VERSION%%/libical/icaltz-util.h
 include/evolution-data-server-%%VERSION%%/libical/icalvalue.h
 include/evolution-data-server-%%VERSION%%/libical/icalvcal.h
 include/evolution-data-server-%%VERSION%%/libical/port.h
@@ -403,6 +402,91 @@ libdata/pkgconfig/libexchange-storage-%%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
@@ -461,7 +545,6 @@ 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-e-data-book-marshal.html
 share/doc/libedata-book/libedata-book-ximian-vcard.html
 share/doc/libedata-book/libedata-book.devhelp
 share/doc/libedata-book/libedata-book.devhelp2
@@ -504,6 +587,7 @@ 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
@@ -550,412 +634,16 @@ share/doc/libedataserverui/libedataserverui.devhelp2
 share/doc/libedataserverui/right.png
 share/doc/libedataserverui/style.css
 share/doc/libedataserverui/up.png
-share/gnome/evolution-data-server-%%VERSION%%/evolutionperson.schema
-share/gnome/evolution-data-server-%%VERSION%%/glade/e-categories-dialog.glade
-share/gnome/evolution-data-server-%%VERSION%%/glade/e-name-selector-dialog.glade
-share/gnome/evolution-data-server-%%VERSION%%/weather/Locations.xml
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/Abidjan.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/Accra.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/Addis_Ababa.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/Algiers.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/Asmera.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/Bamako.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/Bangui.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/Banjul.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/Bissau.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/Blantyre.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/Brazzaville.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/Bujumbura.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/Cairo.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/Casablanca.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/Ceuta.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/Conakry.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/Dakar.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/Dar_es_Salaam.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/Djibouti.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/Douala.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/El_Aaiun.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/Freetown.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/Gaborone.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/Harare.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/Johannesburg.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/Kampala.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/Khartoum.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/Kigali.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/Kinshasa.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/Lagos.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/Libreville.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/Lome.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/Luanda.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/Lubumbashi.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/Lusaka.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/Malabo.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/Maputo.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/Maseru.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/Mbabane.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/Mogadishu.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/Monrovia.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/Nairobi.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/Ndjamena.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/Niamey.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/Nouakchott.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/Ouagadougou.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/Porto-Novo.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/Sao_Tome.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/Timbuktu.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/Tripoli.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/Tunis.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/Windhoek.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Adak.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Anchorage.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Anguilla.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Antigua.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Araguaina.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Aruba.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Asuncion.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Barbados.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Belem.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Belize.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Boa_Vista.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Bogota.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Boise.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Buenos_Aires.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Cambridge_Bay.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Cancun.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Caracas.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Catamarca.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Cayenne.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Cayman.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Chicago.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Chihuahua.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Cordoba.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Costa_Rica.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Cuiaba.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Curacao.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Danmarkshavn.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Dawson.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Dawson_Creek.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Denver.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Detroit.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Dominica.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Edmonton.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Eirunepe.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/El_Salvador.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Fortaleza.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Glace_Bay.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Godthab.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Goose_Bay.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Grand_Turk.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Grenada.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Guadeloupe.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Guatemala.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Guayaquil.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Guyana.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Halifax.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Havana.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Hermosillo.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Indiana/Indianapolis.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Indiana/Knox.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Indiana/Marengo.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Indiana/Vevay.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Indianapolis.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Inuvik.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Iqaluit.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Jamaica.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Jujuy.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Juneau.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Kentucky/Louisville.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Kentucky/Monticello.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/La_Paz.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Lima.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Los_Angeles.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Louisville.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Maceio.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Managua.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Manaus.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Martinique.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Mazatlan.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Mendoza.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Menominee.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Merida.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Mexico_City.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Miquelon.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Monterrey.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Montevideo.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Montreal.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Montserrat.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Nassau.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/New_York.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Nipigon.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Nome.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Noronha.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/North_Dakota/Center.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Panama.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Pangnirtung.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Paramaribo.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Phoenix.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Port-au-Prince.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Port_of_Spain.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Porto_Velho.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Puerto_Rico.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Rainy_River.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Rankin_Inlet.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Recife.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Regina.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Rio_Branco.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Rosario.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Santiago.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Santo_Domingo.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Sao_Paulo.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Scoresbysund.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Shiprock.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/St_Johns.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/St_Kitts.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/St_Lucia.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/St_Thomas.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/St_Vincent.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Swift_Current.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Tegucigalpa.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Thule.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Thunder_Bay.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Tijuana.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Tortola.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Vancouver.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Whitehorse.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Winnipeg.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Yakutat.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Yellowknife.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Antarctica/Casey.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Antarctica/Davis.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Antarctica/DumontDUrville.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Antarctica/Mawson.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Antarctica/McMurdo.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Antarctica/Palmer.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Antarctica/South_Pole.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Antarctica/Syowa.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Antarctica/Vostok.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Arctic/Longyearbyen.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Aden.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Almaty.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Amman.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Anadyr.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Aqtau.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Aqtobe.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Ashgabat.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Baghdad.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Bahrain.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Baku.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Bangkok.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Beirut.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Bishkek.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Brunei.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Calcutta.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Choibalsan.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Chongqing.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Chungking.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Colombo.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Damascus.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Dhaka.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Dili.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Dubai.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Dushanbe.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Gaza.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Harbin.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Hong_Kong.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Hovd.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Irkutsk.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Istanbul.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Jakarta.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Jayapura.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Jerusalem.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Kabul.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Kamchatka.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Karachi.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Kashgar.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Katmandu.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Krasnoyarsk.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Kuala_Lumpur.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Kuching.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Kuwait.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Macao.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Magadan.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Manila.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Muscat.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Nicosia.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Novosibirsk.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Omsk.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Phnom_Penh.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Pontianak.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Pyongyang.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Qatar.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Rangoon.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Riyadh.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Saigon.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Sakhalin.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Samarkand.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Seoul.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Shanghai.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Singapore.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Taipei.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Tashkent.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Tbilisi.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Tehran.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Thimphu.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Tokyo.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Ujung_Pandang.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Ulaanbaatar.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Urumqi.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Vientiane.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Vladivostok.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Yakutsk.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Yekaterinburg.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Yerevan.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Atlantic/Azores.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Atlantic/Bermuda.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Atlantic/Canary.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Atlantic/Cape_Verde.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Atlantic/Faeroe.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Atlantic/Jan_Mayen.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Atlantic/Madeira.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Atlantic/Reykjavik.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Atlantic/South_Georgia.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Atlantic/St_Helena.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Atlantic/Stanley.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Australia/Adelaide.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Australia/Brisbane.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Australia/Broken_Hill.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Australia/Darwin.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Australia/Hobart.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Australia/Lindeman.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Australia/Lord_Howe.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Australia/Melbourne.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Australia/Perth.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Australia/Sydney.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Europe/Amsterdam.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Europe/Andorra.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Europe/Athens.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Europe/Belfast.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Europe/Belgrade.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Europe/Berlin.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Europe/Bratislava.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Europe/Brussels.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Europe/Bucharest.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Europe/Budapest.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Europe/Chisinau.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Europe/Copenhagen.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Europe/Dublin.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Europe/Gibraltar.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Europe/Helsinki.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Europe/Istanbul.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Europe/Kaliningrad.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Europe/Kiev.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Europe/Lisbon.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Europe/Ljubljana.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Europe/London.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Europe/Luxembourg.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Europe/Madrid.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Europe/Malta.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Europe/Minsk.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Europe/Monaco.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Europe/Moscow.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Europe/Nicosia.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Europe/Oslo.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Europe/Paris.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Europe/Prague.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Europe/Riga.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Europe/Rome.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Europe/Samara.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Europe/San_Marino.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Europe/Sarajevo.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Europe/Simferopol.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Europe/Skopje.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Europe/Sofia.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Europe/Stockholm.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Europe/Tallinn.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Europe/Tirane.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Europe/Uzhgorod.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Europe/Vaduz.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Europe/Vatican.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Europe/Vienna.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Europe/Vilnius.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Europe/Warsaw.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Europe/Zagreb.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Europe/Zaporozhye.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Europe/Zurich.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Indian/Antananarivo.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Indian/Chagos.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Indian/Christmas.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Indian/Cocos.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Indian/Comoro.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Indian/Kerguelen.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Indian/Mahe.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Indian/Maldives.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Indian/Mauritius.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Indian/Mayotte.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Indian/Reunion.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Pacific/Apia.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Pacific/Auckland.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Pacific/Chatham.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Pacific/Easter.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Pacific/Efate.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Pacific/Enderbury.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Pacific/Fakaofo.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Pacific/Fiji.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Pacific/Funafuti.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Pacific/Galapagos.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Pacific/Gambier.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Pacific/Guadalcanal.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Pacific/Guam.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Pacific/Honolulu.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Pacific/Johnston.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Pacific/Kiritimati.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Pacific/Kosrae.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Pacific/Kwajalein.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Pacific/Majuro.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Pacific/Marquesas.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Pacific/Midway.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Pacific/Nauru.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Pacific/Niue.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Pacific/Norfolk.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Pacific/Noumea.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Pacific/Pago_Pago.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Pacific/Palau.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Pacific/Pitcairn.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Pacific/Ponape.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Pacific/Port_Moresby.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Pacific/Rarotonga.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Pacific/Saipan.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Pacific/Tahiti.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Pacific/Tarawa.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Pacific/Tongatapu.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Pacific/Truk.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Pacific/Wake.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Pacific/Wallis.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Pacific/Yap.ics
-share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/zones.tab
-share/gnome/idl/evolution-data-server-%%EVO_VERSION%%/Evolution-DataServer-Addressbook.idl
-share/gnome/idl/evolution-data-server-%%EVO_VERSION%%/Evolution-DataServer-Calendar.idl
-share/gnome/idl/evolution-data-server-%%EVO_VERSION%%/Evolution-DataServer.idl
-share/gnome/pixmaps/evolution-data-server/category_birthday_16.png
-share/gnome/pixmaps/evolution-data-server/category_business_16.png
-share/gnome/pixmaps/evolution-data-server/category_favorites_16.png
-share/gnome/pixmaps/evolution-data-server/category_gifts_16.png
-share/gnome/pixmaps/evolution-data-server/category_goals_16.png
-share/gnome/pixmaps/evolution-data-server/category_holiday-cards_16.png
-share/gnome/pixmaps/evolution-data-server/category_holiday_16.png
-share/gnome/pixmaps/evolution-data-server/category_hot-contacts_16.png
-share/gnome/pixmaps/evolution-data-server/category_ideas_16.png
-share/gnome/pixmaps/evolution-data-server/category_international_16.png
-share/gnome/pixmaps/evolution-data-server/category_key-customer_16.png
-share/gnome/pixmaps/evolution-data-server/category_miscellaneous_16.png
-share/gnome/pixmaps/evolution-data-server/category_personal_16.png
-share/gnome/pixmaps/evolution-data-server/category_phonecalls_16.png
-share/gnome/pixmaps/evolution-data-server/category_status_16.png
-share/gnome/pixmaps/evolution-data-server/category_strategies_16.png
-share/gnome/pixmaps/evolution-data-server/category_suppliers_16.png
-share/gnome/pixmaps/evolution-data-server/category_time-and-expenses_16.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
+share/evolution-data-server-%%VERSION%%/weather/Locations.xml
+share/idl/evolution-data-server-%%EVO_VERSION%%/Evolution-DataServer-Addressbook.idl
+share/idl/evolution-data-server-%%EVO_VERSION%%/Evolution-DataServer-Calendar.idl
+share/idl/evolution-data-server-%%EVO_VERSION%%/Evolution-DataServer.idl
 share/locale/am/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
 share/locale/ar/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
+share/locale/as/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
 share/locale/az/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
 share/locale/be/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
 share/locale/bg/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
@@ -1003,6 +691,7 @@ share/locale/nb/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
 share/locale/ne/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
 share/locale/nl/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
 share/locale/nn/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
+share/locale/oc/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
 share/locale/or/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
 share/locale/pa/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
 share/locale/pl/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
@@ -1018,6 +707,7 @@ share/locale/sr/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
 share/locale/sr@Latn/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
 share/locale/sv/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
 share/locale/ta/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
+share/locale/te/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
 share/locale/th/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
 share/locale/tr/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
 share/locale/uk/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
@@ -1027,31 +717,36 @@ share/locale/xh/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
 share/locale/zh_CN/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
 share/locale/zh_HK/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
 share/locale/zh_TW/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
-@dirrm share/gnome/pixmaps/evolution-data-server
-@dirrm share/gnome/idl/evolution-data-server-%%EVO_VERSION%%
-@dirrm share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Pacific
-@dirrm share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Indian
-@dirrm share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Europe
-@dirrm share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Australia
-@dirrm share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Atlantic
-@dirrm share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia
-@dirrm share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Arctic
-@dirrm share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Antarctica
-@dirrm share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/North_Dakota
-@dirrm share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Kentucky
-@dirrm share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Indiana
-@dirrm share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America
-@dirrm share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa
-@dirrm share/gnome/evolution-data-server-%%VERSION%%/zoneinfo
-@dirrm share/gnome/evolution-data-server-%%VERSION%%/weather
-@dirrm share/gnome/evolution-data-server-%%VERSION%%/glade
-@dirrm share/gnome/evolution-data-server-%%VERSION%%
+share/pixmaps/evolution-data-server/category_birthday_16.png
+share/pixmaps/evolution-data-server/category_business_16.png
+share/pixmaps/evolution-data-server/category_favorites_16.png
+share/pixmaps/evolution-data-server/category_gifts_16.png
+share/pixmaps/evolution-data-server/category_goals_16.png
+share/pixmaps/evolution-data-server/category_holiday-cards_16.png
+share/pixmaps/evolution-data-server/category_holiday_16.png
+share/pixmaps/evolution-data-server/category_hot-contacts_16.png
+share/pixmaps/evolution-data-server/category_ideas_16.png
+share/pixmaps/evolution-data-server/category_international_16.png
+share/pixmaps/evolution-data-server/category_key-customer_16.png
+share/pixmaps/evolution-data-server/category_miscellaneous_16.png
+share/pixmaps/evolution-data-server/category_personal_16.png
+share/pixmaps/evolution-data-server/category_phonecalls_16.png
+share/pixmaps/evolution-data-server/category_status_16.png
+share/pixmaps/evolution-data-server/category_strategies_16.png
+share/pixmaps/evolution-data-server/category_suppliers_16.png
+share/pixmaps/evolution-data-server/category_time-and-expenses_16.png
+@dirrm share/pixmaps/evolution-data-server
+@dirrm share/idl/evolution-data-server-%%EVO_VERSION%%
+@dirrm share/evolution-data-server-%%VERSION%%/weather
+@dirrm share/evolution-data-server-%%VERSION%%/glade
+@dirrm share/evolution-data-server-%%VERSION%%
 @dirrm share/doc/libedataserverui
 @dirrm share/doc/libedataserver
 @dirrm share/doc/libedata-cal
 @dirrm share/doc/libedata-book
 @dirrm share/doc/libecal
 @dirrm share/doc/libebook
+@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%%
@@ -1070,8 +765,12 @@ share/locale/zh_TW/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
 @dirrmtry share/locale/zh_HK
 @dirrmtry share/locale/xh/LC_MESSAGES
 @dirrmtry share/locale/xh
+@dirrmtry share/locale/te/LC_MESSAGES
+@dirrmtry share/locale/te
 @dirrmtry share/locale/rw/LC_MESSAGES
 @dirrmtry share/locale/rw
+@dirrmtry share/locale/oc/LC_MESSAGES
+@dirrmtry share/locale/oc
 @dirrmtry share/locale/mr/LC_MESSAGES
 @dirrmtry share/locale/mr
 @dirrmtry share/locale/ku/LC_MESSAGES
@@ -1080,3 +779,5 @@ share/locale/zh_TW/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
 @dirrmtry share/locale/dz
 @dirrmtry share/locale/bn_IN/LC_MESSAGES
 @dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/as/LC_MESSAGES
+@dirrmtry share/locale/as
diff --git a/databases/glom/Makefile b/databases/glom/Makefile
index 1bd65f448c4a..c779613fae5c 100644
--- a/databases/glom/Makefile
+++ b/databases/glom/Makefile
@@ -3,12 +3,12 @@
 # Whom:					Adam Weinberger <adamw@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/databases/glom/Makefile,v 1.9 2006/09/05 03:44:45 mezz Exp $
+#   $MCom: ports/databases/glom/Makefile,v 1.11 2007/07/23 19:45:47 mezz Exp $
 #
 
 PORTNAME=	glom
 PORTVERSION=	1.0.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	databases gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -36,7 +36,8 @@ CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" \
 INSTALLS_ICONS=	yes
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|-update-mime-database|true|g' ${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e 's|-update-mime-database|true|g' \
+		${WRKSRC}/Makefile.in
 
 post-install:
 	@-update-mime-database ${PREFIX}/share/mime
diff --git a/databases/glom/files/patch-glom-libglom-python_embed-py_glom_record.cc b/databases/glom/files/patch-glom-libglom-python_embed-py_glom_record.cc
index 24ce492ec3a0..a83ec8738c29 100644
--- a/databases/glom/files/patch-glom-libglom-python_embed-py_glom_record.cc
+++ b/databases/glom/files/patch-glom-libglom-python_embed-py_glom_record.cc
@@ -1,157 +1,20 @@
---- glom/libglom/python_embed/py_glom_record.cc.orig	2006-04-28 03:12:31.000000000 -0500
-+++ glom/libglom/python_embed/py_glom_record.cc	2007-09-05 00:21:02.305894450 -0500
-@@ -50,51 +50,57 @@
+--- glom/libglom/python_embed/py_glom_record.cc.orig	Sun Jul 15 13:34:18 2007
++++ glom/libglom/python_embed/py_glom_record.cc	Sun Jul 15 13:34:44 2007
+@@ -122,7 +122,7 @@
  
- //Set the object's member data, from the parameters supplied when creating the object:
- static int
--Record_init(PyGlomRecord *self, PyObject * /* args */, PyObject * /* kwds */)
-+Record_init(PyObject *self, PyObject * /* args */, PyObject * /* kwds */)
- {
-+  PyGlomRecord *self_record = (PyGlomRecord*)self;
-+
-   //static char *kwlist[] = {"test", NULL};
- 
-   //if(!PyArg_ParseTupleAndKeywords(args, kwds, "|i", kwlist,
-    //                                 &self->m_test))
-    // return -1;
- 
--  if(self)
-+  if(self_record)
-   {
--    self->m_related = 0;
-+    self_record->m_related = 0;
- 
--    if(self->m_pMap_field_values == 0)
--      self->m_pMap_field_values = new PyGlomRecord::type_map_field_values();
-+    if(self_record->m_pMap_field_values == 0)
-+      self_record->m_pMap_field_values = new PyGlomRecord::type_map_field_values();
-   }
- 
-   return 0;
- }
- 
- static void
--Record_dealloc(PyGlomRecord* self)
-+Record_dealloc(PyObject* self)
- {
--  if(self->m_pMap_field_values)
-+  PyGlomRecord *self_record = (PyGlomRecord*)self;
-+
-+  if(self_record->m_pMap_field_values)
-   {
--    delete self->m_pMap_field_values;
--    self->m_pMap_field_values = 0;
-+    delete self_record->m_pMap_field_values;
-+    self_record->m_pMap_field_values = 0;
-   }
- 
--  self->ob_type->tp_free((PyObject*)self);
-+  self_record->ob_type->tp_free((PyObject*)self);
- }
- 
- 
- static PyObject *
--Record__get_related(PyGlomRecord* self, void* /* closure */)
-+Record__get_related(PyObject* self, void* /* closure */)
- {
-+  PyGlomRecord *self_record = (PyGlomRecord*)self;
-+
-   //We initialize it here, so that this work never happens if it's not needed:
--  if(!(self->m_related))
-+  if(!(self_record->m_related))
-   {
-     //Return a new RelatedRecord:
-     PyObject* new_args = PyTuple_New(0);
--    self->m_related = (PyGlomRelated*)PyObject_Call((PyObject*)PyGlomRelated_GetPyType(), new_args, 0);
-+    self_record->m_related = (PyGlomRelated*)PyObject_Call((PyObject*)PyGlomRelated_GetPyType(), new_args, 0);
-     Py_DECREF(new_args);
- 
-     //Fill it:
--    Document_Glom::type_vecRelationships vecRelationships = self->m_document->get_relationships(*(self->m_table_name));
-+    Document_Glom::type_vecRelationships vecRelationships = self_record->m_document->get_relationships(*(self_record->m_table_name));
-     PyGlomRelated::type_map_relationships map_relationships;
-     for(Document_Glom::type_vecRelationships::const_iterator iter = vecRelationships.begin(); iter != vecRelationships.end(); ++iter)
-     {
-@@ -102,14 +108,14 @@
-         map_relationships[(*iter)->get_name()] = *iter;
-     }
  
--    PyGlomRelated_SetRelationships(self->m_related, map_relationships);
-+    PyGlomRelated_SetRelationships(self_record->m_related, map_relationships);
  
--    self->m_related->m_record = self;
--    Py_XINCREF(self); //unreffed in the self->m_related's _dealloc. //TODO: Is this a circular reference?
-+    self_record->m_related->m_record = self_record;
-+    Py_XINCREF(self_record); //unreffed in the self->m_related's _dealloc. //TODO: Is this a circular reference?
-   }
- 
--  Py_INCREF(self->m_related); //Should we do this?
--  return (PyObject*)self->m_related;
-+  Py_INCREF(self_record->m_related); //Should we do this?
-+  return (PyObject*)self_record->m_related;
- }
- 
- 
-@@ -122,31 +128,44 @@
- 
- 
- 
-+//Adapt to API changes in Python 2.5:
-+#if defined(PY_VERSION_HEX) && (PY_VERSION_HEX >= 0x02050000) /* Python 2.5+ */
+-static int
 +static Py_ssize_t
-+Record_tp_as_mapping_length(PyObject *self)
-+{
-+  PyGlomRecord *self_record = (PyGlomRecord*)self;
-+  return self_record->m_pMap_field_values->size();
-+}
-+#else
- static int
--Record_tp_as_mapping_length(PyGlomRecord *self)
-+Record_tp_as_mapping_length(PyObject *self)
+ Record_tp_as_mapping_length(PyGlomRecord *self)
  {
--  return self->m_pMap_field_values->size();
-+  PyGlomRecord *self_record = (PyGlomRecord*)self;
-+  return (int)(self->m_pMap_field_values->size());
- }
-+#endif
- 
- static PyObject *
--Record_tp_as_mapping_getitem(PyGlomRecord *self, PyObject *item)
-+Record_tp_as_mapping_getitem(PyObject *self, PyObject *item)
- {
-+  PyGlomRecord *self_record = (PyGlomRecord*)self;
-+
-   if(PyString_Check(item))
-   {
-     const char* pchKey = PyString_AsString(item);
-     if(pchKey)
-     {
-       const Glib::ustring key(pchKey);
--      if(self && self->m_pMap_field_values)
-+      if(self_record && self_record->m_pMap_field_values)
-       {
--        PyGlomRecord::type_map_field_values::const_iterator iterFind = self->m_pMap_field_values->find(key);
--        if(iterFind != self->m_pMap_field_values->end())
-+        PyGlomRecord::type_map_field_values::const_iterator iterFind = self_record->m_pMap_field_values->find(key);
-+        if(iterFind != self_record->m_pMap_field_values->end())
-         {
-           return pygda_value_as_pyobject(iterFind->second.gobj(), true /* copy */);
+   return self->m_pMap_field_values->size();
+@@ -146,7 +146,7 @@
          }
          else
          {
 -          g_warning("Record_tp_as_mapping_getitem(): item not found in m_pMap_field_values. size=%d, item=%s", self->m_pMap_field_values->size(), pchKey);
-+          g_warning("Record_tp_as_mapping_getitem(): item not found in m_pMap_field_values. size=%d, item=%s", (int)self_record->m_pMap_field_values->size(), pchKey);
++          g_warning("Record_tp_as_mapping_getitem(): item not found in m_pMap_field_values. size=%d, item=%s", (int)self->m_pMap_field_values->size(), pchKey);
          }
        }
        else
-@@ -180,8 +199,8 @@
- */
- 
- static PyMappingMethods Record_tp_as_mapping = {
--    (inquiry)Record_tp_as_mapping_length,
--    (binaryfunc)Record_tp_as_mapping_getitem,
-+    Record_tp_as_mapping_length,
-+    Record_tp_as_mapping_getitem,
-     (objobjargproc)0 /* Record_tp_as_mapping_setitem */
- };
- 
diff --git a/databases/glom/files/patch-glom-libglom-python_embed-py_glom_related.cc b/databases/glom/files/patch-glom-libglom-python_embed-py_glom_related.cc
deleted file mode 100644
index 206b2133b49e..000000000000
--- a/databases/glom/files/patch-glom-libglom-python_embed-py_glom_related.cc
+++ /dev/null
@@ -1,170 +0,0 @@
---- glom/libglom/python_embed/py_glom_related.cc.orig	2006-05-20 06:35:32.000000000 -0500
-+++ glom/libglom/python_embed/py_glom_related.cc	2007-09-05 00:42:52.657306150 -0500
-@@ -52,62 +52,79 @@
- 
- //Set the object's member data, from the parameters supplied when creating the object:
- static int
--Related_init(PyGlomRelated *self, PyObject* /* args */, PyObject* /* kwds */)
-+Related_init(PyObject *self, PyObject* /* args */, PyObject* /* kwds */)
- {
--  if(self)
-+  PyGlomRelated *self_related = (PyGlomRelated*)self;
-+
-+  if(self_related)
-   {
--    self->m_record = 0;
-+    self_related->m_record = 0;
- 
--    if(self->m_pMap_relationships == 0)
--      self->m_pMap_relationships = new PyGlomRelated::type_map_relationships();
-+    if(self_related->m_pMap_relationships == 0)
-+      self_related->m_pMap_relationships = new PyGlomRelated::type_map_relationships();
- 
--    if(self->m_pMap_relatedrecords == 0)
--      self->m_pMap_relatedrecords = new PyGlomRelated::type_map_relatedrecords();
-+    if(self_related->m_pMap_relatedrecords == 0)
-+      self_related->m_pMap_relatedrecords = new PyGlomRelated::type_map_relatedrecords();
-   }
- 
-   return 0;
- }
- 
- static void
--Related_dealloc(PyGlomRelated* self)
-+Related_dealloc(PyObject* self)
- {
--  if(self->m_pMap_relationships)
-+  PyGlomRelated *self_related = (PyGlomRelated*)self;
-+
-+  if(self_related->m_pMap_relationships)
-   {
--    delete self->m_pMap_relationships;
--    self->m_pMap_relationships = 0;
-+    delete self_related->m_pMap_relationships;
-+    self_related->m_pMap_relationships = 0;
-   }
- 
--  if(self->m_record)
-+  if(self_related->m_record)
-   {
--    Py_XDECREF( (PyObject*)self->m_record );
--    self->m_record = 0;
-+    Py_XDECREF( (PyObject*)self_related->m_record );
-+    self_related->m_record = 0;
-   }
- 
--  if(self->m_pMap_relatedrecords)
-+  if(self_related->m_pMap_relatedrecords)
-   {
-     //Unref each item:
--    for(PyGlomRelated::type_map_relatedrecords::iterator iter = self->m_pMap_relatedrecords->begin(); iter != self->m_pMap_relatedrecords->end(); ++iter)
-+    for(PyGlomRelated::type_map_relatedrecords::iterator iter = self_related->m_pMap_relatedrecords->begin(); iter != self_related->m_pMap_relatedrecords->end(); ++iter)
-     {
-       Py_XDECREF( (PyObject*)(iter->second) );
-     }
- 
--    delete self->m_pMap_relatedrecords;
--    self->m_pMap_relatedrecords = 0;
-+    delete self_related->m_pMap_relatedrecords;
-+    self_related->m_pMap_relatedrecords = 0;
-   }
- 
--  self->ob_type->tp_free((PyObject*)self);
-+  self_related->ob_type->tp_free((PyObject*)self);
- }
- 
- 
-+//Adapt to API changes in Python 2.5:
-+#if defined(PY_VERSION_HEX) && (PY_VERSION_HEX >= 0x02050000) /* Python 2.5 */
-+static Py_ssize_t
-+Related_tp_as_mapping_length(PyObject *self)
-+{
-+  PyGlomRelated *self_related = (PyGlomRelated*)self;
-+  return self_related->m_pMap_relationships->size();
-+}
-+#else
- static int
--Related_tp_as_mapping_length(PyGlomRelated *self)
-+Related_tp_as_mapping_length(PyObject *self)
- {
--  return self->m_pMap_relationships->size();
-+  PyGlomRelated *self_related = (PyGlomRelated*)self;
-+  return self_related->m_pMap_relationships->size();
- }
-+#endif
- 
- static PyObject *
--Related_tp_as_mapping_getitem(PyGlomRelated *self, PyObject *item)
-+Related_tp_as_mapping_getitem(PyObject *self, PyObject *item)
- {
-+  PyGlomRelated *self_related = (PyGlomRelated*)self;
-+
-   if(PyString_Check(item))
-   {
-     const char* pchKey = PyString_AsString(item);
-@@ -116,8 +133,8 @@
-       const Glib::ustring key(pchKey);
- 
-       //Return a cached item if possible:
--      PyGlomRelated::type_map_relatedrecords::iterator iterCacheFind = self->m_pMap_relatedrecords->find(key);
--      if(iterCacheFind != self->m_pMap_relatedrecords->end())
-+      PyGlomRelated::type_map_relatedrecords::iterator iterCacheFind = self_related->m_pMap_relatedrecords->find(key);
-+      if(iterCacheFind != self_related->m_pMap_relatedrecords->end())
-       {
-         //Return a reference to the cached item:
-         PyGlomRelatedRecord* pyRelatedRecord = iterCacheFind->second;
-@@ -127,8 +144,8 @@
-       else
-       {
-         //If the relationship exists:
--        PyGlomRelated::type_map_relationships::const_iterator iterFind = self->m_pMap_relationships->find(key);
--        if(iterFind != self->m_pMap_relationships->end())
-+        PyGlomRelated::type_map_relationships::const_iterator iterFind = self_related->m_pMap_relationships->find(key);
-+        if(iterFind != self_related->m_pMap_relationships->end())
-         {
-           //Return a new RelatedRecord:
-           PyObject* new_args = PyTuple_New(0);
-@@ -140,15 +157,15 @@
-           //Get the value of the from_key in the parent record.
-           sharedptr<Relationship> relationship = iterFind->second;
-           const Glib::ustring from_key = relationship->get_from_field();
--          PyGlomRecord::type_map_field_values::const_iterator iterFromKey = self->m_record->m_pMap_field_values->find(from_key);
--          if(iterFromKey != self->m_record->m_pMap_field_values->end())
-+          PyGlomRecord::type_map_field_values::const_iterator iterFromKey = self_related->m_record->m_pMap_field_values->find(from_key);
-+          if(iterFromKey != self_related->m_record->m_pMap_field_values->end())
-           {
-             const Gnome::Gda::Value from_key_value = iterFromKey->second;
- 
-             //TODO_Performance:
-             //Get the full field details so we can sqlize its value:
-             sharedptr<Field> from_key_field;
--            from_key_field = self->m_record->m_document->get_field(*(self->m_record->m_table_name), from_key);
-+            from_key_field = self_related->m_record->m_document->get_field(*(self_related->m_record->m_table_name), from_key);
-             if(from_key_field)
-             {
-               Glib::ustring key_value_sqlized;
-@@ -157,11 +174,11 @@
-               if(!GlomConversions::value_is_empty(from_key_value)) //Do not link on null-values. That would cause us to link on 0, or "0".
-                 key_value_sqlized = from_key_field->sql(from_key_value);
- 
--              PyGlomRelatedRecord_SetRelationship(pyRelatedRecord, iterFind->second, key_value_sqlized, self->m_record->m_document);
-+              PyGlomRelatedRecord_SetRelationship(pyRelatedRecord, iterFind->second, key_value_sqlized, self_related->m_record->m_document);
- 
-               //Store it in the cache:
-               Py_INCREF((PyObject*)pyRelatedRecord); //Dereferenced in _dealloc().
--              (*(self->m_pMap_relatedrecords))[key] = pyRelatedRecord;
-+              (*(self_related->m_pMap_relatedrecords))[key] = pyRelatedRecord;
- 
-               return (PyObject*)pyRelatedRecord; //TODO: pygda_value_as_pyobject(iterFind->second.gobj(), true /* copy */);
-             }
-@@ -185,8 +202,8 @@
- */
- 
- static PyMappingMethods Related_tp_as_mapping = {
--    (inquiry)Related_tp_as_mapping_length,
--    (binaryfunc)Related_tp_as_mapping_getitem,
-+    Related_tp_as_mapping_length,
-+    Related_tp_as_mapping_getitem,
-     (objobjargproc)0 /* Related_tp_as_mapping_setitem */
- };
- 
diff --git a/databases/glom/files/patch-glom-libglom-python_embed-py_glom_relatedrecord.cc b/databases/glom/files/patch-glom-libglom-python_embed-py_glom_relatedrecord.cc
deleted file mode 100644
index 43f0df8e9706..000000000000
--- a/databases/glom/files/patch-glom-libglom-python_embed-py_glom_relatedrecord.cc
+++ /dev/null
@@ -1,153 +0,0 @@
---- glom/libglom/python_embed/py_glom_relatedrecord.cc.orig	2006-05-20 06:35:36.000000000 -0500
-+++ glom/libglom/python_embed/py_glom_relatedrecord.cc	2007-09-05 01:02:13.606806043 -0500
-@@ -137,11 +137,22 @@
- */
- 
- 
-+//Adapt to API changes in Python 2.5:
-+#if defined(PY_VERSION_HEX) && (PY_VERSION_HEX >= 0x02050000) /* Python 2.5+ */
-+static Py_ssize_t
-+RelatedRecord_tp_as_mapping_length(PyObject *self)
-+{
-+  PyGlomRelatedRecord* self_derived = (PyGlomRelatedRecord*)self;
-+  return self_derived->m_pMap_field_values->size();
-+}
-+#else
- static int
--RelatedRecord_tp_as_mapping_length(PyGlomRelatedRecord *self)
-+RelatedRecord_tp_as_mapping_length(PyObject *self)
- {
--  return self->m_pMap_field_values->size();
-+  PyGlomRelatedRecord* self_derived = (PyGlomRelatedRecord*)self;
-+  return (int)(self_derived->m_pMap_field_values->size());
- }
-+#endif
- 
- static void RelatedRecord_HandlePythonError()
- {
-@@ -150,29 +161,31 @@
- }
- 
- static PyObject *
--RelatedRecord_tp_as_mapping_getitem(PyGlomRelatedRecord *self, PyObject *item)
-+RelatedRecord_tp_as_mapping_getitem(PyObject *self, PyObject *item)
- {
-+  PyGlomRelatedRecord* self_derived = (PyGlomRelatedRecord*)self;
-+
-   if(PyString_Check(item))
-   {
-     const char* pchKey = PyString_AsString(item);
-     if(pchKey)
-     {
-       const Glib::ustring field_name(pchKey);
--      PyGlomRelatedRecord::type_map_field_values::const_iterator iterFind = self->m_pMap_field_values->find(field_name);
--      if(iterFind != self->m_pMap_field_values->end())
-+      PyGlomRelatedRecord::type_map_field_values::const_iterator iterFind = self_derived->m_pMap_field_values->find(field_name);
-+      if(iterFind != self_derived->m_pMap_field_values->end())
-       {
-         //If the value has already been stored, then just return it again:
-         return pygda_value_as_pyobject(iterFind->second.gobj(), true /* copy */);
-       }
-       else
-       {
--         const Glib::ustring related_table = (*(self->m_relationship))->get_to_table();
-+         const Glib::ustring related_table = (*(self_derived->m_relationship))->get_to_table();
- 
-         //Check whether the field exists in the table.
-         //TODO_Performance: Do this without the useless Field information?
--        sharedptr<Field> field  = self->m_document->get_field((*(self->m_relationship))->get_to_table(), field_name);
-+        sharedptr<Field> field  = self_derived->m_document->get_field((*(self_derived->m_relationship))->get_to_table(), field_name);
-         if(!field)
--          g_warning("RelatedRecord_tp_as_mapping_getitem: field %s not found in table %s", field_name.c_str(), (*(self->m_relationship))->get_to_table().c_str());
-+          g_warning("RelatedRecord_tp_as_mapping_getitem: field %s not found in table %s", field_name.c_str(), (*(self_derived->m_relationship))->get_to_table().c_str());
-         else
-         {
-           //Try to get the value from the database:
-@@ -182,15 +195,15 @@
-           {
-             Glib::RefPtr<Gnome::Gda::Connection> gda_connection = sharedconnection->get_gda_connection();
- 
--            const Glib::ustring related_key_name = (*(self->m_relationship))->get_to_field();
-+            const Glib::ustring related_key_name = (*(self_derived->m_relationship))->get_to_field();
- 
-             //Do not try to get a value based on a null key value:
--            if(!(self->m_from_key_value_sqlized))
-+            if(!(self_derived->m_from_key_value_sqlized))
-               return Py_None;
-        
-             //Get the single value from the related records:
-             Glib::ustring sql_query = "SELECT \"" + related_table + "\".\"" + field_name + "\" FROM \"" + related_table + "\""
--              + " WHERE \"" + related_table + "\".\"" + related_key_name + "\" = " + *(self->m_from_key_value_sqlized);
-+              + " WHERE \"" + related_table + "\".\"" + related_key_name + "\" = " + *(self_derived->m_from_key_value_sqlized);
- 
-             //std::cout << "PyGlomRelatedRecord: Executing:  " << sql_query << std::endl;
-             Glib::RefPtr<Gnome::Gda::DataModel> datamodel = gda_connection->execute_single_command(sql_query);
-@@ -200,7 +213,7 @@
-               //g_warning("RelatedRecord_tp_as_mapping_getitem(): value from datamodel = %s", value.to_string().c_str());
- 
-               //Cache it, in case it's asked-for again.
--              (*(self->m_pMap_field_values))[field_name] = value;
-+              (*(self_derived->m_pMap_field_values))[field_name] = value;
-               return pygda_value_as_pyobject(value.gobj(), true /* copy */);
-             }
-             else if(!datamodel)
-@@ -211,7 +224,7 @@
-             }
-             else
-             {
--              g_warning("RelatedRecord_tp_as_mapping_getitem(): No related records exist yet for relationship %s.",  (*(self->m_relationship))->get_name().c_str());
-+              g_warning("RelatedRecord_tp_as_mapping_getitem(): No related records exist yet for relationship %s.",  (*(self_derived->m_relationship))->get_name().c_str());
-             }
-           }
-         }
-@@ -234,8 +247,8 @@
- */
- 
- static PyMappingMethods RelatedRecord_tp_as_mapping = {
--    (inquiry)RelatedRecord_tp_as_mapping_length,
--    (binaryfunc)RelatedRecord_tp_as_mapping_getitem,
-+    RelatedRecord_tp_as_mapping_length,
-+    RelatedRecord_tp_as_mapping_getitem,
-     (objobjargproc)0 /* RelatedRecord_tp_as_mapping_setitem */
- };
- 
-@@ -311,27 +324,31 @@
- }
- 
- static PyObject *
--RelatedRecord_sum(PyGlomRelatedRecord* self, PyObject *args, PyObject *kwargs)
-+RelatedRecord_sum(PyObject* self, PyObject *args, PyObject *kwargs)
- {
--  return RelatedRecord_generic_aggregate(self, args, kwargs, "sum");
-+  PyGlomRelatedRecord* self_derived = (PyGlomRelatedRecord*)self;
-+  return RelatedRecord_generic_aggregate(self_derived, args, kwargs, "sum");
- }
- 
- static PyObject *
--RelatedRecord_count(PyGlomRelatedRecord* self, PyObject *args, PyObject *kwargs)
-+RelatedRecord_count(PyObject* self, PyObject *args, PyObject *kwargs)
- {
--  return RelatedRecord_generic_aggregate(self, args, kwargs, "count");
-+  PyGlomRelatedRecord* self_derived = (PyGlomRelatedRecord*)self;
-+  return RelatedRecord_generic_aggregate(self_derived, args, kwargs, "count");
- }
- 
- static PyObject *
--RelatedRecord_min(PyGlomRelatedRecord* self, PyObject *args, PyObject *kwargs)
-+RelatedRecord_min(PyObject* self, PyObject *args, PyObject *kwargs)
- {
--  return RelatedRecord_generic_aggregate(self, args, kwargs, "min");
-+  PyGlomRelatedRecord* self_derived = (PyGlomRelatedRecord*)self;
-+  return RelatedRecord_generic_aggregate(self_derived, args, kwargs, "min");
- }
- 
- static PyObject *
--RelatedRecord_max(PyGlomRelatedRecord* self, PyObject *args, PyObject *kwargs)
-+RelatedRecord_max(PyObject* self, PyObject *args, PyObject *kwargs)
- {
--  return RelatedRecord_generic_aggregate(self, args, kwargs, "max");
-+  PyGlomRelatedRecord* self_derived = (PyGlomRelatedRecord*)self;
-+  return RelatedRecord_generic_aggregate(self_derived, args, kwargs, "max");
- }
- 
- static PyMethodDef RelatedRecord_methods[] = {
diff --git a/databases/glom/pkg-plist b/databases/glom/pkg-plist
index 88bcda3abfc4..2f5df39bee37 100644
--- a/databases/glom/pkg-plist
+++ b/databases/glom/pkg-plist
@@ -6,19 +6,19 @@ lib/libglom.so.0
 %%PYTHON_SITELIBDIR%%/glom.a
 %%PYTHON_SITELIBDIR%%/glom.la
 %%PYTHON_SITELIBDIR%%/glom.so
-share/gnome/applications/glom.desktop
-share/gnome/glom/doc/examples/example_smallbusiness.glom
-share/gnome/glom/glade/glom.glade
-share/gnome/glom/glom_document.dtd
-share/gnome/glom/xslt/print_details_to_html.xsl
-share/gnome/glom/xslt/print_report_to_html.xsl
+share/applications/glom.desktop
+share/glom/doc/examples/example_smallbusiness.glom
+share/glom/glade/glom.glade
+share/glom/glom_document.dtd
+share/glom/xslt/print_details_to_html.xsl
+share/glom/xslt/print_report_to_html.xsl
 share/gnome/help/glom/C/figures/start.png
 share/gnome/help/glom/C/glom.xml
 share/gnome/help/glom/C/legal.xml
 share/gnome/help/glom/de/figures/start.png
 share/gnome/help/glom/de/glom.xml
-share/gnome/mime-info/glom.keys
-share/gnome/mime-info/glom.mime
+share/mime-info/glom.keys
+share/mime-info/glom.mime
 share/icons/hicolor/48x48/apps/glom.png
 share/icons/hicolor/scalable/apps/glom.svg
 share/locale/ca/LC_MESSAGES/glom.mo
@@ -48,12 +48,13 @@ share/mime/packages/glom.xml
 @dirrm share/gnome/help/glom/C/figures
 @dirrm share/gnome/help/glom/C
 @dirrm share/gnome/help/glom
-@dirrm share/gnome/glom/xslt
-@dirrm share/gnome/glom/glade
-@dirrm share/gnome/glom/doc/examples
-@dirrm share/gnome/glom/doc
-@dirrm share/gnome/glom
+@dirrm share/glom/xslt
+@dirrm share/glom/glade
+@dirrm share/glom/doc/examples
+@dirrm share/glom/doc
+@dirrm share/glom
 @dirrmtry share/locale/rw/LC_MESSAGES
 @dirrmtry share/locale/rw
 @exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
 @unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
+@dirrmtry share/applications
diff --git a/databases/gnome-db/Makefile b/databases/gnome-db/Makefile
index 50c19c6d7c32..6ce21fb3c9aa 100644
--- a/databases/gnome-db/Makefile
+++ b/databases/gnome-db/Makefile
@@ -3,12 +3,12 @@
 # Whom:					Ade Lovett <ade@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/databases/gnome-db/Makefile,v 1.2 2006/09/10 00:51:05 mezz Exp $
+#   $MCom: ports/databases/gnome-db/Makefile,v 1.5 2007/05/19 21:36:00 marcus Exp $
 #
 
 PORTNAME=	gnome-db
 PORTVERSION=	0.2.96
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	databases gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-db/0.2
diff --git a/databases/gnome-db/files/patch-doc::C::reference::Makefile.in b/databases/gnome-db/files/patch-doc::C::reference::Makefile.in
index b9c8dda0e901..0509e52a6de6 100644
--- a/databases/gnome-db/files/patch-doc::C::reference::Makefile.in
+++ b/databases/gnome-db/files/patch-doc::C::reference::Makefile.in
@@ -7,7 +7,7 @@ $FreeBSD$
  
  
  DOC_MAIN_SGML_FILE = libgnomedb-reference.sgml
--DOC_DIR = $(datadir)/html
+-DOC_DIR = $(datadir)/gnome/html
 +DOC_DIR = $(prefix)/share/doc/gnomedb
  TARGET_DIR = $(DOC_DIR)/libgnomedb-reference
  
diff --git a/databases/gnome-db/files/patch-idl::Makefile.in b/databases/gnome-db/files/patch-idl::Makefile.in
deleted file mode 100644
index da60a4cfbf63..000000000000
--- a/databases/gnome-db/files/patch-idl::Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- idl/Makefile.in	2001/07/26 14:06:24	1.1
-+++ idl/Makefile.in	2001/07/26 14:06:37
-@@ -153,7 +153,7 @@
- EXTRA_DIST =  	$(IDL_FILES)
- 
- 
--idldir = $(prefix)/share/idl
-+idldir = $(prefix)/share/gnome/idl
- idl_DATA = $(IDL_FILES)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../config.h
diff --git a/databases/gnome-db/pkg-plist b/databases/gnome-db/pkg-plist
index b85a8396e885..9226911f6ed3 100644
--- a/databases/gnome-db/pkg-plist
+++ b/databases/gnome-db/pkg-plist
@@ -118,25 +118,12 @@ share/gnome/help/gnome-db/pt_BR/manager.html
 share/gnome/help/gnome-db/pt_BR/topic.dat
 share/gnome/help/gnome-db/pt_BR/widgetlib-overview.html
 share/gnome/help/gnome-db/pt_BR/widgetlib.html
-share/gnome/idl/GNOME_Database_UI.idl
-share/gnome/oaf/GNOME_DB_Builder.oaf
-share/gnome/oaf/GNOME_DB_ComponentFactory.oaf
-share/gnome/oaf/GNOME_DB_Connection.oaf
-share/gnome/oaf/GNOME_DB_Designer.oaf
-share/gnome/oaf/GNOME_DB_Export.oaf
-share/gnome/oaf/GNOME_DB_Log.oaf
-share/gnome/oaf/GNOME_DB_Manager.oaf
-share/gnome/oaf/GNOME_DB_Monikers.oaf
-share/gnome/omf/gnome-db/gnome-db-C.omf
-share/gnome/omf/gnome-db/gnome-db-es.omf
-share/gnome/omf/gnome-db/gnome-db-it.omf
-share/gnome/omf/gnome-db/gnome-db-pt_BR.omf
-share/gnome/pixmaps/gnome-db.png
 share/gnome/ui/gnomedb-com-connection.xml
 share/gnome/ui/gnomedb-com-designer.xml
 share/gnome/ui/gnomedb-com-log.xml
 share/gnome/ui/gnomedb-fe.xml
 share/gnome/ui/gnomedb-manager.xml
+share/idl/GNOME_Database_UI.idl
 share/locale/az/LC_MESSAGES/gnome-db.mo
 share/locale/ca/LC_MESSAGES/gnome-db.mo
 share/locale/da/LC_MESSAGES/gnome-db.mo
@@ -164,7 +151,20 @@ share/locale/sv/LC_MESSAGES/gnome-db.mo
 share/locale/tr/LC_MESSAGES/gnome-db.mo
 share/locale/uk/LC_MESSAGES/gnome-db.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-db.mo
-@dirrm share/gnome/omf/gnome-db
+share/oaf/GNOME_DB_Builder.oaf
+share/oaf/GNOME_DB_ComponentFactory.oaf
+share/oaf/GNOME_DB_Connection.oaf
+share/oaf/GNOME_DB_Designer.oaf
+share/oaf/GNOME_DB_Export.oaf
+share/oaf/GNOME_DB_Log.oaf
+share/oaf/GNOME_DB_Manager.oaf
+share/oaf/GNOME_DB_Monikers.oaf
+share/omf/gnome-db/gnome-db-C.omf
+share/omf/gnome-db/gnome-db-es.omf
+share/omf/gnome-db/gnome-db-it.omf
+share/omf/gnome-db/gnome-db-pt_BR.omf
+share/pixmaps/gnome-db.png
+@dirrm share/omf/gnome-db
 @dirrm share/gnome/help/gnome-db/pt_BR/images
 @dirrm share/gnome/help/gnome-db/pt_BR
 @dirrm share/gnome/help/gnome-db/it/images
diff --git a/databases/libgda/Makefile b/databases/libgda/Makefile
index d3919468bdbf..95c2bb6eb639 100644
--- a/databases/libgda/Makefile
+++ b/databases/libgda/Makefile
@@ -3,12 +3,12 @@
 # Whom:					Ade Lovett <ade@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/databases/libgda/Makefile,v 1.2 2006/09/10 00:51:06 mezz Exp $
+#   $MCom: ports/databases/libgda/Makefile,v 1.5 2007/05/19 21:36:00 marcus Exp $
 #
 
 PORTNAME=	libgda
 PORTVERSION=	0.2.96
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	databases gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.2
@@ -36,8 +36,4 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 PLIST_SUB=	VERSION=${PORTVERSION}
 
-post-patch:
-	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
-		's|share/idl|share/gnome/idl|g'
-
 .include <bsd.port.mk>
diff --git a/databases/libgda/files/patch-doc::C::reference::libgda-client::Makefile.in b/databases/libgda/files/patch-doc::C::reference::libgda-client::Makefile.in
index 463f043f902c..36aee4bdb2cb 100644
--- a/databases/libgda/files/patch-doc::C::reference::libgda-client::Makefile.in
+++ b/databases/libgda/files/patch-doc::C::reference::libgda-client::Makefile.in
@@ -7,7 +7,7 @@ $FreeBSD$
  LDFLAGS = " 	$(GDA_CLIENT_LIBS) 	$(top_builddir)/lib/gda-common/.libs/libgda-common.so 	$(top_builddir)/lib/gda-client/.libs/libgda-client.a 	"
  
  
--DOC_DIR = $(datadir)/html
+-DOC_DIR = $(datadir)/gnome/html
 +DOC_DIR = $(prefix)/share/doc/libgda
  
  DOC_DIR_INSTALL_FILES =  	 libgda-client.args 	 libgda-client.hierarchy 	 libgda-client.signals		 libgda-client.types 	 libgda-client-decl.txt			 libgda-client-sections.txt
diff --git a/databases/libgda/files/patch-doc::C::reference::libgda-common::Makefile.in b/databases/libgda/files/patch-doc::C::reference::libgda-common::Makefile.in
index 25b6b1ddc2e5..3e0a18cf3d33 100644
--- a/databases/libgda/files/patch-doc::C::reference::libgda-common::Makefile.in
+++ b/databases/libgda/files/patch-doc::C::reference::libgda-common::Makefile.in
@@ -7,7 +7,7 @@ $FreeBSD$
  LDFLAGS = " 	$(GDA_CLIENT_LIBS) 	$(top_builddir)/lib/gda-common/.libs/libgda-common.a 	"
  
  
--DOC_DIR = $(datadir)/html
+-DOC_DIR = $(datadir)/gnome/html
 +DOC_DIR = $(prefix)/share/doc/libgda
  
  DOC_DIR_INSTALL_FILES =  	 libgda-common.args 	 libgda-common.hierarchy 	 libgda-common.signals		 libgda-common.types 	 libgda-common-decl.txt			 libgda-common-sections.txt
diff --git a/databases/libgda/files/patch-tools::gda-buildserver.in b/databases/libgda/files/patch-tools::gda-buildserver.in
deleted file mode 100644
index fa75e2dcc31f..000000000000
--- a/databases/libgda/files/patch-tools::gda-buildserver.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- tools/gda-buildserver.in	2001/08/06 08:16:41	1.1
-+++ tools/gda-buildserver.in	2001/08/06 08:16:54
-@@ -7,7 +7,7 @@
- CC=@CC@
- shell=@shell@
- 
--TEMPLATES_DIR="${prefix}/share/gda/templates"
-+TEMPLATES_DIR="${prefix}/share/gnome/gda/templates"
- TMPL_C_FILES="gda-srv-command.c gda-srv-connection.c gda-srv-recordset.c main-srv.c"
- TMPL_H_FILES="gda-srv.h"
- 
diff --git a/databases/libgda/files/patch-tools::templates::Makefile.in b/databases/libgda/files/patch-tools::templates::Makefile.in
deleted file mode 100644
index 2ca62bfb551d..000000000000
--- a/databases/libgda/files/patch-tools::templates::Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- tools/templates/Makefile.in	2001/08/06 08:15:18	1.1
-+++ tools/templates/Makefile.in	2001/08/06 08:15:53
-@@ -148,7 +148,7 @@
- 
- EXTRA_DIST = $(TEMPLATE_FILES)
- 
--gdatemplatesdir = $(prefix)/share/gda/templates
-+gdatemplatesdir = $(prefix)/share/gnome/gda/templates
- gdatemplates_DATA = $(TEMPLATE_FILES)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../../config.h
diff --git a/databases/libgda/pkg-plist b/databases/libgda/pkg-plist
index 195f9aa7a656..7edb5f4b3516 100644
--- a/databases/libgda/pkg-plist
+++ b/databases/libgda/pkg-plist
@@ -74,11 +74,11 @@ lib/libgda-server.so.0
 %%DOCSDIR%%/libgda-common.hierarchy
 %%DOCSDIR%%/libgda-common.signals
 %%DOCSDIR%%/libgda-common.types
-share/gnome/gda/templates/gda-srv-command.c.tmpl
-share/gnome/gda/templates/gda-srv-connection.c.tmpl
-share/gnome/gda/templates/gda-srv-recordset.c.tmpl
-share/gnome/gda/templates/gda-srv.h.tmpl
-share/gnome/gda/templates/main-srv.c.tmpl
+share/gda/templates/gda-srv-command.c.tmpl
+share/gda/templates/gda-srv-connection.c.tmpl
+share/gda/templates/gda-srv-recordset.c.tmpl
+share/gda/templates/gda-srv.h.tmpl
+share/gda/templates/main-srv.c.tmpl
 share/gnome/help/libgda/C/architecture.html
 share/gnome/help/libgda/C/clients-building-corba.html
 share/gnome/help/libgda/C/clients-building.html
@@ -165,18 +165,14 @@ share/gnome/help/libgda/pt_BR/providers-actual-implementation.html
 share/gnome/help/libgda/pt_BR/providers-examples.html
 share/gnome/help/libgda/pt_BR/providers-implementation.html
 share/gnome/help/libgda/pt_BR/topic.dat
-share/gnome/idl/GDA.idl
-share/gnome/idl/GDA_Command.idl
-share/gnome/idl/GDA_Connection.idl
-share/gnome/idl/GDA_Error.idl
-share/gnome/idl/GDA_Field.idl
-share/gnome/idl/GDA_Listener.idl
-share/gnome/idl/GDA_Parameter.idl
-share/gnome/idl/GDA_Recordset.idl
-share/gnome/oaf/GNOME_GDA_Provider_Default.oaf
-share/gnome/omf/libgda/libgda-C.omf
-share/gnome/omf/libgda/libgda-es.omf
-share/gnome/omf/libgda/libgda-pt_BR.omf
+share/idl/GDA.idl
+share/idl/GDA_Command.idl
+share/idl/GDA_Connection.idl
+share/idl/GDA_Error.idl
+share/idl/GDA_Field.idl
+share/idl/GDA_Listener.idl
+share/idl/GDA_Parameter.idl
+share/idl/GDA_Recordset.idl
 share/locale/ca/LC_MESSAGES/libgda.mo
 share/locale/da/LC_MESSAGES/libgda.mo
 share/locale/de/LC_MESSAGES/libgda.mo
@@ -200,7 +196,11 @@ share/locale/sk/LC_MESSAGES/libgda.mo
 share/locale/sl/LC_MESSAGES/libgda.mo
 share/locale/sv/LC_MESSAGES/libgda.mo
 share/locale/uk/LC_MESSAGES/libgda.mo
-@dirrm share/gnome/omf/libgda
+share/oaf/GNOME_GDA_Provider_Default.oaf
+share/omf/libgda/libgda-C.omf
+share/omf/libgda/libgda-es.omf
+share/omf/libgda/libgda-pt_BR.omf
+@dirrm share/omf/libgda
 @dirrm share/gnome/help/libgda/pt_BR/images
 @dirrm share/gnome/help/libgda/pt_BR
 @dirrm share/gnome/help/libgda/es/images
@@ -208,8 +208,8 @@ share/locale/uk/LC_MESSAGES/libgda.mo
 @dirrm share/gnome/help/libgda/C/images
 @dirrm share/gnome/help/libgda/C
 @dirrm share/gnome/help/libgda
-@dirrm share/gnome/gda/templates
-@dirrm share/gnome/gda
+@dirrm share/gda/templates
+@dirrm share/gda
 @dirrm include/libgda-%%VERSION%%/gda++
 @dirrm include/libgda-%%VERSION%%/gda
 @dirrm include/libgda-%%VERSION%%
diff --git a/databases/libgda2/Makefile b/databases/libgda2/Makefile
index 75da5884c391..1c7df563d32c 100644
--- a/databases/libgda2/Makefile
+++ b/databases/libgda2/Makefile
@@ -3,12 +3,12 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/databases/libgda2/Makefile,v 1.35 2006/09/10 00:51:06 mezz Exp $
+#   $MCom: ports/databases/libgda2/Makefile,v 1.41 2007/10/21 03:13:52 mezz Exp $
 #
 
 PORTNAME=	libgda2
 PORTVERSION=	1.2.4
-PORTREVISION?=	1
+PORTREVISION?=	3
 PORTEPOCH?=	1
 CATEGORIES=	databases gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
@@ -23,14 +23,13 @@ USE_BZIP2=	yes
 
 .if !defined(REFERENCE_PORT)
 
-BUILD_DEPENDS=	scrollkeeper-config:${PORTSDIR}/textproc/scrollkeeper
-LIB_DEPENDS=	popt.0:${PORTSDIR}/devel/popt
-RUN_DEPENDS=	scrollkeeper-config:${PORTSDIR}/textproc/scrollkeeper
+LIB_DEPENDS=	popt.0:${PORTSDIR}/devel/popt \
+    		rarian.0:${PORTSDIR}/textproc/rarian
 
 CONFLICTS=	libgda-0*
 
 USE_GMAKE=	yes
-USE_GNOME=	gnomeprefix gnomehack glib20 libxslt referencehack
+USE_GNOME=	gnomeprefix gnomehack glib20 libxslt referencehack intlhack
 USE_GETTEXT=	yes
 USE_XLIB=	yes
 INSTALLS_OMF=	yes
@@ -61,8 +60,10 @@ WITH_MYSQL=	yes
 WITH_LDAP=yes
 .endif
 
-.if exists(${LOCALBASE}/lib/libgds.so)
+.if exists(${LOCALBASE}/lib/libgds.so.1)
 WITH_FIREBIRD=	yes
+.elif exists(${LOCALBASE}/lib/libgds.so.2)
+WITHOUT_FIREBIRD=yes
 .endif
 
 .if exists(${LOCALBASE}/lib/libtds.so)
@@ -117,7 +118,7 @@ LIB_DEPENDS+=		gds.1:${PORTSDIR}/databases/firebird-client
 CONFIGURE_ARGS+=	--with-firebird=${LOCALBASE}
 PLIST_SUB+=		FIREBIRD:=""
 .else
-CONFIGURE_ARGS+=	--without-interbase
+CONFIGURE_ARGS+=	--without-firebird
 PLIST_SUB+=		FIREBIRD:="@comment "
 .endif
 
diff --git a/databases/libgda2/pkg-plist b/databases/libgda2/pkg-plist
index f14263451fbd..f014a85934d3 100644
--- a/databases/libgda2/pkg-plist
+++ b/databases/libgda2/pkg-plist
@@ -109,11 +109,11 @@ lib/libgda/providers/libgda-xml.a
 lib/libgda/providers/libgda-xml.la
 lib/libgda/providers/libgda-xml.so
 libdata/pkgconfig/libgda.pc
-share/gnome/libgda/xml/gda-report.dtd
-share/gnome/libgda/xml/gda-report-result.dtd
-share/gnome/libgda/xml/gda-xml-query.dtd
-share/gnome/libgda/xml/gda-xml-query.xsl
-share/gnome/omf/libgda/libgda-C.omf
+share/libgda/xml/gda-report.dtd
+share/libgda/xml/gda-report-result.dtd
+share/libgda/xml/gda-xml-query.dtd
+share/libgda/xml/gda-xml-query.xsl
+share/omf/libgda/libgda-C.omf
 share/locale/az/LC_MESSAGES/libgda-2.mo
 share/locale/ca/LC_MESSAGES/libgda-2.mo
 share/locale/cs/LC_MESSAGES/libgda-2.mo
@@ -152,9 +152,9 @@ share/locale/uk/LC_MESSAGES/libgda-2.mo
 share/locale/vi/LC_MESSAGES/libgda-2.mo
 share/locale/zh_CN/LC_MESSAGES/libgda-2.mo
 share/locale/zh_TW/LC_MESSAGES/libgda-2.mo
-@dirrm share/gnome/omf/libgda
-@dirrm share/gnome/libgda/xml
-@dirrm share/gnome/libgda
+@dirrm share/omf/libgda
+@dirrm share/libgda/xml
+@dirrm share/libgda
 @dirrm lib/libgda/providers
 @dirrm lib/libgda
 @dirrm include/libgda-%%VERSION%%/sql
diff --git a/databases/libgda3/Makefile b/databases/libgda3/Makefile
index 694f16b53133..f06f03797dc4 100644
--- a/databases/libgda3/Makefile
+++ b/databases/libgda3/Makefile
@@ -3,12 +3,12 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/databases/libgda3/Makefile,v 1.2 2006/09/10 00:51:06 mezz Exp $
+#   $MCom: ports/databases/libgda3/Makefile,v 1.5 2007/10/21 03:13:52 mezz Exp $
 #
 
 PORTNAME=	libgda3
 PORTVERSION=	1.9.102
-PORTREVISION?=	3
+PORTREVISION?=	4
 CATEGORIES=	databases gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/3$//}/${PORTVERSION:R}
@@ -58,6 +58,8 @@ WITH_LDAP=yes
 
 .if exists(${LOCALBASE}/lib/libgds.so.1)
 WITH_FIREBIRD=	yes
+.elif exists(${LOCALBASE}/lib/libgds.so.2)
+WITHOUT_FIREBIRD=yes
 .endif
 
 .if exists(${LOCALBASE}/lib/libtds.so.2)
@@ -112,7 +114,7 @@ LIB_DEPENDS+=		gds.1:${PORTSDIR}/databases/firebird-client
 CONFIGURE_ARGS+=	--with-firebird=${LOCALBASE}
 PLIST_SUB+=		FIREBIRD:=""
 .else
-CONFIGURE_ARGS+=	--without-interbase
+CONFIGURE_ARGS+=	--without-firebird
 PLIST_SUB+=		FIREBIRD:="@comment "
 .endif
 
diff --git a/databases/libgda3/pkg-plist b/databases/libgda3/pkg-plist
index e40eaac353eb..5ef6181d8ff4 100644
--- a/databases/libgda3/pkg-plist
+++ b/databases/libgda3/pkg-plist
@@ -150,18 +150,18 @@ lib/libgda-%%VERSION%%/providers/libgda-sqlite.a
 lib/libgda-%%VERSION%%/providers/libgda-sqlite.la
 lib/libgda-%%VERSION%%/providers/libgda-sqlite.so
 libdata/pkgconfig/libgda-2.0.pc
-share/gnome/libgda/dtd/libgda-array.dtd
-share/gnome/libgda/dtd/libgda-dict.dtd
-%%MYSQL:%%share/gnome/libgda/mysql_specs_create_db.xml
-%%MYSQL:%%share/gnome/libgda/mysql_specs_dsn.xml
-%%POSTGRES:%%share/gnome/libgda/postgres_specs_create_db.xml
-%%POSTGRES:%%share/gnome/libgda/postgres_specs_dsn.xml
-share/gnome/libgda/sqlite_specs_create_db.xml
-share/gnome/libgda/sqlite_specs_dsn.xml
-share/gnome/libgda/xml/gda-report.dtd
-share/gnome/libgda/xml/gda-report-result.dtd
-share/gnome/libgda/xml/gda-xml-query.dtd
-share/gnome/libgda/xml/gda-xml-query.xsl
+share/libgda/dtd/libgda-array.dtd
+share/libgda/dtd/libgda-dict.dtd
+%%MYSQL:%%share/libgda/mysql_specs_create_db.xml
+%%MYSQL:%%share/libgda/mysql_specs_dsn.xml
+%%POSTGRES:%%share/libgda/postgres_specs_create_db.xml
+%%POSTGRES:%%share/libgda/postgres_specs_dsn.xml
+share/libgda/sqlite_specs_create_db.xml
+share/libgda/sqlite_specs_dsn.xml
+share/libgda/xml/gda-report.dtd
+share/libgda/xml/gda-report-result.dtd
+share/libgda/xml/gda-xml-query.dtd
+share/libgda/xml/gda-xml-query.xsl
 share/locale/az/LC_MESSAGES/libgda-3.mo
 share/locale/ca/LC_MESSAGES/libgda-3.mo
 share/locale/cs/LC_MESSAGES/libgda-3.mo
@@ -205,9 +205,9 @@ share/locale/vi/LC_MESSAGES/libgda-3.mo
 share/locale/zh_CN/LC_MESSAGES/libgda-3.mo
 share/locale/zh_HK/LC_MESSAGES/libgda-3.mo
 share/locale/zh_TW/LC_MESSAGES/libgda-3.mo
-@dirrm share/gnome/libgda/xml
-@dirrm share/gnome/libgda/dtd
-@dirrm share/gnome/libgda
+@dirrm share/libgda/xml
+@dirrm share/libgda/dtd
+@dirrm share/libgda
 @dirrm lib/libgda-%%VERSION%%/providers
 @dirrm lib/libgda-%%VERSION%%
 @dirrm lib/libgda
diff --git a/databases/libgnomedb/Makefile b/databases/libgnomedb/Makefile
index 8ca35d2e7df3..56a7786ccb0d 100644
--- a/databases/libgnomedb/Makefile
+++ b/databases/libgnomedb/Makefile
@@ -3,12 +3,12 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/databases/libgnomedb/Makefile,v 1.28 2006/09/10 00:51:06 mezz Exp $
+#   $MCom: ports/databases/libgnomedb/Makefile,v 1.30 2007/07/23 19:49:12 mezz Exp $
 #
 
 PORTNAME=	libgnomedb
 PORTVERSION=	1.9.102
-PORTREVISION?=	4
+PORTREVISION?=	5
 CATEGORIES=	databases gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:R}
diff --git a/databases/libgnomedb/pkg-plist b/databases/libgnomedb/pkg-plist
index cb5a90e9b64c..b7cc503799c6 100644
--- a/databases/libgnomedb/pkg-plist
+++ b/databases/libgnomedb/pkg-plist
@@ -102,43 +102,43 @@ lib/libgnomedb_handlers-3.la
 lib/libgnomedb_handlers-3.so
 lib/libgnomedb_handlers-3.so.4
 libdata/pkgconfig/libgnomedb-2.0.pc
-share/gnome/applications/database-properties.desktop
-share/gnome/mime-info/libgnomedb.keys
-share/gnome/mime-info/libgnomedb.mime
-share/gnome/omf/libgnomedb/libgnomedb-C.omf
-share/gnome/pixmaps/libgnomedb/gnome-db-aggregates_16x16.png
-share/gnome/pixmaps/libgnomedb/gnome-db-aggregates_24x24.png
-share/gnome/pixmaps/libgnomedb/gnome-db-commit_24x24.png
-share/gnome/pixmaps/libgnomedb/gnome-db-connect_24x24.png
-share/gnome/pixmaps/libgnomedb/gnome-db-database-login_48x48.png
-share/gnome/pixmaps/libgnomedb/gnome-db-database_16x16.png
-share/gnome/pixmaps/libgnomedb/gnome-db-database_24x24.png
-share/gnome/pixmaps/libgnomedb/gnome-db-database_48x48.png
-share/gnome/pixmaps/libgnomedb/gnome-db-designer_24x24.png
-share/gnome/pixmaps/libgnomedb/gnome-db-disconnect_24x24.png
-share/gnome/pixmaps/libgnomedb/gnome-db-field_16x16.png
-share/gnome/pixmaps/libgnomedb/gnome-db-indexes_16x16.png
-share/gnome/pixmaps/libgnomedb/gnome-db-no-transaction_24x24.png
-share/gnome/pixmaps/libgnomedb/gnome-db-procedures_16x16.png
-share/gnome/pixmaps/libgnomedb/gnome-db-procedures_24x24.png
-share/gnome/pixmaps/libgnomedb/gnome-db-query_16x16.png
-share/gnome/pixmaps/libgnomedb/gnome-db-query_24x24.png
-share/gnome/pixmaps/libgnomedb/gnome-db-relations_16x16.png
-share/gnome/pixmaps/libgnomedb/gnome-db-relations_24x24.png
-share/gnome/pixmaps/libgnomedb/gnome-db-rollback_24x24.png
-share/gnome/pixmaps/libgnomedb/gnome-db-sequences_16x16.png
-share/gnome/pixmaps/libgnomedb/gnome-db-sequences_24x24.png
-share/gnome/pixmaps/libgnomedb/gnome-db-sql_16x16.png
-share/gnome/pixmaps/libgnomedb/gnome-db-sql_24x24.png
-share/gnome/pixmaps/libgnomedb/gnome-db-table_16x16.png
-share/gnome/pixmaps/libgnomedb/gnome-db-tables_16x16.png
-share/gnome/pixmaps/libgnomedb/gnome-db-tables_24x24.png
-share/gnome/pixmaps/libgnomedb/gnome-db-triggers_16x16.png
-share/gnome/pixmaps/libgnomedb/gnome-db-types_16x16.png
-share/gnome/pixmaps/libgnomedb/gnome-db-types_24x24.png
-share/gnome/pixmaps/libgnomedb/gnome-db-views_16x16.png
-share/gnome/pixmaps/libgnomedb/gnome-db-within-transaction_24x24.png
-share/gnome/pixmaps/libgnomedb/gnome-db.png
+share/applications/database-properties.desktop
+share/mime-info/libgnomedb.keys
+share/mime-info/libgnomedb.mime
+share/omf/libgnomedb/libgnomedb-C.omf
+share/pixmaps/libgnomedb/gnome-db-aggregates_16x16.png
+share/pixmaps/libgnomedb/gnome-db-aggregates_24x24.png
+share/pixmaps/libgnomedb/gnome-db-commit_24x24.png
+share/pixmaps/libgnomedb/gnome-db-connect_24x24.png
+share/pixmaps/libgnomedb/gnome-db-database-login_48x48.png
+share/pixmaps/libgnomedb/gnome-db-database_16x16.png
+share/pixmaps/libgnomedb/gnome-db-database_24x24.png
+share/pixmaps/libgnomedb/gnome-db-database_48x48.png
+share/pixmaps/libgnomedb/gnome-db-designer_24x24.png
+share/pixmaps/libgnomedb/gnome-db-disconnect_24x24.png
+share/pixmaps/libgnomedb/gnome-db-field_16x16.png
+share/pixmaps/libgnomedb/gnome-db-indexes_16x16.png
+share/pixmaps/libgnomedb/gnome-db-no-transaction_24x24.png
+share/pixmaps/libgnomedb/gnome-db-procedures_16x16.png
+share/pixmaps/libgnomedb/gnome-db-procedures_24x24.png
+share/pixmaps/libgnomedb/gnome-db-query_16x16.png
+share/pixmaps/libgnomedb/gnome-db-query_24x24.png
+share/pixmaps/libgnomedb/gnome-db-relations_16x16.png
+share/pixmaps/libgnomedb/gnome-db-relations_24x24.png
+share/pixmaps/libgnomedb/gnome-db-rollback_24x24.png
+share/pixmaps/libgnomedb/gnome-db-sequences_16x16.png
+share/pixmaps/libgnomedb/gnome-db-sequences_24x24.png
+share/pixmaps/libgnomedb/gnome-db-sql_16x16.png
+share/pixmaps/libgnomedb/gnome-db-sql_24x24.png
+share/pixmaps/libgnomedb/gnome-db-table_16x16.png
+share/pixmaps/libgnomedb/gnome-db-tables_16x16.png
+share/pixmaps/libgnomedb/gnome-db-tables_24x24.png
+share/pixmaps/libgnomedb/gnome-db-triggers_16x16.png
+share/pixmaps/libgnomedb/gnome-db-types_16x16.png
+share/pixmaps/libgnomedb/gnome-db-types_24x24.png
+share/pixmaps/libgnomedb/gnome-db-views_16x16.png
+share/pixmaps/libgnomedb/gnome-db-within-transaction_24x24.png
+share/pixmaps/libgnomedb/gnome-db.png
 share/locale/az/LC_MESSAGES/libgnomedb-3.mo
 share/locale/be/LC_MESSAGES/libgnomedb-3.mo
 share/locale/ca/LC_MESSAGES/libgnomedb-3.mo
@@ -185,8 +185,8 @@ share/locale/vi/LC_MESSAGES/libgnomedb-3.mo
 share/locale/zh_CN/LC_MESSAGES/libgnomedb-3.mo
 share/locale/zh_HK/LC_MESSAGES/libgnomedb-3.mo
 share/locale/zh_TW/LC_MESSAGES/libgnomedb-3.mo
-@dirrm share/gnome/pixmaps/libgnomedb
-@dirrm share/gnome/omf/libgnomedb
+@dirrm share/pixmaps/libgnomedb
+@dirrm share/omf/libgnomedb
 @dirrm lib/libgnomedb/plugins
 @dirrm lib/libgnomedb
 @dirrm include/libgnomedb-%%VERSION%%/libgnomedb/graph
@@ -197,3 +197,4 @@ share/locale/zh_TW/LC_MESSAGES/libgnomedb-3.mo
 @dirrmtry share/locale/zh_HK
 @dirrmtry share/locale/rw/LC_MESSAGES
 @dirrmtry share/locale/rw
+@dirrmtry share/applications
diff --git a/databases/mdbtools/Makefile b/databases/mdbtools/Makefile
index 7bd1520e822d..9fc04dc0fa02 100644
--- a/databases/mdbtools/Makefile
+++ b/databases/mdbtools/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mdbtools
 PORTVERSION=	0.5
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/databases/mdbtools/pkg-plist b/databases/mdbtools/pkg-plist
index b8d8fefdae8e..eef47c42b620 100644
--- a/databases/mdbtools/pkg-plist
+++ b/databases/mdbtools/pkg-plist
@@ -34,37 +34,37 @@ lib/libmdbsql.so.0
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/TODO
-%%GNOME:%%share/gnome/gmdb/glade/code.xpm
-%%GNOME:%%share/gnome/gmdb/glade/debug.xpm
-%%GNOME:%%share/gnome/gmdb/glade/form_big.xpm
-%%GNOME:%%share/gnome/gmdb/glade/forms.xpm
-%%GNOME:%%share/gnome/gmdb/glade/gmdb-debug.glade
-%%GNOME:%%share/gnome/gmdb/glade/gmdb-export.glade
-%%GNOME:%%share/gnome/gmdb/glade/gmdb-prefs.glade
-%%GNOME:%%share/gnome/gmdb/glade/gmdb-props.glade
-%%GNOME:%%share/gnome/gmdb/glade/gmdb-schema.glade
-%%GNOME:%%share/gnome/gmdb/glade/gmdb-sql-file.glade
-%%GNOME:%%share/gnome/gmdb/glade/gmdb-sql.glade
-%%GNOME:%%share/gnome/gmdb/glade/gmdb.glade
-%%GNOME:%%share/gnome/gmdb/glade/logo.xpm
-%%GNOME:%%share/gnome/gmdb/glade/macro_big.xpm
-%%GNOME:%%share/gnome/gmdb/glade/macros.xpm
-%%GNOME:%%share/gnome/gmdb/glade/module_big.xpm
-%%GNOME:%%share/gnome/gmdb/glade/pk.xpm
-%%GNOME:%%share/gnome/gmdb/glade/query.xpm
-%%GNOME:%%share/gnome/gmdb/glade/query_big.xpm
-%%GNOME:%%share/gnome/gmdb/glade/report_big.xpm
-%%GNOME:%%share/gnome/gmdb/glade/reports.xpm
-%%GNOME:%%share/gnome/gmdb/glade/stock_export-16.png
-%%GNOME:%%share/gnome/gmdb/glade/stock_export.png
-%%GNOME:%%share/gnome/gmdb/glade/table.xpm
-%%GNOME:%%share/gnome/gmdb/glade/table_big.xpm
+%%GNOME:%%share/gmdb/glade/code.xpm
+%%GNOME:%%share/gmdb/glade/debug.xpm
+%%GNOME:%%share/gmdb/glade/form_big.xpm
+%%GNOME:%%share/gmdb/glade/forms.xpm
+%%GNOME:%%share/gmdb/glade/gmdb-debug.glade
+%%GNOME:%%share/gmdb/glade/gmdb-export.glade
+%%GNOME:%%share/gmdb/glade/gmdb-prefs.glade
+%%GNOME:%%share/gmdb/glade/gmdb-props.glade
+%%GNOME:%%share/gmdb/glade/gmdb-schema.glade
+%%GNOME:%%share/gmdb/glade/gmdb-sql-file.glade
+%%GNOME:%%share/gmdb/glade/gmdb-sql.glade
+%%GNOME:%%share/gmdb/glade/gmdb.glade
+%%GNOME:%%share/gmdb/glade/logo.xpm
+%%GNOME:%%share/gmdb/glade/macro_big.xpm
+%%GNOME:%%share/gmdb/glade/macros.xpm
+%%GNOME:%%share/gmdb/glade/module_big.xpm
+%%GNOME:%%share/gmdb/glade/pk.xpm
+%%GNOME:%%share/gmdb/glade/query.xpm
+%%GNOME:%%share/gmdb/glade/query_big.xpm
+%%GNOME:%%share/gmdb/glade/report_big.xpm
+%%GNOME:%%share/gmdb/glade/reports.xpm
+%%GNOME:%%share/gmdb/glade/stock_export-16.png
+%%GNOME:%%share/gmdb/glade/stock_export.png
+%%GNOME:%%share/gmdb/glade/table.xpm
+%%GNOME:%%share/gmdb/glade/table_big.xpm
 %%GNOME:%%share/gnome/help/gmdb/C/figures/gmdb2_window.png
 %%GNOME:%%share/gnome/help/gmdb/C/gmdb.xml
 %%GNOME:%%share/gnome/help/gmdb/C/legal.xml
 %%GNOME:%%@dirrm share/gnome/help/gmdb/C/figures
 %%GNOME:%%@dirrm share/gnome/help/gmdb/C
 %%GNOME:%%@dirrm share/gnome/help/gmdb
-%%GNOME:%%@dirrm share/gnome/gmdb/glade
-%%GNOME:%%@dirrm share/gnome/gmdb
+%%GNOME:%%@dirrm share/gmdb/glade
+%%GNOME:%%@dirrm share/gmdb
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/databases/mysql-query-browser/Makefile b/databases/mysql-query-browser/Makefile
index de8095505d16..ddb77ae98a93 100644
--- a/databases/mysql-query-browser/Makefile
+++ b/databases/mysql-query-browser/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mysql-query-browser
 PORTVERSION=	1.1.18
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_MYSQL}
 MASTER_SITE_SUBDIR=	MySQLAdministrationSuite
@@ -16,15 +16,10 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A database querying tool for MySQL servers
 
 LIB_DEPENDS=	gtkmm-2.4:${PORTSDIR}/x11-toolkits/gtkmm24 \
-		pcre.0:${PORTSDIR}/devel/pcre
+		pcre.0:${PORTSDIR}/devel/pcre \
+		rarian.0:${PORTSDIR}/textproc/rarian
 BUILD_DEPENDS=	gsed:${PORTSDIR}/textproc/gsed \
 		gtkdoc-mkhtml:${PORTSDIR}/textproc/gtk-doc \
-		scrollkeeper-config:${PORTSDIR}/textproc/scrollkeeper
-RUN_DEPENDS=	scrollkeeper-config:${PORTSDIR}/textproc/scrollkeeper
-
-BROKEN=		fails to fetch
-DEPRECATED=	"${BROKEN}"
-EXPIRATION_DATE=	2007-12-24
 
 USE_XLIB=	yes
 USE_GMAKE=	yes
@@ -40,7 +35,7 @@ IGNORE_WITH_MYSQL=	323
 GTKHTML_VER=	${gtkhtml3_DETECT:R}
 CONFIGURE_ARGS_GUI=	--prefix=${X11BASE} \
 			--datadir=${DATADIR} \
-			--localstatedir=${PREFIX}/share/gnome
+			--localstatedir=${PREFIX}/share
 CONFIGURE_ARGS_MAIN=	${CONFIGURE_ARGS_GUI} \
 			--with-gtkhtml=${GTKHTML_VER:C/^.*\///g}
 
@@ -81,12 +76,4 @@ do-install:
 	@cd ${MAIN_DIR}; \
 	${GMAKE} ${INSTALL_TARGET}
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 700042
-.if ${ARCH} == "amd64" || ${ARCH} == "sparc64"
-BROKEN=		Does not compile with GCC 4.2
-.endif
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>