8 files changed, 97 insertions, 119 deletions

diff --git a/databases/libgda/Makefile b/databases/libgda/Makefile
index 149904e8b975..1e64233b95df 100644
--- a/databases/libgda/Makefile
+++ b/databases/libgda/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	libgda
-PORTVERSION=	0.2.90
-PORTREVISION=	4
+PORTVERSION=	0.2.93
 CATEGORIES=	databases gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	stable/sources/gnome-db
+MASTER_SITE_SUBDIR=	stable/sources/${PORTNAME}
 
 MAINTAINER=	gnome@FreeBSD.org
 
@@ -25,6 +24,7 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib -lintl -lgdbm"
 CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
+PLIST_SUB=	VERSION=${PORTVERSION}
 
 pre-patch:
 	@${PERL} -pi -e 's|-lpthread|-pthread|g ; \
diff --git a/databases/libgda/distinfo b/databases/libgda/distinfo
index 539c48fb099a..b9ffb51aa65d 100644
--- a/databases/libgda/distinfo
+++ b/databases/libgda/distinfo
@@ -1 +1 @@
-MD5 (libgda-0.2.90.tar.gz) = d968e062868656e2c55b354eb8bb2d0a
+MD5 (libgda-0.2.93.tar.gz) = ed5e317475ec71c4de25d1b4c1db16fb
diff --git a/databases/libgda/files/patch-aa b/databases/libgda/files/patch-aa
index 041e76617dad..13153918fd10 100644
--- a/databases/libgda/files/patch-aa
+++ b/databases/libgda/files/patch-aa
@@ -1,14 +1,13 @@
 
 $FreeBSD$
 
---- Makefile.in.orig	Tue Aug 14 10:29:18 2001
-+++ Makefile.in	Tue Aug 14 10:41:04 2001
-@@ -146,7 +146,7 @@
- XML_I18N_UPDATE = @XML_I18N_UPDATE@
- XML_LIBS = @XML_LIBS@
+--- Makefile.in.orig	Mon Oct 22 14:27:14 2001
++++ Makefile.in	Mon Oct 22 14:27:42 2001
+@@ -167,7 +167,6 @@
+ 	bindings \
+ 	providers \
+ 	tools \
+-	testing \
+ 	doc
  
--SUBDIRS =  	po 	intl 	macros 	idl 	lib 	bindings 	providers 	tools 	testing 	doc
-+SUBDIRS =  	po 	intl 	macros	idl 	lib 	bindings 	providers 	tools 	doc
  
- 
- EXTRA_DIST =  	COPYING 	libgda.spec.in 	xml-i18n-extract.in 	xml-i18n-merge.in 	xml-i18n-update.in
diff --git a/databases/libgda/files/patch-configure b/databases/libgda/files/patch-configure
deleted file mode 100644
index 9b06f29c68d6..000000000000
--- a/databases/libgda/files/patch-configure
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- configure	2001/08/06 08:32:35	1.1
-+++ configure	2001/08/06 08:32:59
-@@ -8896,7 +8896,7 @@
- 
- 
- 
--GDA_oafdir=`oaf-config --prefix`/share/oaf
-+GDA_oafdir="${prefix}/share/gnome/oaf"
- 
- 
- 
diff --git a/databases/libgda/files/patch-providers::gda-default-server::Makefile.in b/databases/libgda/files/patch-providers::gda-default-server::Makefile.in
deleted file mode 100644
index 10a773128884..000000000000
--- a/databases/libgda/files/patch-providers::gda-default-server::Makefile.in
+++ /dev/null
@@ -1,7 +0,0 @@
---- providers/gda-default-server/Makefile.in.orig	Fri Jun 15 15:17:33 2001
-+++ providers/gda-default-server/Makefile.in	Tue Jun 19 00:44:20 2001
-@@ -502,3 +502,3 @@
- 	../sqlite/configure && \
--	make
-+	${MAKE}
- 	cp build_sqlite/libsqlite.a libsqlite.a
diff --git a/databases/libgda/files/patch-providers::gda-default-server::sqlite::Makefile.in b/databases/libgda/files/patch-providers::gda-default-server::sqlite::Makefile.in
deleted file mode 100644
index d2fd990d2c40..000000000000
--- a/databases/libgda/files/patch-providers::gda-default-server::sqlite::Makefile.in
+++ /dev/null
@@ -1,7 +0,0 @@
---- providers/gda-default-server/sqlite/Makefile.in.orig	Fri Apr 27 20:17:17 2001
-+++ providers/gda-default-server/sqlite/Makefile.in	Tue Jun 19 00:54:45 2001
-@@ -99,3 +99,3 @@
- 	$(TCC) $(READLINE_FLAGS) -o sqlite $(TOP)/src/shell.c \
--		libsqlite.a $(LIBGDBM) $(LIBREADLINE)
-+		libsqlite.a $(LIBGDBM) $(LIBREADLINE) -L/usr/local/lib -lgdbm
- 
diff --git a/databases/libgda/files/patch-providers::gda-default-server::sqlite::tool::lemon.c b/databases/libgda/files/patch-providers::gda-default-server::sqlite::tool::lemon.c
index 694313e430ae..8ba03657d5c3 100644
--- a/databases/libgda/files/patch-providers::gda-default-server::sqlite::tool::lemon.c
+++ b/databases/libgda/files/patch-providers::gda-default-server::sqlite::tool::lemon.c
@@ -1,8 +1,8 @@
 
 $FreeBSD$
 
---- providers/gda-default-server/sqlite/tool/lemon.c.orig	Fri Aug  3 17:47:37 2001
-+++ providers/gda-default-server/sqlite/tool/lemon.c	Mon Aug  6 10:59:21 2001
+--- providers/gda-default-server/sqlite/lemon.c.orig	Fri Aug  3 17:47:37 2001
++++ providers/gda-default-server/sqlite/lemon.c	Mon Aug  6 10:59:21 2001
 @@ -1327,7 +1327,7 @@
  /*
  ** Return a pointer to the next structure in the linked list.
diff --git a/databases/libgda/pkg-plist b/databases/libgda/pkg-plist
index 46a4bc8df949..173c61a350cc 100644
--- a/databases/libgda/pkg-plist
+++ b/databases/libgda/pkg-plist
@@ -3,48 +3,48 @@ bin/gda-buildserver
 bin/gda-config
 bin/gda-default-srv
 bin/gda-run
-include/gda/GDA.h
-include/gda/gda++/gdaBatch.h
-include/gda/gda++/gdaCommand.h
-include/gda/gda++/gdaConnection.h
-include/gda/gda++/gdaError.h
-include/gda/gda++/gdaErrorList.h
-include/gda/gda++/gdaField.h
-include/gda/gda++/gdaIncludes.h
-include/gda/gda++/gdaRecordset.h
-include/gda/gda++/gdaValue.h
-include/gda/gda-batch.h
-include/gda/gda-client.h
-include/gda/gda-command.h
-include/gda/gda-common-defs.h
-include/gda/gda-common.h
-include/gda/gda-config.h
-include/gda/gda-connection-pool.h
-include/gda/gda-connection.h
-include/gda/gda-corba.h
-include/gda/gda-error.h
-include/gda/gda-export.h
-include/gda/gda-field.h
-include/gda/gda-listener.h
-include/gda/gda-log.h
-include/gda/gda-quark-list.h
-include/gda/gda-recordset.h
-include/gda/gda-server-command.h
-include/gda/gda-server-connection.h
-include/gda/gda-server-error.h
-include/gda/gda-server-field.h
-include/gda/gda-server-recordset.h
-include/gda/gda-server.h
-include/gda/gda-thread.h
-include/gda/gda-util.h
-include/gda/gda-value.h
-include/gda/gda-xml-atom-item.h
-include/gda/gda-xml-bin-item.h
-include/gda/gda-xml-database.h
-include/gda/gda-xml-document.h
-include/gda/gda-xml-item.h
-include/gda/gda-xml-list-item.h
-include/gda/gda-xml-util.h
+include/libgda-%%VERSION%%/gda++/gdaBatch.h
+include/libgda-%%VERSION%%/gda++/gdaCommand.h
+include/libgda-%%VERSION%%/gda++/gdaConnection.h
+include/libgda-%%VERSION%%/gda++/gdaError.h
+include/libgda-%%VERSION%%/gda++/gdaErrorList.h
+include/libgda-%%VERSION%%/gda++/gdaField.h
+include/libgda-%%VERSION%%/gda++/gdaIncludes.h
+include/libgda-%%VERSION%%/gda++/gdaRecordset.h
+include/libgda-%%VERSION%%/gda++/gdaValue.h
+include/libgda-%%VERSION%%/gda/GDA.h
+include/libgda-%%VERSION%%/gda/gda-batch.h
+include/libgda-%%VERSION%%/gda/gda-client.h
+include/libgda-%%VERSION%%/gda/gda-command.h
+include/libgda-%%VERSION%%/gda/gda-common-defs.h
+include/libgda-%%VERSION%%/gda/gda-common.h
+include/libgda-%%VERSION%%/gda/gda-config.h
+include/libgda-%%VERSION%%/gda/gda-connection-pool.h
+include/libgda-%%VERSION%%/gda/gda-connection.h
+include/libgda-%%VERSION%%/gda/gda-corba.h
+include/libgda-%%VERSION%%/gda/gda-error.h
+include/libgda-%%VERSION%%/gda/gda-export.h
+include/libgda-%%VERSION%%/gda/gda-field.h
+include/libgda-%%VERSION%%/gda/gda-listener.h
+include/libgda-%%VERSION%%/gda/gda-log.h
+include/libgda-%%VERSION%%/gda/gda-quark-list.h
+include/libgda-%%VERSION%%/gda/gda-recordset.h
+include/libgda-%%VERSION%%/gda/gda-server-command.h
+include/libgda-%%VERSION%%/gda/gda-server-connection.h
+include/libgda-%%VERSION%%/gda/gda-server-error.h
+include/libgda-%%VERSION%%/gda/gda-server-field.h
+include/libgda-%%VERSION%%/gda/gda-server-recordset.h
+include/libgda-%%VERSION%%/gda/gda-server.h
+include/libgda-%%VERSION%%/gda/gda-thread.h
+include/libgda-%%VERSION%%/gda/gda-util.h
+include/libgda-%%VERSION%%/gda/gda-value.h
+include/libgda-%%VERSION%%/gda/gda-xml-atom-item.h
+include/libgda-%%VERSION%%/gda/gda-xml-bin-item.h
+include/libgda-%%VERSION%%/gda/gda-xml-database.h
+include/libgda-%%VERSION%%/gda/gda-xml-document.h
+include/libgda-%%VERSION%%/gda/gda-xml-item.h
+include/libgda-%%VERSION%%/gda/gda-xml-list-item.h
+include/libgda-%%VERSION%%/gda/gda-xml-util.h
 lib/libgda-client.a
 lib/libgda-client.so
 lib/libgda-client.so.0
@@ -63,53 +63,54 @@ share/gnome/gda/templates/gda-srv-recordset.c.tmpl
 share/gnome/gda/templates/gda-srv.h.tmpl
 share/gnome/gda/templates/main-srv.c.tmpl
 share/gnome/help/libgda/C/architecture.html
-share/gnome/help/libgda/C/clients-building-corba.html
-share/gnome/help/libgda/C/clients-building.html
-share/gnome/help/libgda/C/clients.html
-share/gnome/help/libgda/C/docbook.css
-share/gnome/help/libgda/C/fdl-section1.html
-share/gnome/help/libgda/C/fdl-section10.html
-share/gnome/help/libgda/C/fdl-section2.html
-share/gnome/help/libgda/C/fdl-section3.html
-share/gnome/help/libgda/C/fdl-section4.html
-share/gnome/help/libgda/C/fdl-section5.html
-share/gnome/help/libgda/C/fdl-section6.html
-share/gnome/help/libgda/C/fdl-section7.html
-share/gnome/help/libgda/C/fdl-section8.html
-share/gnome/help/libgda/C/fdl-section9.html
-share/gnome/help/libgda/C/fdl-using.html
-share/gnome/help/libgda/C/fdl.html
-share/gnome/help/libgda/C/gda-client-batch.html
-share/gnome/help/libgda/C/gda-client-meta.html
-share/gnome/help/libgda/C/gda-client-objects.html
-share/gnome/help/libgda/C/gda-client-types.html
-share/gnome/help/libgda/C/gda-client.html
-share/gnome/help/libgda/C/gda-common-logs.html
-share/gnome/help/libgda/C/gda-common-xml-databases.html
-share/gnome/help/libgda/C/gda-common-xml-queries.html
-share/gnome/help/libgda/C/gda-common.html
 share/gnome/help/libgda/C/index.html
-share/gnome/help/libgda/C/installation-configuring.html
 share/gnome/help/libgda/C/installation-installing.html
 share/gnome/help/libgda/C/installation.html
 share/gnome/help/libgda/C/introduction.html
 share/gnome/help/libgda/C/libgda.html
-share/gnome/help/libgda/C/ln40.html
-share/gnome/help/libgda/C/providers-actual-implementation.html
-share/gnome/help/libgda/C/providers-examples.html
-share/gnome/help/libgda/C/providers-implementation.html
-share/gnome/help/libgda/C/providers.html
-share/gnome/help/libgda/C/reports.html
 share/gnome/help/libgda/C/topic.dat
+share/gnome/help/libgda/es/architecture.html
+share/gnome/help/libgda/es/index.html
+share/gnome/help/libgda/es/installation-installing.html
+share/gnome/help/libgda/es/installation.html
+share/gnome/help/libgda/es/introduction.html
+share/gnome/help/libgda/es/libgda.html
 share/gnome/help/libgda/es/topic.dat
+share/gnome/help/libgda/pt_BR/architecture.html
+share/gnome/help/libgda/pt_BR/c162.html
+share/gnome/help/libgda/pt_BR/c182.html
+share/gnome/help/libgda/pt_BR/c323.html
+share/gnome/help/libgda/pt_BR/c350.html
+share/gnome/help/libgda/pt_BR/clients-building-corba.html
+share/gnome/help/libgda/pt_BR/clients-building.html
+share/gnome/help/libgda/pt_BR/gda-client-batch.html
+share/gnome/help/libgda/pt_BR/gda-client-meta.html
+share/gnome/help/libgda/pt_BR/gda-client-objects.html
+share/gnome/help/libgda/pt_BR/gda-client-types.html
+share/gnome/help/libgda/pt_BR/gda-common-logs.html
+share/gnome/help/libgda/pt_BR/gda-common-xml-databases.html
+share/gnome/help/libgda/pt_BR/gda-common-xml-queries.html
+share/gnome/help/libgda/pt_BR/index.html
+share/gnome/help/libgda/pt_BR/installation-configuring.html
+share/gnome/help/libgda/pt_BR/installation-installing.html
+share/gnome/help/libgda/pt_BR/installation.html
+share/gnome/help/libgda/pt_BR/introduction.html
+share/gnome/help/libgda/pt_BR/libgda.html
+share/gnome/help/libgda/pt_BR/providers-actual-implementation.html
+share/gnome/help/libgda/pt_BR/providers-examples.html
+share/gnome/help/libgda/pt_BR/providers-implementation.html
 share/gnome/help/libgda/pt_BR/topic.dat
+share/gnome/html/libgda-client-decl.txt
 share/gnome/html/libgda-client-sections.txt
 share/gnome/html/libgda-client.args
 share/gnome/html/libgda-client.hierarchy
+share/gnome/html/libgda-client.signals
 share/gnome/html/libgda-client.types
+share/gnome/html/libgda-common-decl.txt
 share/gnome/html/libgda-common-sections.txt
 share/gnome/html/libgda-common.args
 share/gnome/html/libgda-common.hierarchy
+share/gnome/html/libgda-common.signals
 share/gnome/html/libgda-common.types
 share/gnome/idl/GDA.idl
 share/gnome/idl/GDA_Command.idl
@@ -120,6 +121,9 @@ share/gnome/idl/GDA_Listener.idl
 share/gnome/idl/GDA_Parameter.idl
 share/gnome/idl/GDA_Recordset.idl
 share/gnome/oaf/GNOME_GDA_Provider_Default.oaf
+share/gnome/omf/libgda/libgda-C.omf
+share/gnome/omf/libgda/libgda-es.omf
+share/gnome/omf/libgda/libgda-pt_BR.omf
 share/locale/ca/LC_MESSAGES/libgda.mo
 share/locale/da/LC_MESSAGES/libgda.mo
 share/locale/de/LC_MESSAGES/libgda.mo
@@ -136,12 +140,14 @@ share/locale/nl/LC_MESSAGES/libgda.mo
 share/locale/nn/LC_MESSAGES/libgda.mo
 share/locale/no/LC_MESSAGES/libgda.mo
 share/locale/pl/LC_MESSAGES/libgda.mo
+share/locale/pt/LC_MESSAGES/libgda.mo
 share/locale/pt_BR/LC_MESSAGES/libgda.mo
 share/locale/ru/LC_MESSAGES/libgda.mo
 share/locale/sk/LC_MESSAGES/libgda.mo
 share/locale/sl/LC_MESSAGES/libgda.mo
 share/locale/sv/LC_MESSAGES/libgda.mo
 share/locale/uk/LC_MESSAGES/libgda.mo
+@dirrm share/gnome/omf/libgda
 @dirrm share/gnome/help/libgda/pt_BR/images
 @dirrm share/gnome/help/libgda/pt_BR
 @dirrm share/gnome/help/libgda/es/images
@@ -151,5 +157,6 @@ share/locale/uk/LC_MESSAGES/libgda.mo
 @dirrm share/gnome/help/libgda
 @dirrm share/gnome/gda/templates
 @dirrm share/gnome/gda
-@dirrm include/gda/gda++
-@dirrm include/gda
+@dirrm include/libgda-%%VERSION%%/gda++
+@dirrm include/libgda-%%VERSION%%/gda
+@dirrm include/libgda-%%VERSION%%