8 files changed, 22 insertions, 80 deletions

diff --git a/databases/libgda3/files/patch-aa b/databases/libgda3/files/patch-aa
index 8f9cc8fb43a8..6892fe3f329b 100644
--- a/databases/libgda3/files/patch-aa
+++ b/databases/libgda3/files/patch-aa
@@ -1,14 +1,11 @@
-
-$FreeBSD$
-
---- Makefile.in.orig	Wed Nov 21 10:29:52 2001
-+++ Makefile.in	Wed Nov 21 10:30:19 2001
-@@ -158,7 +158,7 @@
- YACC = @YACC@
- l = @l@
+--- Makefile.in.orig	Sun Jun  2 22:13:42 2002
++++ Makefile.in	Sun Jun  2 22:13:50 2002
+@@ -149,7 +149,7 @@
+ WARN_CFLAGS = @WARN_CFLAGS@
+ cxxflags_set = @cxxflags_set@
  
--SUBDIRS =  	po 	intl 	macros 	idl 	lib 	bindings 	providers 	tools 	testing 	doc
-+SUBDIRS =  	po 	intl 	macros 	idl 	lib 	bindings 	providers 	tools 	doc
+-SUBDIRS =  	po 	idl 	libgda 	providers 	report 	tools 	testing 	data 	doc
++SUBDIRS =  	po 	idl 	libgda 	providers 	report 	tools 	data 	doc
  
  
- EXTRA_DIST =  	COPYING 	libgda.spec.in 	xml-i18n-extract.in 	xml-i18n-merge.in 	xml-i18n-update.in
+ EXTRA_DIST =  	COPYING 	libgda.spec.in 	libgda.pc.in 	intltool-extract.in 	intltool-merge.in 	intltool-update.in
diff --git a/databases/libgda3/files/patch-configure b/databases/libgda3/files/patch-configure
index 948849e89223..d744b24f81e8 100644
--- a/databases/libgda3/files/patch-configure
+++ b/databases/libgda3/files/patch-configure
@@ -1,9 +1,6 @@
-
-$FreeBSD$
-
---- configure	2002/05/01 08:18:05	1.1
-+++ configure	2002/05/01 08:19:03
-@@ -5785,6 +5785,7 @@
+--- configure.orig	Sun Jun  2 22:12:29 2002
++++ configure	Sun Jun  2 22:13:06 2002
+@@ -8429,6 +8429,7 @@
  
  # This can be used to rebuild libtool when needed
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
diff --git a/databases/libgda3/files/patch-doc::C::reference::libgda-client::Makefile.in b/databases/libgda3/files/patch-doc::C::reference::libgda-client::Makefile.in
deleted file mode 100644
index 463f043f902c..000000000000
--- a/databases/libgda3/files/patch-doc::C::reference::libgda-client::Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- doc/C/reference/libgda-client/Makefile.in	2002/05/01 08:16:31	1.1
-+++ doc/C/reference/libgda-client/Makefile.in	2002/05/01 08:17:40
-@@ -171,7 +171,7 @@
- LDFLAGS = " 	$(GDA_CLIENT_LIBS) 	$(top_builddir)/lib/gda-common/.libs/libgda-common.so 	$(top_builddir)/lib/gda-client/.libs/libgda-client.a 	"
- 
- 
--DOC_DIR = $(datadir)/html
-+DOC_DIR = $(prefix)/share/doc/libgda
- 
- DOC_DIR_INSTALL_FILES =  	 libgda-client.args 	 libgda-client.hierarchy 	 libgda-client.signals		 libgda-client.types 	 libgda-client-decl.txt			 libgda-client-sections.txt
- 
diff --git a/databases/libgda3/files/patch-doc::C::reference::libgda-common::Makefile.in b/databases/libgda3/files/patch-doc::C::reference::libgda-common::Makefile.in
deleted file mode 100644
index 25b6b1ddc2e5..000000000000
--- a/databases/libgda3/files/patch-doc::C::reference::libgda-common::Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- doc/C/reference/libgda-common/Makefile.in	2002/05/01 08:16:31	1.1
-+++ doc/C/reference/libgda-common/Makefile.in	2002/05/01 08:17:35
-@@ -171,7 +171,7 @@
- LDFLAGS = " 	$(GDA_CLIENT_LIBS) 	$(top_builddir)/lib/gda-common/.libs/libgda-common.a 	"
- 
- 
--DOC_DIR = $(datadir)/html
-+DOC_DIR = $(prefix)/share/doc/libgda
- 
- DOC_DIR_INSTALL_FILES =  	 libgda-common.args 	 libgda-common.hierarchy 	 libgda-common.signals		 libgda-common.types 	 libgda-common-decl.txt			 libgda-common-sections.txt
- 
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 000000000000..718a4a1ebe6f
--- /dev/null
+++ b/databases/libgda3/files/patch-doc_C_Makefile.in
@@ -0,0 +1,11 @@
+--- doc/C/Makefile.in.orig	Sun Jun  2 22:17:05 2002
++++ doc/C/Makefile.in	Sun Jun  2 22:17:27 2002
+@@ -152,7 +152,7 @@
+ cxxflags_set = @cxxflags_set@
+ 
+ DOC_MODULE = libgda
+-HTML_DIR = $(datadir)/gtk-doc/html
++HTML_DIR = $(prefix)/share/doc
+ 
+ # The top-level SGML file. Change it if you want.
+ DOC_MAIN_SGML_FILE = $(DOC_MODULE)-docs.sgml
diff --git a/databases/libgda3/files/patch-po::Makefile.in.in b/databases/libgda3/files/patch-po::Makefile.in.in
deleted file mode 100644
index 3f425ffda3af..000000000000
--- a/databases/libgda3/files/patch-po::Makefile.in.in
+++ /dev/null
@@ -1,7 +0,0 @@
---- 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/libgda3/files/patch-tools::gda-buildserver.in b/databases/libgda3/files/patch-tools::gda-buildserver.in
deleted file mode 100644
index fa75e2dcc31f..000000000000
--- a/databases/libgda3/files/patch-tools::gda-buildserver.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$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/libgda3/files/patch-tools::templates::Makefile.in b/databases/libgda3/files/patch-tools::templates::Makefile.in
deleted file mode 100644
index 2ca62bfb551d..000000000000
--- a/databases/libgda3/files/patch-tools::templates::Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$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