aboutsummaryrefslogtreecommitdiffstats
path: root/databases
diff options
context:
space:
mode:
authorkwm <kwm@FreeBSD.org>2010-11-20 23:37:08 +0800
committerkwm <kwm@FreeBSD.org>2010-11-20 23:37:08 +0800
commit3d272740920a1868e8acfed76d6e4c67c331e101 (patch)
tree2a5c0b3f83feeff6b7818d6af84084a526182651 /databases
parent16773b885888858d80db86065d33dcf723459cbd (diff)
downloadfreebsd-ports-graphics-3d272740920a1868e8acfed76d6e4c67c331e101.tar.gz
freebsd-ports-graphics-3d272740920a1868e8acfed76d6e4c67c331e101.tar.zst
freebsd-ports-graphics-3d272740920a1868e8acfed76d6e4c67c331e101.zip
Presenting GNOME 2.32.1 for FreeBSD. The offical release notes for this
release can be found at http://library.gnome.org/misc/release-notes/2.32/ This will be the last release of the GNOME 2.x series, mainly a bugfix and bridge release to the first release of the GNOME 3.x series. This release features commits by avl, marcus, mezz and myself. The FreeBSD GNOME Team would like to thank the following contributors and testers for there help with this release: Zane C.B. <vvelox@vvelox.net> romain@ Olaf Seibert <O.Seibert@cs.ru.nl> DomiX Bapt <baptiste.daroussin@gmail.com> jsa@ miwi@ Sergio de Almeida Lenzi <lenzi.sergio@gmail.com> Maxim Samsonov <xors@mne.ru> Kris Moore And pav@ for 2 exp-runs PR: ports/152255 ports/143260 ports/141033 ports/149629 ports/150350 ports/151523 With hat: gnome@
Diffstat (limited to 'databases')
-rw-r--r--databases/evolution-data-server/Makefile9
-rw-r--r--databases/evolution-data-server/distinfo5
-rw-r--r--databases/evolution-data-server/files/patch-calendar_libedata-cal_e-cal-backend-intervaltree.c11
-rw-r--r--databases/evolution-data-server/pkg-plist247
-rw-r--r--databases/glom/Makefile6
-rw-r--r--databases/libgda4-mysql/Makefile4
-rw-r--r--databases/libgda4-mysql/pkg-plist2
-rw-r--r--databases/libgda4-postgresql/Makefile4
-rw-r--r--databases/libgda4-postgresql/pkg-plist4
-rw-r--r--databases/libgda4/Makefile59
-rw-r--r--databases/libgda4/distinfo5
-rw-r--r--databases/libgda4/files/patch-configure62
-rw-r--r--databases/libgda4/pkg-plist284
-rw-r--r--databases/libgdamm/Makefile5
-rw-r--r--databases/libgdamm/distinfo6
-rw-r--r--databases/libgdamm/pkg-plist6
16 files changed, 512 insertions, 207 deletions
diff --git a/databases/evolution-data-server/Makefile b/databases/evolution-data-server/Makefile
index b43017790b9..45d60670b64 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-stable/databases/evolution-data-server/Makefile,v 1.8 2010/06/24 10:03:53 kwm Exp $
+# $MCom: ports/databases/evolution-data-server/Makefile,v 1.203 2010/11/15 17:19:55 kwm Exp $
#
PORTNAME= evolution-data-server
-PORTVERSION= 2.30.3
+PORTVERSION= 2.32.1
CATEGORIES= databases gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -16,6 +16,7 @@ MAINTAINER= gnome@FreeBSD.org
COMMENT= The data backends for the Evolution integrated mail/PIM suite
LIB_DEPENDS= soup-2.4.1:${PORTSDIR}/devel/libsoup \
+ gdata.7:${PORTSDIR}/devel/libgdata \
dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
ical.44:${PORTSDIR}/devel/libical \
nss3.1:${PORTSDIR}/security/nss \
@@ -29,6 +30,7 @@ USE_BISON= build
USE_GETTEXT= yes
USE_GNOME= gnomeprefix gnomehack intlhack ltverhack ltasneededhack gconf2 \
libxml2
+GNOME_DESKTOP_VERSION=2
USE_OPENLDAP= yes
USE_AUTOTOOLS= libtool:22
USE_BDB= 41+
@@ -40,7 +42,7 @@ CONFIGURE_ARGS= --enable-static \
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${BDB_INCLUDE_DIR} ${PTHREAD_CFLAGS}" \
LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
-PLIST_SUB= VERSION="2.30" EVO_VERSION="1.2"
+PLIST_SUB= VERSION="2.32" EVO_VERSION="1.2"
#OPTIONS= IMAP4 "Enable experimental IMAP4 backend" off
OPTIONS= WEATHER "Enable weather calendar backend" on
@@ -84,7 +86,6 @@ pre-everything::
post-patch:
@${REINPLACE_CMD} -e 's|-ldb|-l${BDB_LIB_NAME}|g ; \
s|heimlibs=".*"|heimlibs="${KRB5_LIB}"|g ; \
- s|LIBEDATASERVER_CURRENT=13|LIBEDATASERVER_CURRENT=11|g ; \
s|-Wl,--no-undefined||g ; \
s|-Wmissing-include-dirs||g' \
${WRKSRC}/configure
diff --git a/databases/evolution-data-server/distinfo b/databases/evolution-data-server/distinfo
index adccd4efda6..d510805ec31 100644
--- a/databases/evolution-data-server/distinfo
+++ b/databases/evolution-data-server/distinfo
@@ -1,3 +1,2 @@
-MD5 (gnome2/evolution-data-server-2.30.3.tar.bz2) = 095bac0a80043d57d00f64319f3cbdbb
-SHA256 (gnome2/evolution-data-server-2.30.3.tar.bz2) = 3773e677ab3b9ff5564a26409ec6b00bc1bd68baf58a8781109866a7e29df890
-SIZE (gnome2/evolution-data-server-2.30.3.tar.bz2) = 4652416
+SHA256 (gnome2/evolution-data-server-2.32.1.tar.bz2) = de6a724504a9d72ca550a5a157df1e27dbb951a673f281106171c2345912fc79
+SIZE (gnome2/evolution-data-server-2.32.1.tar.bz2) = 4290087
diff --git a/databases/evolution-data-server/files/patch-calendar_libedata-cal_e-cal-backend-intervaltree.c b/databases/evolution-data-server/files/patch-calendar_libedata-cal_e-cal-backend-intervaltree.c
new file mode 100644
index 00000000000..573eb5312a3
--- /dev/null
+++ b/databases/evolution-data-server/files/patch-calendar_libedata-cal_e-cal-backend-intervaltree.c
@@ -0,0 +1,11 @@
+--- calendar/libedata-cal/e-cal-backend-intervaltree.c.orig 2010-09-19 18:17:35.000000000 +0000
++++ calendar/libedata-cal/e-cal-backend-intervaltree.c 2010-09-19 18:17:44.000000000 +0000
+@@ -26,7 +26,7 @@
+
+ #include <stdio.h>
+ #include <string.h>
+-#include <malloc.h>
++#include <stdlib.h>
+
+ #include "e-cal-backend-intervaltree.h"
+
diff --git a/databases/evolution-data-server/pkg-plist b/databases/evolution-data-server/pkg-plist
index 8d112f6add3..982014ecc1a 100644
--- a/databases/evolution-data-server/pkg-plist
+++ b/databases/evolution-data-server/pkg-plist
@@ -1,5 +1,4 @@
include/evolution-data-server-%%VERSION%%/camel/camel-address.h
-include/evolution-data-server-%%VERSION%%/camel/camel-arg.h
include/evolution-data-server-%%VERSION%%/camel/camel-block-file.h
include/evolution-data-server-%%VERSION%%/camel/camel-certdb.h
include/evolution-data-server-%%VERSION%%/camel/camel-charset-map.h
@@ -8,14 +7,9 @@ include/evolution-data-server-%%VERSION%%/camel/camel-data-cache.h
include/evolution-data-server-%%VERSION%%/camel/camel-data-wrapper.h
include/evolution-data-server-%%VERSION%%/camel/camel-db.h
include/evolution-data-server-%%VERSION%%/camel/camel-debug.h
-include/evolution-data-server-%%VERSION%%/camel/camel-digest-folder.h
-include/evolution-data-server-%%VERSION%%/camel/camel-digest-store.h
-include/evolution-data-server-%%VERSION%%/camel/camel-digest-summary.h
include/evolution-data-server-%%VERSION%%/camel/camel-disco-diary.h
include/evolution-data-server-%%VERSION%%/camel/camel-disco-folder.h
include/evolution-data-server-%%VERSION%%/camel/camel-disco-store.h
-include/evolution-data-server-%%VERSION%%/camel/camel-exception-list.def
-include/evolution-data-server-%%VERSION%%/camel/camel-exception.h
include/evolution-data-server-%%VERSION%%/camel/camel-file-utils.h
include/evolution-data-server-%%VERSION%%/camel/camel-filter-driver.h
include/evolution-data-server-%%VERSION%%/camel/camel-filter-search.h
@@ -26,7 +20,6 @@ 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
@@ -36,6 +29,7 @@ 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-mempool.h
include/evolution-data-server-%%VERSION%%/camel/camel-mime-filter-basic.h
include/evolution-data-server-%%VERSION%%/camel/camel-mime-filter-bestenc.h
include/evolution-data-server-%%VERSION%%/camel/camel-mime-filter-canon.h
@@ -65,15 +59,14 @@ 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-object-bag.h
include/evolution-data-server-%%VERSION%%/camel/camel-offline-folder.h
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
@@ -109,7 +102,6 @@ include/evolution-data-server-%%VERSION%%/camel/camel-tcp-stream.h
include/evolution-data-server-%%VERSION%%/camel/camel-text-index.h
include/evolution-data-server-%%VERSION%%/camel/camel-transport.h
include/evolution-data-server-%%VERSION%%/camel/camel-trie.h
-include/evolution-data-server-%%VERSION%%/camel/camel-types.h
include/evolution-data-server-%%VERSION%%/camel/camel-uid-cache.h
include/evolution-data-server-%%VERSION%%/camel/camel-url-scanner.h
include/evolution-data-server-%%VERSION%%/camel/camel-url.h
@@ -119,10 +111,6 @@ include/evolution-data-server-%%VERSION%%/camel/camel-vee-store.h
include/evolution-data-server-%%VERSION%%/camel/camel-vee-summary.h
include/evolution-data-server-%%VERSION%%/camel/camel-vtrash-folder.h
include/evolution-data-server-%%VERSION%%/camel/camel.h
-include/evolution-data-server-%%VERSION%%/google/libgdata-google/gdata-google-service.h
-include/evolution-data-server-%%VERSION%%/google/libgdata/gdata-entry.h
-include/evolution-data-server-%%VERSION%%/google/libgdata/gdata-feed.h
-include/evolution-data-server-%%VERSION%%/google/libgdata/gdata-service-iface.h
include/evolution-data-server-%%VERSION%%/groupwise/e-gw-connection.h
include/evolution-data-server-%%VERSION%%/groupwise/e-gw-container.h
include/evolution-data-server-%%VERSION%%/groupwise/e-gw-filter.h
@@ -170,6 +158,7 @@ include/evolution-data-server-%%VERSION%%/libedata-book/e-data-book.h
include/evolution-data-server-%%VERSION%%/libedata-cal/e-cal-backend-cache.h
include/evolution-data-server-%%VERSION%%/libedata-cal/e-cal-backend-factory.h
include/evolution-data-server-%%VERSION%%/libedata-cal/e-cal-backend-file-store.h
+include/evolution-data-server-%%VERSION%%/libedata-cal/e-cal-backend-intervaltree.h
include/evolution-data-server-%%VERSION%%/libedata-cal/e-cal-backend-sexp.h
include/evolution-data-server-%%VERSION%%/libedata-cal/e-cal-backend-store.h
include/evolution-data-server-%%VERSION%%/libedata-cal/e-cal-backend-sync.h
@@ -184,26 +173,23 @@ include/evolution-data-server-%%VERSION%%/libedataserver/e-account-list.h
include/evolution-data-server-%%VERSION%%/libedataserver/e-account.h
include/evolution-data-server-%%VERSION%%/libedataserver/e-categories.h
include/evolution-data-server-%%VERSION%%/libedataserver/e-data-server-util.h
+include/evolution-data-server-%%VERSION%%/libedataserver/e-debug-log.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
include/evolution-data-server-%%VERSION%%/libedataserver/e-list.h
include/evolution-data-server-%%VERSION%%/libedataserver/e-memory.h
-include/evolution-data-server-%%VERSION%%/libedataserver/e-msgport.h
include/evolution-data-server-%%VERSION%%/libedataserver/e-proxy.h
include/evolution-data-server-%%VERSION%%/libedataserver/e-sexp.h
include/evolution-data-server-%%VERSION%%/libedataserver/e-source-group.h
include/evolution-data-server-%%VERSION%%/libedataserver/e-source-list.h
include/evolution-data-server-%%VERSION%%/libedataserver/e-source.h
include/evolution-data-server-%%VERSION%%/libedataserver/e-time-utils.h
-include/evolution-data-server-%%VERSION%%/libedataserver/e-trie.h
include/evolution-data-server-%%VERSION%%/libedataserver/e-uid.h
include/evolution-data-server-%%VERSION%%/libedataserver/e-url.h
include/evolution-data-server-%%VERSION%%/libedataserver/e-xml-hash-utils.h
include/evolution-data-server-%%VERSION%%/libedataserver/e-xml-utils.h
include/evolution-data-server-%%VERSION%%/libedataserver/eds-version.h
-include/evolution-data-server-%%VERSION%%/libedataserver/md5-utils.h
include/evolution-data-server-%%VERSION%%/libedataserverui/e-book-auth-util.h
include/evolution-data-server-%%VERSION%%/libedataserverui/e-category-completion.h
include/evolution-data-server-%%VERSION%%/libedataserverui/e-categories-dialog.h
@@ -217,7 +203,6 @@ include/evolution-data-server-%%VERSION%%/libedataserverui/e-name-selector-model
include/evolution-data-server-%%VERSION%%/libedataserverui/e-name-selector.h
include/evolution-data-server-%%VERSION%%/libedataserverui/e-passwords.h
include/evolution-data-server-%%VERSION%%/libedataserverui/e-source-combo-box.h
-include/evolution-data-server-%%VERSION%%/libedataserverui/e-source-option-menu.h
include/evolution-data-server-%%VERSION%%/libedataserverui/e-source-selector-dialog.h
include/evolution-data-server-%%VERSION%%/libedataserverui/e-source-selector.h
include/evolution-data-server-%%VERSION%%/libedataserverui/e-tree-model-generator.h
@@ -284,9 +269,6 @@ lib/evolution-data-server-%%EVO_VERSION%%/extensions/libecalbackendcontacts.so
lib/evolution-data-server-%%EVO_VERSION%%/extensions/libecalbackendfile.a
lib/evolution-data-server-%%EVO_VERSION%%/extensions/libecalbackendfile.la
lib/evolution-data-server-%%EVO_VERSION%%/extensions/libecalbackendfile.so
-lib/evolution-data-server-%%EVO_VERSION%%/extensions/libecalbackendgoogle.a
-lib/evolution-data-server-%%EVO_VERSION%%/extensions/libecalbackendgoogle.la
-lib/evolution-data-server-%%EVO_VERSION%%/extensions/libecalbackendgoogle.so
lib/evolution-data-server-%%EVO_VERSION%%/extensions/libecalbackendgroupwise.a
lib/evolution-data-server-%%EVO_VERSION%%/extensions/libecalbackendgroupwise.la
lib/evolution-data-server-%%EVO_VERSION%%/extensions/libecalbackendgroupwise.so
@@ -299,11 +281,11 @@ lib/evolution-data-server-%%EVO_VERSION%%/extensions/libecalbackendhttp.so
lib/libcamel-%%EVO_VERSION%%.a
lib/libcamel-%%EVO_VERSION%%.la
lib/libcamel-%%EVO_VERSION%%.so
-lib/libcamel-%%EVO_VERSION%%.so.14
+lib/libcamel-%%EVO_VERSION%%.so.19
lib/libcamel-provider-%%EVO_VERSION%%.a
lib/libcamel-provider-%%EVO_VERSION%%.la
lib/libcamel-provider-%%EVO_VERSION%%.so
-lib/libcamel-provider-%%EVO_VERSION%%.so.14
+lib/libcamel-provider-%%EVO_VERSION%%.so.19
lib/libebackend-%%EVO_VERSION%%.a
lib/libebackend-%%EVO_VERSION%%.la
lib/libebackend-%%EVO_VERSION%%.so
@@ -311,39 +293,31 @@ lib/libebackend-%%EVO_VERSION%%.so.0
lib/libebook-%%EVO_VERSION%%.a
lib/libebook-%%EVO_VERSION%%.la
lib/libebook-%%EVO_VERSION%%.so
-lib/libebook-%%EVO_VERSION%%.so.9
+lib/libebook-%%EVO_VERSION%%.so.10
lib/libecal-%%EVO_VERSION%%.a
lib/libecal-%%EVO_VERSION%%.la
lib/libecal-%%EVO_VERSION%%.so
-lib/libecal-%%EVO_VERSION%%.so.7
+lib/libecal-%%EVO_VERSION%%.so.8
lib/libedata-book-%%EVO_VERSION%%.a
lib/libedata-book-%%EVO_VERSION%%.la
lib/libedata-book-%%EVO_VERSION%%.so
-lib/libedata-book-%%EVO_VERSION%%.so.2
+lib/libedata-book-%%EVO_VERSION%%.so.8
lib/libedata-cal-%%EVO_VERSION%%.a
lib/libedata-cal-%%EVO_VERSION%%.la
lib/libedata-cal-%%EVO_VERSION%%.so
-lib/libedata-cal-%%EVO_VERSION%%.so.7
+lib/libedata-cal-%%EVO_VERSION%%.so.10
lib/libedataserver-%%EVO_VERSION%%.a
lib/libedataserver-%%EVO_VERSION%%.la
lib/libedataserver-%%EVO_VERSION%%.so
-lib/libedataserver-%%EVO_VERSION%%.so.11
+lib/libedataserver-%%EVO_VERSION%%.so.14
lib/libedataserverui-%%EVO_VERSION%%.a
lib/libedataserverui-%%EVO_VERSION%%.la
lib/libedataserverui-%%EVO_VERSION%%.so
-lib/libedataserverui-%%EVO_VERSION%%.so.8
+lib/libedataserverui-%%EVO_VERSION%%.so.11
lib/libegroupwise-%%EVO_VERSION%%.a
lib/libegroupwise-%%EVO_VERSION%%.la
lib/libegroupwise-%%EVO_VERSION%%.so
lib/libegroupwise-%%EVO_VERSION%%.so.13
-lib/libgdata-%%EVO_VERSION%%.a
-lib/libgdata-%%EVO_VERSION%%.la
-lib/libgdata-%%EVO_VERSION%%.so
-lib/libgdata-%%EVO_VERSION%%.so.1
-lib/libgdata-google-%%EVO_VERSION%%.a
-lib/libgdata-google-%%EVO_VERSION%%.la
-lib/libgdata-google-%%EVO_VERSION%%.so
-lib/libgdata-google-%%EVO_VERSION%%.so.1
libdata/pkgconfig/camel-%%EVO_VERSION%%.pc
libdata/pkgconfig/camel-provider-%%EVO_VERSION%%.pc
libdata/pkgconfig/evolution-data-server-%%EVO_VERSION%%.pc
@@ -355,8 +329,6 @@ libdata/pkgconfig/libedata-cal-%%EVO_VERSION%%.pc
libdata/pkgconfig/libedataserver-%%EVO_VERSION%%.pc
libdata/pkgconfig/libedataserverui-%%EVO_VERSION%%.pc
libdata/pkgconfig/libegroupwise-%%EVO_VERSION%%.pc
-libdata/pkgconfig/libgdata-%%EVO_VERSION%%.pc
-libdata/pkgconfig/libgdata-google-%%EVO_VERSION%%.pc
libexec/camel-index-control-%%EVO_VERSION%%
libexec/camel-lock-helper-%%EVO_VERSION%%
libexec/e-addressbook-factory
@@ -364,6 +336,86 @@ libexec/e-calendar-factory
share/dbus-1/services/org.gnome.evolution.dataserver.AddressBook.service
share/dbus-1/services/org.gnome.evolution.dataserver.Calendar.service
share/doc/camel/Addresses.html
+share/doc/camel/CamelAddress.html
+share/doc/camel/CamelCertDB.html
+share/doc/camel/CamelCipherContext.html
+share/doc/camel/CamelDataCache.html
+share/doc/camel/CamelDataWrapper.html
+share/doc/camel/CamelDiscoDiary.html
+share/doc/camel/CamelDiscoFolder.html
+share/doc/camel/CamelDiscoStore.html
+share/doc/camel/CamelFilterDriver.html
+share/doc/camel/CamelFolder.html
+share/doc/camel/CamelFolderSearch.html
+share/doc/camel/CamelFolderSummary.html
+share/doc/camel/CamelGpgContext.html
+share/doc/camel/CamelHttpStream.html
+share/doc/camel/CamelIndex.html
+share/doc/camel/CamelInternetAddress.html
+share/doc/camel/CamelKeyFile.html
+share/doc/camel/CamelKeyTable.html
+share/doc/camel/CamelMedium.html
+share/doc/camel/CamelMimeFilter.html
+share/doc/camel/CamelMimeFilterBasic.html
+share/doc/camel/CamelMimeFilterBestenc.html
+share/doc/camel/CamelMimeFilterCRLF.html
+share/doc/camel/CamelMimeFilterCanon.html
+share/doc/camel/CamelMimeFilterCharset.html
+share/doc/camel/CamelMimeFilterEnriched.html
+share/doc/camel/CamelMimeFilterFrom.html
+share/doc/camel/CamelMimeFilterGZip.html
+share/doc/camel/CamelMimeFilterHTML.html
+share/doc/camel/CamelMimeFilterIndex.html
+share/doc/camel/CamelMimeFilterLinewrap.html
+share/doc/camel/CamelMimeFilterPgp.html
+share/doc/camel/CamelMimeFilterProgress.html
+share/doc/camel/CamelMimeFilterSave.html
+share/doc/camel/CamelMimeFilterToHTML.html
+share/doc/camel/CamelMimeFilterWindows.html
+share/doc/camel/CamelMimeFilterYenc.html
+share/doc/camel/CamelMimeMessage.html
+share/doc/camel/CamelMimeParser.html
+share/doc/camel/CamelMimePart.html
+share/doc/camel/CamelMultipart.html
+share/doc/camel/CamelMultipartEncrypted.html
+share/doc/camel/CamelMultipartSigned.html
+share/doc/camel/CamelNNTPAddress.html
+share/doc/camel/CamelObject.html
+share/doc/camel/CamelOfflineFolder.html
+share/doc/camel/CamelOfflineJournal.html
+share/doc/camel/CamelOfflineStore.html
+share/doc/camel/CamelSMIMEContext.html
+share/doc/camel/CamelSasl.html
+share/doc/camel/CamelSaslAnonymous.html
+share/doc/camel/CamelSaslCramMd5.html
+share/doc/camel/CamelSaslDigestMd5.html
+share/doc/camel/CamelSaslGssapi.html
+share/doc/camel/CamelSaslLogin.html
+share/doc/camel/CamelSaslNTLM.html
+share/doc/camel/CamelSaslPOPB4SMTP.html
+share/doc/camel/CamelSaslPlain.html
+share/doc/camel/CamelSeekableStream.html
+share/doc/camel/CamelSeekableSubstream.html
+share/doc/camel/CamelService.html
+share/doc/camel/CamelSession.html
+share/doc/camel/CamelStore.html
+share/doc/camel/CamelStoreSummary.html
+share/doc/camel/CamelStream.html
+share/doc/camel/CamelStreamBuffer.html
+share/doc/camel/CamelStreamFilter.html
+share/doc/camel/CamelStreamFs.html
+share/doc/camel/CamelStreamMem.html
+share/doc/camel/CamelStreamNull.html
+share/doc/camel/CamelStreamProcess.html
+share/doc/camel/CamelStreamVFS.html
+share/doc/camel/CamelTcpStream.html
+share/doc/camel/CamelTcpStreamRaw.html
+share/doc/camel/CamelTextIndexName.html
+share/doc/camel/CamelTransport.html
+share/doc/camel/CamelVTrashFolder.html
+share/doc/camel/CamelVeeFolder.html
+share/doc/camel/CamelVeeStore.html
+share/doc/camel/CamelVeeSummary.html
share/doc/camel/ClassTree.html
share/doc/camel/Crypto.html
share/doc/camel/Deprecated.html
@@ -382,99 +434,14 @@ share/doc/camel/api-index-2.24.html
share/doc/camel/api-index-2.26.html
share/doc/camel/api-index-2.28.html
share/doc/camel/api-index-2.30.html
+share/doc/camel/api-index-2.32.html
share/doc/camel/api-index-deprecated.html
share/doc/camel/api-index-full.html
-share/doc/camel/camel-CamelAddress.html
-share/doc/camel/camel-CamelCertDB.html
-share/doc/camel/camel-CamelCipherContext.html
share/doc/camel/camel-CamelDB.html
-share/doc/camel/camel-CamelDataCache.html
-share/doc/camel/camel-CamelDataWrapper.html
-share/doc/camel/camel-CamelDigestFolder.html
-share/doc/camel/camel-CamelDigestStore.html
-share/doc/camel/camel-CamelDigestSummary.html
-share/doc/camel/camel-CamelDiscoDiary.html
-share/doc/camel/camel-CamelDiscoFolder.html
-share/doc/camel/camel-CamelDiscoStore.html
-share/doc/camel/camel-CamelFilterDriver.html
-share/doc/camel/camel-CamelFolder.html
-share/doc/camel/camel-CamelFolderSearch.html
-share/doc/camel/camel-CamelFolderSummary.html
-share/doc/camel/camel-CamelGpgContext.html
-share/doc/camel/camel-CamelHttpStream.html
-share/doc/camel/camel-CamelIndex.html
-share/doc/camel/camel-CamelInternetAddress.html
-share/doc/camel/camel-CamelKeyFile.html
-share/doc/camel/camel-CamelKeyTable.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-CamelMimeFilterGZip.html
-share/doc/camel/camel-CamelMimeFilterHTML.html
-share/doc/camel/camel-CamelMimeFilterIndex.html
-share/doc/camel/camel-CamelMimeFilterLinewrap.html
-share/doc/camel/camel-CamelMimeFilterPgp.html
-share/doc/camel/camel-CamelMimeFilterProgress.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-CamelMsgPort.html
-share/doc/camel/camel-CamelMultipart.html
-share/doc/camel/camel-CamelMultipartEncrypted.html
-share/doc/camel/camel-CamelMultipartSigned.html
-share/doc/camel/camel-CamelNNTPAddress.html
-share/doc/camel/camel-CamelNewsAddress.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-CamelSMIMEContext.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-CamelSaslLogin.html
-share/doc/camel/camel-CamelSaslNTLM.html
-share/doc/camel/camel-CamelSaslPOPB4SMTP.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-CamelStreamProcess.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-CamelTextIndexName.html
-share/doc/camel/camel-CamelTransport.html
-share/doc/camel/camel-CamelVTrashFolder.html
-share/doc/camel/camel-CamelVeeFolder.html
-share/doc/camel/camel-CamelVeeStore.html
-share/doc/camel/camel-CamelVeeSummary.html
-share/doc/camel/camel-camel-arg.html
share/doc/camel/camel-camel-charset-map.html
share/doc/camel/camel-camel-debug.html
-share/doc/camel/camel-camel-exception.html
share/doc/camel/camel-camel-file-utils.html
share/doc/camel/camel-camel-filter-search.html
share/doc/camel/camel-camel-folder-thread.html
@@ -483,14 +450,14 @@ share/doc/camel/camel-camel-junk-plugin.html
share/doc/camel/camel-camel-list-utils.html
share/doc/camel/camel-camel-lock-client.html
share/doc/camel/camel-camel-lock.html
+share/doc/camel/camel-camel-mempool.html
share/doc/camel/camel-camel-mime-utils.html
share/doc/camel/camel-camel-movemail.html
share/doc/camel/camel-camel-net-utils.html
share/doc/camel/camel-camel-operation.html
-share/doc/camel/camel-camel-process.html
share/doc/camel/camel-camel-provider.html
-share/doc/camel/camel-camel-search-sql.html
share/doc/camel/camel-camel-search-sql-sexp.html
+share/doc/camel/camel-camel-search-sql.html
share/doc/camel/camel-camel-string-utils.html
share/doc/camel/camel-camel-trie.html
share/doc/camel/camel-camel-uid-cache.html
@@ -512,6 +479,7 @@ share/doc/libebackend/api-index-2.24.html
share/doc/libebackend/api-index-2.26.html
share/doc/libebackend/api-index-2.28.html
share/doc/libebackend/api-index-2.30.html
+share/doc/libebackend/api-index-deprecated.html
share/doc/libebackend/ch01.html
share/doc/libebackend/home.png
share/doc/libebackend/index.html
@@ -539,6 +507,8 @@ share/doc/libebook/api-index-2.24.html
share/doc/libebook/api-index-2.26.html
share/doc/libebook/api-index-2.28.html
share/doc/libebook/api-index-2.30.html
+share/doc/libebook/api-index-2.32.html
+share/doc/libebook/api-index-deprecated.html
share/doc/libebook/api-index-full.html
share/doc/libebook/ch01.html
share/doc/libebook/home.png
@@ -563,6 +533,8 @@ share/doc/libecal/api-index-2.24.html
share/doc/libecal/api-index-2.26.html
share/doc/libecal/api-index-2.28.html
share/doc/libecal/api-index-2.30.html
+share/doc/libecal/api-index-2.32.html
+share/doc/libecal/api-index-deprecated.html
share/doc/libecal/api-index-full.html
share/doc/libecal/ch01.html
share/doc/libecal/home.png
@@ -594,6 +566,8 @@ share/doc/libedata-book/api-index-2.24.html
share/doc/libedata-book/api-index-2.26.html
share/doc/libedata-book/api-index-2.28.html
share/doc/libedata-book/api-index-2.30.html
+share/doc/libedata-book/api-index-2.32.html
+share/doc/libedata-book/api-index-deprecated.html
share/doc/libedata-book/api-index-full.html
share/doc/libedata-book/ch01.html
share/doc/libedata-book/home.png
@@ -620,6 +594,8 @@ share/doc/libedata-cal/api-index-2.24.html
share/doc/libedata-cal/api-index-2.26.html
share/doc/libedata-cal/api-index-2.28.html
share/doc/libedata-cal/api-index-2.30.html
+share/doc/libedata-cal/api-index-2.32.html
+share/doc/libedata-cal/api-index-deprecated.html
share/doc/libedata-cal/api-index-full.html
share/doc/libedata-cal/ch01.html
share/doc/libedata-cal/home.png
@@ -631,6 +607,7 @@ share/doc/libedata-cal/libedata-cal-ECalBackendLoaderFactory.html
share/doc/libedata-cal/libedata-cal-ECalBackendStore.html
share/doc/libedata-cal/libedata-cal-EDataCalFactory.html
share/doc/libedata-cal/libedata-cal-EDataCalView.html
+share/doc/libedata-cal/libedata-cal-EIntervalTree.html
share/doc/libedata-cal/libedata-cal-e-cal-backend-util.html
share/doc/libedata-cal/libedata-cal.devhelp
share/doc/libedata-cal/libedata-cal.devhelp2
@@ -651,6 +628,8 @@ share/doc/libedataserver/api-index-2.24.html
share/doc/libedataserver/api-index-2.26.html
share/doc/libedataserver/api-index-2.28.html
share/doc/libedataserver/api-index-2.30.html
+share/doc/libedataserver/api-index-2.32.html
+share/doc/libedataserver/api-index-deprecated.html
share/doc/libedataserver/api-index-full.html
share/doc/libedataserver/ch01.html
share/doc/libedataserver/home.png
@@ -662,16 +641,13 @@ share/doc/libedataserver/libedataserver-EProxy.html
share/doc/libedataserver/libedataserver-ESExp.html
share/doc/libedataserver/libedataserver-Version-Information.html
share/doc/libedataserver/libedataserver-e-categories.html
-share/doc/libedataserver/libedataserver-e-iconv.html
+share/doc/libedataserver/libedataserver-e-debug-log.html
share/doc/libedataserver/libedataserver-e-memory.html
-share/doc/libedataserver/libedataserver-e-msgport.html
share/doc/libedataserver/libedataserver-e-time-utils.html
-share/doc/libedataserver/libedataserver-e-trie.html
share/doc/libedataserver/libedataserver-e-uid.html
share/doc/libedataserver/libedataserver-e-url.html
share/doc/libedataserver/libedataserver-e-util.html
share/doc/libedataserver/libedataserver-e-xml-hash-utils.html
-share/doc/libedataserver/libedataserver-md5-utils.html
share/doc/libedataserver/libedataserver.devhelp
share/doc/libedataserver/libedataserver.devhelp2
share/doc/libedataserver/right.png
@@ -686,7 +662,6 @@ share/doc/libedataserverui/ENameSelectorEntry.html
share/doc/libedataserverui/ENameSelectorList.html
share/doc/libedataserverui/ENameSelectorModel.html
share/doc/libedataserverui/ESourceComboBox.html
-share/doc/libedataserverui/ESourceOptionMenu.html
share/doc/libedataserverui/ESourceSelector.html
share/doc/libedataserverui/ESourceSelectorDialog.html
share/doc/libedataserverui/ETreeModelGenerator.html
@@ -696,6 +671,8 @@ share/doc/libedataserverui/api-index-2.24.html
share/doc/libedataserverui/api-index-2.26.html
share/doc/libedataserverui/api-index-2.28.html
share/doc/libedataserverui/api-index-2.30.html
+share/doc/libedataserverui/api-index-2.32.html
+share/doc/libedataserverui/api-index-deprecated.html
share/doc/libedataserverui/api-index-full.html
share/doc/libedataserverui/ch01.html
share/doc/libedataserverui/home.png
@@ -705,7 +682,6 @@ share/doc/libedataserverui/left.png
share/doc/libedataserverui/libedataserverui-ECategoryCompletion.html
share/doc/libedataserverui/libedataserverui-ECellRendererColor.html
share/doc/libedataserverui/libedataserverui-e-book-auth-util.html
-share/doc/libedataserverui/libedataserverui-e-data-server-ui-marshal.html
share/doc/libedataserverui/libedataserverui-e-passwords.html
share/doc/libedataserverui/libedataserverui.devhelp
share/doc/libedataserverui/libedataserverui.devhelp2
@@ -839,9 +815,6 @@ share/pixmaps/evolution-data-server/category_time-and-expenses_16.png
@dirrm include/evolution-data-server-%%VERSION%%/libebook
@dirrm include/evolution-data-server-%%VERSION%%/libebackend
@dirrm include/evolution-data-server-%%VERSION%%/groupwise
-@dirrm include/evolution-data-server-%%VERSION%%/google/libgdata-google
-@dirrm include/evolution-data-server-%%VERSION%%/google/libgdata
-@dirrm include/evolution-data-server-%%VERSION%%/google
@dirrm include/evolution-data-server-%%VERSION%%/camel
@dirrm include/evolution-data-server-%%VERSION%%
@dirrmtry share/locale/zh_HK/LC_MESSAGES
diff --git a/databases/glom/Makefile b/databases/glom/Makefile
index 0947b088984..7f451b1be98 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.28 2009/10/11 10:43:05 kwm Exp $
+# $MCom: ports/databases/glom/Makefile,v 1.30 2010/11/04 15:57:03 kwm Exp $
#
PORTNAME= glom
PORTVERSION= 1.12.2
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= databases gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -21,7 +21,7 @@ LIB_DEPENDS= gdamm-4.0.12:${PORTSDIR}/databases/libgdamm \
gtksourceviewmm-2.0.2:${PORTSDIR}/x11-toolkits/libgtksourceviewmm \
avahi-ui.0:${PORTSDIR}/net/avahi-gtk \
epc-1.0.2:${PORTSDIR}/www/libepc \
- goocanvasmm-0.1.5:${PORTSDIR}/graphics/goocanvasmm
+ goocanvasmm-1.0.5:${PORTSDIR}/graphics/goocanvasmm
BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes \
${LOCALBASE}/libdata/pkgconfig/libgda-postgres-4.0.pc:${PORTSDIR}/databases/libgda4-postgresql
RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes \
diff --git a/databases/libgda4-mysql/Makefile b/databases/libgda4-mysql/Makefile
index 997331ff9b5..35bc74aea0d 100644
--- a/databases/libgda4-mysql/Makefile
+++ b/databases/libgda4-mysql/Makefile
@@ -3,10 +3,10 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/databases/libgda4-mysql/Makefile,v 1.1 2008/08/18 23:53:35 kwm Exp $
+# $MCom: ports/databases/libgda4-mysql/Makefile,v 1.3 2010/10/18 12:47:12 kwm Exp $
#
-PORTREVISION?= 1
+PORTREVISION?= 0
CATEGORIES= databases gnome
PKGNAMESUFFIX?= -mysql
diff --git a/databases/libgda4-mysql/pkg-plist b/databases/libgda4-mysql/pkg-plist
index 5aff78cd8a0..b5ff48b6fe3 100644
--- a/databases/libgda4-mysql/pkg-plist
+++ b/databases/libgda4-mysql/pkg-plist
@@ -3,6 +3,8 @@ lib/libgda-%%VERSION%%/providers/libgda-mysql.la
lib/libgda-%%VERSION%%/providers/libgda-mysql.so
libdata/pkgconfig/libgda-mysql-%%VERSION%%.pc
share/libgda-%%VERSION%%/mysql_specs_add_column.xml
+share/libgda-%%VERSION%%/mysql_specs_comment_table.xml
+share/libgda-%%VERSION%%/mysql_specs_comment_column.xml
share/libgda-%%VERSION%%/mysql_specs_create_db.xml
share/libgda-%%VERSION%%/mysql_specs_create_index.xml
share/libgda-%%VERSION%%/mysql_specs_create_table.xml
diff --git a/databases/libgda4-postgresql/Makefile b/databases/libgda4-postgresql/Makefile
index 553fc2fc148..fcc137941fe 100644
--- a/databases/libgda4-postgresql/Makefile
+++ b/databases/libgda4-postgresql/Makefile
@@ -3,10 +3,10 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/databases/libgda4-postgresql/Makefile,v 1.1 2008/08/18 23:53:36 kwm Exp $
+# $MCom: ports/databases/libgda4-postgresql/Makefile,v 1.3 2010/10/18 12:47:12 kwm Exp $
#
-PORTREVISION?= 1
+PORTREVISION?= 0
CATEGORIES= databases gnome
PKGNAMESUFFIX?= -postgresql
diff --git a/databases/libgda4-postgresql/pkg-plist b/databases/libgda4-postgresql/pkg-plist
index e2de17eb1d3..02ae080c90e 100644
--- a/databases/libgda4-postgresql/pkg-plist
+++ b/databases/libgda4-postgresql/pkg-plist
@@ -5,12 +5,16 @@ libdata/pkgconfig/libgda-postgres-%%VERSION%%.pc
share/libgda-%%VERSION%%/postgres_specs_add_column.xml
share/libgda-%%VERSION%%/postgres_specs_create_db.xml
share/libgda-%%VERSION%%/postgres_specs_create_index.xml
+share/libgda-%%VERSION%%/postgres_specs_create_role.xml
share/libgda-%%VERSION%%/postgres_specs_create_table.xml
+share/libgda-%%VERSION%%/postgres_specs_create_user.xml
share/libgda-%%VERSION%%/postgres_specs_create_view.xml
share/libgda-%%VERSION%%/postgres_specs_drop_column.xml
share/libgda-%%VERSION%%/postgres_specs_drop_db.xml
share/libgda-%%VERSION%%/postgres_specs_drop_index.xml
+share/libgda-%%VERSION%%/postgres_specs_drop_role.xml
share/libgda-%%VERSION%%/postgres_specs_drop_table.xml
+share/libgda-%%VERSION%%/postgres_specs_drop_user.xml
share/libgda-%%VERSION%%/postgres_specs_drop_view.xml
share/libgda-%%VERSION%%/postgres_specs_dsn.xml
share/libgda-%%VERSION%%/postgres_specs_rename_table.xml
diff --git a/databases/libgda4/Makefile b/databases/libgda4/Makefile
index 23a78523a2f..30868bae3fa 100644
--- a/databases/libgda4/Makefile
+++ b/databases/libgda4/Makefile
@@ -3,11 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports-stable/databases/libgda4/Makefile,v 1.4 2010/06/23 21:29:32 kwm Exp $
+# $MCom: ports/databases/libgda4/Makefile,v 1.14 2010/11/14 20:57:58 kwm Exp $
#
PORTNAME= libgda4
-PORTVERSION?= 4.0.9
+PORTVERSION?= 4.2.1
PORTREVISION?= 0
CATEGORIES= databases gnome
MASTER_SITES= GNOME
@@ -25,6 +25,7 @@ LIBGDA4_SLAVE?= no
BUILD_DEPENDS= g-ir-scanner:${PORTSDIR}/devel/gobject-introspection
LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt \
+ gcrypt.17:${PORTSDIR}/security/libgcrypt \
soup-2.4.1:${PORTSDIR}/devel/libsoup \
json-glib-1.0.0:${PORTSDIR}/devel/json-glib
RUN_DEPENDS= ${LOCALBASE}/lib/girepository-1.0/GObject-2.0.typelib:${PORTSDIR}/devel/gobject-introspection
@@ -36,11 +37,19 @@ USE_GNOME= gnomeprefix gnomehack glib20 libxslt intlhack referencehack
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
MAKE_JOBS_UNSAFE=yes
-CONFIGURE_ARGS= --without-sybase \
- --enable-introspection
+CONFIGURE_ARGS= --without-oracle \
+ --enable-introspection=no
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib -lintl"
+.if ${LIBGDA4_SLAVE}=="no"
+OPTIONS= UI "Build UI tools" on
+.endif
+
+.if defined(WITH_UI)
+INSTALLS_ICONS= yes
+.endif
+
.include <bsd.port.pre.mk>
#VERSION= ${PORTVERSION:R}
@@ -48,6 +57,16 @@ VERSION= 4.0
PLIST_SUB= VERSION=${VERSION}
.if ${LIBGDA4_SLAVE}=="no"
+.if defined(WITH_UI)
+CONFIGURE_ARGS+=--with-ui
+BUILD_DEPENDS+= xml2po:${PORTSDIR}/textproc/gnome-doc-utils
+USE_GNOME+= gtk20
+PLIST_SUB+= UI=""
+.else
+CONFIGURE_ARGS+=--without-ui
+PLIST_SUB+= UI="@comment "
+.endif
+
MAN1= gda-sql.1 gda-sql-4.0.1
.else
USE_GNOME+= libgda4
@@ -74,13 +93,6 @@ CONFIGURE_ARGS+= --with-postgres=${LOCALBASE}
CONFIGURE_ARGS+= --without-postgres
.endif
-.if ${LIBGDA4_SLAVE}=="ldap"
-USE_OPENLDAP= yes
-CONFIGURE_ARGS+= --with-ldap=${LOCALBASE}
-.else
-CONFIGURE_ARGS+= --without-ldap
-.endif
-
.if ${LIBGDA4_SLAVE}=="firebird"
LIB_DEPENDS+= gds.2:${PORTSDIR}/databases/firebird2-client
CONFIGURE_ARGS+= --with-firebird=${LOCALBASE}
@@ -88,13 +100,6 @@ CONFIGURE_ARGS+= --with-firebird=${LOCALBASE}
CONFIGURE_ARGS+= --without-firebird
.endif
-.if ${LIBGDA4_SLAVE}=="freetds"
-LIB_DEPENDS+= tds.5:${PORTSDIR}/databases/freetds
-CONFIGURE_ARGS+= --with-tds=${LOCALBASE}
-.else
-CONFIGURE_ARGS+= --without-tds
-.endif
-
# MDB (MS Access)
.if ${LIBGDA4_SLAVE}=="mdb"
LIB_DEPENDS+= mdbsql.0:${PORTSDIR}/databases/mdbtools
@@ -103,13 +108,6 @@ CONFIGURE_ARGS+= --with-mdb=${LOCALBASE}
CONFIGURE_ARGS+= --without-mdb
.endif
-.if ${LIBGDA4_SLAVE}=="odbc"
-LIB_DEPENDS+= odbc.1:${PORTSDIR}/databases/unixODBC
-CONFIGURE_ARGS+= --with-odbc=${LOCALBASE}
-.else
-CONFIGURE_ARGS+= --without-odbc
-.endif
-
.if ${LIBGDA4_SLAVE}=="jdbc"
USE_JAVA= yes
JAVA_VENDOR= bsdjava openjdk
@@ -135,12 +133,21 @@ post-patch:
${WRKSRC}/providers/bdb/gda-bdb-test.c
.if ${LIBGDA4_SLAVE}!="no"
#. for d in msql firebird odbc freetds mdb ldap mysql sqlite postgres
-. for d in bdb jdbc mdb mysql postgres
+. for d in bdb jdbc mdb mysql postgres reuseable/postgres reuseable/mysql
@${REINPLACE_CMD} -e 's|$$(top_builddir)/libgda/libgda-4.0.la|${LOCALBASE}/lib/libgda-4.0.la|g' \
${WRKSRC}/providers/${d}/Makefile.in
. endfor
.endif
+pre-build:
+.if ${LIBGDA4_SLAVE}=="postgresql"
+ cd ${WRKSRC}/providers/reuseable/postgres && ${GMAKE} libgda-postgres.la
+.endif
+
+.if ${LIBGDA4_SLAVE}=="mysql"
+ cd ${WRKSRC}/providers/reuseable/mysql && ${GMAKE} libgda-mysql.la
+.endif
+
.if ${LIBGDA4_SLAVE}=="no"
post-install:
${INSTALL_DATA} ${WRKSRC}/data/config \
diff --git a/databases/libgda4/distinfo b/databases/libgda4/distinfo
index 5ba3eb25adc..faa37761636 100644
--- a/databases/libgda4/distinfo
+++ b/databases/libgda4/distinfo
@@ -1,3 +1,2 @@
-MD5 (gnome2/libgda-4.0.9.tar.bz2) = de14cf681c0bcfb3a4076a3ddc1508a2
-SHA256 (gnome2/libgda-4.0.9.tar.bz2) = c3e2958cd711177ec4be0a69cd453ab728526fa38592c5539e7d89d3778e9e56
-SIZE (gnome2/libgda-4.0.9.tar.bz2) = 8227552
+SHA256 (gnome2/libgda-4.2.1.tar.bz2) = d485d24fb19bd95faad196c8ed22b2cb8f9e9275d907f880a3f8f079f6bf40f7
+SIZE (gnome2/libgda-4.2.1.tar.bz2) = 14048095
diff --git a/databases/libgda4/files/patch-configure b/databases/libgda4/files/patch-configure
index 6e42fcfab8f..cf6a34b0c4a 100644
--- a/databases/libgda4/files/patch-configure
+++ b/databases/libgda4/files/patch-configure
@@ -1,14 +1,48 @@
---- configure.orig 2010-06-23 23:07:54.000000000 +0200
-+++ configure 2010-06-23 23:09:57.000000000 +0200
-@@ -18629,9 +18629,9 @@
- INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0`
- INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0`
- INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0`
-- INTROSPECTION_GIRDIR=${INTROSPECTION_GIRDIR/$datadir/\$(datadir)}
-+ INTROSPECTION_GIRDIR=`echo ${INTROSPECTION_GIRDIR} | sed -e "s|${datadir}|\\\${datadir}|"`
- INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)"
-- INTROSPECTION_TYPELIBDIR=${INTROSPECTION_TYPELIBDIR/$libdir/\$(libdir)}
-+ INTROSPECTION_TYPELIBDIR=`echo ${INTROSPECTION_TYPELIBDIR} | sed -e "s|${libdir}|\\\${libdir}|"`
- INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0`
- INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0`
- INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection
+--- configure.orig 2010-11-14 17:29:29.000000000 +0100
++++ configure 2010-11-14 17:33:39.000000000 +0100
+@@ -19487,9 +19487,9 @@
+ INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0`
+ INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0`
+ INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0`
+- INTROSPECTION_GIRDIR=${INTROSPECTION_GIRDIR/$datadir/\$(datadir)}
++ INTROSPECTION_GIRDIR=`echo ${INTROSPECTION_GIRDIR} | sed -e "s|${datadir}|\\\$(datadir)|"`
+ INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)"
+- INTROSPECTION_TYPELIBDIR=${INTROSPECTION_TYPELIBDIR/$libdir/\$(libdir)}
++ INTROSPECTION_TYPELIBDIR=`echo ${INTROSPECTION_TYPELIBDIR} | sed -e "s|${libdir}|\\\$(libdir)|"`
+ INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0`
+ INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0`
+ INTROSPECTION_MAKEFILE=$introspection_makefile
+@@ -19586,7 +19586,7 @@
+ echo "$LIBCRYPTO_PKG_ERRORS" >&5
+
+ if test "$enable_crypto" = "yes"; then
+- as_fn_error $? "libcrypto support requested but not found" "$LINENO" 5
++# as_fn_error $? "libcrypto support requested but not found" "$LINENO" 5
+ fi
+ have_crypto=no
+
+@@ -19594,7 +19594,7 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ if test "$enable_crypto" = "yes"; then
+- as_fn_error $? "libcrypto support requested but not found" "$LINENO" 5
++# as_fn_error $? "libcrypto support requested but not found" "$LINENO" 5
+ fi
+ have_crypto=no
+
+@@ -21772,6 +21772,15 @@
+ fi
+ CFLAGS="$save_CFLAGS"
+ fi
++ else
++ if false; then
++ MDB_TRUE=
++ MDB_FALSE='#'
++else
++ MDB_TRUE='#'
++ MDB_FALSE=
++fi
++
+ fi
+
+ if test "$mdbtools_found" = "yes"; then
diff --git a/databases/libgda4/pkg-plist b/databases/libgda4/pkg-plist
index 90fa9176857..63dbcf3467d 100644
--- a/databases/libgda4/pkg-plist
+++ b/databases/libgda4/pkg-plist
@@ -1,9 +1,11 @@
bin/gda-list-config-%%VERSION%%
+%%UI%%bin/gda-browser-%%VERSION%%
+%%UI%%bin/gda-control-center-%%VERSION%%
bin/gda-list-config
-bin/gda-list-server-op-%%VERSION%%
bin/gda-list-server-op
-bin/gda-sql-%%VERSION%%
+bin/gda-list-server-op-%%VERSION%%
bin/gda-sql
+bin/gda-sql-%%VERSION%%
bin/gda-test-connection-%%VERSION%%
bin/gda_trml2html/__init__.py
bin/gda_trml2html/trml2html.py
@@ -12,6 +14,7 @@ bin/gda_trml2pdf/__init__.py
bin/gda_trml2pdf/color.py
bin/gda_trml2pdf/trml2pdf.py
bin/gda_trml2pdf/utils.py
+%%UI%%bin/gdaui-demo-%%VERSION%%
@unexec if cmp -s %D/etc/libgda-%%VERSION%%/config %D/etc/libgda-%%VERSION%%/config.default; then rm -f %D/etc/libgda-%%VERSION%%/config; fi
etc/libgda-%%VERSION%%/config.default
@exec [ -f %B/config ] || cp %B/%f %B/config
@@ -21,6 +24,30 @@ include/libgda-%%VERSION%%/libgda-report/gda-report-document.h
include/libgda-%%VERSION%%/libgda-report/gda-report-engine.h
include/libgda-%%VERSION%%/libgda-report/gda-report-rml-document.h
include/libgda-%%VERSION%%/libgda-report/libgda-report.h
+%%UI%%include/libgda-%%VERSION%%/libgda-ui/gdaui-basic-form.h
+%%UI%%include/libgda-%%VERSION%%/libgda-ui/gdaui-cloud.h
+%%UI%%include/libgda-%%VERSION%%/libgda-ui/gdaui-combo.h
+%%UI%%include/libgda-%%VERSION%%/libgda-ui/gdaui-data-cell-renderer-util.h
+%%UI%%include/libgda-%%VERSION%%/libgda-ui/gdaui-data-entry.h
+%%UI%%include/libgda-%%VERSION%%/libgda-ui/gdaui-data-filter.h
+%%UI%%include/libgda-%%VERSION%%/libgda-ui/gdaui-data-proxy-info.h
+%%UI%%include/libgda-%%VERSION%%/libgda-ui/gdaui-data-proxy.h
+%%UI%%include/libgda-%%VERSION%%/libgda-ui/gdaui-data-selector.h
+%%UI%%include/libgda-%%VERSION%%/libgda-ui/gdaui-data-store.h
+%%UI%%include/libgda-%%VERSION%%/libgda-ui/gdaui-decl.h
+%%UI%%include/libgda-%%VERSION%%/libgda-ui/gdaui-easy.h
+%%UI%%include/libgda-%%VERSION%%/libgda-ui/gdaui-enum-types.h
+%%UI%%include/libgda-%%VERSION%%/libgda-ui/gdaui-enums.h
+%%UI%%include/libgda-%%VERSION%%/libgda-ui/gdaui-form.h
+%%UI%%include/libgda-%%VERSION%%/libgda-ui/gdaui-grid.h
+%%UI%%include/libgda-%%VERSION%%/libgda-ui/gdaui-login.h
+%%UI%%include/libgda-%%VERSION%%/libgda-ui/gdaui-plugin.h
+%%UI%%include/libgda-%%VERSION%%/libgda-ui/gdaui-provider-selector.h
+%%UI%%include/libgda-%%VERSION%%/libgda-ui/gdaui-raw-form.h
+%%UI%%include/libgda-%%VERSION%%/libgda-ui/gdaui-raw-grid.h
+%%UI%%include/libgda-%%VERSION%%/libgda-ui/gdaui-server-operation.h
+%%UI%%include/libgda-%%VERSION%%/libgda-ui/gdaui-tree-store.h
+%%UI%%include/libgda-%%VERSION%%/libgda-ui/libgda-ui.h
include/libgda-%%VERSION%%/libgda-xslt/libgda-xslt.h
include/libgda-%%VERSION%%/libgda/gda-attributes-manager.h
include/libgda-%%VERSION%%/libgda/gda-batch.h
@@ -57,14 +84,24 @@ include/libgda-%%VERSION%%/libgda/gda-meta-store.h
include/libgda-%%VERSION%%/libgda/gda-meta-struct.h
include/libgda-%%VERSION%%/libgda/gda-mutex.h
include/libgda-%%VERSION%%/libgda/gda-quark-list.h
+include/libgda-%%VERSION%%/libgda/gda-repetitive-statement.h
include/libgda-%%VERSION%%/libgda/gda-row.h
include/libgda-%%VERSION%%/libgda/gda-server-operation.h
include/libgda-%%VERSION%%/libgda/gda-server-provider-extra.h
include/libgda-%%VERSION%%/libgda/gda-server-provider-private.h
include/libgda-%%VERSION%%/libgda/gda-server-provider.h
include/libgda-%%VERSION%%/libgda/gda-set.h
+include/libgda-%%VERSION%%/libgda/gda-sql-builder.h
include/libgda-%%VERSION%%/libgda/gda-statement-extra.h
include/libgda-%%VERSION%%/libgda/gda-statement.h
+include/libgda-%%VERSION%%/libgda/gda-tree-manager.h
+include/libgda-%%VERSION%%/libgda/gda-tree-mgr-columns.h
+include/libgda-%%VERSION%%/libgda/gda-tree-mgr-label.h
+include/libgda-%%VERSION%%/libgda/gda-tree-mgr-schemas.h
+include/libgda-%%VERSION%%/libgda/gda-tree-mgr-select.h
+include/libgda-%%VERSION%%/libgda/gda-tree-mgr-tables.h
+include/libgda-%%VERSION%%/libgda/gda-tree-node.h
+include/libgda-%%VERSION%%/libgda/gda-tree.h
include/libgda-%%VERSION%%/libgda/gda-transaction-status-private.h
include/libgda-%%VERSION%%/libgda/gda-transaction-status.h
include/libgda-%%VERSION%%/libgda/gda-util.h
@@ -96,6 +133,7 @@ include/libgda-%%VERSION%%/libgda/sql-parser/gda-statement-struct-update.h
include/libgda-%%VERSION%%/libgda/sql-parser/gda-statement-struct-util.h
include/libgda-%%VERSION%%/libgda/sql-parser/gda-statement-struct.h
include/libgda-%%VERSION%%/libgda/sqlite/gda-sqlite-provider.h
+include/libgda-%%VERSION%%/libgda/thread-wrapper/gda-thread-wrapper.h
include/libgda-%%VERSION%%/libgda/virtual/gda-vconnection-data-model.h
include/libgda-%%VERSION%%/libgda/virtual/gda-vconnection-hub.h
include/libgda-%%VERSION%%/libgda/virtual/gda-virtual-connection.h
@@ -103,31 +141,224 @@ include/libgda-%%VERSION%%/libgda/virtual/gda-virtual-provider.h
include/libgda-%%VERSION%%/libgda/virtual/gda-vprovider-data-model.h
include/libgda-%%VERSION%%/libgda/virtual/gda-vprovider-hub.h
include/libgda-%%VERSION%%/libgda/virtual/libgda-virtual.h
-lib/girepository-1.0/Gda-4.0.typelib
lib/libgda-%%VERSION%%.a
lib/libgda-%%VERSION%%.la
lib/libgda-%%VERSION%%.so
-lib/libgda-%%VERSION%%.so.4
+lib/libgda-%%VERSION%%.so.5
+%%UI%%lib/libgda-%%VERSION%%/plugins/gdaui-entry-filesel-spec.xml
+%%UI%%lib/libgda-%%VERSION%%/plugins/gdaui-entry-password.xml
+%%UI%%lib/libgda-%%VERSION%%/plugins/gdaui-entry-pict-spec.xml
+%%UI%%lib/libgda-%%VERSION%%/plugins/gdaui-entry-pict-spec_string.xml
+%%UI%%lib/libgda-%%VERSION%%/plugins/gdaui-entry-text-spec.xml
+%%UI%%lib/libgda-%%VERSION%%/plugins/libgda-ui-plugins.a
+%%UI%%lib/libgda-%%VERSION%%/plugins/libgda-ui-plugins.la
+%%UI%%lib/libgda-%%VERSION%%/plugins/libgda-ui-plugins.so
+lib/libgda-%%VERSION%%/providers/libgda-web.a
+lib/libgda-%%VERSION%%/providers/libgda-web.la
+lib/libgda-%%VERSION%%/providers/libgda-web.so
lib/libgda-%%VERSION%%/providers/libgda-sqlite.a
lib/libgda-%%VERSION%%/providers/libgda-sqlite.la
lib/libgda-%%VERSION%%/providers/libgda-sqlite.so
lib/libgda-report-%%VERSION%%.a
lib/libgda-report-%%VERSION%%.la
lib/libgda-report-%%VERSION%%.so
-lib/libgda-report-%%VERSION%%.so.4
+lib/libgda-report-%%VERSION%%.so.5
+%%UI%%lib/libgda-ui-%%VERSION%%.a
+%%UI%%lib/libgda-ui-%%VERSION%%.la
+%%UI%%lib/libgda-ui-%%VERSION%%.so
+%%UI%%lib/libgda-ui-%%VERSION%%.so.5
lib/libgda-xslt-%%VERSION%%.a
lib/libgda-xslt-%%VERSION%%.la
lib/libgda-xslt-%%VERSION%%.so
-lib/libgda-xslt-%%VERSION%%.so.4
+lib/libgda-xslt-%%VERSION%%.so.5
libdata/pkgconfig/libgda-%%VERSION%%.pc
libdata/pkgconfig/libgda-report-%%VERSION%%.pc
libdata/pkgconfig/libgda-sqlite-%%VERSION%%.pc
+%%UI%%libdata/pkgconfig/libgda-ui-%%VERSION%%.pc
+libdata/pkgconfig/libgda-web-%%VERSION%%.pc
libdata/pkgconfig/libgda-xslt-%%VERSION%%.pc
-share/gir-1.0/Gda-4.0.gir
+%%UI%%share/applications/gda-browser-%%VERSION%%.desktop
+%%UI%%share/applications/gda-control-center-%%VERSION%%.desktop
+%%UI%%share/gnome/help/gda-browser/C/data-manager-perspective.page
+%%UI%%share/gnome/help/gda-browser/C/data-manager-xml-syntax.page
+%%UI%%share/gnome/help/gda-browser/C/diagram.page
+%%UI%%share/gnome/help/gda-browser/C/features.page
+%%UI%%share/gnome/help/gda-browser/C/figures/cnc_open.png
+%%UI%%share/gnome/help/gda-browser/C/figures/data-man-mode.png
+%%UI%%share/gnome/help/gda-browser/C/figures/data-man-persp.png
+%%UI%%share/gnome/help/gda-browser/C/figures/data-man-xmlcompose.png
+%%UI%%share/gnome/help/gda-browser/C/figures/diagram.png
+%%UI%%share/gnome/help/gda-browser/C/figures/mainwin.png
+%%UI%%share/gnome/help/gda-browser/C/figures/query-exec-persp.png
+%%UI%%share/gnome/help/gda-browser/C/figures/trans-begin.png
+%%UI%%share/gnome/help/gda-browser/C/figures/trans-commit.png
+%%UI%%share/gnome/help/gda-browser/C/figures/table-insert-data.png
+%%UI%%share/gnome/help/gda-browser/C/figures/trans-rollback.png
+%%UI%%share/gnome/help/gda-browser/C/general-ui.page
+%%UI%%share/gnome/help/gda-browser/C/index.page
+%%UI%%share/gnome/help/gda-browser/C/legal.xml
+%%UI%%share/gnome/help/gda-browser/C/query-execution-perspective.page
+%%UI%%share/gnome/help/gda-browser/C/schema-browser-perspective.page
+%%UI%%share/gnome/help/gda-browser/C/table-insert-data.page
+%%UI%%share/gnome/help/gda-browser/C/transactions.page
+%%UI%%share/gnome/help/gda-browser/C/variables.page
+%%UI%%share/gnome/help/gda-browser/de/data-manager-perspective.page
+%%UI%%share/gnome/help/gda-browser/de/data-manager-xml-syntax.page
+%%UI%%share/gnome/help/gda-browser/de/diagram.page
+%%UI%%share/gnome/help/gda-browser/de/features.page
+%%UI%%share/gnome/help/gda-browser/de/figures/cnc_open.png
+%%UI%%share/gnome/help/gda-browser/de/figures/data-man-mode.png
+%%UI%%share/gnome/help/gda-browser/de/figures/data-man-persp.png
+%%UI%%share/gnome/help/gda-browser/de/figures/data-man-xmlcompose.png
+%%UI%%share/gnome/help/gda-browser/de/figures/diagram.png
+%%UI%%share/gnome/help/gda-browser/de/figures/mainwin.png
+%%UI%%share/gnome/help/gda-browser/de/figures/query-exec-persp.png
+%%UI%%share/gnome/help/gda-browser/de/figures/trans-begin.png
+%%UI%%share/gnome/help/gda-browser/de/figures/trans-commit.png
+%%UI%%share/gnome/help/gda-browser/de/figures/table-insert-data.png
+%%UI%%share/gnome/help/gda-browser/de/figures/trans-rollback.png
+%%UI%%share/gnome/help/gda-browser/de/general-ui.page
+%%UI%%share/gnome/help/gda-browser/de/index.page
+%%UI%%share/gnome/help/gda-browser/de/legal.xml
+%%UI%%share/gnome/help/gda-browser/de/query-execution-perspective.page
+%%UI%%share/gnome/help/gda-browser/de/schema-browser-perspective.page
+%%UI%%share/gnome/help/gda-browser/de/table-insert-data.page
+%%UI%%share/gnome/help/gda-browser/de/transactions.page
+%%UI%%share/gnome/help/gda-browser/de/variables.page
+%%UI%%share/gnome/help/gda-browser/es/data-manager-perspective.page
+%%UI%%share/gnome/help/gda-browser/es/data-manager-xml-syntax.page
+%%UI%%share/gnome/help/gda-browser/es/diagram.page
+%%UI%%share/gnome/help/gda-browser/es/features.page
+%%UI%%share/gnome/help/gda-browser/es/figures/cnc_open.png
+%%UI%%share/gnome/help/gda-browser/es/figures/data-man-mode.png
+%%UI%%share/gnome/help/gda-browser/es/figures/data-man-persp.png
+%%UI%%share/gnome/help/gda-browser/es/figures/data-man-xmlcompose.png
+%%UI%%share/gnome/help/gda-browser/es/figures/diagram.png
+%%UI%%share/gnome/help/gda-browser/es/figures/mainwin.png
+%%UI%%share/gnome/help/gda-browser/es/figures/query-exec-persp.png
+%%UI%%share/gnome/help/gda-browser/es/figures/table-insert-data.png
+%%UI%%share/gnome/help/gda-browser/es/figures/trans-begin.png
+%%UI%%share/gnome/help/gda-browser/es/figures/trans-commit.png
+%%UI%%share/gnome/help/gda-browser/es/figures/trans-rollback.png
+%%UI%%share/gnome/help/gda-browser/es/general-ui.page
+%%UI%%share/gnome/help/gda-browser/es/index.page
+%%UI%%share/gnome/help/gda-browser/es/legal.xml
+%%UI%%share/gnome/help/gda-browser/es/query-execution-perspective.page
+%%UI%%share/gnome/help/gda-browser/es/schema-browser-perspective.page
+%%UI%%share/gnome/help/gda-browser/es/table-insert-data.page
+%%UI%%share/gnome/help/gda-browser/es/transactions.page
+%%UI%%share/gnome/help/gda-browser/es/variables.page
+%%UI%%share/gnome/help/gda-browser/sl/data-manager-perspective.page
+%%UI%%share/gnome/help/gda-browser/sl/data-manager-xml-syntax.page
+%%UI%%share/gnome/help/gda-browser/sl/diagram.page
+%%UI%%share/gnome/help/gda-browser/sl/features.page
+%%UI%%share/gnome/help/gda-browser/sl/figures/cnc_open.png
+%%UI%%share/gnome/help/gda-browser/sl/figures/data-man-mode.png
+%%UI%%share/gnome/help/gda-browser/sl/figures/data-man-persp.png
+%%UI%%share/gnome/help/gda-browser/sl/figures/data-man-xmlcompose.png
+%%UI%%share/gnome/help/gda-browser/sl/figures/diagram.png
+%%UI%%share/gnome/help/gda-browser/sl/figures/mainwin.png
+%%UI%%share/gnome/help/gda-browser/sl/figures/query-exec-persp.png
+%%UI%%share/gnome/help/gda-browser/sl/figures/table-insert-data.png
+%%UI%%share/gnome/help/gda-browser/sl/figures/trans-begin.png
+%%UI%%share/gnome/help/gda-browser/sl/figures/trans-commit.png
+%%UI%%share/gnome/help/gda-browser/sl/figures/trans-rollback.png
+%%UI%%share/gnome/help/gda-browser/sl/general-ui.page
+%%UI%%share/gnome/help/gda-browser/sl/index.page
+%%UI%%share/gnome/help/gda-browser/sl/legal.xml
+%%UI%%share/gnome/help/gda-browser/sl/query-execution-perspective.page
+%%UI%%share/gnome/help/gda-browser/sl/schema-browser-perspective.page
+%%UI%%share/gnome/help/gda-browser/sl/table-insert-data.page
+%%UI%%share/gnome/help/gda-browser/sl/transactions.page
+%%UI%%share/gnome/help/gda-browser/sl/variables.page
+%%UI%%share/icons/hicolor/16x16/apps/gda-control-center.png
+%%UI%%share/icons/hicolor/22x22/apps/gda-control-center.png
+%%UI%%share/icons/hicolor/24x24/apps/gda-control-center.png
+%%UI%%share/icons/hicolor/256x256/apps/gda-control-center.png
+%%UI%%share/icons/hicolor/32x32/apps/gda-control-center.png
+%%UI%%share/icons/hicolor/48x48/apps/gda-control-center.png
+%%UI%%share/libgda-%%VERSION%%/demo/basic_form.c
+%%UI%%share/libgda-%%VERSION%%/demo/cloud.c
+%%UI%%share/libgda-%%VERSION%%/demo/combo.c
+%%UI%%share/libgda-%%VERSION%%/demo/custom_layout.xml
+%%UI%%share/libgda-%%VERSION%%/demo/data_model_dir.c
+%%UI%%share/libgda-%%VERSION%%/demo/ddl_queries.c
+%%UI%%share/libgda-%%VERSION%%/demo/demo_db.db
+%%UI%%share/libgda-%%VERSION%%/demo/form.c
+%%UI%%share/libgda-%%VERSION%%/demo/form_data_layout.c
+%%UI%%share/libgda-%%VERSION%%/demo/form_pict.c
+%%UI%%share/libgda-%%VERSION%%/demo/form_rw.c
+%%UI%%share/libgda-%%VERSION%%/demo/grid.c
+%%UI%%share/libgda-%%VERSION%%/demo/grid_data_layout.c
+%%UI%%share/libgda-%%VERSION%%/demo/grid_pict.c
+%%UI%%share/libgda-%%VERSION%%/demo/grid_rw.c
+%%UI%%share/libgda-%%VERSION%%/demo/linked_grid_form.c
+%%UI%%share/libgda-%%VERSION%%/demo/linked_model_param.c
+%%UI%%share/libgda-%%VERSION%%/demo/login.c
+%%UI%%share/libgda-%%VERSION%%/demo/provider_sel.c
+%%UI%%share/libgda-%%VERSION%%/demo/tree.c
+%%UI%%share/libgda-%%VERSION%%/dtd/gdaui-layout.dtd
share/libgda-%%VERSION%%/dtd/libgda-array.dtd
share/libgda-%%VERSION%%/dtd/libgda-paramlist.dtd
share/libgda-%%VERSION%%/dtd/libgda-server-operation.dtd
+%%UI%%share/libgda-%%VERSION%%/icons/hicolor/16x16/actions/bookmark-view.png
+%%UI%%share/libgda-%%VERSION%%/icons/hicolor/16x16/actions/glade.png
+%%UI%%share/libgda-%%VERSION%%/icons/hicolor/16x16/actions/history-view.png
+%%UI%%share/libgda-%%VERSION%%/icons/hicolor/22x22/actions/bookmark-view.png
+%%UI%%share/libgda-%%VERSION%%/icons/hicolor/22x22/actions/glade.png
+%%UI%%share/libgda-%%VERSION%%/icons/hicolor/22x22/actions/history-view.png
+%%UI%%share/libgda-%%VERSION%%/icons/hicolor/24x24/actions/bookmark-view.png
+%%UI%%share/libgda-%%VERSION%%/icons/hicolor/24x24/actions/glade.png
+%%UI%%share/libgda-%%VERSION%%/icons/hicolor/24x24/actions/history-view.png
+%%UI%%share/libgda-%%VERSION%%/icons/hicolor/24x24/actions/transaction-begin.png
+%%UI%%share/libgda-%%VERSION%%/icons/hicolor/24x24/actions/transaction-commit.png
+%%UI%%share/libgda-%%VERSION%%/icons/hicolor/24x24/actions/transaction-rollback.png
+%%UI%%share/libgda-%%VERSION%%/icons/hicolor/32x32/actions/bookmark-view.png
+%%UI%%share/libgda-%%VERSION%%/icons/hicolor/32x32/actions/glade.png
+%%UI%%share/libgda-%%VERSION%%/icons/hicolor/32x32/actions/history-view.png
+%%UI%%share/libgda-%%VERSION%%/icons/hicolor/icon-theme.cache
+%%UI%%share/libgda-%%VERSION%%/icons/hicolor/scalable/actions/bookmark-view.svg
+%%UI%%share/libgda-%%VERSION%%/icons/hicolor/scalable/actions/glade.svg
+%%UI%%share/libgda-%%VERSION%%/icons/hicolor/scalable/actions/history-view.svg
+%%UI%%share/libgda-%%VERSION%%/import_encodings.xml
share/libgda-%%VERSION%%/information_schema.xml
+%%UI%%share/libgda-%%VERSION%%/language-specs/gda-sql.lang
+share/libgda-%%VERSION%%/php/README
+share/libgda-%%VERSION%%/php/gda-clean.php
+share/libgda-%%VERSION%%/php/gda-config.php
+share/libgda-%%VERSION%%/php/gda-exception.php
+share/libgda-%%VERSION%%/php/gda-front.php
+share/libgda-%%VERSION%%/php/gda-meta.php
+share/libgda-%%VERSION%%/php/gda-setup.php
+share/libgda-%%VERSION%%/php/gda-tester.php
+share/libgda-%%VERSION%%/php/gda-utils.php
+share/libgda-%%VERSION%%/php/gda-worker.php
+%%UI%%share/libgda-%%VERSION%%/pixmaps/bin-attachment-16x16.png
+%%UI%%share/libgda-%%VERSION%%/pixmaps/gda-browser-auth-big.png
+%%UI%%share/libgda-%%VERSION%%/pixmaps/gda-browser-auth.png
+%%UI%%share/libgda-%%VERSION%%/pixmaps/gda-browser-bookmark.png
+%%UI%%share/libgda-%%VERSION%%/pixmaps/gda-browser-column-fk.png
+%%UI%%share/libgda-%%VERSION%%/pixmaps/gda-browser-column-fknn.png
+%%UI%%share/libgda-%%VERSION%%/pixmaps/gda-browser-column-nn.png
+%%UI%%share/libgda-%%VERSION%%/pixmaps/gda-browser-column-pk.png
+%%UI%%share/libgda-%%VERSION%%/pixmaps/gda-browser-column.png
+%%UI%%share/libgda-%%VERSION%%/pixmaps/gda-browser-connected-big.png
+%%UI%%share/libgda-%%VERSION%%/pixmaps/gda-browser-connected.png
+%%UI%%share/libgda-%%VERSION%%/pixmaps/gda-browser-diagram.png
+%%UI%%share/libgda-%%VERSION%%/pixmaps/gda-browser-form.png
+%%UI%%share/libgda-%%VERSION%%/pixmaps/gda-browser-grid.png
+%%UI%%share/libgda-%%VERSION%%/pixmaps/gda-browser-menu-ind.png
+%%UI%%share/libgda-%%VERSION%%/pixmaps/gda-browser-non-connected-big.png
+%%UI%%share/libgda-%%VERSION%%/pixmaps/gda-browser-non-connected.png
+%%UI%%share/libgda-%%VERSION%%/pixmaps/gda-browser-query.png
+%%UI%%share/libgda-%%VERSION%%/pixmaps/gda-browser-reference.png
+%%UI%%share/libgda-%%VERSION%%/pixmaps/gda-browser-schema.png
+%%UI%%share/libgda-%%VERSION%%/pixmaps/gda-browser-table.png
+%%UI%%share/libgda-%%VERSION%%/pixmaps/gda-browser.png
+%%UI%%share/libgda-%%VERSION%%/pixmaps/gda-control-center-newcnc.png
+%%UI%%share/libgda-%%VERSION%%/pixmaps/gda-control-center.png
+%%UI%%share/libgda-%%VERSION%%/pixmaps/gdaui-generic.png
+%%UI%%share/libgda-%%VERSION%%/server_operation.glade
share/libgda-%%VERSION%%/sqlite_specs_add_column.xml
share/libgda-%%VERSION%%/sqlite_specs_create_db.xml
share/libgda-%%VERSION%%/sqlite_specs_create_index.xml
@@ -139,6 +370,10 @@ share/libgda-%%VERSION%%/sqlite_specs_drop_table.xml
share/libgda-%%VERSION%%/sqlite_specs_drop_view.xml
share/libgda-%%VERSION%%/sqlite_specs_dsn.xml
share/libgda-%%VERSION%%/sqlite_specs_rename_table.xml
+%%UI%%share/libgda-%%VERSION%%/ui/gdaui-entry-number.xml
+%%UI%%share/libgda-%%VERSION%%/ui/gdaui-entry-string.xml
+share/libgda-%%VERSION%%/web_specs_auth.xml
+share/libgda-%%VERSION%%/web_specs_dsn.xml
share/libgda-%%VERSION%%/web/cnc.js
share/libgda-%%VERSION%%/web/gda-print.css
share/libgda-%%VERSION%%/web/gda.css
@@ -151,6 +386,7 @@ share/libgda-%%VERSION%%/web/mouseirb_2.js
share/locale/ar/LC_MESSAGES/libgda-%%VERSION%%.mo
share/locale/az/LC_MESSAGES/libgda-%%VERSION%%.mo
share/locale/ca/LC_MESSAGES/libgda-%%VERSION%%.mo
+share/locale/ca@valencia/LC_MESSAGES/libgda-4.0.mo
share/locale/cs/LC_MESSAGES/libgda-%%VERSION%%.mo
share/locale/da/LC_MESSAGES/libgda-%%VERSION%%.mo
share/locale/de/LC_MESSAGES/libgda-%%VERSION%%.mo
@@ -167,6 +403,7 @@ share/locale/ga/LC_MESSAGES/libgda-%%VERSION%%.mo
share/locale/gl/LC_MESSAGES/libgda-%%VERSION%%.mo
share/locale/hr/LC_MESSAGES/libgda-%%VERSION%%.mo
share/locale/hu/LC_MESSAGES/libgda-%%VERSION%%.mo
+share/locale/id/LC_MESSAGES/libgda-%%VERSION%%.mo
share/locale/it/LC_MESSAGES/libgda-%%VERSION%%.mo
share/locale/ja/LC_MESSAGES/libgda-%%VERSION%%.mo
share/locale/ko/LC_MESSAGES/libgda-%%VERSION%%.mo
@@ -196,17 +433,48 @@ share/locale/vi/LC_MESSAGES/libgda-%%VERSION%%.mo
share/locale/zh_CN/LC_MESSAGES/libgda-%%VERSION%%.mo
share/locale/zh_HK/LC_MESSAGES/libgda-%%VERSION%%.mo
share/locale/zh_TW/LC_MESSAGES/libgda-%%VERSION%%.mo
+%%UI%%share/pixmaps/gda-browser-%%VERSION%%.png
@dirrm share/libgda-%%VERSION%%/web
+%%UI%%@dirrm share/libgda-%%VERSION%%/ui
+%%UI%%@dirrm share/libgda-%%VERSION%%/pixmaps
+@dirrm share/libgda-%%VERSION%%/php
+%%UI%%@dirrm share/libgda-%%VERSION%%/language-specs
+%%UI%%@dirrm share/libgda-%%VERSION%%/icons/hicolor/scalable/actions
+%%UI%%@dirrm share/libgda-%%VERSION%%/icons/hicolor/scalable
+%%UI%%@dirrm share/libgda-%%VERSION%%/icons/hicolor/32x32/actions
+%%UI%%@dirrm share/libgda-%%VERSION%%/icons/hicolor/32x32
+%%UI%%@dirrm share/libgda-%%VERSION%%/icons/hicolor/24x24/actions
+%%UI%%@dirrm share/libgda-%%VERSION%%/icons/hicolor/24x24
+%%UI%%@dirrm share/libgda-%%VERSION%%/icons/hicolor/22x22/actions
+%%UI%%@dirrm share/libgda-%%VERSION%%/icons/hicolor/22x22
+%%UI%%@dirrm share/libgda-%%VERSION%%/icons/hicolor/16x16/actions
+%%UI%%@dirrm share/libgda-%%VERSION%%/icons/hicolor/16x16
+%%UI%%@dirrm share/libgda-%%VERSION%%/icons/hicolor
+%%UI%%@dirrm share/libgda-%%VERSION%%/icons
+%%UI%%@dirrm share/gnome/help/gda-browser/sl/figures
+%%UI%%@dirrm share/gnome/help/gda-browser/sl
+%%UI%%@dirrm share/gnome/help/gda-browser/es/figures
+%%UI%%@dirrm share/gnome/help/gda-browser/es
+%%UI%%@dirrm share/gnome/help/gda-browser/de/figures
+%%UI%%@dirrm share/gnome/help/gda-browser/de
+%%UI%%@dirrm share/gnome/help/gda-browser/C/figures
+%%UI%%@dirrm share/gnome/help/gda-browser/C
+%%UI%%@dirrm share/gnome/help/gda-browser
@dirrm share/libgda-%%VERSION%%/dtd
+%%UI%%@dirrm share/libgda-%%VERSION%%/demo
@dirrm share/libgda-%%VERSION%%/
+%%UI%%@dirrmtry share/applications
@dirrm lib/libgda-%%VERSION%%/providers
+%%UI%%@dirrm lib/libgda-%%VERSION%%/plugins
@dirrm lib/libgda-%%VERSION%%
@dirrm include/libgda-%%VERSION%%/libgda/virtual
+@dirrm include/libgda-%%VERSION%%/libgda/thread-wrapper
@dirrm include/libgda-%%VERSION%%/libgda/sqlite
@dirrm include/libgda-%%VERSION%%/libgda/sql-parser
@dirrm include/libgda-%%VERSION%%/libgda/providers-support
@dirrm include/libgda-%%VERSION%%/libgda/handlers
@dirrm include/libgda-%%VERSION%%/libgda-xslt
+%%UI%%@dirrm include/libgda-%%VERSION%%/libgda-ui
@dirrm include/libgda-%%VERSION%%/libgda-report
@dirrm include/libgda-%%VERSION%%/libgda
@dirrm include/libgda-%%VERSION%%
@@ -221,3 +489,5 @@ share/locale/zh_TW/LC_MESSAGES/libgda-%%VERSION%%.mo
@dirrmtry share/locale/oc
@dirrmtry share/locale/dz/LC_MESSAGES
@dirrmtry share/locale/dz
+@dirrmtry share/locale/ca@valencia/LC_MESSAGES
+@dirrmtry share/locale/ca@valencia
diff --git a/databases/libgdamm/Makefile b/databases/libgdamm/Makefile
index 90128f48fd2..4c35e462b95 100644
--- a/databases/libgdamm/Makefile
+++ b/databases/libgdamm/Makefile
@@ -3,12 +3,11 @@
# Whom: Alexander Nedotsukov <bland@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/databases/libgdamm/Makefile,v 1.18 2009/11/28 05:58:58 mezz Exp $
+# $MCom: ports/databases/libgdamm/Makefile,v 1.21 2010/10/23 16:04:08 kwm Exp $
#
PORTNAME= libgdamm
-PORTVERSION= 3.99.17.1
-PORTREVISION= 2
+PORTVERSION= 3.99.21
CATEGORIES= databases gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/databases/libgdamm/distinfo b/databases/libgdamm/distinfo
index 52ebba84dce..7af2ac99346 100644
--- a/databases/libgdamm/distinfo
+++ b/databases/libgdamm/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/libgdamm-3.99.17.1.tar.bz2) = 227d838905b45e8ccd6440cf661630fc
-SHA256 (gnome2/libgdamm-3.99.17.1.tar.bz2) = d3078223d4589ee69af94a649a156a933cc8b058fc24064fd440724f234a50db
-SIZE (gnome2/libgdamm-3.99.17.1.tar.bz2) = 924028
+MD5 (gnome2/libgdamm-3.99.21.tar.bz2) = f2eb75edc7a439e7df71cb45bac9ec22
+SHA256 (gnome2/libgdamm-3.99.21.tar.bz2) = 08a17b9275104fa9da964cfff331e2118bfb57705c30271cff44cef91574ec9d
+SIZE (gnome2/libgdamm-3.99.21.tar.bz2) = 1628064
diff --git a/databases/libgdamm/pkg-plist b/databases/libgdamm/pkg-plist
index 8458fdd6eaa..e3aab937887 100644
--- a/databases/libgdamm/pkg-plist
+++ b/databases/libgdamm/pkg-plist
@@ -55,7 +55,10 @@ include/libgdamm-4.0/libgdamm/private/row_p.h
include/libgdamm-4.0/libgdamm/private/serveroperation_p.h
include/libgdamm-4.0/libgdamm/private/serverprovider_p.h
include/libgdamm-4.0/libgdamm/private/set_p.h
+include/libgdamm-4.0/libgdamm/private/sqlbuilder_p.h
+include/libgdamm-4.0/libgdamm/private/sqlexpr_p.h
include/libgdamm-4.0/libgdamm/private/sqlparser_p.h
+include/libgdamm-4.0/libgdamm/private/sqlstatement_p.h
include/libgdamm-4.0/libgdamm/private/statement_p.h
include/libgdamm-4.0/libgdamm/private/transactionstatus_p.h
include/libgdamm-4.0/libgdamm/private/xatransaction_p.h
@@ -64,7 +67,10 @@ include/libgdamm-4.0/libgdamm/row.h
include/libgdamm-4.0/libgdamm/serveroperation.h
include/libgdamm-4.0/libgdamm/serverprovider.h
include/libgdamm-4.0/libgdamm/set.h
+include/libgdamm-4.0/libgdamm/sqlbuilder.h
+include/libgdamm-4.0/libgdamm/sqlexpr.h
include/libgdamm-4.0/libgdamm/sqlparser.h
+include/libgdamm-4.0/libgdamm/sqlstatement.h
include/libgdamm-4.0/libgdamm/statement.h
include/libgdamm-4.0/libgdamm/transactionstatus.h
include/libgdamm-4.0/libgdamm/throw_exception.h