Update to 0.2.90.

5 files changed, 48 insertions, 64 deletions

diff --git a/databases/libgda2/files/patch-bindings::perl::Makefile.in b/databases/libgda2/files/patch-bindings::perl::Makefile.in
deleted file mode 100644
index 0822ed6c061c..000000000000
--- a/databases/libgda2/files/patch-bindings::perl::Makefile.in
+++ /dev/null
@@ -1,16 +0,0 @@
---- 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/libgda2/files/patch-configure b/databases/libgda2/files/patch-configure
index 29982c39abc5..9b06f29c68d6 100644
--- a/databases/libgda2/files/patch-configure
+++ b/databases/libgda2/files/patch-configure
@@ -1,56 +1,14 @@
 
 $FreeBSD$
 
---- configure.orig	Thu Jul 26 15:51:10 2001
-+++ configure	Thu Jul 26 16:09:53 2001
-@@ -6238,7 +6240,7 @@
+--- configure	2001/08/06 08:32:35	1.1
++++ configure	2001/08/06 08:32:59
+@@ -8896,7 +8896,7 @@
  
  
  
--if test $perl_val == true; then
-+if test $perl_val = true; then
-   WITH_PERL_TRUE=
-   WITH_PERL_FALSE='#'
- else
-@@ -7909,7 +7911,7 @@
- #line 7910 "configure"
- #include "confdefs.h"
- #include <stdlib.h>
--#include <iconv.h>
-+#include <giconv.h>
- int main() {
- iconv_t cd = iconv_open("","");
-        iconv(cd,NULL,NULL,NULL,NULL);
-@@ -7926,12 +7928,12 @@
- rm -f conftest*
-     if test "$am_cv_func_iconv" != yes; then
-       am_save_LIBS="$LIBS"
--      LIBS="$LIBS -liconv"
-+      LIBS="$LIBS -lgiconv"
-       cat > conftest.$ac_ext <<EOF
- #line 7932 "configure"
- #include "confdefs.h"
- #include <stdlib.h>
--#include <iconv.h>
-+#include <giconv.h>
- int main() {
- iconv_t cd = iconv_open("","");
-          iconv(cd,NULL,NULL,NULL,NULL);
-@@ -7969,7 +7971,7 @@
- #include "confdefs.h"
+-GDA_oafdir=`oaf-config --prefix`/share/oaf
++GDA_oafdir="${prefix}/share/gnome/oaf"
+ 
  
- #include <stdlib.h>
--#include <iconv.h>
-+#include <giconv.h>
- extern
- #ifdef __cplusplus
- "C"
-@@ -8007,7 +8009,7 @@
-   fi
-   LIBICONV=
-   if test "$am_cv_lib_iconv" = yes; then
--    LIBICONV="-liconv"
-+    LIBICONV="-lgiconv"
-   fi
-   
  
diff --git a/databases/libgda2/files/patch-providers::gda-default-server::sqlite::tool::lemon.c b/databases/libgda2/files/patch-providers::gda-default-server::sqlite::tool::lemon.c
new file mode 100644
index 000000000000..694313e430ae
--- /dev/null
+++ b/databases/libgda2/files/patch-providers::gda-default-server::sqlite::tool::lemon.c
@@ -0,0 +1,14 @@
+
+$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
+@@ -1327,7 +1327,7 @@
+ /*
+ ** Return a pointer to the next structure in the linked list.
+ */
+-#define NEXT(A) (*(char**)(((int)A)+offset))
++#define NEXT(A) (*(char**)(((long)A)+offset))
+ 
+ /*
+ ** Inputs:
diff --git a/databases/libgda2/files/patch-tools::gda-buildserver.in b/databases/libgda2/files/patch-tools::gda-buildserver.in
new file mode 100644
index 000000000000..fa75e2dcc31f
--- /dev/null
+++ b/databases/libgda2/files/patch-tools::gda-buildserver.in
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- tools/gda-buildserver.in	2001/08/06 08:16:41	1.1
++++ tools/gda-buildserver.in	2001/08/06 08:16:54
+@@ -7,7 +7,7 @@
+ CC=@CC@
+ shell=@shell@
+ 
+-TEMPLATES_DIR="${prefix}/share/gda/templates"
++TEMPLATES_DIR="${prefix}/share/gnome/gda/templates"
+ TMPL_C_FILES="gda-srv-command.c gda-srv-connection.c gda-srv-recordset.c main-srv.c"
+ TMPL_H_FILES="gda-srv.h"
+ 
diff --git a/databases/libgda2/files/patch-tools::templates::Makefile.in b/databases/libgda2/files/patch-tools::templates::Makefile.in
new file mode 100644
index 000000000000..2ca62bfb551d
--- /dev/null
+++ b/databases/libgda2/files/patch-tools::templates::Makefile.in
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- tools/templates/Makefile.in	2001/08/06 08:15:18	1.1
++++ tools/templates/Makefile.in	2001/08/06 08:15:53
+@@ -148,7 +148,7 @@
+ 
+ EXTRA_DIST = $(TEMPLATE_FILES)
+ 
+-gdatemplatesdir = $(prefix)/share/gda/templates
++gdatemplatesdir = $(prefix)/share/gnome/gda/templates
+ gdatemplates_DATA = $(TEMPLATE_FILES)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../../config.h