1 files changed, 11 insertions, 63 deletions
diff --git a/databases/mysql41-server/files/patch-configure b/databases/mysql41-server/files/patch-configure
index c7b052905fa8..10080e85bfee 100644
--- a/databases/mysql41-server/files/patch-configure
+++ b/databases/mysql41-server/files/patch-configure
@@ -1,59 +1,16 @@
---- configure.orig	Mon Dec  1 13:55:34 2003
-+++ configure	Wed Dec 10 00:22:08 2003
-@@ -9069,7 +9070,7 @@
-   ;;
- esac
- fi
--HOSTNAME=$ac_cv_path_HOSTNAME
-+HOSTNAME="$ac_cv_path_HOSTNAME -s"
+--- configure.orig	Tue Jun  1 09:08:41 2004
++++ configure	Tue Jun  1 09:08:41 2004
+@@ -18835,9 +18835,6 @@
  
- if test -n "$HOSTNAME"; then
-   echo "$as_me:$LINENO: result: $HOSTNAME" >&5
-@@ -9261,43 +9262,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
--# Linux style
--if $PS p $$ 2> /dev/null | grep $0 > /dev/null
--then
--  FIND_PROC="$PS p \$\$PID | grep mysqld > /dev/null"
--# Solaris
--elif $PS -p $$ 2> /dev/null | grep $0 > /dev/null
--then
--  FIND_PROC="$PS -p \$\$PID | grep mysqld > /dev/null"
- # BSD style
--elif $PS -uaxww 2> /dev/null | grep $0 > /dev/null
--then
-   FIND_PROC="$PS -uaxww | grep mysqld | grep \" \$\$PID \" > /dev/null"
--# SysV style
--elif $PS -ef 2> /dev/null | grep $0 > /dev/null
--then
--  FIND_PROC="$PS -ef | grep mysqld | grep \" \$\$PID \" > /dev/null"
--# Do anybody use this?
--elif $PS $$ 2> /dev/null | grep $0 > /dev/null
--then
--  FIND_PROC="$PS \$\$PID | grep mysqld > /dev/null"
--else
--  case $SYSTEM_TYPE in
--    *darwin*)
--      FIND_PROC="$PS -uaxww | grep mysqld | grep \" \$\$PID \" > /dev/null"
--      ;;
--    *cygwin*)
--      FIND_PROC="$PS -e | grep mysqld | grep \" \$\$PID \" > /dev/null"
--      ;;
--    *netware* | *modesto*)
--      FIND_PROC=
--      ;;
--    *)
--      { { echo "$as_me:$LINENO: error: Could not find the right ps switches. Which OS is this ?. See the Installation chapter in the Reference Manual." >&5
--echo "$as_me: error: Could not find the right ps switches. Which OS is this ?. See the Installation chapter in the Reference Manual." >&2;}
--   { (exit 1); exit 1; }; }
--  esac
--fi
  
- echo "$as_me:$LINENO: result: \"$FIND_PROC\"" >&5
- echo "${ECHO_T}\"$FIND_PROC\"" >&6
-@@ -12678,8 +12644,8 @@
+ 
+-# Ensure that we have --preserve-dup-deps defines, otherwise we get link
+-# problems of 'mysql' with CXX=g++
+-LIBTOOL="$LIBTOOL --preserve-dup-deps"
+ 
+ #AC_LIBTOOL_DLOPEN AC_LIBTOOL_WIN32_DLL AC_DISABLE_FAST_INSTALL AC_DISABLE_SHARED AC_DISABLE_STATIC
+ 
+@@ -23625,8 +23622,8 @@
  # Some system specific hacks
  #
  
@@ -64,12 +21,3 @@
  
  case $SYSTEM_TYPE in
    *solaris2.7*)
-@@ -23893,7 +23859,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