Presenting GNOME 2.26 for FreeBSD. See

http://library.gnome.org/misc/release-notes/2.26/ for a list of what's new.
On the FreeBSD front, we introduced a port of libxul 1.9 as an alternative
for Firefox 2.0 as a Gecko provider.  Almost all of the Gecko consumers
can make use of this provider by setting:

WITH_GECKO=libxul

The GNOME 2.26 port was done by ahze, kwm, marcus, and mezz with
contributions by Joseph S. Atkinson, Peter Wemm, Eric L. Chen,
Martin Matuska, Craig Butler, and Pawel Worach.

12 files changed, 188 insertions, 257 deletions

diff --git a/databases/evolution-data-server/Makefile b/databases/evolution-data-server/Makefile
index e1b229ce08ba..1c90f48bbc35 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.164 2009/01/10 01:59:21 mezz Exp $
+#   $MCom: ports/databases/evolution-data-server/Makefile,v 1.168 2009/03/17 13:17:16 kwm Exp $
 #
 
 PORTNAME=	evolution-data-server
-PORTVERSION=	2.24.5
+PORTVERSION=	2.26.0
 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 \
+		ical.43:${PORTSDIR}/devel/libical \
 		nss3.1:${PORTSDIR}/security/nss \
 		tasn1.4:${PORTSDIR}/security/libtasn1 \
 		sqlite3.8:${PORTSDIR}/databases/sqlite3 \
@@ -39,9 +40,10 @@ 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.24" EVO_VERSION="1.2"
+PLIST_SUB=	VERSION="2.26" EVO_VERSION="1.2"
 
 #OPTIONS=	IMAP4	"Enable experimental IMAP4 backend" off
+OPTIONS=	WEATHER "Enable weather calendar backend" on
 
 .include <bsd.port.pre.mk>
 
@@ -49,7 +51,6 @@ PLIST_SUB=	VERSION="2.24" EVO_VERSION="1.2"
 HEIMDAL_HOME?=	${LOCALBASE}
 LIB_DEPENDS+=		krb5:${PORTSDIR}/security/heimdal
 CONFIGURE_ARGS+=	--with-krb5=${HEIMDAL_HOME} --with-krb5-includes=${HEIMDAL_HOME}/include
-KRB5_LIB=		`${HEIMDAL_HOME}/bin/krb5-config gssapi --libs`
 .elif !defined(NO_KERBEROS)
 CONFIGURE_ARGS+=        --with-krb5=/usr
 KRB5_LIB=		`/usr/bin/krb5-config gssapi --libs`
@@ -62,6 +63,15 @@ KRB5_LIB=		`/usr/bin/krb5-config gssapi --libs`
 PLIST_SUB+=		IMAP4="@comment "
 #.endif
 
+.if defined(WITH_WEATHER)
+LIB_DEPENDS+=		gweather.1:${PORTSDIR}/net/libgweather
+CONFIGURE_ARGS+=	--with-weather
+PLIST_SUB+=		WEATHER=""
+.else
+CONFIGURE_ARGS+=	--without-weather
+PLIST_SUB+=		WEATHER="@comment "
+.endif
+
 EDS_BDB_MSG=	"!!!WARNING!!!: Berkeley Database version is ${BDB_VER}.  If this is an upgrade, you may experience problems if you or any other Evolution-data-server users were previously using BDB_VER 41."
 
 pre-everything::
diff --git a/databases/evolution-data-server/distinfo b/databases/evolution-data-server/distinfo
index 966c8a0f0029..ed4def55e750 100644
--- a/databases/evolution-data-server/distinfo
+++ b/databases/evolution-data-server/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/evolution-data-server-2.24.5.tar.bz2) = cf12f02b8cc0a15e046c121e6a7250cb
-SHA256 (gnome2/evolution-data-server-2.24.5.tar.bz2) = c2240b96437f36f3656da538df7631510785664a6e7723cbf75ec0f88c3d38d1
-SIZE (gnome2/evolution-data-server-2.24.5.tar.bz2) = 7857405
+MD5 (gnome2/evolution-data-server-2.26.0.tar.bz2) = d010845a4ee9604f050403b106c2f416
+SHA256 (gnome2/evolution-data-server-2.26.0.tar.bz2) = 1e15e964355de7db63f9ee1480c0882ede0d44252ed5778fe65b4e163f7945f0
+SIZE (gnome2/evolution-data-server-2.26.0.tar.bz2) = 7344309
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
deleted file mode 100644
index 06b6ce249762..000000000000
--- a/databases/evolution-data-server/files/patch-calendar_libical_src_libical_icaltz-util.c
+++ /dev/null
@@ -1,18 +0,0 @@
---- calendar/libical/src/libical/icaltz-util.c.orig	2008-12-22 04:49:23.000000000 -0500
-+++ calendar/libical/src/libical/icaltz-util.c	2009-01-12 22:33:53.000000000 -0500
-@@ -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
- #elif defined(_WIN32)
- #define BIG_ENDIAN 'B'
- #define LITTLE_ENDIAN 'l'
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
index 0c06d57ce33f..f84db6643729 100644
--- a/databases/evolution-data-server/files/patch-docs_reference_camel_Makefile.in
+++ b/databases/evolution-data-server/files/patch-docs_reference_camel_Makefile.in
@@ -1,5 +1,5 @@
---- docs/reference/camel/Makefile.in.orig	2009-02-03 11:31:13.000000000 -0500
-+++ docs/reference/camel/Makefile.in	2009-02-03 11:32:37.000000000 -0500
+--- docs/reference/camel/Makefile.in.orig	2009-01-16 16:16:56.000000000 +0100
++++ docs/reference/camel/Makefile.in	2009-01-16 16:18:31.000000000 +0100
 @@ -130,7 +130,7 @@ GNOME_PLATFORM_LIBS = @GNOME_PLATFORM_LI
  GOBJECT_QUERY = @GOBJECT_QUERY@
  GREP = @GREP@
@@ -9,14 +9,3 @@
  ICONV_CFLAGS = @ICONV_CFLAGS@
  ICONV_LIBS = @ICONV_LIBS@
  IDL_INCLUDES = @IDL_INCLUDES@
-@@ -686,8 +686,8 @@ install-data-local:
- 	  done; \
- 	  echo '-- Installing $(srcdir)/html/index.sgml' ; \
- 	  $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR) || :; \
--	  which gtkdoc-rebase >/dev/null && \
--	    gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$(DESTDIR)$(TARGET_DIR) ; \
-+#	  which gtkdoc-rebase >/dev/null && \
-+#	    gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$(DESTDIR)$(TARGET_DIR) ; \
- 	fi
- 
- uninstall-local:
diff --git a/databases/evolution-data-server/pkg-plist b/databases/evolution-data-server/pkg-plist
index df48ab873e0c..d8ef379ca612 100644
--- a/databases/evolution-data-server/pkg-plist
+++ b/databases/evolution-data-server/pkg-plist
@@ -238,6 +238,7 @@ 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
 include/evolution-data-server-%%VERSION%%/libedataserverui/e-cell-renderer-color.h
 include/evolution-data-server-%%VERSION%%/libedataserverui/e-contact-store.h
@@ -253,51 +254,6 @@ include/evolution-data-server-%%VERSION%%/libedataserverui/e-source-option-menu.
 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
-include/evolution-data-server-%%VERSION%%/libical/ical.h
-include/evolution-data-server-%%VERSION%%/libical/icalarray.h
-include/evolution-data-server-%%VERSION%%/libical/icalattach.h
-include/evolution-data-server-%%VERSION%%/libical/icalcalendar.h
-include/evolution-data-server-%%VERSION%%/libical/icalclassify.h
-include/evolution-data-server-%%VERSION%%/libical/icalcluster.h
-include/evolution-data-server-%%VERSION%%/libical/icalcomponent.h
-include/evolution-data-server-%%VERSION%%/libical/icalderivedparameter.h
-include/evolution-data-server-%%VERSION%%/libical/icalderivedproperty.h
-include/evolution-data-server-%%VERSION%%/libical/icalderivedvalue.h
-include/evolution-data-server-%%VERSION%%/libical/icaldirset.h
-include/evolution-data-server-%%VERSION%%/libical/icaldirsetimpl.h
-include/evolution-data-server-%%VERSION%%/libical/icalduration.h
-include/evolution-data-server-%%VERSION%%/libical/icalenums.h
-include/evolution-data-server-%%VERSION%%/libical/icalerror.h
-include/evolution-data-server-%%VERSION%%/libical/icalfileset.h
-include/evolution-data-server-%%VERSION%%/libical/icalfilesetimpl.h
-include/evolution-data-server-%%VERSION%%/libical/icalgauge.h
-include/evolution-data-server-%%VERSION%%/libical/icalgaugeimpl.h
-include/evolution-data-server-%%VERSION%%/libical/icallangbind.h
-include/evolution-data-server-%%VERSION%%/libical/icalmemory.h
-include/evolution-data-server-%%VERSION%%/libical/icalmessage.h
-include/evolution-data-server-%%VERSION%%/libical/icalmime.h
-include/evolution-data-server-%%VERSION%%/libical/icalparameter.h
-include/evolution-data-server-%%VERSION%%/libical/icalparser.h
-include/evolution-data-server-%%VERSION%%/libical/icalperiod.h
-include/evolution-data-server-%%VERSION%%/libical/icalproperty.h
-include/evolution-data-server-%%VERSION%%/libical/icalrecur.h
-include/evolution-data-server-%%VERSION%%/libical/icalrestriction.h
-include/evolution-data-server-%%VERSION%%/libical/icalset.h
-include/evolution-data-server-%%VERSION%%/libical/icalspanlist.h
-include/evolution-data-server-%%VERSION%%/libical/icalss.h
-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
-include/evolution-data-server-%%VERSION%%/libical/pvl.h
-include/evolution-data-server-%%VERSION%%/libical/sspm.h
-include/evolution-data-server-%%VERSION%%/libical/vcaltmp.h
-include/evolution-data-server-%%VERSION%%/libical/vcc.h
-include/evolution-data-server-%%VERSION%%/libical/vobject.h
 lib/evolution-data-server-%%EVO_VERSION%%/camel-providers/libcamelgroupwise.a
 lib/evolution-data-server-%%EVO_VERSION%%/camel-providers/libcamelgroupwise.la
 lib/evolution-data-server-%%EVO_VERSION%%/camel-providers/libcamelgroupwise.so
@@ -366,9 +322,9 @@ lib/evolution-data-server-%%EVO_VERSION%%/extensions/libecalbackendgroupwise.so
 lib/evolution-data-server-%%EVO_VERSION%%/extensions/libecalbackendhttp.a
 lib/evolution-data-server-%%EVO_VERSION%%/extensions/libecalbackendhttp.la
 lib/evolution-data-server-%%EVO_VERSION%%/extensions/libecalbackendhttp.so
-lib/evolution-data-server-%%EVO_VERSION%%/extensions/libecalbackendweather.a
-lib/evolution-data-server-%%EVO_VERSION%%/extensions/libecalbackendweather.la
-lib/evolution-data-server-%%EVO_VERSION%%/extensions/libecalbackendweather.so
+%%WEATHER%%lib/evolution-data-server-%%EVO_VERSION%%/extensions/libecalbackendweather.a
+%%WEATHER%%lib/evolution-data-server-%%EVO_VERSION%%/extensions/libecalbackendweather.la
+%%WEATHER%%lib/evolution-data-server-%%EVO_VERSION%%/extensions/libecalbackendweather.so
 lib/libcamel-%%EVO_VERSION%%.a
 lib/libcamel-%%EVO_VERSION%%.la
 lib/libcamel-%%EVO_VERSION%%.so
@@ -554,8 +510,8 @@ 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-sexp.html
 share/doc/camel/camel-camel-search-sql.html
+share/doc/camel/camel-camel-search-sql-sexp.html
 share/doc/camel/camel-camel-string-utils.html
 share/doc/camel/camel-camel-trie.html
 share/doc/camel/camel-camel-uid-cache.html
@@ -727,6 +683,7 @@ share/doc/libedataserverui/index.html
 share/doc/libedataserverui/index.sgml
 share/doc/libedataserverui/ix01.html
 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
@@ -739,7 +696,7 @@ share/doc/libedataserverui/up.png
 share/evolution-data-server-%%VERSION%%/evolutionperson.schema
 share/evolution-data-server-%%VERSION%%/glade/e-categories-dialog.glade
 share/evolution-data-server-%%VERSION%%/glade/e-name-selector-dialog.glade
-share/evolution-data-server-%%VERSION%%/weather/Locations.xml
+%%WEATHER%%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
@@ -783,7 +740,6 @@ share/locale/ka/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
 share/locale/kn/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
 share/locale/ko/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
 share/locale/ku/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
-share/locale/la/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
 share/locale/lt/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
 share/locale/lv/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
 share/locale/mk/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
@@ -842,7 +798,7 @@ 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
+%%WEATHER%%@dirrm share/evolution-data-server-%%VERSION%%/weather
 @dirrm share/evolution-data-server-%%VERSION%%/glade
 @dirrm share/evolution-data-server-%%VERSION%%
 @dirrm share/doc/libedataserverui
@@ -856,7 +812,6 @@ share/pixmaps/evolution-data-server/category_time-and-expenses_16.png
 @dirrm lib/evolution-data-server-%%EVO_VERSION%%/extensions
 @dirrm lib/evolution-data-server-%%EVO_VERSION%%/camel-providers
 @dirrm lib/evolution-data-server-%%EVO_VERSION%%
-@dirrm include/evolution-data-server-%%VERSION%%/libical
 @dirrm include/evolution-data-server-%%VERSION%%/libedataserverui
 @dirrm include/evolution-data-server-%%VERSION%%/libedataserver
 @dirrm include/evolution-data-server-%%VERSION%%/libedata-cal
@@ -887,8 +842,6 @@ share/pixmaps/evolution-data-server/category_time-and-expenses_16.png
 @dirrmtry share/locale/oc
 @dirrmtry share/locale/mr/LC_MESSAGES
 @dirrmtry share/locale/mr
-@dirrmtry share/locale/la/LC_MESSAGES
-@dirrmtry share/locale/la
 @dirrmtry share/locale/ku/LC_MESSAGES
 @dirrmtry share/locale/ku
 @dirrmtry share/locale/dz/LC_MESSAGES
diff --git a/databases/glom/Makefile b/databases/glom/Makefile
index 3f7c98a38597..4ef08f9db73e 100644
--- a/databases/glom/Makefile
+++ b/databases/glom/Makefile
@@ -3,11 +3,11 @@
 # Whom:					Adam Weinberger <adamw@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/databases/glom/Makefile,v 1.21 2009/01/09 11:46:25 kwm Exp $
+#   $MCom: ports/databases/glom/Makefile,v 1.24 2009/03/17 16:33:41 kwm Exp $
 #
 
 PORTNAME=	glom
-PORTVERSION=	1.8.7
+PORTVERSION=	1.10.0
 CATEGORIES=	databases gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -16,15 +16,13 @@ MAINTAINER=	kwm@FreeBSD.org
 COMMENT=	GNOME database designer and user interface
 
 LIB_DEPENDS=	bakery-2.6:${PORTSDIR}/x11-toolkits/bakery \
-		gdamm-3.0.10:${PORTSDIR}/databases/libgdamm \
+		gdamm-4.0.10:${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.4:${PORTSDIR}/graphics/goocanvasmm
 BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes \
-		${LOCALBASE}/libdata/pkgconfig/libgda-postgres-3.0.pc:${PORTSDIR}/databases/libgda3-postgresql
+		${LOCALBASE}/libdata/pkgconfig/libgda-postgres-4.0.pc:${PORTSDIR}/databases/libgda4-postgresql
 RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes \
-		${LOCALBASE}/libdata/pkgconfig/libgda-postgres-3.0.pc:${PORTSDIR}/databases/libgda3-postgresql
+		${LOCALBASE}/libdata/pkgconfig/libgda-postgres-4.0.pc:${PORTSDIR}/databases/libgda4-postgresql
 
 USE_BZIP2=	yes
 USE_PYTHON=	yes
diff --git a/databases/glom/distinfo b/databases/glom/distinfo
index 1ee0184f9b07..522bfdf6e68e 100644
--- a/databases/glom/distinfo
+++ b/databases/glom/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/glom-1.8.7.tar.bz2) = 5ac17e5505f0c519eda63e4cb1fc9be1
-SHA256 (gnome2/glom-1.8.7.tar.bz2) = 6d11cc30e54f84a4ff28e2df0eb3f8799c8db2ea541642aef1685b11a6b2780f
-SIZE (gnome2/glom-1.8.7.tar.bz2) = 3267908
+MD5 (gnome2/glom-1.10.0.tar.bz2) = 8c46a5e087771a0bc45c71d7dd74ec7f
+SHA256 (gnome2/glom-1.10.0.tar.bz2) = a0e03a087cec62ccf440923d44f2f99f83607502bf84aef34dc50c41989fca2a
+SIZE (gnome2/glom-1.10.0.tar.bz2) = 3246293
diff --git a/databases/glom/files/patch-glom_main.cc b/databases/glom/files/patch-glom_main.cc
index 69a77fb592b4..c9143bb8b24e 100644
--- a/databases/glom/files/patch-glom_main.cc
+++ b/databases/glom/files/patch-glom_main.cc
@@ -1,6 +1,6 @@
---- glom/main.cc.orig	2008-08-22 16:36:46.000000000 +0200
-+++ glom/main.cc	2008-09-13 21:23:46.000000000 +0200
-@@ -89,18 +89,19 @@
+--- glom/main.cc.orig	2009-03-16 14:53:55.000000000 +0100
++++ glom/main.cc	2009-03-17 16:22:01.000000000 +0100
+@@ -100,18 +100,19 @@ OptionGroup::OptionGroup()
  
  } //namespace Glom
  
@@ -22,10 +22,10 @@
    WSADATA data;
    int errcode = WSAStartup(MAKEWORD(2, 0), &data);
    if(errcode != 0)
-@@ -108,6 +109,7 @@
-     std::cerr << "Failed to initialize WinSock: " << errcode << std::endl;
-     return -1;
-   }
+@@ -123,6 +124,7 @@ main(int argc, char* argv[])
+   gchar* installation_dir_c = g_win32_get_package_installation_directory_of_module(NULL);
+   const std::string installation_dir(installation_dir_c);
+   g_free(installation_dir_c);
 +#  endif
  #endif
  
diff --git a/databases/glom/pkg-plist b/databases/glom/pkg-plist
index a9db6f4b6ebb..682717c2ee83 100644
--- a/databases/glom/pkg-plist
+++ b/databases/glom/pkg-plist
@@ -1,11 +1,53 @@
 bin/glom
-lib/libglom.a
-lib/libglom.la
-lib/libglom.so
-lib/libglom.so.0
+include/glom-1.0/libglom/appstate.h
+include/glom-1.0/libglom/data_structure/field.h
+include/glom-1.0/libglom/data_structure/fieldtypes.h
+include/glom-1.0/libglom/data_structure/foundset.h
+include/glom-1.0/libglom/data_structure/glomconversions.h
+include/glom-1.0/libglom/data_structure/groupinfo.h
+include/glom-1.0/libglom/data_structure/iso_codes.h
+include/glom-1.0/libglom/data_structure/layout/custom_title.h
+include/glom-1.0/libglom/data_structure/layout/fieldformatting.h
+include/glom-1.0/libglom/data_structure/layout/layoutgroup.h
+include/glom-1.0/libglom/data_structure/layout/layoutitem.h
+include/glom-1.0/libglom/data_structure/layout/layoutitem_button.h
+include/glom-1.0/libglom/data_structure/layout/layoutitem_calendarportal.h
+include/glom-1.0/libglom/data_structure/layout/layoutitem_field.h
+include/glom-1.0/libglom/data_structure/layout/layoutitem_image.h
+include/glom-1.0/libglom/data_structure/layout/layoutitem_line.h
+include/glom-1.0/libglom/data_structure/layout/layoutitem_notebook.h
+include/glom-1.0/libglom/data_structure/layout/layoutitem_placeholder.h
+include/glom-1.0/libglom/data_structure/layout/layoutitem_portal.h
+include/glom-1.0/libglom/data_structure/layout/layoutitem_text.h
+include/glom-1.0/libglom/data_structure/layout/report_parts/layoutitem_fieldsummary.h
+include/glom-1.0/libglom/data_structure/layout/report_parts/layoutitem_footer.h
+include/glom-1.0/libglom/data_structure/layout/report_parts/layoutitem_groupby.h
+include/glom-1.0/libglom/data_structure/layout/report_parts/layoutitem_header.h
+include/glom-1.0/libglom/data_structure/layout/report_parts/layoutitem_summary.h
+include/glom-1.0/libglom/data_structure/layout/report_parts/layoutitem_verticalgroup.h
+include/glom-1.0/libglom/data_structure/layout/usesrelationship.h
+include/glom-1.0/libglom/data_structure/numeric_format.h
+include/glom-1.0/libglom/data_structure/parameternamegenerator.h
+include/glom-1.0/libglom/data_structure/print_layout.h
+include/glom-1.0/libglom/data_structure/privileges.h
+include/glom-1.0/libglom/data_structure/relationship.h
+include/glom-1.0/libglom/data_structure/report.h
+include/glom-1.0/libglom/data_structure/system_prefs.h
+include/glom-1.0/libglom/data_structure/tableinfo.h
+include/glom-1.0/libglom/data_structure/translatable_item.h
+include/glom-1.0/libglom/document/document_glom.h
+include/glom-1.0/libglom/document/view.h
+include/glom-1.0/libglom/libglom_config.h
+include/glom-1.0/libglom/sharedptr.h
+include/glom-1.0/libglom/standard_table_prefs_fields.h
+lib/libglom-1.0.a
+lib/libglom-1.0.la
+lib/libglom-1.0.so
+lib/libglom-1.0.so.0
 %%PYTHON_SITELIBDIR%%/glom.a
 %%PYTHON_SITELIBDIR%%/glom.la
 %%PYTHON_SITELIBDIR%%/glom.so
+libdata/pkgconfig/glom-1.0.pc
 share/applications/glom.desktop
 %%DATADIR%%/doc/examples/example_film_manager.glom
 %%DATADIR%%/doc/examples/example_lesson_planner.glom
@@ -203,3 +245,9 @@ share/omf/glom/glom-sv.omf
 @dirrmtry share/locale/rw
 @dirrmtry share/locale/dz/LC_MESSAGES
 @dirrmtry share/locale/dz
+@dirrm include/glom-1.0/libglom/document
+@dirrm include/glom-1.0/libglom/data_structure/layout/report_parts
+@dirrm include/glom-1.0/libglom/data_structure/layout
+@dirrm include/glom-1.0/libglom/data_structure
+@dirrm include/glom-1.0/libglom
+@dirrm include/glom-1.0
diff --git a/databases/libgdamm/Makefile b/databases/libgdamm/Makefile
index 709388663e2f..1e2be16b3ea7 100644
--- a/databases/libgdamm/Makefile
+++ b/databases/libgdamm/Makefile
@@ -3,12 +3,12 @@
 # Whom:                 Alexander Nedotsukov <bland@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/databases/libgdamm/Makefile,v 1.9 2008/03/17 19:53:24 kwm Exp $
+#   $MCom: ports/databases/libgdamm/Makefile,v 1.15 2009/04/09 03:24:07 mezz Exp $
 #
 
 PORTNAME=	libgdamm
-PORTVERSION=	3.0.1
-PORTREVISION=	0
+PORTVERSION=	3.99.14
+PORTREVISION=	1
 CATEGORIES=	databases gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -22,7 +22,7 @@ BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 USE_AUTOTOOLS=	libtool:15
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomehack libgda3
+USE_GNOME=	gnomehack libgda4
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--enable-static
diff --git a/databases/libgdamm/distinfo b/databases/libgdamm/distinfo
index de82a37d4ca8..a8b2bd6c3046 100644
--- a/databases/libgdamm/distinfo
+++ b/databases/libgdamm/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/libgdamm-3.0.1.tar.bz2) = 63583ec970e643962474401400e19994
-SHA256 (gnome2/libgdamm-3.0.1.tar.bz2) = 64a537f59157f0a8c804caa5a07b9b8f8676dd966190429ae0f6a04b810e28b9
-SIZE (gnome2/libgdamm-3.0.1.tar.bz2) = 1281602
+MD5 (gnome2/libgdamm-3.99.14.tar.bz2) = 51b680fdf2b724cfd475886c687f5780
+SHA256 (gnome2/libgdamm-3.99.14.tar.bz2) = d5e860afa2927af7be4deabfc97c7ead9c13f2efdab8f1b158f8e4d19bcdefa4
+SIZE (gnome2/libgdamm-3.99.14.tar.bz2) = 830976
diff --git a/databases/libgdamm/pkg-plist b/databases/libgdamm/pkg-plist
index e2fbd839b7eb..6c974cbc08c8 100644
--- a/databases/libgdamm/pkg-plist
+++ b/databases/libgdamm/pkg-plist
@@ -1,136 +1,87 @@
-include/libgdamm-3.0/libgdamm.h
-include/libgdamm-3.0/libgdamm/blob.h
-include/libgdamm-3.0/libgdamm/blobop.h
-include/libgdamm-3.0/libgdamm/client.h
-include/libgdamm-3.0/libgdamm/column.h
-include/libgdamm-3.0/libgdamm/columnindex.h
-include/libgdamm-3.0/libgdamm/command.h
-include/libgdamm-3.0/libgdamm/config.h
-include/libgdamm-3.0/libgdamm/connection.h
-include/libgdamm-3.0/libgdamm/connectionevent.h
-include/libgdamm-3.0/libgdamm/datahandler.h
-include/libgdamm-3.0/libgdamm/datamodel.h
-include/libgdamm-3.0/libgdamm/datamodelarray.h
-include/libgdamm-3.0/libgdamm/datamodelfiltersql.h
-include/libgdamm-3.0/libgdamm/datamodelhash.h
-include/libgdamm-3.0/libgdamm/datamodelimport.h
-include/libgdamm-3.0/libgdamm/datamodelindex.h
-include/libgdamm-3.0/libgdamm/datamodeliter.h
-include/libgdamm-3.0/libgdamm/datamodelquery.h
-include/libgdamm-3.0/libgdamm/datamodelrow.h
-include/libgdamm-3.0/libgdamm/dataproxy.h
-include/libgdamm-3.0/libgdamm/datasourceinfo.h
-include/libgdamm-3.0/libgdamm/dict.h
-include/libgdamm-3.0/libgdamm/dictaggregate.h
-include/libgdamm-3.0/libgdamm/dictconstraint.h
-include/libgdamm-3.0/libgdamm/dictdatabase.h
-include/libgdamm-3.0/libgdamm/dictfield.h
-include/libgdamm-3.0/libgdamm/dictfunction.h
-include/libgdamm-3.0/libgdamm/dicttable.h
-include/libgdamm-3.0/libgdamm/dicttype.h
-include/libgdamm-3.0/libgdamm/entity.h
-include/libgdamm-3.0/libgdamm/entityfield.h
-include/libgdamm-3.0/libgdamm/handlerbin.h
-include/libgdamm-3.0/libgdamm/handlerboolean.h
-include/libgdamm-3.0/libgdamm/handlernumerical.h
-include/libgdamm-3.0/libgdamm/handlerstring.h
-include/libgdamm-3.0/libgdamm/handlertime.h
-include/libgdamm-3.0/libgdamm/handlertype.h
-include/libgdamm-3.0/libgdamm/init.h
-include/libgdamm-3.0/libgdamm/object.h
-include/libgdamm-3.0/libgdamm/parameter.h
-include/libgdamm-3.0/libgdamm/parameterlist.h
-include/libgdamm-3.0/libgdamm/private/blob_p.h
-include/libgdamm-3.0/libgdamm/private/blobop_p.h
-include/libgdamm-3.0/libgdamm/private/client_p.h
-include/libgdamm-3.0/libgdamm/private/column_p.h
-include/libgdamm-3.0/libgdamm/private/columnindex_p.h
-include/libgdamm-3.0/libgdamm/private/command_p.h
-include/libgdamm-3.0/libgdamm/private/connection_p.h
-include/libgdamm-3.0/libgdamm/private/connectionevent_p.h
-include/libgdamm-3.0/libgdamm/private/datahandler_p.h
-include/libgdamm-3.0/libgdamm/private/datamodel_p.h
-include/libgdamm-3.0/libgdamm/private/datamodelarray_p.h
-include/libgdamm-3.0/libgdamm/private/datamodelfiltersql_p.h
-include/libgdamm-3.0/libgdamm/private/datamodelhash_p.h
-include/libgdamm-3.0/libgdamm/private/datamodelimport_p.h
-include/libgdamm-3.0/libgdamm/private/datamodelindex_p.h
-include/libgdamm-3.0/libgdamm/private/datamodeliter_p.h
-include/libgdamm-3.0/libgdamm/private/datamodelquery_p.h
-include/libgdamm-3.0/libgdamm/private/datamodelrow_p.h
-include/libgdamm-3.0/libgdamm/private/dataproxy_p.h
-include/libgdamm-3.0/libgdamm/private/datasourceinfo_p.h
-include/libgdamm-3.0/libgdamm/private/dict_p.h
-include/libgdamm-3.0/libgdamm/private/dictaggregate_p.h
-include/libgdamm-3.0/libgdamm/private/dictconstraint_p.h
-include/libgdamm-3.0/libgdamm/private/dictdatabase_p.h
-include/libgdamm-3.0/libgdamm/private/dictfield_p.h
-include/libgdamm-3.0/libgdamm/private/dictfunction_p.h
-include/libgdamm-3.0/libgdamm/private/dicttable_p.h
-include/libgdamm-3.0/libgdamm/private/dicttype_p.h
-include/libgdamm-3.0/libgdamm/private/entity_p.h
-include/libgdamm-3.0/libgdamm/private/entityfield_p.h
-include/libgdamm-3.0/libgdamm/private/handlerbin_p.h
-include/libgdamm-3.0/libgdamm/private/handlerboolean_p.h
-include/libgdamm-3.0/libgdamm/private/handlernumerical_p.h
-include/libgdamm-3.0/libgdamm/private/handlerstring_p.h
-include/libgdamm-3.0/libgdamm/private/handlertime_p.h
-include/libgdamm-3.0/libgdamm/private/handlertype_p.h
-include/libgdamm-3.0/libgdamm/private/object_p.h
-include/libgdamm-3.0/libgdamm/private/parameter_p.h
-include/libgdamm-3.0/libgdamm/private/parameterlist_p.h
-include/libgdamm-3.0/libgdamm/private/providerinfo_p.h
-include/libgdamm-3.0/libgdamm/private/query_p.h
-include/libgdamm-3.0/libgdamm/private/querycondition_p.h
-include/libgdamm-3.0/libgdamm/private/queryfield_p.h
-include/libgdamm-3.0/libgdamm/private/queryfieldagg_p.h
-include/libgdamm-3.0/libgdamm/private/queryfieldall_p.h
-include/libgdamm-3.0/libgdamm/private/queryfieldfield_p.h
-include/libgdamm-3.0/libgdamm/private/queryfieldfunc_p.h
-include/libgdamm-3.0/libgdamm/private/queryfieldvalue_p.h
-include/libgdamm-3.0/libgdamm/private/queryjoin_p.h
-include/libgdamm-3.0/libgdamm/private/queryobject_p.h
-include/libgdamm-3.0/libgdamm/private/querytarget_p.h
-include/libgdamm-3.0/libgdamm/private/referer_p.h
-include/libgdamm-3.0/libgdamm/private/renderer_p.h
-include/libgdamm-3.0/libgdamm/private/row_p.h
-include/libgdamm-3.0/libgdamm/private/serveroperation_p.h
-include/libgdamm-3.0/libgdamm/private/serverprovider_p.h
-include/libgdamm-3.0/libgdamm/private/transactionstatus_p.h
-include/libgdamm-3.0/libgdamm/private/xmlstorage_p.h
-include/libgdamm-3.0/libgdamm/providerinfo.h
-include/libgdamm-3.0/libgdamm/query.h
-include/libgdamm-3.0/libgdamm/querycondition.h
-include/libgdamm-3.0/libgdamm/queryfield.h
-include/libgdamm-3.0/libgdamm/queryfieldagg.h
-include/libgdamm-3.0/libgdamm/queryfieldall.h
-include/libgdamm-3.0/libgdamm/queryfieldfield.h
-include/libgdamm-3.0/libgdamm/queryfieldfunc.h
-include/libgdamm-3.0/libgdamm/queryfieldvalue.h
-include/libgdamm-3.0/libgdamm/queryjoin.h
-include/libgdamm-3.0/libgdamm/queryobject.h
-include/libgdamm-3.0/libgdamm/querytarget.h
-include/libgdamm-3.0/libgdamm/referer.h
-include/libgdamm-3.0/libgdamm/renderer.h
-include/libgdamm-3.0/libgdamm/row.h
-include/libgdamm-3.0/libgdamm/serveroperation.h
-include/libgdamm-3.0/libgdamm/serverprovider.h
-include/libgdamm-3.0/libgdamm/transactionstatus.h
-include/libgdamm-3.0/libgdamm/value.h
-include/libgdamm-3.0/libgdamm/wrap_init.h
-include/libgdamm-3.0/libgdamm/xmlstorage.h
-lib/libgdamm-3.0.a
-lib/libgdamm-3.0.la
-lib/libgdamm-3.0.so
-lib/libgdamm-3.0.so.10
-lib/libgdamm-3.0/include/libgdammconfig.h
-lib/libgdamm-3.0/proc/m4/convert.m4
-lib/libgdamm-3.0/proc/m4/convert_libgdamm.m4
-libdata/pkgconfig/libgdamm-3.0.pc
-@dirrm lib/libgdamm-3.0/proc/m4
-@dirrm lib/libgdamm-3.0/proc
-@dirrm lib/libgdamm-3.0/include
-@dirrm lib/libgdamm-3.0
-@dirrm include/libgdamm-3.0/libgdamm/private
-@dirrm include/libgdamm-3.0/libgdamm
-@dirrm include/libgdamm-3.0
+include/libgdamm-4.0/libgdamm.h
+include/libgdamm-4.0/libgdamm/batch.h
+include/libgdamm-4.0/libgdamm/blob.h
+include/libgdamm-4.0/libgdamm/blobop.h
+include/libgdamm-4.0/libgdamm/column.h
+include/libgdamm-4.0/libgdamm/config.h
+include/libgdamm-4.0/libgdamm/connection.h
+include/libgdamm-4.0/libgdamm/connectionevent.h
+include/libgdamm-4.0/libgdamm/dataaccesswrapper.h
+include/libgdamm-4.0/libgdamm/datacomparator.h
+include/libgdamm-4.0/libgdamm/datahandler.h
+include/libgdamm-4.0/libgdamm/datamodel.h
+include/libgdamm-4.0/libgdamm/datamodelarray.h
+include/libgdamm-4.0/libgdamm/datamodelimport.h
+include/libgdamm-4.0/libgdamm/datamodeliter.h
+include/libgdamm-4.0/libgdamm/dataproxy.h
+include/libgdamm-4.0/libgdamm/dataselect.h
+include/libgdamm-4.0/libgdamm/handlerbin.h
+include/libgdamm-4.0/libgdamm/handlerboolean.h
+include/libgdamm-4.0/libgdamm/handlernumerical.h
+include/libgdamm-4.0/libgdamm/handlerstring.h
+include/libgdamm-4.0/libgdamm/handlertime.h
+include/libgdamm-4.0/libgdamm/handlertype.h
+include/libgdamm-4.0/libgdamm/holder.h
+include/libgdamm-4.0/libgdamm/init.h
+include/libgdamm-4.0/libgdamm/metastore.h
+include/libgdamm-4.0/libgdamm/metastruct.h
+include/libgdamm-4.0/libgdamm/private/batch_p.h
+include/libgdamm-4.0/libgdamm/private/blob_p.h
+include/libgdamm-4.0/libgdamm/private/blobop_p.h
+include/libgdamm-4.0/libgdamm/private/column_p.h
+include/libgdamm-4.0/libgdamm/private/config_p.h
+include/libgdamm-4.0/libgdamm/private/connection_p.h
+include/libgdamm-4.0/libgdamm/private/connectionevent_p.h
+include/libgdamm-4.0/libgdamm/private/dataaccesswrapper_p.h
+include/libgdamm-4.0/libgdamm/private/datacomparator_p.h
+include/libgdamm-4.0/libgdamm/private/datahandler_p.h
+include/libgdamm-4.0/libgdamm/private/datamodel_p.h
+include/libgdamm-4.0/libgdamm/private/datamodelarray_p.h
+include/libgdamm-4.0/libgdamm/private/datamodelimport_p.h
+include/libgdamm-4.0/libgdamm/private/datamodeliter_p.h
+include/libgdamm-4.0/libgdamm/private/dataproxy_p.h
+include/libgdamm-4.0/libgdamm/private/dataselect_p.h
+include/libgdamm-4.0/libgdamm/private/handlerbin_p.h
+include/libgdamm-4.0/libgdamm/private/handlerboolean_p.h
+include/libgdamm-4.0/libgdamm/private/handlernumerical_p.h
+include/libgdamm-4.0/libgdamm/private/handlerstring_p.h
+include/libgdamm-4.0/libgdamm/private/handlertime_p.h
+include/libgdamm-4.0/libgdamm/private/handlertype_p.h
+include/libgdamm-4.0/libgdamm/private/holder_p.h
+include/libgdamm-4.0/libgdamm/private/metastore_p.h
+include/libgdamm-4.0/libgdamm/private/metastruct_p.h
+include/libgdamm-4.0/libgdamm/private/quarklist_p.h
+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/sqlparser_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
+include/libgdamm-4.0/libgdamm/quarklist.h
+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/sqlparser.h
+include/libgdamm-4.0/libgdamm/statement.h
+include/libgdamm-4.0/libgdamm/transactionstatus.h
+include/libgdamm-4.0/libgdamm/value.h
+include/libgdamm-4.0/libgdamm/wrap_init.h
+include/libgdamm-4.0/libgdamm/xatransaction.h
+lib/libgdamm-4.0.a
+lib/libgdamm-4.0.la
+lib/libgdamm-4.0.so
+lib/libgdamm-4.0.so.10
+lib/libgdamm-4.0/include/libgdammconfig.h
+lib/libgdamm-4.0/proc/m4/convert.m4
+lib/libgdamm-4.0/proc/m4/convert_libgdamm.m4
+libdata/pkgconfig/libgdamm-4.0.pc
+@dirrm lib/libgdamm-4.0/proc/m4
+@dirrm lib/libgdamm-4.0/proc
+@dirrm lib/libgdamm-4.0/include
+@dirrm lib/libgdamm-4.0
+@dirrm include/libgdamm-4.0/libgdamm/private
+@dirrm include/libgdamm-4.0/libgdamm
+@dirrm include/libgdamm-4.0