Update to 0.2.10

9 files changed, 199 insertions, 30 deletions

diff --git a/databases/libgda/Makefile b/databases/libgda/Makefile
index def1da97e85b..e63377a45006 100644
--- a/databases/libgda/Makefile
+++ b/databases/libgda/Makefile
@@ -6,23 +6,30 @@
 #
 
 PORTNAME=	libgda
-PORTVERSION=	0.2.3
+PORTVERSION=	0.2.10
 CATEGORIES=	databases gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	stable/sources/libgda
+MASTER_SITE_SUBDIR=	stable/sources/gnome-db
 
 MAINTAINER=	gnome@FreeBSD.org
 
-USE_GNOME=	yes
+LIB_DEPENDS=	giconv.2:${PORTSDIR}/converters/libiconv \
+		gdbm.2:${PORTSDIR}/databases/gdbm
+
+USE_GNOMECTRL=	yes
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
 
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LIBS="-L${LOCALBASE}/lib -lintl -lgdbm"
+
 pre-patch:
 	@${PERL} -pi -e 's|-lpthread|-pthread|g ; \
 		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
 	@find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \
 		's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \
+		 s|share/idl|share/gnome/idl|g ; \
 		 s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g'
 
 .include <bsd.port.mk>
diff --git a/databases/libgda/distinfo b/databases/libgda/distinfo
index 802e4a484e63..3ef9eda29205 100644
--- a/databases/libgda/distinfo
+++ b/databases/libgda/distinfo
@@ -1 +1 @@
-MD5 (libgda-0.2.3.tar.gz) = 8d1f1ea307ae4f680bcefedb433e0c34
+MD5 (libgda-0.2.10.tar.gz) = 07af13d295e15f2b779c8d3909b20846
diff --git a/databases/libgda/files/patch-aa b/databases/libgda/files/patch-aa
index 370723ab829b..ab7e324837b7 100644
--- a/databases/libgda/files/patch-aa
+++ b/databases/libgda/files/patch-aa
@@ -1,7 +1,7 @@
---- Makefile.in.orig	Wed Feb 14 18:40:55 2001
-+++ Makefile.in	Thu Mar  8 17:10:44 2001
-@@ -138,3 +138,3 @@
+--- Makefile.in.orig	Tue Jun 19 00:17:33 2001
++++ Makefile.in	Tue Jun 19 00:18:07 2001
+@@ -148,3 +148,3 @@
  
--SUBDIRS =  	po 	macros 	doc 	idl 	lib 	bindings 	providers 	tools 	report 	testing
-+SUBDIRS =  	po 	macros 	doc 	idl 	lib 	bindings 	providers 	tools 	report
+-SUBDIRS =  	po 	intl 	macros 	idl 	lib 	bindings 	providers 	tools 	testing 	doc
++SUBDIRS =  	po 	intl 	macros 	idl 	lib 	bindings 	providers 	tools 	doc
  
diff --git a/databases/libgda/files/patch-bindings::perl::Makefile.in b/databases/libgda/files/patch-bindings::perl::Makefile.in
new file mode 100644
index 000000000000..0822ed6c061c
--- /dev/null
+++ b/databases/libgda/files/patch-bindings::perl::Makefile.in
@@ -0,0 +1,16 @@
+--- bindings/perl/Makefile.in.orig	Tue Jun 19 02:01:09 2001
++++ bindings/perl/Makefile.in	Tue Jun 19 02:05:09 2001
+@@ -254,4 +254,4 @@
+ all:
+-	cd Gnome/GDA/Common && perl Makefile.PL && make
+-	cd Gnome/GDA/Client && perl Makefile.PL && make
++	cd Gnome/GDA/Common && perl Makefile.PL && ${MAKE}
++	cd Gnome/GDA/Client && perl Makefile.PL && ${MAKE}
+ 
+@@ -259,4 +259,4 @@
+ install-data-local:
+-	cd Gnome/GDA/Common && make install
+-	cd Gnome/GDA/Client && make install
++	cd Gnome/GDA/Common && ${MAKE} install
++	cd Gnome/GDA/Client && ${MAKE} install
+ 
diff --git a/databases/libgda/files/patch-configure b/databases/libgda/files/patch-configure
new file mode 100644
index 000000000000..71c871b4fca1
--- /dev/null
+++ b/databases/libgda/files/patch-configure
@@ -0,0 +1,62 @@
+--- configure.orig	Wed Jun 13 18:45:10 2001
++++ configure	Tue Jun 19 00:39:40 2001
+@@ -5389,4 +5389,19 @@
+ 
+-
+-
++# Actually configure libtool.  ac_aux_dir is where install-sh is found.
++CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
++LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
++LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \
++DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \
++${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
++$libtool_flags $ac_aux_dir/ltmain.sh $lt_target \
++|| { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
++  
++# Reload cache, that may have been modified by ltconfig
++if test -r "$cache_file"; then
++  echo "loading cache $cache_file"
++  . $cache_file
++else
++  echo "creating cache $cache_file"
++  > $cache_file
++fi
+ 
+@@ -5394,3 +5409,3 @@
+ # This can be used to rebuild libtool when needed
+-LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh"
+ 
+@@ -5399,2 +5414,7 @@
+ 
++# Redirect the config.log output again, so that the ltconfig log is not
++# clobbered by the next message.
++exec 5>>./config.log
++
++
+ # Prevent multiple expansion
+@@ -7911,3 +7931,3 @@
+ #include <stdlib.h>
+-#include <iconv.h>
++#include <giconv.h>
+ int main() {
+@@ -7928,3 +7948,3 @@
+       am_save_LIBS="$LIBS"
+-      LIBS="$LIBS -liconv"
++      LIBS="$LIBS -lgiconv"
+       cat > conftest.$ac_ext <<EOF
+@@ -7933,3 +7953,3 @@
+ #include <stdlib.h>
+-#include <iconv.h>
++#include <giconv.h>
+ int main() {
+@@ -7971,3 +7991,3 @@
+ #include <stdlib.h>
+-#include <iconv.h>
++#include <giconv.h>
+ extern
+@@ -8009,3 +8029,3 @@
+   if test "$am_cv_lib_iconv" = yes; then
+-    LIBICONV="-liconv"
++    LIBICONV="-lgiconv"
+   fi
diff --git a/databases/libgda/files/patch-po::Makefile.in.in b/databases/libgda/files/patch-po::Makefile.in.in
new file mode 100644
index 000000000000..3f425ffda3af
--- /dev/null
+++ b/databases/libgda/files/patch-po::Makefile.in.in
@@ -0,0 +1,7 @@
+--- po/Makefile.in.in.orig	Wed Jun 13 15:55:50 2001
++++ po/Makefile.in.in	Tue Jun 19 01:14:13 2001
+@@ -25,3 +25,3 @@
+ datadir = @datadir@
+-localedir = $(datadir)/locale
++localedir = $(prefix)/share/locale
+ gettextsrcdir = $(datadir)/gettext/po
diff --git a/databases/libgda/files/patch-providers::gda-default-server::Makefile.in b/databases/libgda/files/patch-providers::gda-default-server::Makefile.in
new file mode 100644
index 000000000000..10a773128884
--- /dev/null
+++ b/databases/libgda/files/patch-providers::gda-default-server::Makefile.in
@@ -0,0 +1,7 @@
+--- 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
new file mode 100644
index 000000000000..d2fd990d2c40
--- /dev/null
+++ b/databases/libgda/files/patch-providers::gda-default-server::sqlite::Makefile.in
@@ -0,0 +1,7 @@
+--- 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/pkg-plist b/databases/libgda/pkg-plist
index e8f37837790f..8f1f4385065d 100644
--- a/databases/libgda/pkg-plist
+++ b/databases/libgda/pkg-plist
@@ -1,7 +1,7 @@
 bin/gda-buildclient
 bin/gda-buildserver
 bin/gda-config
-bin/gda-report-server
+bin/gda-default-srv
 bin/gda-run
 include/gda/GDA.h
 include/gda/gda++/gdaBatch.h
@@ -22,13 +22,10 @@ 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-log.h
 include/gda/gda-recordset.h
-include/gda/gda-report-client.h
-include/gda/gda-report-defs.h
-include/gda/gda-report-engine.h
-include/gda/gda-report-stream.h
 include/gda/gda-server-impl.h
 include/gda/gda-server.h
 include/gda/gda-thread.h
@@ -36,7 +33,6 @@ include/gda/gda-util.h
 include/gda/gda-value.h
 include/gda/gda-xml-database.h
 include/gda/gda-xml-file.h
-include/gda/gda-xml-query.h
 lib/libgda-client.a
 lib/libgda-client.so
 lib/libgda-client.so.0
@@ -46,9 +42,6 @@ lib/libgda-clientcpp.so.0
 lib/libgda-common.a
 lib/libgda-common.so
 lib/libgda-common.so.0
-lib/libgda-report.a
-lib/libgda-report.so
-lib/libgda-report.so.0
 lib/libgda-server.a
 lib/libgda-server.so
 lib/libgda-server.so.0
@@ -57,13 +50,23 @@ share/gda/templates/gda-srv-connection.c.tmpl
 share/gda/templates/gda-srv-recordset.c.tmpl
 share/gda/templates/gda-srv.h.tmpl
 share/gda/templates/main-srv.c.tmpl
-share/gnome/gda/dtd/gda-report.dtd
-share/gnome/gda/dtd/gda-xml-query.dtd
 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
@@ -79,13 +82,39 @@ 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/ln32.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/clients-building-corba.html
+share/gnome/help/libgda/es/clients-building.html
+share/gnome/help/libgda/es/clients.html
+share/gnome/help/libgda/es/docbook.css
+share/gnome/help/libgda/es/gda-client-batch.html
+share/gnome/help/libgda/es/gda-client-meta.html
+share/gnome/help/libgda/es/gda-client-objects.html
+share/gnome/help/libgda/es/gda-client-types.html
+share/gnome/help/libgda/es/gda-client.html
+share/gnome/help/libgda/es/gda-common-logs.html
+share/gnome/help/libgda/es/gda-common-xml-databases.html
+share/gnome/help/libgda/es/gda-common-xml-queries.html
+share/gnome/help/libgda/es/gda-common.html
+share/gnome/help/libgda/es/index.html
+share/gnome/help/libgda/es/installation-configuring.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/ln47.html
+share/gnome/help/libgda/es/providers-actual-implementation.html
+share/gnome/help/libgda/es/providers-examples.html
+share/gnome/help/libgda/es/providers-implementation.html
+share/gnome/help/libgda/es/providers.html
+share/gnome/help/libgda/es/reports.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
@@ -112,20 +141,54 @@ 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/idl/GDA.idl
-share/idl/GDA_Command.idl
-share/idl/GDA_Connection.idl
-share/idl/GDA_Error.idl
-share/idl/GDA_Field.idl
-share/idl/GDA_Parameter.idl
-share/idl/GDA_Recordset.idl
+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
+share/gnome/idl/GDA_Connection.idl
+share/gnome/idl/GDA_Error.idl
+share/gnome/idl/GDA_Field.idl
+share/gnome/idl/GDA_Recordset.idl
+share/gnome/idl/GDA_Parameter.idl
+share/gnome/oaf/GNOME_GDA_Provider_Default.oaf
+share/locale/ca/LC_MESSAGES/libgda.mo
+share/locale/da/LC_MESSAGES/libgda.mo
+share/locale/de/LC_MESSAGES/libgda.mo
+share/locale/el/LC_MESSAGES/libgda.mo
+share/locale/es/LC_MESSAGES/libgda.mo
+share/locale/fi/LC_MESSAGES/libgda.mo
+share/locale/fr/LC_MESSAGES/libgda.mo
+share/locale/ga/LC_MESSAGES/libgda.mo
+share/locale/gl/LC_MESSAGES/libgda.mo
+share/locale/hu/LC_MESSAGES/libgda.mo
+share/locale/it/LC_MESSAGES/libgda.mo
+share/locale/ja/LC_MESSAGES/libgda.mo
+share/locale/nl/LC_MESSAGES/libgda.mo
+share/locale/no/LC_MESSAGES/libgda.mo
+share/locale/pl/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/help/libgda/pt_BR/images
 @dirrm share/gnome/help/libgda/pt_BR
+@dirrm share/gnome/help/libgda/es/images
+@dirrm share/gnome/help/libgda/es
 @dirrm share/gnome/help/libgda/C/images
 @dirrm share/gnome/help/libgda/C
 @dirrm share/gnome/help/libgda
-@dirrm share/gnome/gda/dtd
-@dirrm share/gnome/gda
 @dirrm share/gda/templates
 @dirrm share/gda
 @dirrm include/gda/gda++