3 files changed, 48 insertions, 16 deletions

diff --git a/databases/libgda2/files/patch-aa b/databases/libgda2/files/patch-aa
index 94f70db4275c..a090fe088157 100644
--- a/databases/libgda2/files/patch-aa
+++ b/databases/libgda2/files/patch-aa
@@ -1,11 +1,11 @@
---- Makefile.in.orig	Fri Jul 26 16:09:57 2002
-+++ Makefile.in	Fri Jul 26 16:10:46 2002
-@@ -155,7 +155,7 @@
+--- Makefile.in.orig	Thu Feb  6 23:01:24 2003
++++ Makefile.in	Thu Feb  6 23:01:54 2003
+@@ -164,7 +164,7 @@
  YACC = @YACC@
  cxxflags_set = @cxxflags_set@
  
--SUBDIRS =  	po 	idl 	libsql 	libgda 	providers 	report 	tools 	testing 	data 	doc
-+SUBDIRS =  	po 	idl 	libsql 	libgda 	providers 	report 	tools 	data 	doc
+-SUBDIRS =  	po 	libsql 	libgda 	providers 	report 	tools 	testing 	data 	doc
++SUBDIRS =  	po 	libsql 	libgda 	providers 	report 	tools 	data 	doc
  
  
- EXTRA_DIST =  	COPYING 	libgda.spec.in 	libgda.pc.in 	intltool-extract.in 	intltool-merge.in 	intltool-update.in
+ EXTRA_DIST =  	COPYING 	libgda.spec 	intltool-extract.in 	intltool-merge.in 	intltool-update.in
diff --git a/databases/libgda2/files/patch-configure b/databases/libgda2/files/patch-configure
deleted file mode 100644
index d744b24f81e8..000000000000
--- a/databases/libgda2/files/patch-configure
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
- 
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/databases/libgda2/files/patch-ltmain.sh b/databases/libgda2/files/patch-ltmain.sh
new file mode 100644
index 000000000000..1c2fba5d533f
--- /dev/null
+++ b/databases/libgda2/files/patch-ltmain.sh
@@ -0,0 +1,42 @@
+--- ltmain.sh.orig	Fri Sep 13 15:38:11 2002
++++ ltmain.sh	Fri Oct 11 01:44:24 2002
+@@ -1073,8 +1073,16 @@
+ 	continue
+ 	;;
+ 
++      -pthread)
++      compile_command="$compile_command -pthread"
++      finalize_command="$finalize_command -pthread"
++      compiler_flags="$compiler_flags -pthread"
++      continue
++      ;;
++
+       -module)
+ 	module=yes
++	build_old_libs=no
+ 	continue
+ 	;;
+ 
+@@ -2502,6 +2510,9 @@
+ 	  *-*-openbsd*)
+ 	    # Do not include libc due to us having libc/libc_r.
+ 	    ;;
++	  *-*-freebsd*)
++	    # FreeBSD doesn't need this...
++	    ;;
+ 	  *)
+ 	    # Add libc to deplibs on all other systems if necessary.
+ 	    if test $build_libtool_need_lc = "yes"; then
+@@ -4286,10 +4297,12 @@
+ 	fi
+ 
+ 	# Install the pseudo-library for information purposes.
++	if /usr/bin/false; then
+ 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+ 	instname="$dir/$name"i
+ 	$show "$install_prog $instname $destdir/$name"
+ 	$run eval "$install_prog $instname $destdir/$name" || exit $?
++	fi
+ 
+ 	# Maybe install the static library, too.
+ 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"