USE_X_PREFIX -> USE_XLIB, bump the PORTREVISION.

BTW: databases/mergeant is the only one that is untest due to BROKEN.


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@6802 df743ca5-7f9a-e211-a948-0013205c9059

53 files changed, 1851 insertions, 0 deletions

diff --git a/databases/gnome-db/Makefile b/databases/gnome-db/Makefile
new file mode 100644
index 000000000..ae2c677a9
--- /dev/null
+++ b/databases/gnome-db/Makefile
@@ -0,0 +1,35 @@
+# New ports collection makefile for:	gnomedb
+# Date created:				19th June 2001
+# Whom:					Ade Lovett <ade@FreeBSD.org>
+#
+# $FreeBSD$
+#   $MCom$
+#
+
+PORTNAME=	gnome-db
+PORTVERSION=	0.2.96
+PORTREVISION=	6
+CATEGORIES=	databases gnome
+MASTER_SITES=	${MASTER_SITE_GNOME}
+MASTER_SITE_SUBDIR=	sources/gnome-db/0.2
+DIST_SUBDIR=	gnome
+
+MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	Provide uniform access to data sources for the GNOME environment
+
+USE_BZIP2=	yes
+USE_XLIB=	yes
+USE_GNOME=	gnomehack gnomeprefix gnomehier libgda
+USE_GMAKE=	yes
+USE_GETTEXT=	yes
+INSTALLS_OMF=	yes
+GNU_CONFIGURE=	yes
+INSTALLS_SHLIB=	yes
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LIBS="${PTHREAD_LIBS} -L${LOCALBASE}/lib -lintl"
+CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
+PLIST_SUB=	VERSION=${PORTVERSION}
+
+DOCSDIR=	${PREFIX}/share/doc/gnomedb
+
+.include <bsd.port.mk>
diff --git a/databases/gnome-db/distinfo b/databases/gnome-db/distinfo
new file mode 100644
index 000000000..5e15f21fa
--- /dev/null
+++ b/databases/gnome-db/distinfo
@@ -0,0 +1,3 @@
+MD5 (gnome/gnome-db-0.2.96.tar.bz2) = 718d3761ef96f83c02d34c16627d8579
+SHA256 (gnome/gnome-db-0.2.96.tar.bz2) = cc86c0a3ae8049b1f1c3e644b0c8cd8c2a1a2ef2bd26dbd56ec595e239acbc06
+SIZE (gnome/gnome-db-0.2.96.tar.bz2) = 676247
diff --git a/databases/gnome-db/files/patch-components::Makefile.in b/databases/gnome-db/files/patch-components::Makefile.in
new file mode 100644
index 000000000..f35a82030
--- /dev/null
+++ b/databases/gnome-db/files/patch-components::Makefile.in
@@ -0,0 +1,14 @@
+
+$FreeBSD: ports/databases/gnome-db/files/patch-components::Makefile.in,v 1.1 2002/01/23 15:22:40 sobomax Exp $
+
+--- components/Makefile.in	2002/01/22 13:14:51	1.1
++++ components/Makefile.in	2002/01/22 13:15:50
+@@ -177,7 +177,7 @@
+ 
+ libdatabase_moniker_la_SOURCES =  	gnomedb-monikers-database.c 	gnomedb-monikers.h
+ 
+-libdatabase_moniker_la_LIBADD =  	$(GNOMEDB_LIBS)
++libdatabase_moniker_la_LIBADD =  	$(GNOMEDB_LIBS) -module -avoid-version
+ 
+ 
+ oafdir = $(datadir)/oaf
diff --git a/databases/gnome-db/files/patch-configure b/databases/gnome-db/files/patch-configure
new file mode 100644
index 000000000..2ac9d22ca
--- /dev/null
+++ b/databases/gnome-db/files/patch-configure
@@ -0,0 +1,22 @@
+
+$FreeBSD: ports/databases/gnome-db/files/patch-configure,v 1.9 2004/06/27 17:32:30 marcus Exp $
+
+--- configure.orig	Mon Apr 15 15:30:28 2002
++++ configure	Wed May  1 11:51:50 2002
+@@ -5905,6 +5905,7 @@
+ 
+ # This can be used to rebuild libtool when needed
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++$ac_aux_dir/ltconfig $LIBTOOL_DEPS
+ 
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+@@ -8876,7 +8877,7 @@
+ 		PERL_CC=`perl -MConfig -e 'print $Config{cc},"\n";'`
+ 		PERL_LD=`perl -MConfig -e 'print $Config{ld},"\n";'`
+ 		PERL_CCOPTS=`perl -MExtUtils::Embed -e ccopts`
+-		PERL_LDOPTS=`perl -MExtUtils::Embed -e ldopts`
++		PERL_LDOPTS=`perl -MExtUtils::Embed -e '$_ = ldopts(1); s/-lc //g; print $_ . "\n"'`
+ 		
+ 		
+ 		
diff --git a/databases/gnome-db/files/patch-doc::C::reference::Makefile.in b/databases/gnome-db/files/patch-doc::C::reference::Makefile.in
new file mode 100644
index 000000000..e9d7761d2
--- /dev/null
+++ b/databases/gnome-db/files/patch-doc::C::reference::Makefile.in
@@ -0,0 +1,14 @@
+
+$FreeBSD: ports/databases/gnome-db/files/patch-doc::C::reference::Makefile.in,v 1.1 2002/05/01 20:23:00 sobomax Exp $
+
+--- doc/C/reference/Makefile.in	2002/05/01 08:49:53	1.1
++++ doc/C/reference/Makefile.in	2002/05/01 08:50:40
+@@ -174,7 +174,7 @@
+ 
+ 
+ DOC_MAIN_SGML_FILE = libgnomedb-reference.sgml
+-DOC_DIR = $(datadir)/html
++DOC_DIR = $(prefix)/share/doc/gnomedb
+ TARGET_DIR = $(DOC_DIR)/libgnomedb-reference
+ 
+ DOC_DIR_INSTALL_FILES =  	 libgnomedb.args 	 libgnomedb.hierarchy 	 libgnomedb.signals		 libgnomedb.types 	 libgnomedb-decl.txt			 libgnomedb-sections.txt
diff --git a/databases/gnome-db/files/patch-idl::Makefile.in b/databases/gnome-db/files/patch-idl::Makefile.in
new file mode 100644
index 000000000..46e2a008e
--- /dev/null
+++ b/databases/gnome-db/files/patch-idl::Makefile.in
@@ -0,0 +1,14 @@
+
+$FreeBSD: ports/databases/gnome-db/files/patch-idl::Makefile.in,v 1.1 2001/07/26 14:13:05 sobomax Exp $
+
+--- idl/Makefile.in	2001/07/26 14:06:24	1.1
++++ idl/Makefile.in	2001/07/26 14:06:37
+@@ -153,7 +153,7 @@
+ EXTRA_DIST =  	$(IDL_FILES)
+ 
+ 
+-idldir = $(prefix)/share/idl
++idldir = $(prefix)/share/gnome/idl
+ idl_DATA = $(IDL_FILES)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../config.h
diff --git a/databases/gnome-db/pkg-descr b/databases/gnome-db/pkg-descr
new file mode 100644
index 000000000..ff86e957f
--- /dev/null
+++ b/databases/gnome-db/pkg-descr
@@ -0,0 +1,8 @@
+gnome-db can be considered as an extension of the libgda project.
+
+Its aims are the same: to provide universal data source access for
+client applications, as well as development tools and libraries
+for doing so. gnome-db; is an extension to libgda; because it adds
+support to the architecture for the GNOME project.
+
+WWW: http://www.gnome-db.org/
diff --git a/databases/gnome-db/pkg-plist b/databases/gnome-db/pkg-plist
new file mode 100644
index 000000000..b85a8396e
--- /dev/null
+++ b/databases/gnome-db/pkg-plist
@@ -0,0 +1,179 @@
+bin/gnomedb-builder
+bin/gnomedb-components
+bin/gnomedb-config
+bin/gnomedb-fe
+bin/gnomedb-mgr
+include/libgnomedb-%%VERSION%%/gnome-db/GNOME_Database_UI.h
+include/libgnomedb-%%VERSION%%/gnome-db/gnome-db-browser.h
+include/libgnomedb-%%VERSION%%/gnome-db/gnome-db-combo.h
+include/libgnomedb-%%VERSION%%/gnome-db/gnome-db-component.h
+include/libgnomedb-%%VERSION%%/gnome-db/gnome-db-config.h
+include/libgnomedb-%%VERSION%%/gnome-db/gnome-db-control-defprops.h
+include/libgnomedb-%%VERSION%%/gnome-db/gnome-db-control-widget.h
+include/libgnomedb-%%VERSION%%/gnome-db/gnome-db-control.h
+include/libgnomedb-%%VERSION%%/gnome-db/gnome-db-dataset.h
+include/libgnomedb-%%VERSION%%/gnome-db/gnome-db-designer.h
+include/libgnomedb-%%VERSION%%/gnome-db/gnome-db-dsn-config-druid.h
+include/libgnomedb-%%VERSION%%/gnome-db/gnome-db-dsn-config.h
+include/libgnomedb-%%VERSION%%/gnome-db/gnome-db-embeddable.h
+include/libgnomedb-%%VERSION%%/gnome-db/gnome-db-entry.h
+include/libgnomedb-%%VERSION%%/gnome-db/gnome-db-error-dlg.h
+include/libgnomedb-%%VERSION%%/gnome-db/gnome-db-error.h
+include/libgnomedb-%%VERSION%%/gnome-db/gnome-db-export.h
+include/libgnomedb-%%VERSION%%/gnome-db/gnome-db-grid.h
+include/libgnomedb-%%VERSION%%/gnome-db/gnome-db-icon-list.h
+include/libgnomedb-%%VERSION%%/gnome-db/gnome-db-label.h
+include/libgnomedb-%%VERSION%%/gnome-db/gnome-db-list.h
+include/libgnomedb-%%VERSION%%/gnome-db/gnome-db-log-viewer.h
+include/libgnomedb-%%VERSION%%/gnome-db/gnome-db-login-dlg.h
+include/libgnomedb-%%VERSION%%/gnome-db/gnome-db-login.h
+include/libgnomedb-%%VERSION%%/gnome-db/gnome-db-moniker.h
+include/libgnomedb-%%VERSION%%/gnome-db/gnome-db-report.h
+include/libgnomedb-%%VERSION%%/gnome-db/gnome-db-shortcut.h
+include/libgnomedb-%%VERSION%%/gnome-db/gnome-db-table-editor.h
+include/libgnomedb-%%VERSION%%/gnome-db/gnome-db-util.h
+include/libgnomedb-%%VERSION%%/gnome-db/gnome-db-window.h
+include/libgnomedb-%%VERSION%%/gnome-db/gnome-db.h
+lib/bonobo/monikers/libdatabase_moniker.a
+lib/bonobo/monikers/libdatabase_moniker.la
+lib/bonobo/monikers/libdatabase_moniker.so
+lib/libgnomedb.a
+lib/libgnomedb.la
+lib/libgnomedb.so
+lib/libgnomedb.so.0
+%%DOCSDIR%%/libgnomedb-decl.txt
+%%DOCSDIR%%/libgnomedb-sections.txt
+%%DOCSDIR%%/libgnomedb.args
+%%DOCSDIR%%/libgnomedb.hierarchy
+%%DOCSDIR%%/libgnomedb.types
+share/gnome/apps/Applications/gnomedb-fe.desktop
+share/gnome/help/gnome-db/C/comlib.html
+share/gnome/help/gnome-db/C/components.html
+share/gnome/help/gnome-db/C/fdl-appendix.sgml
+share/gnome/help/gnome-db/C/fdl-section1.html
+share/gnome/help/gnome-db/C/fdl-section10.html
+share/gnome/help/gnome-db/C/fdl-section2.html
+share/gnome/help/gnome-db/C/fdl-section3.html
+share/gnome/help/gnome-db/C/fdl-section4.html
+share/gnome/help/gnome-db/C/fdl-section5.html
+share/gnome/help/gnome-db/C/fdl-section6.html
+share/gnome/help/gnome-db/C/fdl-section7.html
+share/gnome/help/gnome-db/C/fdl-section8.html
+share/gnome/help/gnome-db/C/fdl-section9.html
+share/gnome/help/gnome-db/C/fdl-using.html
+share/gnome/help/gnome-db/C/fdl.html
+share/gnome/help/gnome-db/C/fe.html
+share/gnome/help/gnome-db/C/gnome-db.sgml
+share/gnome/help/gnome-db/C/index.html
+share/gnome/help/gnome-db/C/introduction.html
+share/gnome/help/gnome-db/C/manager-config-components.html
+share/gnome/help/gnome-db/C/manager.html
+share/gnome/help/gnome-db/C/topic.dat
+share/gnome/help/gnome-db/C/widgetlib-overview.html
+share/gnome/help/gnome-db/C/widgetlib.html
+share/gnome/help/gnome-db/es/comlib.html
+share/gnome/help/gnome-db/es/components.html
+share/gnome/help/gnome-db/es/fe.html
+share/gnome/help/gnome-db/es/gnome-db.html
+share/gnome/help/gnome-db/es/gnome-db.sgml
+share/gnome/help/gnome-db/es/index.html
+share/gnome/help/gnome-db/es/introduction.html
+share/gnome/help/gnome-db/es/manager-config-components.html
+share/gnome/help/gnome-db/es/manager.html
+share/gnome/help/gnome-db/es/topic.dat
+share/gnome/help/gnome-db/es/widgetlib-overview.html
+share/gnome/help/gnome-db/es/widgetlib.html
+share/gnome/help/gnome-db/it/comlib.html
+share/gnome/help/gnome-db/it/components.html
+share/gnome/help/gnome-db/it/fdl-appendix.sgml
+share/gnome/help/gnome-db/it/fdl-section1.html
+share/gnome/help/gnome-db/it/fdl-section10.html
+share/gnome/help/gnome-db/it/fdl-section2.html
+share/gnome/help/gnome-db/it/fdl-section3.html
+share/gnome/help/gnome-db/it/fdl-section4.html
+share/gnome/help/gnome-db/it/fdl-section5.html
+share/gnome/help/gnome-db/it/fdl-section6.html
+share/gnome/help/gnome-db/it/fdl-section7.html
+share/gnome/help/gnome-db/it/fdl-section8.html
+share/gnome/help/gnome-db/it/fdl-section9.html
+share/gnome/help/gnome-db/it/fdl-using.html
+share/gnome/help/gnome-db/it/fdl.html
+share/gnome/help/gnome-db/it/fe.html
+share/gnome/help/gnome-db/it/gnome-db.sgml
+share/gnome/help/gnome-db/it/index.html
+share/gnome/help/gnome-db/it/introduction.html
+share/gnome/help/gnome-db/it/manager-config-components.html
+share/gnome/help/gnome-db/it/manager.html
+share/gnome/help/gnome-db/it/topic.dat
+share/gnome/help/gnome-db/it/widgetlib-overview.html
+share/gnome/help/gnome-db/it/widgetlib.html
+share/gnome/help/gnome-db/pt_BR/comlib.html
+share/gnome/help/gnome-db/pt_BR/components.html
+share/gnome/help/gnome-db/pt_BR/fe.html
+share/gnome/help/gnome-db/pt_BR/gnome-db.sgml
+share/gnome/help/gnome-db/pt_BR/index.html
+share/gnome/help/gnome-db/pt_BR/introduction.html
+share/gnome/help/gnome-db/pt_BR/manager-config-components.html
+share/gnome/help/gnome-db/pt_BR/manager.html
+share/gnome/help/gnome-db/pt_BR/topic.dat
+share/gnome/help/gnome-db/pt_BR/widgetlib-overview.html
+share/gnome/help/gnome-db/pt_BR/widgetlib.html
+share/gnome/idl/GNOME_Database_UI.idl
+share/gnome/oaf/GNOME_DB_Builder.oaf
+share/gnome/oaf/GNOME_DB_ComponentFactory.oaf
+share/gnome/oaf/GNOME_DB_Connection.oaf
+share/gnome/oaf/GNOME_DB_Designer.oaf
+share/gnome/oaf/GNOME_DB_Export.oaf
+share/gnome/oaf/GNOME_DB_Log.oaf
+share/gnome/oaf/GNOME_DB_Manager.oaf
+share/gnome/oaf/GNOME_DB_Monikers.oaf
+share/gnome/omf/gnome-db/gnome-db-C.omf
+share/gnome/omf/gnome-db/gnome-db-es.omf
+share/gnome/omf/gnome-db/gnome-db-it.omf
+share/gnome/omf/gnome-db/gnome-db-pt_BR.omf
+share/gnome/pixmaps/gnome-db.png
+share/gnome/ui/gnomedb-com-connection.xml
+share/gnome/ui/gnomedb-com-designer.xml
+share/gnome/ui/gnomedb-com-log.xml
+share/gnome/ui/gnomedb-fe.xml
+share/gnome/ui/gnomedb-manager.xml
+share/locale/az/LC_MESSAGES/gnome-db.mo
+share/locale/ca/LC_MESSAGES/gnome-db.mo
+share/locale/da/LC_MESSAGES/gnome-db.mo
+share/locale/de/LC_MESSAGES/gnome-db.mo
+share/locale/el/LC_MESSAGES/gnome-db.mo
+share/locale/es/LC_MESSAGES/gnome-db.mo
+share/locale/fi/LC_MESSAGES/gnome-db.mo
+share/locale/fr/LC_MESSAGES/gnome-db.mo
+share/locale/ga/LC_MESSAGES/gnome-db.mo
+share/locale/gl/LC_MESSAGES/gnome-db.mo
+share/locale/hu/LC_MESSAGES/gnome-db.mo
+share/locale/it/LC_MESSAGES/gnome-db.mo
+share/locale/ja/LC_MESSAGES/gnome-db.mo
+share/locale/ko/LC_MESSAGES/gnome-db.mo
+share/locale/nl/LC_MESSAGES/gnome-db.mo
+share/locale/nn/LC_MESSAGES/gnome-db.mo
+share/locale/no/LC_MESSAGES/gnome-db.mo
+share/locale/pl/LC_MESSAGES/gnome-db.mo
+share/locale/pt/LC_MESSAGES/gnome-db.mo
+share/locale/pt_BR/LC_MESSAGES/gnome-db.mo
+share/locale/ru/LC_MESSAGES/gnome-db.mo
+share/locale/sk/LC_MESSAGES/gnome-db.mo
+share/locale/sl/LC_MESSAGES/gnome-db.mo
+share/locale/sv/LC_MESSAGES/gnome-db.mo
+share/locale/tr/LC_MESSAGES/gnome-db.mo
+share/locale/uk/LC_MESSAGES/gnome-db.mo
+share/locale/zh_TW/LC_MESSAGES/gnome-db.mo
+@dirrm share/gnome/omf/gnome-db
+@dirrm share/gnome/help/gnome-db/pt_BR/images
+@dirrm share/gnome/help/gnome-db/pt_BR
+@dirrm share/gnome/help/gnome-db/it/images
+@dirrm share/gnome/help/gnome-db/it
+@dirrm share/gnome/help/gnome-db/es/images
+@dirrm share/gnome/help/gnome-db/es
+@dirrm share/gnome/help/gnome-db/C/images
+@dirrm share/gnome/help/gnome-db/C
+@dirrm share/gnome/help/gnome-db
+@dirrm %%DOCSDIR%%
+@dirrm include/libgnomedb-%%VERSION%%/gnome-db
+@dirrm include/libgnomedb-%%VERSION%%
diff --git a/databases/libgda2/Makefile b/databases/libgda2/Makefile
new file mode 100644
index 000000000..a8ec91469
--- /dev/null
+++ b/databases/libgda2/Makefile
@@ -0,0 +1,192 @@
+# New ports collection makefile for:	libgda2
+# Date created:				02 June 2002
+# Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
+#
+# $FreeBSD$
+#   $MCom$
+#
+
+PORTNAME=	libgda2
+PORTVERSION=	1.2.3
+PORTREVISION?=	2
+PORTEPOCH?=	1
+CATEGORIES=	databases gnome
+MASTER_SITES=	${MASTER_SITE_GNOME}
+MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/1.2
+DISTNAME=	libgda-${PORTVERSION}
+DIST_SUBDIR=	gnome2
+
+MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	Provides uniform access to different kinds of data sources
+
+USE_BZIP2=	yes
+
+.if !defined(REFERENCE_PORT)
+
+BUILD_DEPENDS=	scrollkeeper-config:${PORTSDIR}/textproc/scrollkeeper
+LIB_DEPENDS=	popt.0:${PORTSDIR}/devel/popt
+RUN_DEPENDS=	scrollkeeper-config:${PORTSDIR}/textproc/scrollkeeper
+
+USE_GMAKE=	yes
+USE_GNOME=	gnomeprefix gnomehack glib20 libxslt referencehack
+USE_GETTEXT=	yes
+USE_XLIB=	yes
+INSTALLS_OMF=	yes
+INSTALLS_SHLIB=	yes
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--without-bdb
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LIBS="-L${LOCALBASE}/lib -lintl"
+
+MAN1=		gda-config-tool.1
+MAN5=		gda-config.5
+
+PLIST_SUB=	VERSION=${PORTVERSION:R}
+
+CONFLICTS=	libgda3-[0-9]*
+
+post-patch:
+	@${REINPLACE_CMD} -e "/^SUBDIRS =/s/testing//" \
+		${WRKSRC}/Makefile.in
+
+.include <bsd.port.pre.mk>
+
+.if exists(${LOCALBASE}/lib/mysql/libmysqlclient.so)
+WITH_MYSQL=	yes
+.endif
+
+.if exists(${LOCALBASE}/lib/libldap.so.2)
+WITH_LDAP=yes
+.endif
+
+.if exists(${LOCALBASE}/lib/libgds.so.1)
+WITH_FIREBIRD=	yes
+.endif
+
+.if exists(${LOCALBASE}/lib/libtds.so.2)
+WITH_FREETDS=	yes
+.endif
+
+.if exists(${LOCALBASE}/lib/libsybdb.so.3)
+WITH_SYBASE=	yes
+.endif
+
+.if exists(${LOCALBASE}/lib/libmdbsql.so.0)
+WITH_MDB=	yes
+.endif
+
+.if exists(${LOCALBASE}/lib/libODBC.so.1)
+WITH_ODBC=	yes
+.endif
+
+.if exists(${LOCALBASE}/lib/libsqlite3.so.8)
+WITH_SQLITE=	yes
+.endif
+
+.if !defined(WITH_MYSQL)
+PLIST_SUB+=		MYSQL:="@comment "
+CONFIGURE_ARGS+=	--without-mysql
+.else
+USE_MYSQL=		yes
+CONFIGURE_ARGS+=	--with-mysql=${LOCALBASE}
+PLIST_SUB+=		MYSQL:=""
+.endif
+
+.if !defined(WITHOUT_PGSQL) && defined(WITH_PGSQL)
+USE_PGSQL=		yes
+CONFIGURE_ARGS+=	--with-postgres=${LOCALBASE}
+PLIST_SUB+=		POSTGRES:=""
+.else
+PLIST_SUB+=		POSTGRES:="@comment "
+CONFIGURE_ARGS+=	--without-postgres
+.endif
+
+.if !defined(WITHOUT_LDAP) && defined(WITH_LDAP)
+USE_OPENLDAP=		yes
+CONFIGURE_ARGS+=	--with-ldap=${LOCALBASE}
+PLIST_SUB+=		LDAP:=""
+.else
+CONFIGURE_ARGS+=	--without-ldap
+PLIST_SUB+=		LDAP:="@comment "
+.endif
+
+.if !defined(WITHOUT_FIREBIRD) && defined(WITH_FIREBIRD)
+LIB_DEPENDS+=		gds.1:${PORTSDIR}/databases/firebird-client
+CONFIGURE_ARGS+=	--with-firebird=${LOCALBASE}
+PLIST_SUB+=		FIREBIRD:=""
+.else
+CONFIGURE_ARGS+=	--without-interbase
+PLIST_SUB+=		FIREBIRD:="@comment "
+.endif
+
+.if !defined(WITHOUT_FREETDS) && defined(WITH_FREETDS)
+LIB_DEPENDS+=		tds.2:${PORTSDIR}/databases/freetds
+CONFIGURE_ARGS+=	--with-tds=${LOCALBASE}
+PLIST_SUB+=		FREETDS:=""
+.else
+CONFIGURE_ARGS+=	--without-tds
+PLIST_SUB+=		FREETDS:="@comment "
+.endif
+
+.if !defined(WITHOUT_SYBASE) && defined(WITH_SYBASE)
+LIB_DEPENDS+=		sybdb.3:${PORTSDIR}/databases/freetds
+CONFIGURE_ARGS+=	--with-sybase=${LOCALBASE}
+PLIST_SUB+=		SYBASE:=""
+.else
+CONFIGURE_ARGS+=	--without-sybase
+PLIST_SUB+=		SYBASE:="@comment "
+.endif
+
+.if !defined(WITHOUT_MDB) && defined(WITH_MDB)
+LIB_DEPENDS+=		mdbsql.0:${PORTSDIR}/databases/mdbtools
+CONFIGURE_ARGS+=	--with-mdb=${LOCALBASE}
+PLIST_SUB+=		MDB:=""
+.else
+CONFIGURE_ARGS+=	--without-mdb
+PLIST_SUB+=		MDB:="@comment "
+.endif
+
+.if !defined(WITHOUT_ODBC) && defined(WITH_ODBC)
+LIB_DEPENDS+=		odbc.1:${PORTSDIR}/databases/unixODBC
+CONFIGURE_ARGS+=	--with-odbc=${LOCALBASE}
+PLIST_SUB+=		ODBC:=""
+.else
+CONFIGURE_ARGS+=	--without-odbc
+PLIST_SUB+=		ODBC:="@comment "
+.endif
+
+.if !defined(WITHOUT_SQLITE) && defined(WITH_SQLITE)
+LIB_DEPENDS+=		sqlite3.8:${PORTSDIR}/databases/sqlite3
+CONFIGURE_ARGS+=	--with-sqlite=${LOCALBASE}
+PLIST_SUB+=		SQLITE:=""
+.else
+CONFIGURE_ARGS+=	--without-sqlite
+PLIST_SUB+=		SQLITE:="@comment "
+.endif
+
+pre-everything::
+.if !defined(WITH_MYSQL)
+	@${ECHO_MSG} "You can enable support for MySQL databases by defining WITH_MYSQL."
+.endif
+.if !defined(WITH_LDAP)
+	@${ECHO_MSG} "You can enable support for LDAP databases by defining WITH_LDAP."
+.endif
+.if !defined(WITH_FREETDS)
+	@${ECHO_MSG} "You can enable support for TDS databases by defining WITH_FREETDS."
+.endif
+.if !defined(WITH_SYBASE)
+	@${ECHO_MSG} "You can enable support for Sybase databases by defining WITH_SYBASE."
+.endif
+.if !defined(WITH_MDB)
+	@${ECHO_MSG} "You can enable support for MDB databases by defining WITH_MDB."
+.endif
+.if !defined(WITH_ODBC)
+	@${ECHO_MSG} "You can enable support for ODBC databases by defining WITH_ODBC."
+.endif
+.if !defined(WITH_SQLITE)
+	@${ECHO_MSG} "You can enable support for SQLITE databases by defining WITH_SQLITE."
+.endif
+
+.include <bsd.port.post.mk>
+
+.endif
diff --git a/databases/libgda2/distinfo b/databases/libgda2/distinfo
new file mode 100644
index 000000000..d1cf065dc
--- /dev/null
+++ b/databases/libgda2/distinfo
@@ -0,0 +1,3 @@
+MD5 (gnome2/libgda-1.2.3.tar.bz2) = eb9c31c3102d542de728f5f55674d511
+SHA256 (gnome2/libgda-1.2.3.tar.bz2) = 17add29bb2d7b57da5874f8a28c1a0af4b6f965ad992fef25002b6c33318f303
+SIZE (gnome2/libgda-1.2.3.tar.bz2) = 1075643
diff --git a/databases/libgda2/files/patch-aa b/databases/libgda2/files/patch-aa
new file mode 100644
index 000000000..3b1f99251
--- /dev/null
+++ b/databases/libgda2/files/patch-aa
@@ -0,0 +1,10 @@
+--- Makefile.in.orig	Fri Jan 16 23:06:50 2004
++++ Makefile.in	Fri Jan 16 23:07:18 2004
+@@ -276,7 +276,6 @@
+ 	providers \
+ 	report \
+ 	tools \
+-	testing \
+ 	data \
+ 	doc
+ 
diff --git a/databases/libgda2/files/patch-configure b/databases/libgda2/files/patch-configure
new file mode 100644
index 000000000..8df5044bb
--- /dev/null
+++ b/databases/libgda2/files/patch-configure
@@ -0,0 +1,11 @@
+--- configure.orig	Tue Apr  6 14:10:07 2004
++++ configure	Tue Apr  6 14:10:19 2004
+@@ -23012,7 +23012,7 @@
+ _ACEOF
+ 
+ 		FIREBIRD_CFLAGS="-I${firebirddir}/include"
+-		FIREBIRD_LIBS="-L${firebirddir}/lib -lgds -ldl -lcrypt"
++		FIREBIRD_LIBS="-L${firebirddir}/lib -lgds -lcrypt"
+ 	fi
+ fi
+
diff --git a/databases/libgda2/files/patch-doc::libgda-C.omf.in b/databases/libgda2/files/patch-doc::libgda-C.omf.in
new file mode 100644
index 000000000..f98b540c5
--- /dev/null
+++ b/databases/libgda2/files/patch-doc::libgda-C.omf.in
@@ -0,0 +1,11 @@
+--- doc/libgda-C.omf.in.orig	Mon Feb 28 05:30:59 2005
++++ doc/libgda-C.omf.in	Thu Mar  3 14:07:24 2005
+@@ -16,7 +16,7 @@
+     </description>
+     <type>user's guide</type>
+     <format mime="text/html"/>
+-    <identifier url="file:@prefix@/share/gtk-doc/html/libgda/index.html"/>
++    <identifier url="file:@prefix@/share/doc/libgda/index.html"/>
+     <language code="C"/>
+     <relation seriesid="ebe4f574-a94d-11d6-8bc3-bd1f202a92f8"/>
+     <rights type="GNU FDL" license.version="1.1"/>
diff --git a/databases/libgda2/files/patch-doc_C_Makefile.in b/databases/libgda2/files/patch-doc_C_Makefile.in
new file mode 100644
index 000000000..ef37c3190
--- /dev/null
+++ b/databases/libgda2/files/patch-doc_C_Makefile.in
@@ -0,0 +1,11 @@
+--- doc/C/Makefile.in.orig	Thu Jul 22 10:35:19 2004
++++ doc/C/Makefile.in	Thu Jul 22 10:35:48 2004
+@@ -116,7 +116,7 @@
+ HISTORY_LIB = @HISTORY_LIB@
+ HISTORY_LIB_FALSE = @HISTORY_LIB_FALSE@
+ HISTORY_LIB_TRUE = @HISTORY_LIB_TRUE@
+-HTML_DIR = $(datadir)/gtk-doc/html
++HTML_DIR = $(prefix)/share/doc
+ IBMDB2_CFLAGS = @IBMDB2_CFLAGS@
+ IBMDB2_FALSE = @IBMDB2_FALSE@
+ IBMDB2_LIBS = @IBMDB2_LIBS@
diff --git a/databases/libgda2/files/patch-libgda.pc.in b/databases/libgda2/files/patch-libgda.pc.in
new file mode 100644
index 000000000..f9bd3aaed
--- /dev/null
+++ b/databases/libgda2/files/patch-libgda.pc.in
@@ -0,0 +1,11 @@
+--- libgda.pc.in.orig   Fri Oct 31 21:59:33 2003
++++ libgda.pc.in        Fri Oct 31 22:00:52 2003
+@@ -5,7 +5,7 @@
+  
+ Name: libgda
+ Description: GDA (GNOME Data Access) library
+-Requires: glib-2.0 libxml-2.0 libxslt
++Requires: glib-2.0 gthread-2.0 gmodule-2.0 libxml-2.0 libxslt
+ Version: @VERSION@
+ Libs: -L${libdir} -lgda-2
+ Cflags: -I${includedir}
diff --git a/databases/libgda2/files/patch-po_Makefile.in.in b/databases/libgda2/files/patch-po_Makefile.in.in
new file mode 100644
index 000000000..1e6984b6b
--- /dev/null
+++ b/databases/libgda2/files/patch-po_Makefile.in.in
@@ -0,0 +1,10 @@
+--- po/Makefile.in.in.orig	Sat Aug 14 00:43:46 2004
++++ po/Makefile.in.in	Sat Aug 14 00:45:54 2004
+@@ -35,6 +35,7 @@
+ 
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ 
+ CC = @CC@
+ GENCAT = @GENCAT@
diff --git a/databases/libgda2/files/patch-providers_mysql_gda-mysql-recordset.c b/databases/libgda2/files/patch-providers_mysql_gda-mysql-recordset.c
new file mode 100644
index 000000000..f75b3284d
--- /dev/null
+++ b/databases/libgda2/files/patch-providers_mysql_gda-mysql-recordset.c
@@ -0,0 +1,11 @@
+--- providers/mysql/gda-mysql-recordset.c.orig	Wed May 18 03:10:04 2005
++++ providers/mysql/gda-mysql-recordset.c	Tue Jun 14 23:12:25 2005
+@@ -71,7 +71,7 @@ fill_gda_value (GdaValue *gda_value, enu
+ 		if (is_unsigned) {
+ 			gda_value_set_biguint (gda_value, strtoull (value, NULL, 0));
+ 		} else {
+-			gda_value_set_bigint (gda_value, atoll (value));
++			gda_value_set_bigint (gda_value, strtoll (value, NULL, 10));
+ 		}
+ 		break;
+ 	case FIELD_TYPE_SHORT :
diff --git a/databases/libgda2/files/patch-providers_postgres_utils.c b/databases/libgda2/files/patch-providers_postgres_utils.c
new file mode 100644
index 000000000..29fe99b98
--- /dev/null
+++ b/databases/libgda2/files/patch-providers_postgres_utils.c
@@ -0,0 +1,11 @@
+--- providers/postgres/utils.c.orig	Mon Feb 17 21:43:51 2003
++++ providers/postgres/utils.c	Mon Feb 17 21:44:12 2003
+@@ -156,7 +156,7 @@
+ 		gda_value_set_string (value, thevalue);
+ 		break;
+ 	case GDA_VALUE_TYPE_BIGINT :
+-		gda_value_set_bigint (value, atoll (thevalue));
++		gda_value_set_bigint (value, strtoll(thevalue, &thevalue, 10));
+ 		break;
+ 	case GDA_VALUE_TYPE_INTEGER :
+ 		gda_value_set_integer (value, atol (thevalue));
diff --git a/databases/libgda2/files/patch-tools_gda-config-tool.c b/databases/libgda2/files/patch-tools_gda-config-tool.c
new file mode 100644
index 000000000..226aeeee7
--- /dev/null
+++ b/databases/libgda2/files/patch-tools_gda-config-tool.c
@@ -0,0 +1,11 @@
+--- tools/gda-config-tool.c.orig	Fri Jul 26 16:19:17 2002
++++ tools/gda-config-tool.c	Fri Jul 26 16:18:47 2002
+@@ -1136,7 +1136,7 @@
+ static char **
+ completion_func (const gchar *text, int start, int end)
+ {
+-	return ((start == 0) ? rl_completion_matches (text, cmd_generator) :
++	return ((start == 0) ? completion_matches (text, cmd_generator) :
+ 				NULL);
+ }
+ 
diff --git a/databases/libgda2/pkg-descr b/databases/libgda2/pkg-descr
new file mode 100644
index 000000000..12eb57b5e
--- /dev/null
+++ b/databases/libgda2/pkg-descr
@@ -0,0 +1,19 @@
+GNU Data Access (GDA) is an attempt to provide uniform access to 
+different kinds of data sources (databases, information servers,
+mail spools, etc).
+
+It is a complete architecture that provides all you need to access
+your data, defined by a set of CORBA interfaces as generic as possible
+(but very powerful at the same time) so that any kind of data source
+can be accessed through them.
+
+libgda is an interface to the GDA architecture, providing a nice
+wrapper around the CORBA interfaces, for both the client and the server
+parts. It also provides a bunch of tools to help you both in the
+development and management of your data sources, all done through
+the GDA model's set of CORBA interfaces.
+
+libgda was part of the GNOME-DB project, but has been separated from it
+to allow non-GNOME applications to be developed based on it.
+
+WWW: http://www.gnome-db.org/
diff --git a/databases/libgda2/pkg-plist b/databases/libgda2/pkg-plist
new file mode 100644
index 000000000..11899b4e4
--- /dev/null
+++ b/databases/libgda2/pkg-plist
@@ -0,0 +1,165 @@
+bin/gda-config-tool
+bin/gda-report-test
+bin/gda-run
+etc/libgda/config
+include/libgda-%%VERSION%%/libgda-report/gda-report-document.h
+include/libgda-%%VERSION%%/libgda-report/gda-report-item-detail.h
+include/libgda-%%VERSION%%/libgda-report/gda-report-item-label.h
+include/libgda-%%VERSION%%/libgda-report/gda-report-item-pagefooter.h
+include/libgda-%%VERSION%%/libgda-report/gda-report-item-pageheader.h
+include/libgda-%%VERSION%%/libgda-report/gda-report-item-repfield.h
+include/libgda-%%VERSION%%/libgda-report/gda-report-item-report.h
+include/libgda-%%VERSION%%/libgda-report/gda-report-item-reportfooter.h
+include/libgda-%%VERSION%%/libgda-report/gda-report-item-reportheader.h
+include/libgda-%%VERSION%%/libgda-report/gda-report-item-sqlquery.h
+include/libgda-%%VERSION%%/libgda-report/gda-report-item.h
+include/libgda-%%VERSION%%/libgda-report/gda-report-result.h
+include/libgda-%%VERSION%%/libgda-report/gda-report-types.h
+include/libgda-%%VERSION%%/libgda-report/gda-report-valid.h
+include/libgda-%%VERSION%%/libgda-report/gda-report.h
+include/libgda-%%VERSION%%/libgda/gda-blob.h
+include/libgda-%%VERSION%%/libgda/gda-client.h
+include/libgda-%%VERSION%%/libgda/gda-command.h
+include/libgda-%%VERSION%%/libgda/gda-config.h
+include/libgda-%%VERSION%%/libgda/gda-connection.h
+include/libgda-%%VERSION%%/libgda/gda-data-model-array.h
+include/libgda-%%VERSION%%/libgda/gda-data-model-hash.h
+include/libgda-%%VERSION%%/libgda/gda-data-model-list.h
+include/libgda-%%VERSION%%/libgda/gda-data-model.h
+include/libgda-%%VERSION%%/libgda/gda-enum-types.h
+include/libgda-%%VERSION%%/libgda/gda-error.h
+include/libgda-%%VERSION%%/libgda/gda-field.h
+include/libgda-%%VERSION%%/libgda/gda-log.h
+include/libgda-%%VERSION%%/libgda/gda-marshal.h
+include/libgda-%%VERSION%%/libgda/gda-parameter.h
+include/libgda-%%VERSION%%/libgda/gda-quark-list.h
+include/libgda-%%VERSION%%/libgda/gda-row.h
+include/libgda-%%VERSION%%/libgda/gda-select.h
+include/libgda-%%VERSION%%/libgda/gda-server-provider.h
+include/libgda-%%VERSION%%/libgda/gda-table.h
+include/libgda-%%VERSION%%/libgda/gda-transaction.h
+include/libgda-%%VERSION%%/libgda/gda-util.h
+include/libgda-%%VERSION%%/libgda/gda-value.h
+include/libgda-%%VERSION%%/libgda/gda-xml-connection.h
+include/libgda-%%VERSION%%/libgda/gda-xml-database.h
+include/libgda-%%VERSION%%/libgda/gda-xml-document.h
+include/libgda-%%VERSION%%/libgda/gda-xql-atom.h
+include/libgda-%%VERSION%%/libgda/gda-xql-bin.h
+include/libgda-%%VERSION%%/libgda/gda-xql-column.h
+include/libgda-%%VERSION%%/libgda/gda-xql-const.h
+include/libgda-%%VERSION%%/libgda/gda-xql-delete.h
+include/libgda-%%VERSION%%/libgda/gda-xql-dml.h
+include/libgda-%%VERSION%%/libgda/gda-xql-dual.h
+include/libgda-%%VERSION%%/libgda/gda-xql-field.h
+include/libgda-%%VERSION%%/libgda/gda-xql-func.h
+include/libgda-%%VERSION%%/libgda/gda-xql-insert.h
+include/libgda-%%VERSION%%/libgda/gda-xql-item.h
+include/libgda-%%VERSION%%/libgda/gda-xql-join.h
+include/libgda-%%VERSION%%/libgda/gda-xql-list.h
+include/libgda-%%VERSION%%/libgda/gda-xql-query.h
+include/libgda-%%VERSION%%/libgda/gda-xql-select.h
+include/libgda-%%VERSION%%/libgda/gda-xql-stack.h
+include/libgda-%%VERSION%%/libgda/gda-xql-target.h
+include/libgda-%%VERSION%%/libgda/gda-xql-update.h
+include/libgda-%%VERSION%%/libgda/gda-xql-utils.h
+include/libgda-%%VERSION%%/libgda/gda-xql-value.h
+include/libgda-%%VERSION%%/libgda/gda-xql-valueref.h
+include/libgda-%%VERSION%%/libgda/libgda.h
+include/libgda-%%VERSION%%/sql/sql_parser.h
+lib/libgda-2.a
+lib/libgda-2.la
+lib/libgda-2.so
+lib/libgda-2.so.3
+lib/libgda-report-2.a
+lib/libgda-report-2.la
+lib/libgda-report-2.so
+lib/libgda-report-2.so.3
+lib/libgdasql.a
+lib/libgdasql.la
+lib/libgdasql.so
+lib/libgdasql.so.3
+%%FIREBIRD:%%lib/libgda/providers/libgda-firebird.a
+%%FIREBIRD:%%lib/libgda/providers/libgda-firebird.la
+%%FIREBIRD:%%lib/libgda/providers/libgda-firebird.so
+%%FREETDS:%%lib/libgda/providers/libgda-freetds.a
+%%FREETDS:%%lib/libgda/providers/libgda-freetds.la
+%%FREETDS:%%lib/libgda/providers/libgda-freetds.so
+%%LDAP:%%lib/libgda/providers/libgda-ldap.a
+%%LDAP:%%lib/libgda/providers/libgda-ldap.la
+%%LDAP:%%lib/libgda/providers/libgda-ldap.so
+%%MDB:%%lib/libgda/providers/libgda-mdb.a
+%%MDB:%%lib/libgda/providers/libgda-mdb.la
+%%MDB:%%lib/libgda/providers/libgda-mdb.so
+%%MYSQL:%%lib/libgda/providers/libgda-mysql.a
+%%MYSQL:%%lib/libgda/providers/libgda-mysql.la
+%%MYSQL:%%lib/libgda/providers/libgda-mysql.so
+%%ODBC:%%lib/libgda/providers/libgda-odbc.a
+%%ODBC:%%lib/libgda/providers/libgda-odbc.la
+%%ODBC:%%lib/libgda/providers/libgda-odbc.so
+%%POSTGRES:%%lib/libgda/providers/libgda-postgres.a
+%%POSTGRES:%%lib/libgda/providers/libgda-postgres.la
+%%POSTGRES:%%lib/libgda/providers/libgda-postgres.so
+%%SYBASE:%%lib/libgda/providers/libgda-sybase.a
+%%SYBASE:%%lib/libgda/providers/libgda-sybase.la
+%%SYBASE:%%lib/libgda/providers/libgda-sybase.so
+%%SQLITE:%%lib/libgda/providers/libgda-sqlite.a
+%%SQLITE:%%lib/libgda/providers/libgda-sqlite.la
+%%SQLITE:%%lib/libgda/providers/libgda-sqlite.so
+lib/libgda/providers/libgda-xml.a
+lib/libgda/providers/libgda-xml.la
+lib/libgda/providers/libgda-xml.so
+libdata/pkgconfig/libgda.pc
+share/gnome/libgda/xml/gda-report.dtd
+share/gnome/libgda/xml/gda-report-result.dtd
+share/gnome/libgda/xml/gda-xml-query.dtd
+share/gnome/libgda/xml/gda-xml-query.xsl
+share/gnome/omf/libgda/libgda-C.omf
+share/locale/az/LC_MESSAGES/libgda-2.mo
+share/locale/ca/LC_MESSAGES/libgda-2.mo
+share/locale/cs/LC_MESSAGES/libgda-2.mo
+share/locale/da/LC_MESSAGES/libgda-2.mo
+share/locale/de/LC_MESSAGES/libgda-2.mo
+share/locale/el/LC_MESSAGES/libgda-2.mo
+share/locale/en_CA/LC_MESSAGES/libgda-2.mo
+share/locale/en_GB/LC_MESSAGES/libgda-2.mo
+share/locale/es/LC_MESSAGES/libgda-2.mo
+share/locale/fa/LC_MESSAGES/libgda-2.mo
+share/locale/fi/LC_MESSAGES/libgda-2.mo
+share/locale/fr/LC_MESSAGES/libgda-2.mo
+share/locale/ga/LC_MESSAGES/libgda-2.mo
+share/locale/gl/LC_MESSAGES/libgda-2.mo
+share/locale/hr/LC_MESSAGES/libgda-2.mo
+share/locale/hu/LC_MESSAGES/libgda-2.mo
+share/locale/it/LC_MESSAGES/libgda-2.mo
+share/locale/ja/LC_MESSAGES/libgda-2.mo
+share/locale/ko/LC_MESSAGES/libgda-2.mo
+share/locale/ml/LC_MESSAGES/libgda-2.mo
+share/locale/ms/LC_MESSAGES/libgda-2.mo
+share/locale/nb/LC_MESSAGES/libgda-2.mo
+share/locale/nl/LC_MESSAGES/libgda-2.mo
+share/locale/no/LC_MESSAGES/libgda-2.mo
+share/locale/pl/LC_MESSAGES/libgda-2.mo
+share/locale/pt/LC_MESSAGES/libgda-2.mo
+share/locale/pt_BR/LC_MESSAGES/libgda-2.mo
+share/locale/ru/LC_MESSAGES/libgda-2.mo
+share/locale/sk/LC_MESSAGES/libgda-2.mo
+share/locale/sl/LC_MESSAGES/libgda-2.mo
+share/locale/sq/LC_MESSAGES/libgda-2.mo
+share/locale/sr/LC_MESSAGES/libgda-2.mo
+share/locale/sr@Latn/LC_MESSAGES/libgda-2.mo
+share/locale/sv/LC_MESSAGES/libgda-2.mo
+share/locale/tr/LC_MESSAGES/libgda-2.mo
+share/locale/uk/LC_MESSAGES/libgda-2.mo
+share/locale/vi/LC_MESSAGES/libgda-2.mo
+share/locale/zh_CN/LC_MESSAGES/libgda-2.mo
+share/locale/zh_TW/LC_MESSAGES/libgda-2.mo
+@dirrm share/gnome/omf/libgda
+@dirrm share/gnome/libgda/xml
+@dirrm share/gnome/libgda
+@dirrm lib/libgda/providers
+@dirrm lib/libgda
+@dirrm include/libgda-%%VERSION%%/sql
+@dirrm include/libgda-%%VERSION%%/libgda-report
+@dirrm include/libgda-%%VERSION%%/libgda
+@dirrm include/libgda-%%VERSION%%
+@dirrm etc/libgda
diff --git a/databases/libgda3/Makefile b/databases/libgda3/Makefile
new file mode 100644
index 000000000..ed5ff63a9
--- /dev/null
+++ b/databases/libgda3/Makefile
@@ -0,0 +1,188 @@
+# New ports collection makefile for:	libgda2
+# Date created:				02 June 2002
+# Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
+#
+# $FreeBSD$
+#   $MCom$
+#
+
+PORTNAME=	libgda3
+PORTVERSION=	1.9.102
+PORTREVISION?=	2
+CATEGORIES=	databases gnome
+MASTER_SITES=	${MASTER_SITE_GNOME}
+MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/3$//}/${PORTVERSION:R}
+DISTNAME=	libgda-${PORTVERSION}
+DIST_SUBDIR=	gnome2
+
+MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	Provides uniform access to different kinds of data sources
+
+USE_BZIP2=	yes
+
+.if !defined(REFERENCE_PORT)
+
+LIB_DEPENDS=	popt.0:${PORTSDIR}/devel/popt
+
+USE_GETTEXT=	yes
+USE_XLIB=	yes
+USE_GMAKE=	yes
+USE_GNOME=	gnomeprefix gnomehack glib20 libxslt intlhack referencehack
+INSTALLS_SHLIB=	yes
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--without-bdb
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LIBS="-L${LOCALBASE}/lib -lintl"
+
+MAN1=		gda-config-tool.1
+MAN5=		gda-config.5
+
+PLIST_SUB=	VERSION=${PORTVERSION:R}
+
+CONFLICTS=	libgda2-[0-9]*
+
+post-patch:
+	@${REINPLACE_CMD} -e "/^SUBDIRS =/s/testing//" \
+		${WRKSRC}/Makefile.in
+
+.include <bsd.port.pre.mk>
+
+.if exists(${LOCALBASE}/lib/mysql/libmysqlclient.so)
+WITH_MYSQL=	yes
+.endif
+
+.if exists(${LOCALBASE}/lib/libldap.so.2)
+WITH_LDAP=yes
+.endif
+
+.if exists(${LOCALBASE}/lib/libgds.so.1)
+WITH_FIREBIRD=	yes
+.endif
+
+.if exists(${LOCALBASE}/lib/libtds.so.2)
+WITH_FREETDS=	yes
+.endif
+
+.if exists(${LOCALBASE}/lib/libsybdb.so.3)
+WITH_SYBASE=	yes
+.endif
+
+.if exists(${LOCALBASE}/lib/libmdbsql.so.0)
+WITH_MDB=	yes
+.endif
+
+.if exists(${LOCALBASE}/lib/libODBC.so.1)
+WITH_ODBC=	yes
+.endif
+
+.if exists(${LOCALBASE}/lib/libsqlite.so.2)
+WITH_SQLITE=	yes
+.endif
+
+.if !defined(WITH_MYSQL)
+PLIST_SUB+=		MYSQL:="@comment "
+CONFIGURE_ARGS+=	--without-mysql
+.else
+USE_MYSQL=		yes
+CONFIGURE_ARGS+=	--with-mysql=${LOCALBASE}
+PLIST_SUB+=		MYSQL:=""
+.endif
+
+.if !defined(WITHOUT_PGSQL) && defined(WITH_PGSQL)
+USE_PGSQL=		yes
+CONFIGURE_ARGS+=	--with-postgres=${LOCALBASE}
+PLIST_SUB+=		POSTGRES:=""
+.else
+PLIST_SUB+=		POSTGRES:="@comment "
+CONFIGURE_ARGS+=	--without-postgres
+.endif
+
+.if !defined(WITHOUT_LDAP) && defined(WITH_LDAP)
+USE_OPENLDAP=		yes
+CONFIGURE_ARGS+=	--with-ldap=${LOCALBASE}
+PLIST_SUB+=		LDAP:=""
+.else
+CONFIGURE_ARGS+=	--without-ldap
+PLIST_SUB+=		LDAP:="@comment "
+.endif
+
+.if !defined(WITHOUT_FIREBIRD) && defined(WITH_FIREBIRD)
+LIB_DEPENDS+=		gds.1:${PORTSDIR}/databases/firebird-client
+CONFIGURE_ARGS+=	--with-firebird=${LOCALBASE}
+PLIST_SUB+=		FIREBIRD:=""
+.else
+CONFIGURE_ARGS+=	--without-interbase
+PLIST_SUB+=		FIREBIRD:="@comment "
+.endif
+
+.if !defined(WITHOUT_FREETDS) && defined(WITH_FREETDS)
+LIB_DEPENDS+=		tds.2:${PORTSDIR}/databases/freetds
+CONFIGURE_ARGS+=	--with-tds=${LOCALBASE}
+PLIST_SUB+=		FREETDS:=""
+.else
+CONFIGURE_ARGS+=	--without-tds
+PLIST_SUB+=		FREETDS:="@comment "
+.endif
+
+.if !defined(WITHOUT_SYBASE) && defined(WITH_SYBASE)
+LIB_DEPENDS+=		sybdb.3:${PORTSDIR}/databases/freetds
+CONFIGURE_ARGS+=	--with-sybase=${LOCALBASE}
+PLIST_SUB+=		SYBASE:=""
+.else
+CONFIGURE_ARGS+=	--without-sybase
+PLIST_SUB+=		SYBASE:="@comment "
+.endif
+
+.if !defined(WITHOUT_MDB) && defined(WITH_MDB)
+LIB_DEPENDS+=		mdbsql.0:${PORTSDIR}/databases/mdbtools
+CONFIGURE_ARGS+=	--with-mdb=${LOCALBASE}
+PLIST_SUB+=		MDB:=""
+.else
+CONFIGURE_ARGS+=	--without-mdb
+PLIST_SUB+=		MDB:="@comment "
+.endif
+
+.if !defined(WITHOUT_ODBC) && defined(WITH_ODBC)
+LIB_DEPENDS+=		odbc.1:${PORTSDIR}/databases/unixODBC
+CONFIGURE_ARGS+=	--with-odbc=${LOCALBASE}
+PLIST_SUB+=		ODBC:=""
+.else
+CONFIGURE_ARGS+=	--without-odbc
+PLIST_SUB+=		ODBC:="@comment "
+.endif
+
+.if !defined(WITHOUT_SQLITE) && defined(WITH_SQLITE)
+LIB_DEPENDS+=		sqlite.2:${PORTSDIR}/databases/sqlite2
+CONFIGURE_ARGS+=	--with-sqlite=${LOCALBASE}
+PLIST_SUB+=		SQLITE:=""
+.else
+CONFIGURE_ARGS+=	--without-sqlite
+PLIST_SUB+=		SQLITE:="@comment "
+.endif
+
+pre-everything::
+.if !defined(WITH_MYSQL)
+	@${ECHO_MSG} "You can enable support for MySQL databases by defining WITH_MYSQL."
+.endif
+.if !defined(WITH_LDAP)
+	@${ECHO_MSG} "You can enable support for LDAP databases by defining WITH_LDAP."
+.endif
+.if !defined(WITH_FREETDS)
+	@${ECHO_MSG} "You can enable support for TDS databases by defining WITH_FREETDS."
+.endif
+.if !defined(WITH_SYBASE)
+	@${ECHO_MSG} "You can enable support for Sybase databases by defining WITH_SYBASE."
+.endif
+.if !defined(WITH_MDB)
+	@${ECHO_MSG} "You can enable support for MDB databases by defining WITH_MDB."
+.endif
+.if !defined(WITH_ODBC)
+	@${ECHO_MSG} "You can enable support for ODBC databases by defining WITH_ODBC."
+.endif
+.if !defined(WITH_SQLITE)
+	@${ECHO_MSG} "You can enable support for SQLITE databases by defining WITH_SQLITE."
+.endif
+
+.include <bsd.port.post.mk>
+
+.endif
diff --git a/databases/libgda3/distinfo b/databases/libgda3/distinfo
new file mode 100644
index 000000000..cc6c915ac
--- /dev/null
+++ b/databases/libgda3/distinfo
@@ -0,0 +1,3 @@
+MD5 (gnome2/libgda-1.9.102.tar.bz2) = 5a97f6a00fe1cbd369be14b70dbee261
+SHA256 (gnome2/libgda-1.9.102.tar.bz2) = 6c01444976afe7b37e9b146ea9311c1da7cc8965d2aa4182e7f452843ecaa702
+SIZE (gnome2/libgda-1.9.102.tar.bz2) = 1935950
diff --git a/databases/libgda3/files/patch-aa b/databases/libgda3/files/patch-aa
new file mode 100644
index 000000000..283a9d659
--- /dev/null
+++ b/databases/libgda3/files/patch-aa
@@ -0,0 +1,10 @@
+--- Makefile.in.orig	Thu Oct 13 15:37:21 2005
++++ Makefile.in	Thu Oct 13 15:37:38 2005
+@@ -345,7 +345,6 @@
+ 	report \
+ 	tools \
+ 	gda-sharp \
+-	testing \
+ 	data \
+ 	doc
+ 
diff --git a/databases/libgda3/files/patch-configure b/databases/libgda3/files/patch-configure
new file mode 100644
index 000000000..8df5044bb
--- /dev/null
+++ b/databases/libgda3/files/patch-configure
@@ -0,0 +1,11 @@
+--- configure.orig	Tue Apr  6 14:10:07 2004
++++ configure	Tue Apr  6 14:10:19 2004
+@@ -23012,7 +23012,7 @@
+ _ACEOF
+ 
+ 		FIREBIRD_CFLAGS="-I${firebirddir}/include"
+-		FIREBIRD_LIBS="-L${firebirddir}/lib -lgds -ldl -lcrypt"
++		FIREBIRD_LIBS="-L${firebirddir}/lib -lgds -lcrypt"
+ 	fi
+ fi
+
diff --git a/databases/libgda3/files/patch-doc_C_Makefile.in b/databases/libgda3/files/patch-doc_C_Makefile.in
new file mode 100644
index 000000000..ef37c3190
--- /dev/null
+++ b/databases/libgda3/files/patch-doc_C_Makefile.in
@@ -0,0 +1,11 @@
+--- doc/C/Makefile.in.orig	Thu Jul 22 10:35:19 2004
++++ doc/C/Makefile.in	Thu Jul 22 10:35:48 2004
+@@ -116,7 +116,7 @@
+ HISTORY_LIB = @HISTORY_LIB@
+ HISTORY_LIB_FALSE = @HISTORY_LIB_FALSE@
+ HISTORY_LIB_TRUE = @HISTORY_LIB_TRUE@
+-HTML_DIR = $(datadir)/gtk-doc/html
++HTML_DIR = $(prefix)/share/doc
+ IBMDB2_CFLAGS = @IBMDB2_CFLAGS@
+ IBMDB2_FALSE = @IBMDB2_FALSE@
+ IBMDB2_LIBS = @IBMDB2_LIBS@
diff --git a/databases/libgda3/files/patch-libgda-2.0.pc.in b/databases/libgda3/files/patch-libgda-2.0.pc.in
new file mode 100644
index 000000000..4e4c40569
--- /dev/null
+++ b/databases/libgda3/files/patch-libgda-2.0.pc.in
@@ -0,0 +1,11 @@
+--- libgda-2.0.pc.in.orig   Fri Oct 31 21:59:33 2003
++++ libgda-2.0.pc.in        Fri Oct 31 22:00:52 2003
+@@ -5,7 +5,7 @@
+  
+ Name: libgda
+ Description: GDA (GNOME Data Access) library
+-Requires: glib-2.0 libxml-2.0 libxslt
++Requires: glib-2.0 gthread-2.0 gmodule-2.0 libxml-2.0 libxslt
+ Version: @VERSION@
+ Libs: -L${libdir} -lgda-2
+ Cflags: -I${includedir}
diff --git a/databases/libgda3/files/patch-libgda__gda-value.c b/databases/libgda3/files/patch-libgda__gda-value.c
new file mode 100644
index 000000000..5a57ca4c4
--- /dev/null
+++ b/databases/libgda3/files/patch-libgda__gda-value.c
@@ -0,0 +1,12 @@
+--- libgda/gda-value.c.orig	Fri Mar 17 11:08:32 2006
++++ libgda/gda-value.c	Fri Mar 24 22:31:12 2006
+@@ -1281,8 +1281,8 @@ gda_value_is_null (GdaValue *value)
+ gboolean
+ gda_value_is_number (GdaValue *value)
+ {
+-	g_return_val_if_fail (value && G_IS_VALUE(value), FALSE);
+ 	GdaValueType type;
++	g_return_val_if_fail (value && G_IS_VALUE(value), FALSE);
+ 	
+ 	type = GDA_VALUE_TYPE(value);
+ 	switch (type) {
diff --git a/databases/libgda3/files/patch-libgda_gda-query-target.c b/databases/libgda3/files/patch-libgda_gda-query-target.c
new file mode 100644
index 000000000..fbdcaf721
--- /dev/null
+++ b/databases/libgda3/files/patch-libgda_gda-query-target.c
@@ -0,0 +1,12 @@
+--- libgda/gda-query-target.c~	Mon Jan 23 00:18:37 2006
++++ libgda/gda-query-target.c	Sun Mar 26 10:03:52 2006
+@@ -732,8 +732,8 @@
+ 	g_free (str);
+ 	
+ 	if (target->priv->entity_ref) {
+-		str = NULL;
+ 		GdaObject *base = gda_object_ref_get_ref_object (target->priv->entity_ref);
++		str = NULL;
+ 
+ 		if (base) {
+ 			str = gda_xml_storage_get_xml_id (GDA_XML_STORAGE (base));
diff --git a/databases/libgda3/files/patch-libgda_handlers_gda-handler-numerical.c b/databases/libgda3/files/patch-libgda_handlers_gda-handler-numerical.c
new file mode 100644
index 000000000..de8c67a2e
--- /dev/null
+++ b/databases/libgda3/files/patch-libgda_handlers_gda-handler-numerical.c
@@ -0,0 +1,11 @@
+--- libgda/handlers/gda-handler-numerical.c~	Mon Jan 23 02:57:38 2006
++++ libgda/handlers/gda-handler-numerical.c	Sun Mar 26 10:18:42 2006
+@@ -231,7 +231,7 @@
+ 
+ 	switch (type) {
+ 	case GDA_VALUE_TYPE_BIGINT:
+-		value = gda_value_new_bigint (atoll (str));
++		value = gda_value_new_bigint (strtoll (str, (char **)NULL, 10));
+ 		break;
+ 	case GDA_VALUE_TYPE_DOUBLE:
+ 		value = gda_value_new_double (atof (str));
diff --git a/databases/libgda3/files/patch-po_Makefile.in.in b/databases/libgda3/files/patch-po_Makefile.in.in
new file mode 100644
index 000000000..1e6984b6b
--- /dev/null
+++ b/databases/libgda3/files/patch-po_Makefile.in.in
@@ -0,0 +1,10 @@
+--- po/Makefile.in.in.orig	Sat Aug 14 00:43:46 2004
++++ po/Makefile.in.in	Sat Aug 14 00:45:54 2004
+@@ -35,6 +35,7 @@
+ 
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ 
+ CC = @CC@
+ GENCAT = @GENCAT@
diff --git a/databases/libgda3/files/patch-providers__mysql__gda-mysql-recordset.c b/databases/libgda3/files/patch-providers__mysql__gda-mysql-recordset.c
new file mode 100644
index 000000000..58b766996
--- /dev/null
+++ b/databases/libgda3/files/patch-providers__mysql__gda-mysql-recordset.c
@@ -0,0 +1,28 @@
+--- providers/mysql/gda-mysql-recordset.c.orig	Thu Mar  2 22:28:54 2006
++++ providers/mysql/gda-mysql-recordset.c	Sun Mar 26 10:20:02 2006
+@@ -141,7 +141,7 @@
+ 		if (is_unsigned) {
+ 			gda_value_set_biguint (gda_value, strtoull (value, NULL, 0));
+ 		} else {
+-			gda_value_set_bigint (gda_value, atoll (value));
++			gda_value_set_bigint (gda_value, strtoll (value, (char **)NULL, 0));
+ 		}
+ 		break;
+ 	case FIELD_TYPE_SHORT :
+@@ -584,6 +584,7 @@
+ 	     colnum != gda_data_model_get_n_columns (GDA_DATA_MODEL(model));
+ 	     colnum++)
+ 	{
++		gchar *curval;
+ 		attrs = gda_data_model_describe_column (GDA_DATA_MODEL(model), colnum);
+ 
+ 		mysql_field = mysql_fetch_field_direct (priv_data->mysql_res, colnum);
+@@ -592,7 +593,7 @@
+ 		else
+ 			column_name = gda_data_model_get_column_title (GDA_DATA_MODEL (model), colnum);
+ 
+-		gchar *curval = gda_mysql_provider_value_to_sql_string (
++		curval = gda_mysql_provider_value_to_sql_string (
+ 				NULL, 	 
+ 				priv_data->cnc, 	 
+ 				gda_row_get_value ((GdaRow *) row, colnum) 	 
diff --git a/databases/libgda3/files/patch-providers_ibmdb2_gda-ibmdb2-types.c b/databases/libgda3/files/patch-providers_ibmdb2_gda-ibmdb2-types.c
new file mode 100644
index 000000000..f51f91d03
--- /dev/null
+++ b/databases/libgda3/files/patch-providers_ibmdb2_gda-ibmdb2-types.c
@@ -0,0 +1,11 @@
+--- providers/ibmdb2/gda-ibmdb2-types.c~	Thu Jan 12 07:10:33 2006
++++ providers/ibmdb2/gda-ibmdb2-types.c	Sun Mar 26 10:19:26 2006
+@@ -115,7 +115,7 @@
+ 				gda_value_set_integer (value, *((gint*)field->column_data));
+ 				break;
+ 			case SQL_BIGINT:
+-				gda_value_set_bigint (value, (gint64)atoll(field->column_data));
++				gda_value_set_bigint (value, (gint64)strtoll(field->column_data, (char **)NULL, 10));
+ 				break;
+ 			case SQL_REAL:
+ 				gda_value_set_single (value, *((gfloat*)field->column_data));
diff --git a/databases/libgda3/files/patch-providers_oracle_utils.c b/databases/libgda3/files/patch-providers_oracle_utils.c
new file mode 100644
index 000000000..46b894ce4
--- /dev/null
+++ b/databases/libgda3/files/patch-providers_oracle_utils.c
@@ -0,0 +1,11 @@
+--- providers/oracle/utils.c~	Wed Mar 15 07:25:51 2006
++++ providers/oracle/utils.c	Sun Mar 26 10:20:18 2006
+@@ -415,7 +415,7 @@
+ 		g_free (string_buffer);
+ 		break;
+ 	case GDA_VALUE_TYPE_BIGINT:
+-		gda_value_set_bigint (value, atoll (ora_value->value));
++		gda_value_set_bigint (value, strtoll (ora_value->value, (char **)NULL, 10));
+ 		break;
+ 	case GDA_VALUE_TYPE_INTEGER:
+ 		gda_value_set_integer (value, atol (ora_value->value));
diff --git a/databases/libgda3/files/patch-providers_postgres_utils.c b/databases/libgda3/files/patch-providers_postgres_utils.c
new file mode 100644
index 000000000..29fe99b98
--- /dev/null
+++ b/databases/libgda3/files/patch-providers_postgres_utils.c
@@ -0,0 +1,11 @@
+--- providers/postgres/utils.c.orig	Mon Feb 17 21:43:51 2003
++++ providers/postgres/utils.c	Mon Feb 17 21:44:12 2003
+@@ -156,7 +156,7 @@
+ 		gda_value_set_string (value, thevalue);
+ 		break;
+ 	case GDA_VALUE_TYPE_BIGINT :
+-		gda_value_set_bigint (value, atoll (thevalue));
++		gda_value_set_bigint (value, strtoll(thevalue, &thevalue, 10));
+ 		break;
+ 	case GDA_VALUE_TYPE_INTEGER :
+ 		gda_value_set_integer (value, atol (thevalue));
diff --git a/databases/libgda3/files/patch-tools_gda-config-tool.c b/databases/libgda3/files/patch-tools_gda-config-tool.c
new file mode 100644
index 000000000..226aeeee7
--- /dev/null
+++ b/databases/libgda3/files/patch-tools_gda-config-tool.c
@@ -0,0 +1,11 @@
+--- tools/gda-config-tool.c.orig	Fri Jul 26 16:19:17 2002
++++ tools/gda-config-tool.c	Fri Jul 26 16:18:47 2002
+@@ -1136,7 +1136,7 @@
+ static char **
+ completion_func (const gchar *text, int start, int end)
+ {
+-	return ((start == 0) ? rl_completion_matches (text, cmd_generator) :
++	return ((start == 0) ? completion_matches (text, cmd_generator) :
+ 				NULL);
+ }
+ 
diff --git a/databases/libgda3/pkg-descr b/databases/libgda3/pkg-descr
new file mode 100644
index 000000000..12eb57b5e
--- /dev/null
+++ b/databases/libgda3/pkg-descr
@@ -0,0 +1,19 @@
+GNU Data Access (GDA) is an attempt to provide uniform access to 
+different kinds of data sources (databases, information servers,
+mail spools, etc).
+
+It is a complete architecture that provides all you need to access
+your data, defined by a set of CORBA interfaces as generic as possible
+(but very powerful at the same time) so that any kind of data source
+can be accessed through them.
+
+libgda is an interface to the GDA architecture, providing a nice
+wrapper around the CORBA interfaces, for both the client and the server
+parts. It also provides a bunch of tools to help you both in the
+development and management of your data sources, all done through
+the GDA model's set of CORBA interfaces.
+
+libgda was part of the GNOME-DB project, but has been separated from it
+to allow non-GNOME applications to be developed based on it.
+
+WWW: http://www.gnome-db.org/
diff --git a/databases/libgda3/pkg-plist b/databases/libgda3/pkg-plist
new file mode 100644
index 000000000..e9362ddac
--- /dev/null
+++ b/databases/libgda3/pkg-plist
@@ -0,0 +1,225 @@
+bin/gda-config-tool
+bin/gda-report-test
+bin/gda-run
+bin/gda-test-delimiter
+etc/libgda/config
+etc/libgda/sales_test.db
+include/libgda-%%VERSION%%/libgda-report/gda-report-document.h
+include/libgda-%%VERSION%%/libgda-report/gda-report-item-detail.h
+include/libgda-%%VERSION%%/libgda-report/gda-report-item-label.h
+include/libgda-%%VERSION%%/libgda-report/gda-report-item-pagefooter.h
+include/libgda-%%VERSION%%/libgda-report/gda-report-item-pageheader.h
+include/libgda-%%VERSION%%/libgda-report/gda-report-item-repfield.h
+include/libgda-%%VERSION%%/libgda-report/gda-report-item-report.h
+include/libgda-%%VERSION%%/libgda-report/gda-report-item-reportfooter.h
+include/libgda-%%VERSION%%/libgda-report/gda-report-item-reportheader.h
+include/libgda-%%VERSION%%/libgda-report/gda-report-item-sqlquery.h
+include/libgda-%%VERSION%%/libgda-report/gda-report-item.h
+include/libgda-%%VERSION%%/libgda-report/gda-report-result.h
+include/libgda-%%VERSION%%/libgda-report/gda-report-types.h
+include/libgda-%%VERSION%%/libgda-report/gda-report-valid.h
+include/libgda-%%VERSION%%/libgda-report/gda-report.h
+include/libgda-%%VERSION%%/libgda/gda-blob.h
+include/libgda-%%VERSION%%/libgda/gda-client.h
+include/libgda-%%VERSION%%/libgda/gda-column-index.h
+include/libgda-%%VERSION%%/libgda/gda-column.h
+include/libgda-%%VERSION%%/libgda/gda-command.h
+include/libgda-%%VERSION%%/libgda/gda-config.h
+include/libgda-%%VERSION%%/libgda/gda-connection-event.h
+include/libgda-%%VERSION%%/libgda/gda-connection.h
+include/libgda-%%VERSION%%/libgda/gda-data-access-wrapper.h
+include/libgda-%%VERSION%%/libgda/gda-data-handler.h
+include/libgda-%%VERSION%%/libgda/gda-data-model-array.h
+include/libgda-%%VERSION%%/libgda/gda-data-model-extra.h
+include/libgda-%%VERSION%%/libgda/gda-data-model-filter-sql.h
+include/libgda-%%VERSION%%/libgda/gda-data-model-hash.h
+include/libgda-%%VERSION%%/libgda/gda-data-model-import.h
+include/libgda-%%VERSION%%/libgda/gda-data-model-index.h
+include/libgda-%%VERSION%%/libgda/gda-data-model-iter.h
+include/libgda-%%VERSION%%/libgda/gda-data-model-private.h
+include/libgda-%%VERSION%%/libgda/gda-data-model-query.h
+include/libgda-%%VERSION%%/libgda/gda-data-model-row.h
+include/libgda-%%VERSION%%/libgda/gda-data-model.h
+include/libgda-%%VERSION%%/libgda/gda-data-proxy.h
+include/libgda-%%VERSION%%/libgda/gda-decl.h
+include/libgda-%%VERSION%%/libgda/gda-dict-aggregate.h
+include/libgda-%%VERSION%%/libgda/gda-dict-constraint.h
+include/libgda-%%VERSION%%/libgda/gda-dict-database.h
+include/libgda-%%VERSION%%/libgda/gda-dict-field.h
+include/libgda-%%VERSION%%/libgda/gda-dict-function.h
+include/libgda-%%VERSION%%/libgda/gda-dict-table.h
+include/libgda-%%VERSION%%/libgda/gda-dict-type.h
+include/libgda-%%VERSION%%/libgda/gda-dict.h
+include/libgda-%%VERSION%%/libgda/gda-entity-field.h
+include/libgda-%%VERSION%%/libgda/gda-entity.h
+include/libgda-%%VERSION%%/libgda/gda-enum-types.h
+include/libgda-%%VERSION%%/libgda/gda-enums.h
+include/libgda-%%VERSION%%/libgda/gda-graphviz.h
+include/libgda-%%VERSION%%/libgda/gda-log.h
+include/libgda-%%VERSION%%/libgda/gda-marshal.h
+include/libgda-%%VERSION%%/libgda/gda-object-ref.h
+include/libgda-%%VERSION%%/libgda/gda-object.h
+include/libgda-%%VERSION%%/libgda/gda-parameter-list.h
+include/libgda-%%VERSION%%/libgda/gda-parameter.h
+include/libgda-%%VERSION%%/libgda/gda-quark-list.h
+include/libgda-%%VERSION%%/libgda/gda-query-condition.h
+include/libgda-%%VERSION%%/libgda/gda-query-field-agg.h
+include/libgda-%%VERSION%%/libgda/gda-query-field-all.h
+include/libgda-%%VERSION%%/libgda/gda-query-field-field.h
+include/libgda-%%VERSION%%/libgda/gda-query-field-func.h
+include/libgda-%%VERSION%%/libgda/gda-query-field-value.h
+include/libgda-%%VERSION%%/libgda/gda-query-field.h
+include/libgda-%%VERSION%%/libgda/gda-query-join.h
+include/libgda-%%VERSION%%/libgda/gda-query-object.h
+include/libgda-%%VERSION%%/libgda/gda-query-parsing.h
+include/libgda-%%VERSION%%/libgda/gda-query-private.h
+include/libgda-%%VERSION%%/libgda/gda-query-target.h
+include/libgda-%%VERSION%%/libgda/gda-query.h
+include/libgda-%%VERSION%%/libgda/gda-referer.h
+include/libgda-%%VERSION%%/libgda/gda-renderer.h
+include/libgda-%%VERSION%%/libgda/gda-row.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-threader.h
+include/libgda-%%VERSION%%/libgda/gda-transaction.h
+include/libgda-%%VERSION%%/libgda/gda-util.h
+include/libgda-%%VERSION%%/libgda/gda-value.h
+include/libgda-%%VERSION%%/libgda/gda-xml-storage.h
+include/libgda-%%VERSION%%/libgda/graph/gda-graph-item.h
+include/libgda-%%VERSION%%/libgda/graph/gda-graph-query.h
+include/libgda-%%VERSION%%/libgda/graph/gda-graph.h
+include/libgda-%%VERSION%%/libgda/handlers/gda-handler-bin.h
+include/libgda-%%VERSION%%/libgda/handlers/gda-handler-boolean.h
+include/libgda-%%VERSION%%/libgda/handlers/gda-handler-numerical.h
+include/libgda-%%VERSION%%/libgda/handlers/gda-handler-string.h
+include/libgda-%%VERSION%%/libgda/handlers/gda-handler-time.h
+include/libgda-%%VERSION%%/libgda/handlers/gda-handler-type.h
+include/libgda-%%VERSION%%/libgda/libgda.h
+include/libgda-%%VERSION%%/libsql/sql_parser.h
+include/libgda-%%VERSION%%/sql-delimiter/gda-sql-delimiter.h
+lib/libgda-3.a
+lib/libgda-3.la
+lib/libgda-3.so
+lib/libgda-3.so.3
+lib/libgda-report-3.a
+lib/libgda-report-3.la
+lib/libgda-report-3.so
+lib/libgda-report-3.so.3
+lib/libgda_graph-3.a
+lib/libgda_graph-3.la
+lib/libgda_graph-3.so
+lib/libgda_graph-3.so.3
+lib/libgda_handlers-3.a
+lib/libgda_handlers-3.la
+lib/libgda_handlers-3.so
+lib/libgda_handlers-3.so.3
+lib/libgda_sql_delimiter-3.a
+lib/libgda_sql_delimiter-3.la
+lib/libgda_sql_delimiter-3.so
+lib/libgda_sql_delimiter-3.so.3
+lib/libgdasql.a
+lib/libgdasql.la
+lib/libgdasql.so
+lib/libgdasql.so.3
+%%FIREBIRD:%%lib/libgda-%%VERSION%%/providers/libgda-firebird.a
+%%FIREBIRD:%%lib/libgda-%%VERSION%%/providers/libgda-firebird.la
+%%FIREBIRD:%%lib/libgda-%%VERSION%%/providers/libgda-firebird.so
+%%FREETDS:%%lib/libgda-%%VERSION%%/providers/libgda-freetds.a
+%%FREETDS:%%lib/libgda-%%VERSION%%/providers/libgda-freetds.la
+%%FREETDS:%%lib/libgda-%%VERSION%%/providers/libgda-freetds.so
+%%LDAP:%%lib/libgda-%%VERSION%%/providers/libgda-ldap.a
+%%LDAP:%%lib/libgda-%%VERSION%%/providers/libgda-ldap.la
+%%LDAP:%%lib/libgda-%%VERSION%%/providers/libgda-ldap.so
+%%MDB:%%lib/libgda-%%VERSION%%/providers/libgda-mdb.a
+%%MDB:%%lib/libgda-%%VERSION%%/providers/libgda-mdb.la
+%%MDB:%%lib/libgda-%%VERSION%%/providers/libgda-mdb.so
+%%MYSQL:%%lib/libgda-%%VERSION%%/providers/libgda-mysql.a
+%%MYSQL:%%lib/libgda-%%VERSION%%/providers/libgda-mysql.la
+%%MYSQL:%%lib/libgda-%%VERSION%%/providers/libgda-mysql.so
+%%ODBC:%%lib/libgda-%%VERSION%%/providers/libgda-odbc.a
+%%ODBC:%%lib/libgda-%%VERSION%%/providers/libgda-odbc.la
+%%ODBC:%%lib/libgda-%%VERSION%%/providers/libgda-odbc.so
+%%POSTGRES:%%lib/libgda-%%VERSION%%/providers/libgda-postgres.a
+%%POSTGRES:%%lib/libgda-%%VERSION%%/providers/libgda-postgres.la
+%%POSTGRES:%%lib/libgda-%%VERSION%%/providers/libgda-postgres.so
+%%SYBASE:%%lib/libgda-%%VERSION%%/providers/libgda-sybase.a
+%%SYBASE:%%lib/libgda-%%VERSION%%/providers/libgda-sybase.la
+%%SYBASE:%%lib/libgda-%%VERSION%%/providers/libgda-sybase.so
+lib/libgda-%%VERSION%%/providers/libgda-sqlite.a
+lib/libgda-%%VERSION%%/providers/libgda-sqlite.la
+lib/libgda-%%VERSION%%/providers/libgda-sqlite.so
+libdata/pkgconfig/libgda-2.0.pc
+share/gnome/libgda/dtd/libgda-array.dtd
+share/gnome/libgda/dtd/libgda-dict.dtd
+%%MYSQL:%%share/gnome/libgda/mysql_specs_create_db.xml
+%%MYSQL:%%share/gnome/libgda/mysql_specs_dsn.xml
+%%POSTGRES:%%share/gnome/libgda/postgres_specs_create_db.xml
+%%POSTGRES:%%share/gnome/libgda/postgres_specs_dsn.xml
+share/gnome/libgda/sqlite_specs_create_db.xml
+share/gnome/libgda/sqlite_specs_dsn.xml
+share/gnome/libgda/xml/gda-report.dtd
+share/gnome/libgda/xml/gda-report-result.dtd
+share/gnome/libgda/xml/gda-xml-query.dtd
+share/gnome/libgda/xml/gda-xml-query.xsl
+share/locale/az/LC_MESSAGES/libgda-3.mo
+share/locale/ca/LC_MESSAGES/libgda-3.mo
+share/locale/cs/LC_MESSAGES/libgda-3.mo
+share/locale/da/LC_MESSAGES/libgda-3.mo
+share/locale/de/LC_MESSAGES/libgda-3.mo
+share/locale/el/LC_MESSAGES/libgda-3.mo
+share/locale/en_CA/LC_MESSAGES/libgda-3.mo
+share/locale/en_GB/LC_MESSAGES/libgda-3.mo
+share/locale/es/LC_MESSAGES/libgda-3.mo
+share/locale/eu/LC_MESSAGES/libgda-3.mo
+share/locale/fa/LC_MESSAGES/libgda-3.mo
+share/locale/fi/LC_MESSAGES/libgda-3.mo
+share/locale/fr/LC_MESSAGES/libgda-3.mo
+share/locale/ga/LC_MESSAGES/libgda-3.mo
+share/locale/gl/LC_MESSAGES/libgda-3.mo
+share/locale/hr/LC_MESSAGES/libgda-3.mo
+share/locale/hu/LC_MESSAGES/libgda-3.mo
+share/locale/it/LC_MESSAGES/libgda-3.mo
+share/locale/ja/LC_MESSAGES/libgda-3.mo
+share/locale/ko/LC_MESSAGES/libgda-3.mo
+share/locale/ml/LC_MESSAGES/libgda-3.mo
+share/locale/ms/LC_MESSAGES/libgda-3.mo
+share/locale/nb/LC_MESSAGES/libgda-3.mo
+share/locale/ne/LC_MESSAGES/libgda-3.mo
+share/locale/nl/LC_MESSAGES/libgda-3.mo
+share/locale/no/LC_MESSAGES/libgda-3.mo
+share/locale/pl/LC_MESSAGES/libgda-3.mo
+share/locale/pt/LC_MESSAGES/libgda-3.mo
+share/locale/pt_BR/LC_MESSAGES/libgda-3.mo
+share/locale/ru/LC_MESSAGES/libgda-3.mo
+share/locale/rw/LC_MESSAGES/libgda-3.mo
+share/locale/sk/LC_MESSAGES/libgda-3.mo
+share/locale/sl/LC_MESSAGES/libgda-3.mo
+share/locale/sq/LC_MESSAGES/libgda-3.mo
+share/locale/sr/LC_MESSAGES/libgda-3.mo
+share/locale/sr@Latn/LC_MESSAGES/libgda-3.mo
+share/locale/sv/LC_MESSAGES/libgda-3.mo
+share/locale/tr/LC_MESSAGES/libgda-3.mo
+share/locale/uk/LC_MESSAGES/libgda-3.mo
+share/locale/vi/LC_MESSAGES/libgda-3.mo
+share/locale/zh_CN/LC_MESSAGES/libgda-3.mo
+share/locale/zh_HK/LC_MESSAGES/libgda-3.mo
+share/locale/zh_TW/LC_MESSAGES/libgda-3.mo
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrm share/gnome/libgda/xml
+@dirrm share/gnome/libgda/dtd
+@dirrm share/gnome/libgda
+@dirrm lib/libgda-%%VERSION%%/providers
+@dirrm lib/libgda-%%VERSION%%
+@dirrm lib/libgda
+@dirrm include/libgda-%%VERSION%%/sql-delimiter
+@dirrm include/libgda-%%VERSION%%/libsql
+@dirrm include/libgda-%%VERSION%%/libgda-report
+@dirrm include/libgda-%%VERSION%%/libgda/handlers
+@dirrm include/libgda-%%VERSION%%/libgda/graph
+@dirrm include/libgda-%%VERSION%%/libgda
+@dirrm include/libgda-%%VERSION%%
+@dirrm etc/libgda
diff --git a/databases/libgnomedb/Makefile b/databases/libgnomedb/Makefile
new file mode 100644
index 000000000..5fd676f8b
--- /dev/null
+++ b/databases/libgnomedb/Makefile
@@ -0,0 +1,41 @@
+# New ports collection makefile for:	libgnomedb
+# Date created:				02 June 2002
+# Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
+#
+# $FreeBSD$
+#   $MCom$
+#
+
+PORTNAME=	libgnomedb
+PORTVERSION=	1.9.102
+PORTREVISION?=	3
+CATEGORIES=	databases gnome
+MASTER_SITES=	${MASTER_SITE_GNOME}
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:R}
+DIST_SUBDIR=	gnome2
+
+MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	Library components for the GNOME database frontend
+
+USE_BZIP2=	yes
+
+.if !defined(REFERENCE_PORT)
+
+USE_GMAKE=	yes
+USE_GNOME=	gnomeprefix gnomehack libgnomeui libgda3 gtksourceview \
+		intlhack referencehack
+USE_XLIB=	yes
+USE_GETTEXT=	yes
+GNU_CONFIGURE=	yes
+INSTALLS_OMF=	yes
+INSTALLS_SHLIB=	yes
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
+
+GCONF_SCHEMAS=	libgnomedb.schemas
+
+PLIST_SUB=	VERSION=${PORTVERSION:R}
+
+.include <bsd.port.mk>
+
+.endif
diff --git a/databases/libgnomedb/distinfo b/databases/libgnomedb/distinfo
new file mode 100644
index 000000000..4df10c152
--- /dev/null
+++ b/databases/libgnomedb/distinfo
@@ -0,0 +1,3 @@
+MD5 (gnome2/libgnomedb-1.9.102.tar.bz2) = a29e5b845d6bd94fdd70c4c0c0abcbf1
+SHA256 (gnome2/libgnomedb-1.9.102.tar.bz2) = becd12ec688daded8c08d94ae6268d169716872d0f405bf3ce96eb846b078bd8
+SIZE (gnome2/libgnomedb-1.9.102.tar.bz2) = 1821841
diff --git a/databases/libgnomedb/files/patch-Makefile.in b/databases/libgnomedb/files/patch-Makefile.in
new file mode 100644
index 000000000..d0890cf04
--- /dev/null
+++ b/databases/libgnomedb/files/patch-Makefile.in
@@ -0,0 +1,19 @@
+--- Makefile.in.orig	Thu Oct 13 15:59:10 2005
++++ Makefile.in	Thu Oct 13 16:00:04 2005
+@@ -290,15 +290,13 @@
+ @BUILD_GNOMEDB_SHARP_TRUE@GNOME_DIRECTORY = gnomedb-sharp
+ @BUILD_WITH_GNOME_FALSE@GNOME_DIRECTORY = 
+ @BUILD_WITH_GNOME_TRUE@GNOME_DIRECTORY = control-center
+-@ENABLE_GTK_DOC_FALSE@DOC_DIRECTORY = 
+-@ENABLE_GTK_DOC_TRUE@DOC_DIRECTORY = doc
++DOC_DIRECTORY = doc
+ SUBDIRS = \
+ 	po \
+ 	libgnomedb \
+ 	$(LIBGLADE_DIRECTORY) \
+ 	$(GNOME_DIRECTORY) \
+ 	$(GNOMEDB_SHARP_DIRECTORY) \
+-	testing \
+ 	extra \
+ 	examples \
+ 	$(DOC_DIRECTORY) \
diff --git a/databases/libgnomedb/files/patch-doc::libgnomedb-C.omf.in b/databases/libgnomedb/files/patch-doc::libgnomedb-C.omf.in
new file mode 100644
index 000000000..e51ccfd6b
--- /dev/null
+++ b/databases/libgnomedb/files/patch-doc::libgnomedb-C.omf.in
@@ -0,0 +1,11 @@
+--- doc/libgnomedb-C.omf.in.orig	Thu Oct  2 12:15:36 2003
++++ doc/libgnomedb-C.omf.in	Thu Oct  2 12:15:52 2003
+@@ -15,7 +15,7 @@
+     </description>
+     <type>user's guide</type>
+     <format mime="text/html"/>
+-    <identifier url="file:/@prefix@/share/gtk-doc/html/libgnomedb/index.html"/>
++    <identifier url="file:/@prefix@/share/doc/libgnomedb/index.html"/>
+     <language code="C"/>
+     <relation seriesid="0c3a2de2-d4ca-11d6-8994-cd3caececda4"/>
+     <rights type="GNU FDL" license.version="1.1"/>
diff --git a/databases/libgnomedb/files/patch-doc_C_Makefile.in b/databases/libgnomedb/files/patch-doc_C_Makefile.in
new file mode 100644
index 000000000..448aad656
--- /dev/null
+++ b/databases/libgnomedb/files/patch-doc_C_Makefile.in
@@ -0,0 +1,11 @@
+--- doc/C/Makefile.in.orig	Tue Jun  7 16:57:58 2005
++++ doc/C/Makefile.in	Tue Jun  7 16:58:27 2005
+@@ -119,7 +119,7 @@
+ HAVE_GTKSOURCEVIEW_TRUE = @HAVE_GTKSOURCEVIEW_TRUE@
+ HAVE_LIBGLADE_FALSE = @HAVE_LIBGLADE_FALSE@
+ HAVE_LIBGLADE_TRUE = @HAVE_LIBGLADE_TRUE@
+-HTML_DIR = $(datadir)/gtk-doc/html
++HTML_DIR = $(prefix)/share/doc
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
diff --git a/databases/libgnomedb/files/patch-libgnomedb_gnome-db-find-dialog.c b/databases/libgnomedb/files/patch-libgnomedb_gnome-db-find-dialog.c
new file mode 100644
index 000000000..b65e65483
--- /dev/null
+++ b/databases/libgnomedb/files/patch-libgnomedb_gnome-db-find-dialog.c
@@ -0,0 +1,20 @@
+
+$FreeBSD: ports/databases/libgnomedb/files/patch-libgnomedb_gnome-db-find-dialog.c,v 1.3 2005/11/10 16:03:00 vs Exp $
+
+--- libgnomedb/gnome-db-find-dialog.c.orig
++++ libgnomedb/gnome-db-find-dialog.c
+@@ -220,12 +220,14 @@
+ 	
+ 	g_object_ref (dm);
+ 	
++	{
+ 	GnomeDbFindDialog *dialog = gnome_db_find_dialog_new (title);
+ 	gnome_db_find_dialog_add_fields_from_model (dialog, dm);
+ 
+ 	g_object_unref (dm);
+ 
+ 	return dialog;
++	}
+ }
+ 
+ /**
diff --git a/databases/libgnomedb/files/patch-libgnomedb_gnome-db-sql-console.c b/databases/libgnomedb/files/patch-libgnomedb_gnome-db-sql-console.c
new file mode 100644
index 000000000..bad3174cc
--- /dev/null
+++ b/databases/libgnomedb/files/patch-libgnomedb_gnome-db-sql-console.c
@@ -0,0 +1,15 @@
+
+$FreeBSD: ports/databases/libgnomedb/files/patch-libgnomedb_gnome-db-sql-console.c,v 1.1 2005/11/10 16:03:00 vs Exp $
+
+--- libgnomedb/gnome-db-sql-console.c.orig
++++ libgnomedb/gnome-db-sql-console.c
+@@ -596,8 +596,8 @@
+ 
+ 	/* help */
+ 	if (!cmde_ok && !strcmp (pcmde, "?")) {
+-		cmde_ok = TRUE;
+ 		GString *string;
++		cmde_ok = TRUE;
+ 
+ 		string = g_string_new (_("SQL statements:\n"
+ 					 "  they can span several lines, and are executed\n"
diff --git a/databases/libgnomedb/files/patch-po::Makefile.in.in b/databases/libgnomedb/files/patch-po::Makefile.in.in
new file mode 100644
index 000000000..2e0e6e70e
--- /dev/null
+++ b/databases/libgnomedb/files/patch-po::Makefile.in.in
@@ -0,0 +1,10 @@
+--- po/Makefile.in.in.orig	Thu Jul 22 11:06:21 2004
++++ po/Makefile.in.in	Thu Jul 22 11:06:58 2004
+@@ -35,6 +35,7 @@
+ 
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ 
+ CC = @CC@
+ GENCAT = @GENCAT@
diff --git a/databases/libgnomedb/pkg-descr b/databases/libgnomedb/pkg-descr
new file mode 100644
index 000000000..0ef0c27be
--- /dev/null
+++ b/databases/libgnomedb/pkg-descr
@@ -0,0 +1,4 @@
+libgnomedb is the library backend for universal database access for the GNOME
+2.0 environment.
+
+WWW: http://www.gnome-db.org/
diff --git a/databases/libgnomedb/pkg-plist b/databases/libgnomedb/pkg-plist
new file mode 100644
index 000000000..d1b67ec41
--- /dev/null
+++ b/databases/libgnomedb/pkg-plist
@@ -0,0 +1,199 @@
+bin/gnome-database-properties
+bin/gnome-db-browser
+include/libgnomedb-%%VERSION%%/libgnomedb/data-entries/gnome-db-data-cell-renderer-boolean.h
+include/libgnomedb-%%VERSION%%/libgnomedb/data-entries/gnome-db-data-cell-renderer-combo.h
+include/libgnomedb-%%VERSION%%/libgnomedb/data-entries/gnome-db-data-cell-renderer-info.h
+include/libgnomedb-%%VERSION%%/libgnomedb/data-entries/gnome-db-data-cell-renderer-textual.h
+include/libgnomedb-%%VERSION%%/libgnomedb/data-entries/gnome-db-entry-boolean.h
+include/libgnomedb-%%VERSION%%/libgnomedb/data-entries/gnome-db-entry-combo.h
+include/libgnomedb-%%VERSION%%/libgnomedb/data-entries/gnome-db-entry-none.h
+include/libgnomedb-%%VERSION%%/libgnomedb/data-entries/gnome-db-entry-shell.h
+include/libgnomedb-%%VERSION%%/libgnomedb/data-entries/gnome-db-entry-string.h
+include/libgnomedb-%%VERSION%%/libgnomedb/data-entries/gnome-db-entry-time.h
+include/libgnomedb-%%VERSION%%/libgnomedb/data-entries/gnome-db-entry-wrapper.h
+include/libgnomedb-%%VERSION%%/libgnomedb/gnome-db-basic-form.h
+include/libgnomedb-%%VERSION%%/libgnomedb/gnome-db-combo.h
+include/libgnomedb-%%VERSION%%/libgnomedb/gnome-db-connection-properties.h
+include/libgnomedb-%%VERSION%%/libgnomedb/gnome-db-data-entry.h
+include/libgnomedb-%%VERSION%%/libgnomedb/gnome-db-data-source-selector.h
+include/libgnomedb-%%VERSION%%/libgnomedb/gnome-db-data-store.h
+include/libgnomedb-%%VERSION%%/libgnomedb/gnome-db-data-widget-info.h
+include/libgnomedb-%%VERSION%%/libgnomedb/gnome-db-data-widget.h
+include/libgnomedb-%%VERSION%%/libgnomedb/gnome-db-dbms-update-viewer.h
+include/libgnomedb-%%VERSION%%/libgnomedb/gnome-db-decl.h
+include/libgnomedb-%%VERSION%%/libgnomedb/gnome-db-dsn-config-druid.h
+include/libgnomedb-%%VERSION%%/libgnomedb/gnome-db-dsn-config.h
+include/libgnomedb-%%VERSION%%/libgnomedb/gnome-db-dsn-spec.h
+include/libgnomedb-%%VERSION%%/libgnomedb/gnome-db-editor.h
+include/libgnomedb-%%VERSION%%/libgnomedb/gnome-db-enums.h
+include/libgnomedb-%%VERSION%%/libgnomedb/gnome-db-error-dialog.h
+include/libgnomedb-%%VERSION%%/libgnomedb/gnome-db-error.h
+include/libgnomedb-%%VERSION%%/libgnomedb/gnome-db-find-dialog.h
+include/libgnomedb-%%VERSION%%/libgnomedb/gnome-db-form.h
+include/libgnomedb-%%VERSION%%/libgnomedb/gnome-db-gray-bar.h
+include/libgnomedb-%%VERSION%%/libgnomedb/gnome-db-grid.h
+include/libgnomedb-%%VERSION%%/libgnomedb/gnome-db-i18n.h
+include/libgnomedb-%%VERSION%%/libgnomedb/gnome-db-login-dialog.h
+include/libgnomedb-%%VERSION%%/libgnomedb/gnome-db-login.h
+include/libgnomedb-%%VERSION%%/libgnomedb/gnome-db-provider-selector.h
+include/libgnomedb-%%VERSION%%/libgnomedb/gnome-db-raw-form.h
+include/libgnomedb-%%VERSION%%/libgnomedb/gnome-db-raw-grid.h
+include/libgnomedb-%%VERSION%%/libgnomedb/gnome-db-report-editor.h
+include/libgnomedb-%%VERSION%%/libgnomedb/gnome-db-selector-private.h
+include/libgnomedb-%%VERSION%%/libgnomedb/gnome-db-selector.h
+include/libgnomedb-%%VERSION%%/libgnomedb/gnome-db-sql-console.h
+include/libgnomedb-%%VERSION%%/libgnomedb/gnome-db-stock.h
+include/libgnomedb-%%VERSION%%/libgnomedb/gnome-db-tools.h
+include/libgnomedb-%%VERSION%%/libgnomedb/gnome-db-util.h
+include/libgnomedb-%%VERSION%%/libgnomedb/graph/gnome-db-canvas-cursor.h
+include/libgnomedb-%%VERSION%%/libgnomedb/graph/gnome-db-canvas-db-relations.h
+include/libgnomedb-%%VERSION%%/libgnomedb/graph/gnome-db-canvas-entity.h
+include/libgnomedb-%%VERSION%%/libgnomedb/graph/gnome-db-canvas-field.h
+include/libgnomedb-%%VERSION%%/libgnomedb/graph/gnome-db-canvas-fkconstraint.h
+include/libgnomedb-%%VERSION%%/libgnomedb/graph/gnome-db-canvas-item.h
+include/libgnomedb-%%VERSION%%/libgnomedb/graph/gnome-db-canvas-join.h
+include/libgnomedb-%%VERSION%%/libgnomedb/graph/gnome-db-canvas-query-struct.h
+include/libgnomedb-%%VERSION%%/libgnomedb/graph/gnome-db-canvas-text.h
+include/libgnomedb-%%VERSION%%/libgnomedb/graph/gnome-db-canvas-tip.h
+include/libgnomedb-%%VERSION%%/libgnomedb/graph/gnome-db-canvas.h
+include/libgnomedb-%%VERSION%%/libgnomedb/graph/graph-utility.h
+include/libgnomedb-%%VERSION%%/libgnomedb/libgnomedb-private.h
+include/libgnomedb-%%VERSION%%/libgnomedb/libgnomedb.h
+include/libgnomedb-%%VERSION%%/libgnomedb/marshal.h
+include/libgnomedb-%%VERSION%%/libgnomedb/sel-aggregates.h
+include/libgnomedb-%%VERSION%%/libgnomedb/sel-data-types.h
+include/libgnomedb-%%VERSION%%/libgnomedb/sel-functions.h
+include/libgnomedb-%%VERSION%%/libgnomedb/sel-graphs.h
+include/libgnomedb-%%VERSION%%/libgnomedb/sel-onequery.h
+include/libgnomedb-%%VERSION%%/libgnomedb/sel-onetable.h
+include/libgnomedb-%%VERSION%%/libgnomedb/sel-onetarget.h
+include/libgnomedb-%%VERSION%%/libgnomedb/sel-queries.h
+include/libgnomedb-%%VERSION%%/libgnomedb/sel-tables.h
+include/libgnomedb-%%VERSION%%/libgnomedb/utility.h
+lib/libglade/2.0/libgnomedb.a
+lib/libglade/2.0/libgnomedb.la
+lib/libglade/2.0/libgnomedb.so
+lib/libgnomedb-3.a
+lib/libgnomedb-3.la
+lib/libgnomedb-3.so
+lib/libgnomedb-3.so.4
+lib/libgnomedb/plugins/libgnomedb_entry_cidr.a
+lib/libgnomedb/plugins/libgnomedb_entry_cidr.la
+lib/libgnomedb/plugins/libgnomedb_entry_cidr.so
+lib/libgnomedb/plugins/libgnomedb_entry_cidr.so.4
+lib/libgnomedb/plugins/libgnomedb_entry_filesel.a
+lib/libgnomedb/plugins/libgnomedb_entry_filesel.la
+lib/libgnomedb/plugins/libgnomedb_entry_filesel.so
+lib/libgnomedb/plugins/libgnomedb_entry_filesel.so.4
+lib/libgnomedb/plugins/libgnomedb_entry_passmd5.a
+lib/libgnomedb/plugins/libgnomedb_entry_passmd5.la
+lib/libgnomedb/plugins/libgnomedb_entry_passmd5.so
+lib/libgnomedb/plugins/libgnomedb_entry_passmd5.so.4
+lib/libgnomedb/plugins/libgnomedb_entry_text.a
+lib/libgnomedb/plugins/libgnomedb_entry_text.la
+lib/libgnomedb/plugins/libgnomedb_entry_text.so
+lib/libgnomedb/plugins/libgnomedb_entry_text.so.4
+lib/libgnomedb_graph-3.a
+lib/libgnomedb_graph-3.la
+lib/libgnomedb_graph-3.so
+lib/libgnomedb_graph-3.so.4
+lib/libgnomedb_handlers-3.a
+lib/libgnomedb_handlers-3.la
+lib/libgnomedb_handlers-3.so
+lib/libgnomedb_handlers-3.so.4
+libdata/pkgconfig/libgnomedb-2.0.pc
+share/gnome/applications/database-properties.desktop
+share/gnome/mime-info/libgnomedb.keys
+share/gnome/mime-info/libgnomedb.mime
+share/gnome/omf/libgnomedb/libgnomedb-C.omf
+share/gnome/pixmaps/libgnomedb/gnome-db-aggregates_16x16.png
+share/gnome/pixmaps/libgnomedb/gnome-db-aggregates_24x24.png
+share/gnome/pixmaps/libgnomedb/gnome-db-commit_24x24.png
+share/gnome/pixmaps/libgnomedb/gnome-db-connect_24x24.png
+share/gnome/pixmaps/libgnomedb/gnome-db-database-login_48x48.png
+share/gnome/pixmaps/libgnomedb/gnome-db-database_16x16.png
+share/gnome/pixmaps/libgnomedb/gnome-db-database_24x24.png
+share/gnome/pixmaps/libgnomedb/gnome-db-database_48x48.png
+share/gnome/pixmaps/libgnomedb/gnome-db-designer_24x24.png
+share/gnome/pixmaps/libgnomedb/gnome-db-disconnect_24x24.png
+share/gnome/pixmaps/libgnomedb/gnome-db-field_16x16.png
+share/gnome/pixmaps/libgnomedb/gnome-db-indexes_16x16.png
+share/gnome/pixmaps/libgnomedb/gnome-db-no-transaction_24x24.png
+share/gnome/pixmaps/libgnomedb/gnome-db-procedures_16x16.png
+share/gnome/pixmaps/libgnomedb/gnome-db-procedures_24x24.png
+share/gnome/pixmaps/libgnomedb/gnome-db-query_16x16.png
+share/gnome/pixmaps/libgnomedb/gnome-db-query_24x24.png
+share/gnome/pixmaps/libgnomedb/gnome-db-relations_16x16.png
+share/gnome/pixmaps/libgnomedb/gnome-db-relations_24x24.png
+share/gnome/pixmaps/libgnomedb/gnome-db-rollback_24x24.png
+share/gnome/pixmaps/libgnomedb/gnome-db-sequences_16x16.png
+share/gnome/pixmaps/libgnomedb/gnome-db-sequences_24x24.png
+share/gnome/pixmaps/libgnomedb/gnome-db-sql_16x16.png
+share/gnome/pixmaps/libgnomedb/gnome-db-sql_24x24.png
+share/gnome/pixmaps/libgnomedb/gnome-db-table_16x16.png
+share/gnome/pixmaps/libgnomedb/gnome-db-tables_16x16.png
+share/gnome/pixmaps/libgnomedb/gnome-db-tables_24x24.png
+share/gnome/pixmaps/libgnomedb/gnome-db-triggers_16x16.png
+share/gnome/pixmaps/libgnomedb/gnome-db-types_16x16.png
+share/gnome/pixmaps/libgnomedb/gnome-db-types_24x24.png
+share/gnome/pixmaps/libgnomedb/gnome-db-views_16x16.png
+share/gnome/pixmaps/libgnomedb/gnome-db-within-transaction_24x24.png
+share/gnome/pixmaps/libgnomedb/gnome-db.png
+share/locale/az/LC_MESSAGES/libgnomedb-3.mo
+share/locale/be/LC_MESSAGES/libgnomedb-3.mo
+share/locale/ca/LC_MESSAGES/libgnomedb-3.mo
+share/locale/cs/LC_MESSAGES/libgnomedb-3.mo
+share/locale/da/LC_MESSAGES/libgnomedb-3.mo
+share/locale/de/LC_MESSAGES/libgnomedb-3.mo
+share/locale/el/LC_MESSAGES/libgnomedb-3.mo
+share/locale/en_CA/LC_MESSAGES/libgnomedb-3.mo
+share/locale/en_GB/LC_MESSAGES/libgnomedb-3.mo
+share/locale/es/LC_MESSAGES/libgnomedb-3.mo
+share/locale/eu/LC_MESSAGES/libgnomedb-3.mo
+share/locale/fa/LC_MESSAGES/libgnomedb-3.mo
+share/locale/fi/LC_MESSAGES/libgnomedb-3.mo
+share/locale/fr/LC_MESSAGES/libgnomedb-3.mo
+share/locale/ga/LC_MESSAGES/libgnomedb-3.mo
+share/locale/gl/LC_MESSAGES/libgnomedb-3.mo
+share/locale/hr/LC_MESSAGES/libgnomedb-3.mo
+share/locale/hu/LC_MESSAGES/libgnomedb-3.mo
+share/locale/it/LC_MESSAGES/libgnomedb-3.mo
+share/locale/ja/LC_MESSAGES/libgnomedb-3.mo
+share/locale/ka/LC_MESSAGES/libgnomedb-3.mo
+share/locale/ko/LC_MESSAGES/libgnomedb-3.mo
+share/locale/ml/LC_MESSAGES/libgnomedb-3.mo
+share/locale/ms/LC_MESSAGES/libgnomedb-3.mo
+share/locale/nb/LC_MESSAGES/libgnomedb-3.mo
+share/locale/ne/LC_MESSAGES/libgnomedb-3.mo
+share/locale/nl/LC_MESSAGES/libgnomedb-3.mo
+share/locale/no/LC_MESSAGES/libgnomedb-3.mo
+share/locale/pl/LC_MESSAGES/libgnomedb-3.mo
+share/locale/pt/LC_MESSAGES/libgnomedb-3.mo
+share/locale/pt_BR/LC_MESSAGES/libgnomedb-3.mo
+share/locale/ru/LC_MESSAGES/libgnomedb-3.mo
+share/locale/rw/LC_MESSAGES/libgnomedb-3.mo
+share/locale/sk/LC_MESSAGES/libgnomedb-3.mo
+share/locale/sl/LC_MESSAGES/libgnomedb-3.mo
+share/locale/sq/LC_MESSAGES/libgnomedb-3.mo
+share/locale/sr/LC_MESSAGES/libgnomedb-3.mo
+share/locale/sr@Latn/LC_MESSAGES/libgnomedb-3.mo
+share/locale/sv/LC_MESSAGES/libgnomedb-3.mo
+share/locale/ta/LC_MESSAGES/libgnomedb-3.mo
+share/locale/tr/LC_MESSAGES/libgnomedb-3.mo
+share/locale/uk/LC_MESSAGES/libgnomedb-3.mo
+share/locale/vi/LC_MESSAGES/libgnomedb-3.mo
+share/locale/zh_CN/LC_MESSAGES/libgnomedb-3.mo
+share/locale/zh_HK/LC_MESSAGES/libgnomedb-3.mo
+share/locale/zh_TW/LC_MESSAGES/libgnomedb-3.mo
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrm share/gnome/pixmaps/libgnomedb
+@dirrm share/gnome/omf/libgnomedb
+@dirrm lib/libgnomedb/plugins
+@dirrm lib/libgnomedb
+@dirrm include/libgnomedb-%%VERSION%%/libgnomedb/graph
+@dirrm include/libgnomedb-%%VERSION%%/libgnomedb/data-entries
+@dirrm include/libgnomedb-%%VERSION%%/libgnomedb
+@dirrm include/libgnomedb-%%VERSION%%
diff --git a/databases/mergeant/Makefile b/databases/mergeant/Makefile
new file mode 100644
index 000000000..b57188354
--- /dev/null
+++ b/databases/mergeant/Makefile
@@ -0,0 +1,34 @@
+# New ports collection makefile for:	mergeant
+# Date created:				14 September 2002
+# Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
+#
+# $FreeBSD$
+#   $MCom$
+#
+
+PORTNAME=	mergeant
+PORTVERSION=	0.62
+PORTREVISION=	3
+CATEGORIES=	databases gnome
+MASTER_SITES=	${MASTER_SITE_GNOME}
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION}
+DIST_SUBDIR=	gnome2
+
+MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	Provide uniform access to data sources for the GNOME 2 environment
+
+USE_BZIP2=	yes
+USE_XLIB=	yes
+USE_GETTEXT=	yes
+USE_GMAKE=	yes
+USE_GNOME=	gnomeprefix intlhack gnomehack libgnomedb libgnomeprintui
+USE_PERL5=	yes
+GNU_CONFIGURE=	yes
+INSTALLS_OMF=	yes
+INSTALLS_SHLIB=	yes
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
+
+BROKEN=	does not build with new libgnomedb
+
+.include <bsd.port.mk>
diff --git a/databases/mergeant/distinfo b/databases/mergeant/distinfo
new file mode 100644
index 000000000..f26ad3cd9
--- /dev/null
+++ b/databases/mergeant/distinfo
@@ -0,0 +1,3 @@
+MD5 (gnome2/mergeant-0.62.tar.bz2) = acd5dd8d888f8dde8ca0768d081828e3
+SHA256 (gnome2/mergeant-0.62.tar.bz2) = 638ff896459b5fe0a6092748fbf245a5fa096be653cf6456867407c717a7f626
+SIZE (gnome2/mergeant-0.62.tar.bz2) = 1005279
diff --git a/databases/mergeant/files/patch-configure b/databases/mergeant/files/patch-configure
new file mode 100644
index 000000000..baf457654
--- /dev/null
+++ b/databases/mergeant/files/patch-configure
@@ -0,0 +1,14 @@
+--- configure.orig	Sun Aug  7 17:40:05 2005
++++ configure	Sun Aug  7 17:40:37 2005
+@@ -22920,9 +22920,9 @@
+ 
+ MERGEANT_Pixmapdir=${datadir}/pixmaps/${PACKAGE}
+ 
+-MERGEANT_Appdir=${datadir}/gnome/applications
++MERGEANT_Appdir=${datadir}/applications
+ 
+-MERGEANT_Helpdir=${datadir}/gnome/help/${PACKAGE}
++MERGEANT_Helpdir=${datadir}/help/${PACKAGE}
+ 
+ 
+ 
diff --git a/databases/mergeant/pkg-descr b/databases/mergeant/pkg-descr
new file mode 100644
index 000000000..7e1974261
--- /dev/null
+++ b/databases/mergeant/pkg-descr
@@ -0,0 +1,9 @@
+mergeant can be considered as an extension of the libgda project.
+
+Its aims are the same: to provide universal data source access for
+client applications, as well as development tools and libraries
+for doing so. mergeant; is an extension to libgda; because it adds
+support to the architecture for the GNOME project.  mergeant was formed
+by merging components from gnome-db and gASQL.
+
+WWW: http://www.gnome-db.org/
diff --git a/databases/mergeant/pkg-plist b/databases/mergeant/pkg-plist
new file mode 100644
index 000000000..fa89db31d
--- /dev/null
+++ b/databases/mergeant/pkg-plist
@@ -0,0 +1,98 @@
+bin/mergeant
+libdata/bonobo/servers/GNOME_Mergeant.server
+share/gnome/application-registry/mergeant.applications
+share/gnome/applications/mergeant.desktop
+share/gnome/help/mergeant/C/book1.html
+share/gnome/help/mergeant/C/c13.html
+share/gnome/help/mergeant/C/c47.html
+share/gnome/help/mergeant/C/c68.html
+share/gnome/help/mergeant/C/c76.html
+share/gnome/help/mergeant/C/c8.html
+share/gnome/help/mergeant/C/c84.html
+share/gnome/help/mergeant/C/c94.html
+share/gnome/help/mergeant/C/docbook.css
+share/gnome/help/mergeant/C/images/datasources.png
+share/gnome/help/mergeant/C/images/dba_properties.png
+share/gnome/help/mergeant/C/images/workspace-data-types.png
+share/gnome/help/mergeant/C/images/workspace-graphs.png
+share/gnome/help/mergeant/C/images/workspace-queries.png
+share/gnome/help/mergeant/C/images/workspace.png
+share/gnome/help/mergeant/C/index.html
+share/gnome/help/mergeant/C/stylesheet-images/caution.gif
+share/gnome/help/mergeant/C/stylesheet-images/home.gif
+share/gnome/help/mergeant/C/stylesheet-images/important.gif
+share/gnome/help/mergeant/C/stylesheet-images/next.gif
+share/gnome/help/mergeant/C/stylesheet-images/note.gif
+share/gnome/help/mergeant/C/stylesheet-images/prev.gif
+share/gnome/help/mergeant/C/stylesheet-images/tip.gif
+share/gnome/help/mergeant/C/stylesheet-images/toc-blank.gif
+share/gnome/help/mergeant/C/stylesheet-images/toc-minus.gif
+share/gnome/help/mergeant/C/stylesheet-images/toc-plus.gif
+share/gnome/help/mergeant/C/stylesheet-images/up.gif
+share/gnome/help/mergeant/C/stylesheet-images/warning.gif
+share/gnome/help/mergeant/C/topic.dat
+share/gnome/help/mergeant/C/x19.html
+share/gnome/help/mergeant/C/x40.html
+share/gnome/mime-info/mergeant.keys
+share/gnome/mime-info/mergeant.mime
+share/gnome/omf/mergeant/mergeant-C.omf
+share/gnome/pixmaps/document-icons/gnome-application-x-mergeant.png
+share/gnome/pixmaps/mergeant/mergeant.png
+share/gnome/pixmaps/mergeant/mergeant_connect.png
+share/gnome/pixmaps/mergeant/mergeant_connect_small.png
+share/gnome/pixmaps/mergeant/mergeant_disconnect.png
+share/gnome/pixmaps/mergeant/mergeant_disconnect_small.png
+share/gnome/pixmaps/mergeant/mergeant_foot.png
+share/gnome/pixmaps/mergeant/mergeant_forms.png
+share/gnome/pixmaps/mergeant/mergeant_queries.png
+share/gnome/pixmaps/mergeant/mergeant_rels.png
+share/gnome/pixmaps/mergeant/mergeant_rels_small.png
+share/gnome/pixmaps/mergeant/mergeant_sequences.png
+share/gnome/pixmaps/mergeant/mergeant_tables.png
+share/gnome/pixmaps/mergeant/query-view-query_16x16.png
+share/gnome/pixmaps/mergeant/query-view-table_16x16.png
+share/gnome/pixmaps/mergeant/query-view-view_16x16.png
+share/locale/am/LC_MESSAGES/mergeant.mo
+share/locale/az/LC_MESSAGES/mergeant.mo
+share/locale/ca/LC_MESSAGES/mergeant.mo
+share/locale/cs/LC_MESSAGES/mergeant.mo
+share/locale/da/LC_MESSAGES/mergeant.mo
+share/locale/de/LC_MESSAGES/mergeant.mo
+share/locale/el/LC_MESSAGES/mergeant.mo
+share/locale/en_CA/LC_MESSAGES/mergeant.mo
+share/locale/en_GB/LC_MESSAGES/mergeant.mo
+share/locale/es/LC_MESSAGES/mergeant.mo
+share/locale/fa/LC_MESSAGES/mergeant.mo
+share/locale/fr/LC_MESSAGES/mergeant.mo
+share/locale/hr/LC_MESSAGES/mergeant.mo
+share/locale/it/LC_MESSAGES/mergeant.mo
+share/locale/ja/LC_MESSAGES/mergeant.mo
+share/locale/lt/LC_MESSAGES/mergeant.mo
+share/locale/ml/LC_MESSAGES/mergeant.mo
+share/locale/ms/LC_MESSAGES/mergeant.mo
+share/locale/nb/LC_MESSAGES/mergeant.mo
+share/locale/ne/LC_MESSAGES/mergeant.mo
+share/locale/nl/LC_MESSAGES/mergeant.mo
+share/locale/no/LC_MESSAGES/mergeant.mo
+share/locale/pl/LC_MESSAGES/mergeant.mo
+share/locale/pt/LC_MESSAGES/mergeant.mo
+share/locale/pt_BR/LC_MESSAGES/mergeant.mo
+share/locale/ru/LC_MESSAGES/mergeant.mo
+share/locale/rw/LC_MESSAGES/mergeant.mo
+share/locale/sk/LC_MESSAGES/mergeant.mo
+share/locale/sq/LC_MESSAGES/mergeant.mo
+share/locale/sr/LC_MESSAGES/mergeant.mo
+share/locale/sr@Latn/LC_MESSAGES/mergeant.mo
+share/locale/sv/LC_MESSAGES/mergeant.mo
+share/locale/tr/LC_MESSAGES/mergeant.mo
+share/locale/uk/LC_MESSAGES/mergeant.mo
+share/locale/vi/LC_MESSAGES/mergeant.mo
+share/locale/zh_CN/LC_MESSAGES/mergeant.mo
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrm share/gnome/pixmaps/mergeant
+@dirrm share/gnome/omf/mergeant
+@dirrm share/gnome/help/mergeant/C/stylesheet-images
+@dirrm share/gnome/help/mergeant/C/images
+@dirrm share/gnome/help/mergeant/C
+@dirrm share/gnome/help/mergeant