3 files changed, 24 insertions, 32 deletions

diff --git a/databases/mysql60-server/files/patch-Makefile.in b/databases/mysql60-server/files/patch-Makefile.in
index 3e8211497edc..ba5973587226 100644
--- a/databases/mysql60-server/files/patch-Makefile.in
+++ b/databases/mysql60-server/files/patch-Makefile.in
@@ -1,21 +1,16 @@
---- Makefile.in.orig	Tue Feb  4 13:55:10 2003
-+++ Makefile.in	Tue Feb  4 13:58:31 2003
-@@ -210,13 +210,11 @@
+--- Makefile.in.orig	Thu Feb 20 20:58:01 2003
++++ Makefile.in	Thu Feb 27 12:27:18 2003
+@@ -212,12 +212,7 @@
  EXTRA_DIST = INSTALL-SOURCE README \
  			COPYING COPYING.LIB
  
 -SUBDIRS = . include @docs_dirs@ @readline_dir@ \
 -			@thread_dirs@ pstack @sql_client_dirs@ \
 -			@sql_server_dirs@ scripts man tests \
--			BUILD netware os2 @libmysqld_dirs@ \
--			@bench_dirs@ support-files @fs_dirs@ @tools_dirs@ \
--			@platform_dir@
+-			BUILD @netware_dir@ os2 @libmysqld_dirs@ \
+-			@bench_dirs@ support-files @fs_dirs@ @tools_dirs@
 -
-+.if defined(CLIENT_ONLY)
-+SUBDIRS = include @sql_client_dirs@ tests man
-+.else
-+SUBDIRS = include @docs_dirs@ @sql_server_dirs@ scripts support-files
-+.endif
++SUBDIRS =
  
  # Relink after clean
  linked_sources = linked_client_sources linked_server_sources \
diff --git a/databases/mysql60-server/files/patch-configure b/databases/mysql60-server/files/patch-configure
index 7add28292e45..dd057cb485d0 100644
--- a/databases/mysql60-server/files/patch-configure
+++ b/databases/mysql60-server/files/patch-configure
@@ -1,14 +1,16 @@
---- configure.orig	Wed Jan 29 12:29:38 2003
-+++ configure	Tue Feb  4 14:07:39 2003
-@@ -8104,6 +8104,7 @@
+--- configure.orig	Tue Feb 25 21:30:07 2003
++++ configure	Thu Feb 27 12:42:12 2003
+@@ -8101,7 +8101,8 @@
+ 
  
  # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
+-LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++LIBTOOL_DEPS="--disable-ltlibs /usr/local/share/libtool/ltmain.sh"
++/usr/local/share/libtool/ltconfig $LIBTOOL_DEPS
  
  # Always use our own libtool.
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -9046,7 +9047,7 @@
+@@ -9044,7 +9045,7 @@
    ;;
  esac
  fi
@@ -17,7 +19,7 @@
  
  if test -n "$HOSTNAME"; then
    echo "$as_me:$LINENO: result: $HOSTNAME" >&5
-@@ -9238,43 +9239,8 @@
+@@ -9236,43 +9237,8 @@
  echo "$as_me:$LINENO: checking \"how to check if pid exists\"" >&5
  echo $ECHO_N "checking \"how to check if pid exists\"... $ECHO_C" >&6
  PS=$ac_cv_path_PS
@@ -61,3 +63,12 @@
  
  echo "$as_me:$LINENO: result: \"$FIND_PROC\"" >&5
  echo "${ECHO_T}\"$FIND_PROC\"" >&6
+@@ -22310,7 +22276,7 @@
+ 	/* ) rel_srcdir="$srcdir" ;;
+ 	* )  rel_srcdir="../$srcdir" ;;
+     esac
+-    if test "x$enable_dependency_tracking" == xno
++    if test "x$enable_dependency_tracking" = xno
+     then
+       innodb_conf_flags=--disable-dependency-tracking
+     fi
diff --git a/databases/mysql60-server/files/patch-include::Makefile.in b/databases/mysql60-server/files/patch-include::Makefile.in
deleted file mode 100644
index 34b404c0a255..000000000000
--- a/databases/mysql60-server/files/patch-include::Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
---- include/Makefile.in.orig	Tue Nov 19 17:13:35 2002
-+++ include/Makefile.in	Tue Nov 19 17:14:10 2002
-@@ -335,7 +335,11 @@
- installdirs:
- 	$(mkinstalldirs) $(DESTDIR)$(pkgincludedir)
- 
-+.if defined(CLIENT_ONLY)
- install: install-am
-+.else
-+install:
-+.endif
- install-exec: install-exec-am
- install-data: install-data-am
- uninstall: uninstall-am