We finally have a threadsafe realpath(3) in 4.x and 5.x.

Remove problematic HAVE_BROKEN_REALPATH define, now we
have a fixed version. This allows usage of symlinks for
database paths again which was previously broken.

Bump portrevision.

18 files changed, 230 insertions, 59 deletions

diff --git a/databases/mysql323-server/Makefile b/databases/mysql323-server/Makefile
index eead9343d6ad..1ce3b0ca9fe3 100644
--- a/databases/mysql323-server/Makefile
+++ b/databases/mysql323-server/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME?=	${MASTERPORTNAME}
 PORTVERSION=	3.23.56
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	databases
 MASTER_SITES=	http://www.kernelnotes.de/MySQL/Downloads/MySQL-3.23/ \
 		http://mysql.he.net/Downloads/MySQL-3.23/ \
diff --git a/databases/mysql323-server/files/patch-ag b/databases/mysql323-server/files/patch-ag
index 6c6e0ad044fa..bbf51ddda5c7 100644
--- a/databases/mysql323-server/files/patch-ag
+++ b/databases/mysql323-server/files/patch-ag
@@ -1,5 +1,5 @@
---- configure.orig	Thu Dec  5 10:37:31 2002
-+++ configure	Mon Dec 16 19:49:41 2002
+--- configure.orig	Thu Mar 13 19:32:30 2003
++++ configure	Fri May 23 00:00:20 2003
 @@ -8059,6 +8059,7 @@
  
  # This can be used to rebuild libtool when needed
@@ -62,7 +62,26 @@
  
  echo "$as_me:$LINENO: result: \"$FIND_PROC\"" >&5
  echo "${ECHO_T}\"$FIND_PROC\"" >&6
-@@ -13208,7 +13173,6 @@
+@@ -12498,8 +12463,16 @@
+     ;;
+   *freebsd*)
+     echo "Adding fix for interrupted reads"
+-    CFLAGS="$CFLAGS -DHAVE_BROKEN_REALPATH"
+-    CXXFLAGS="$CXXFLAGS -DMYSQLD_NET_RETRY_COUNT=1000000 -DHAVE_BROKEN_REALPATH"
++    OSVERSION=`/sbin/sysctl -a | /usr/bin/grep osreldate | /usr/bin/awk '{ print $2 }'`
++    if test "$OSVERSION" -gt "480100" && \
++       test "$OSVERSION" -lt "500000" || \
++       test "$OSVERSION" -gt "500109"
++    then
++	CXXFLAGS="$CXXFLAGS -DMYSQLD_NET_RETRY_COUNT=1000000"
++    else
++	CFLAGS="$CFLAGS -DHAVE_BROKEN_REALPATH"
++	CXXFLAGS="$CXXFLAGS -DMYSQLD_NET_RETRY_COUNT=1000000 -DHAVE_BROKEN_REALPATH"
++    fi
+     ;;
+   *netbsd*)
+     echo "Adding flag -Dunix"
+@@ -13208,7 +13181,6 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
@@ -70,7 +89,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
  #include "confdefs.h"
-@@ -13262,7 +13226,6 @@
+@@ -13262,7 +13234,6 @@
  #define HAVE_LIBC_R 1
  _ACEOF
  
@@ -78,7 +97,7 @@
  
  fi
  
-@@ -13706,29 +13669,6 @@
+@@ -13706,29 +13677,6 @@
  fi
  
  
@@ -108,7 +127,7 @@
  
  # Check whether --with-debug or --without-debug was given.
  if test "${with_debug+set}" = set; then
-@@ -16081,10 +16021,6 @@
+@@ -16081,10 +16029,6 @@
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
  ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
  
@@ -119,7 +138,7 @@
  mysql_cv_btype_last_arg_accept=none
  cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
-@@ -19222,14 +19158,6 @@
+@@ -19222,14 +19166,6 @@
  ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
  
  
@@ -134,7 +153,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
  #include "confdefs.h"
-@@ -19313,10 +19241,6 @@
+@@ -19313,10 +19249,6 @@
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
  ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
  
@@ -145,7 +164,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
  #include "confdefs.h"
-@@ -19399,10 +19323,6 @@
+@@ -19399,10 +19331,6 @@
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
  ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
  
diff --git a/databases/mysql40-server/Makefile b/databases/mysql40-server/Makefile
index 064b67ba16a6..8550e7547658 100644
--- a/databases/mysql40-server/Makefile
+++ b/databases/mysql40-server/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME?=	mysql
 PORTVERSION=	4.0.13
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	databases
 MASTER_SITES=	ftp://mysql.secsup.org/pub/software/mysql/Downloads/MySQL-4.0/ \
 		http://mysql.tzone.it/Downloads/MySQL-4.0/ \
diff --git a/databases/mysql40-server/files/patch-configure b/databases/mysql40-server/files/patch-configure
index fdee2e7c639d..e50b3f832f47 100644
--- a/databases/mysql40-server/files/patch-configure
+++ b/databases/mysql40-server/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	Tue Feb 25 21:30:07 2003
-+++ configure	Thu Feb 27 12:42:12 2003
-@@ -8101,6 +8101,7 @@
+--- configure.orig	Wed May 14 22:24:53 2003
++++ configure	Fri May 23 00:29:06 2003
+@@ -8110,6 +8110,7 @@
  
  # This can be used to rebuild libtool when needed
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
@@ -8,7 +8,7 @@
  
  # Always use our own libtool.
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -9044,7 +9045,7 @@
+@@ -9052,7 +9053,7 @@
    ;;
  esac
  fi
@@ -17,7 +17,7 @@
  
  if test -n "$HOSTNAME"; then
    echo "$as_me:$LINENO: result: $HOSTNAME" >&5
-@@ -9236,43 +9237,8 @@
+@@ -9244,43 +9245,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,7 +61,26 @@
  
  echo "$as_me:$LINENO: result: \"$FIND_PROC\"" >&5
  echo "${ECHO_T}\"$FIND_PROC\"" >&6
-@@ -22310,7 +22276,7 @@
+@@ -12763,8 +12729,16 @@
+     ;;
+   *freebsd*)
+     echo "Adding fix for interrupted reads"
+-    CFLAGS="$CFLAGS -DHAVE_BROKEN_REALPATH"
+-    CXXFLAGS="$CXXFLAGS -DMYSQLD_NET_RETRY_COUNT=1000000 -DHAVE_BROKEN_REALPATH"
++    OSVERSION=`/sbin/sysctl -a | /usr/bin/grep osreldate | /usr/bin/awk '{ print $2 }'`
++    if test "$OSVERSION" -gt "480100" && \
++       test "$OSVERSION" -lt "500000" || \
++       test "$OSVERSION" -gt "500109"
++    then
++	CXXFLAGS="$CXXFLAGS -DMYSQLD_NET_RETRY_COUNT=1000000"
++    else
++	CFLAGS="$CFLAGS -DHAVE_BROKEN_REALPATH"
++	CXXFLAGS="$CXXFLAGS -DMYSQLD_NET_RETRY_COUNT=1000000 -DHAVE_BROKEN_REALPATH"
++    fi
+     ;;
+   *netbsd*)
+     echo "Adding flag -Dunix"
+@@ -22320,7 +22294,7 @@
  	/* ) rel_srcdir="$srcdir" ;;
  	* )  rel_srcdir="../$srcdir" ;;
      esac
diff --git a/databases/mysql41-server/Makefile b/databases/mysql41-server/Makefile
index 145b1ac72405..13383997dd60 100644
--- a/databases/mysql41-server/Makefile
+++ b/databases/mysql41-server/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME?=	mysql
 PORTVERSION=	4.1.0
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	databases
 MASTER_SITES=	ftp://mysql.secsup.org/pub/software/mysql/Downloads/MySQL-4.1/ \
 		http://mysql.tzone.it/Downloads/MySQL-4.1/ \
diff --git a/databases/mysql41-server/files/patch-configure b/databases/mysql41-server/files/patch-configure
index fdee2e7c639d..d0ecd4995cb0 100644
--- a/databases/mysql41-server/files/patch-configure
+++ b/databases/mysql41-server/files/patch-configure
@@ -1,5 +1,5 @@
---- configure.orig	Tue Feb 25 21:30:07 2003
-+++ configure	Thu Feb 27 12:42:12 2003
+--- configure.orig	Thu Apr  3 14:16:29 2003
++++ configure	Fri May 23 01:05:46 2003
 @@ -8101,6 +8101,7 @@
  
  # This can be used to rebuild libtool when needed
@@ -8,7 +8,7 @@
  
  # Always use our own libtool.
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -9044,7 +9045,7 @@
+@@ -9043,7 +9044,7 @@
    ;;
  esac
  fi
@@ -17,7 +17,7 @@
  
  if test -n "$HOSTNAME"; then
    echo "$as_me:$LINENO: result: $HOSTNAME" >&5
-@@ -9236,43 +9237,8 @@
+@@ -9235,43 +9236,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,7 +61,26 @@
  
  echo "$as_me:$LINENO: result: \"$FIND_PROC\"" >&5
  echo "${ECHO_T}\"$FIND_PROC\"" >&6
-@@ -22310,7 +22276,7 @@
+@@ -12752,8 +12718,16 @@
+     ;;
+   *freebsd*)
+     echo "Adding fix for interrupted reads"
+-    CFLAGS="$CFLAGS -DHAVE_BROKEN_REALPATH"
+-    CXXFLAGS="$CXXFLAGS -DMYSQLD_NET_RETRY_COUNT=1000000 -DHAVE_BROKEN_REALPATH"
++    OSVERSION=`/sbin/sysctl -a | /usr/bin/grep osreldate | /usr/bin/awk '{ print $2 }'`
++    if test "$OSVERSION" -gt "480100" && \
++       test "$OSVERSION" -lt "500000" || \
++       test "$OSVERSION" -gt "500109"
++    then
++	CXXFLAGS="$CXXFLAGS -DMYSQLD_NET_RETRY_COUNT=1000000"
++    else
++	CFLAGS="$CFLAGS -DHAVE_BROKEN_REALPATH"
++	CXXFLAGS="$CXXFLAGS -DMYSQLD_NET_RETRY_COUNT=1000000 -DHAVE_BROKEN_REALPATH"
++    fi
+     ;;
+   *netbsd*)
+     echo "Adding flag -Dunix"
+@@ -23545,7 +23519,7 @@
  	/* ) rel_srcdir="$srcdir" ;;
  	* )  rel_srcdir="../$srcdir" ;;
      esac
diff --git a/databases/mysql50-server/Makefile b/databases/mysql50-server/Makefile
index 145b1ac72405..13383997dd60 100644
--- a/databases/mysql50-server/Makefile
+++ b/databases/mysql50-server/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME?=	mysql
 PORTVERSION=	4.1.0
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	databases
 MASTER_SITES=	ftp://mysql.secsup.org/pub/software/mysql/Downloads/MySQL-4.1/ \
 		http://mysql.tzone.it/Downloads/MySQL-4.1/ \
diff --git a/databases/mysql50-server/files/patch-configure b/databases/mysql50-server/files/patch-configure
index fdee2e7c639d..d0ecd4995cb0 100644
--- a/databases/mysql50-server/files/patch-configure
+++ b/databases/mysql50-server/files/patch-configure
@@ -1,5 +1,5 @@
---- configure.orig	Tue Feb 25 21:30:07 2003
-+++ configure	Thu Feb 27 12:42:12 2003
+--- configure.orig	Thu Apr  3 14:16:29 2003
++++ configure	Fri May 23 01:05:46 2003
 @@ -8101,6 +8101,7 @@
  
  # This can be used to rebuild libtool when needed
@@ -8,7 +8,7 @@
  
  # Always use our own libtool.
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -9044,7 +9045,7 @@
+@@ -9043,7 +9044,7 @@
    ;;
  esac
  fi
@@ -17,7 +17,7 @@
  
  if test -n "$HOSTNAME"; then
    echo "$as_me:$LINENO: result: $HOSTNAME" >&5
-@@ -9236,43 +9237,8 @@
+@@ -9235,43 +9236,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,7 +61,26 @@
  
  echo "$as_me:$LINENO: result: \"$FIND_PROC\"" >&5
  echo "${ECHO_T}\"$FIND_PROC\"" >&6
-@@ -22310,7 +22276,7 @@
+@@ -12752,8 +12718,16 @@
+     ;;
+   *freebsd*)
+     echo "Adding fix for interrupted reads"
+-    CFLAGS="$CFLAGS -DHAVE_BROKEN_REALPATH"
+-    CXXFLAGS="$CXXFLAGS -DMYSQLD_NET_RETRY_COUNT=1000000 -DHAVE_BROKEN_REALPATH"
++    OSVERSION=`/sbin/sysctl -a | /usr/bin/grep osreldate | /usr/bin/awk '{ print $2 }'`
++    if test "$OSVERSION" -gt "480100" && \
++       test "$OSVERSION" -lt "500000" || \
++       test "$OSVERSION" -gt "500109"
++    then
++	CXXFLAGS="$CXXFLAGS -DMYSQLD_NET_RETRY_COUNT=1000000"
++    else
++	CFLAGS="$CFLAGS -DHAVE_BROKEN_REALPATH"
++	CXXFLAGS="$CXXFLAGS -DMYSQLD_NET_RETRY_COUNT=1000000 -DHAVE_BROKEN_REALPATH"
++    fi
+     ;;
+   *netbsd*)
+     echo "Adding flag -Dunix"
+@@ -23545,7 +23519,7 @@
  	/* ) rel_srcdir="$srcdir" ;;
  	* )  rel_srcdir="../$srcdir" ;;
      esac
diff --git a/databases/mysql51-server/Makefile b/databases/mysql51-server/Makefile
index 145b1ac72405..13383997dd60 100644
--- a/databases/mysql51-server/Makefile
+++ b/databases/mysql51-server/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME?=	mysql
 PORTVERSION=	4.1.0
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	databases
 MASTER_SITES=	ftp://mysql.secsup.org/pub/software/mysql/Downloads/MySQL-4.1/ \
 		http://mysql.tzone.it/Downloads/MySQL-4.1/ \
diff --git a/databases/mysql51-server/files/patch-configure b/databases/mysql51-server/files/patch-configure
index fdee2e7c639d..d0ecd4995cb0 100644
--- a/databases/mysql51-server/files/patch-configure
+++ b/databases/mysql51-server/files/patch-configure
@@ -1,5 +1,5 @@
---- configure.orig	Tue Feb 25 21:30:07 2003
-+++ configure	Thu Feb 27 12:42:12 2003
+--- configure.orig	Thu Apr  3 14:16:29 2003
++++ configure	Fri May 23 01:05:46 2003
 @@ -8101,6 +8101,7 @@
  
  # This can be used to rebuild libtool when needed
@@ -8,7 +8,7 @@
  
  # Always use our own libtool.
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -9044,7 +9045,7 @@
+@@ -9043,7 +9044,7 @@
    ;;
  esac
  fi
@@ -17,7 +17,7 @@
  
  if test -n "$HOSTNAME"; then
    echo "$as_me:$LINENO: result: $HOSTNAME" >&5
-@@ -9236,43 +9237,8 @@
+@@ -9235,43 +9236,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,7 +61,26 @@
  
  echo "$as_me:$LINENO: result: \"$FIND_PROC\"" >&5
  echo "${ECHO_T}\"$FIND_PROC\"" >&6
-@@ -22310,7 +22276,7 @@
+@@ -12752,8 +12718,16 @@
+     ;;
+   *freebsd*)
+     echo "Adding fix for interrupted reads"
+-    CFLAGS="$CFLAGS -DHAVE_BROKEN_REALPATH"
+-    CXXFLAGS="$CXXFLAGS -DMYSQLD_NET_RETRY_COUNT=1000000 -DHAVE_BROKEN_REALPATH"
++    OSVERSION=`/sbin/sysctl -a | /usr/bin/grep osreldate | /usr/bin/awk '{ print $2 }'`
++    if test "$OSVERSION" -gt "480100" && \
++       test "$OSVERSION" -lt "500000" || \
++       test "$OSVERSION" -gt "500109"
++    then
++	CXXFLAGS="$CXXFLAGS -DMYSQLD_NET_RETRY_COUNT=1000000"
++    else
++	CFLAGS="$CFLAGS -DHAVE_BROKEN_REALPATH"
++	CXXFLAGS="$CXXFLAGS -DMYSQLD_NET_RETRY_COUNT=1000000 -DHAVE_BROKEN_REALPATH"
++    fi
+     ;;
+   *netbsd*)
+     echo "Adding flag -Dunix"
+@@ -23545,7 +23519,7 @@
  	/* ) rel_srcdir="$srcdir" ;;
  	* )  rel_srcdir="../$srcdir" ;;
      esac
diff --git a/databases/mysql54-server/Makefile b/databases/mysql54-server/Makefile
index 145b1ac72405..13383997dd60 100644
--- a/databases/mysql54-server/Makefile
+++ b/databases/mysql54-server/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME?=	mysql
 PORTVERSION=	4.1.0
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	databases
 MASTER_SITES=	ftp://mysql.secsup.org/pub/software/mysql/Downloads/MySQL-4.1/ \
 		http://mysql.tzone.it/Downloads/MySQL-4.1/ \
diff --git a/databases/mysql54-server/files/patch-configure b/databases/mysql54-server/files/patch-configure
index fdee2e7c639d..d0ecd4995cb0 100644
--- a/databases/mysql54-server/files/patch-configure
+++ b/databases/mysql54-server/files/patch-configure
@@ -1,5 +1,5 @@
---- configure.orig	Tue Feb 25 21:30:07 2003
-+++ configure	Thu Feb 27 12:42:12 2003
+--- configure.orig	Thu Apr  3 14:16:29 2003
++++ configure	Fri May 23 01:05:46 2003
 @@ -8101,6 +8101,7 @@
  
  # This can be used to rebuild libtool when needed
@@ -8,7 +8,7 @@
  
  # Always use our own libtool.
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -9044,7 +9045,7 @@
+@@ -9043,7 +9044,7 @@
    ;;
  esac
  fi
@@ -17,7 +17,7 @@
  
  if test -n "$HOSTNAME"; then
    echo "$as_me:$LINENO: result: $HOSTNAME" >&5
-@@ -9236,43 +9237,8 @@
+@@ -9235,43 +9236,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,7 +61,26 @@
  
  echo "$as_me:$LINENO: result: \"$FIND_PROC\"" >&5
  echo "${ECHO_T}\"$FIND_PROC\"" >&6
-@@ -22310,7 +22276,7 @@
+@@ -12752,8 +12718,16 @@
+     ;;
+   *freebsd*)
+     echo "Adding fix for interrupted reads"
+-    CFLAGS="$CFLAGS -DHAVE_BROKEN_REALPATH"
+-    CXXFLAGS="$CXXFLAGS -DMYSQLD_NET_RETRY_COUNT=1000000 -DHAVE_BROKEN_REALPATH"
++    OSVERSION=`/sbin/sysctl -a | /usr/bin/grep osreldate | /usr/bin/awk '{ print $2 }'`
++    if test "$OSVERSION" -gt "480100" && \
++       test "$OSVERSION" -lt "500000" || \
++       test "$OSVERSION" -gt "500109"
++    then
++	CXXFLAGS="$CXXFLAGS -DMYSQLD_NET_RETRY_COUNT=1000000"
++    else
++	CFLAGS="$CFLAGS -DHAVE_BROKEN_REALPATH"
++	CXXFLAGS="$CXXFLAGS -DMYSQLD_NET_RETRY_COUNT=1000000 -DHAVE_BROKEN_REALPATH"
++    fi
+     ;;
+   *netbsd*)
+     echo "Adding flag -Dunix"
+@@ -23545,7 +23519,7 @@
  	/* ) rel_srcdir="$srcdir" ;;
  	* )  rel_srcdir="../$srcdir" ;;
      esac
diff --git a/databases/mysql55-server/Makefile b/databases/mysql55-server/Makefile
index 145b1ac72405..13383997dd60 100644
--- a/databases/mysql55-server/Makefile
+++ b/databases/mysql55-server/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME?=	mysql
 PORTVERSION=	4.1.0
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	databases
 MASTER_SITES=	ftp://mysql.secsup.org/pub/software/mysql/Downloads/MySQL-4.1/ \
 		http://mysql.tzone.it/Downloads/MySQL-4.1/ \
diff --git a/databases/mysql55-server/files/patch-configure b/databases/mysql55-server/files/patch-configure
index fdee2e7c639d..d0ecd4995cb0 100644
--- a/databases/mysql55-server/files/patch-configure
+++ b/databases/mysql55-server/files/patch-configure
@@ -1,5 +1,5 @@
---- configure.orig	Tue Feb 25 21:30:07 2003
-+++ configure	Thu Feb 27 12:42:12 2003
+--- configure.orig	Thu Apr  3 14:16:29 2003
++++ configure	Fri May 23 01:05:46 2003
 @@ -8101,6 +8101,7 @@
  
  # This can be used to rebuild libtool when needed
@@ -8,7 +8,7 @@
  
  # Always use our own libtool.
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -9044,7 +9045,7 @@
+@@ -9043,7 +9044,7 @@
    ;;
  esac
  fi
@@ -17,7 +17,7 @@
  
  if test -n "$HOSTNAME"; then
    echo "$as_me:$LINENO: result: $HOSTNAME" >&5
-@@ -9236,43 +9237,8 @@
+@@ -9235,43 +9236,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,7 +61,26 @@
  
  echo "$as_me:$LINENO: result: \"$FIND_PROC\"" >&5
  echo "${ECHO_T}\"$FIND_PROC\"" >&6
-@@ -22310,7 +22276,7 @@
+@@ -12752,8 +12718,16 @@
+     ;;
+   *freebsd*)
+     echo "Adding fix for interrupted reads"
+-    CFLAGS="$CFLAGS -DHAVE_BROKEN_REALPATH"
+-    CXXFLAGS="$CXXFLAGS -DMYSQLD_NET_RETRY_COUNT=1000000 -DHAVE_BROKEN_REALPATH"
++    OSVERSION=`/sbin/sysctl -a | /usr/bin/grep osreldate | /usr/bin/awk '{ print $2 }'`
++    if test "$OSVERSION" -gt "480100" && \
++       test "$OSVERSION" -lt "500000" || \
++       test "$OSVERSION" -gt "500109"
++    then
++	CXXFLAGS="$CXXFLAGS -DMYSQLD_NET_RETRY_COUNT=1000000"
++    else
++	CFLAGS="$CFLAGS -DHAVE_BROKEN_REALPATH"
++	CXXFLAGS="$CXXFLAGS -DMYSQLD_NET_RETRY_COUNT=1000000 -DHAVE_BROKEN_REALPATH"
++    fi
+     ;;
+   *netbsd*)
+     echo "Adding flag -Dunix"
+@@ -23545,7 +23519,7 @@
  	/* ) rel_srcdir="$srcdir" ;;
  	* )  rel_srcdir="../$srcdir" ;;
      esac
diff --git a/databases/mysql60-server/Makefile b/databases/mysql60-server/Makefile
index 145b1ac72405..13383997dd60 100644
--- a/databases/mysql60-server/Makefile
+++ b/databases/mysql60-server/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME?=	mysql
 PORTVERSION=	4.1.0
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	databases
 MASTER_SITES=	ftp://mysql.secsup.org/pub/software/mysql/Downloads/MySQL-4.1/ \
 		http://mysql.tzone.it/Downloads/MySQL-4.1/ \
diff --git a/databases/mysql60-server/files/patch-configure b/databases/mysql60-server/files/patch-configure
index fdee2e7c639d..d0ecd4995cb0 100644
--- a/databases/mysql60-server/files/patch-configure
+++ b/databases/mysql60-server/files/patch-configure
@@ -1,5 +1,5 @@
---- configure.orig	Tue Feb 25 21:30:07 2003
-+++ configure	Thu Feb 27 12:42:12 2003
+--- configure.orig	Thu Apr  3 14:16:29 2003
++++ configure	Fri May 23 01:05:46 2003
 @@ -8101,6 +8101,7 @@
  
  # This can be used to rebuild libtool when needed
@@ -8,7 +8,7 @@
  
  # Always use our own libtool.
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -9044,7 +9045,7 @@
+@@ -9043,7 +9044,7 @@
    ;;
  esac
  fi
@@ -17,7 +17,7 @@
  
  if test -n "$HOSTNAME"; then
    echo "$as_me:$LINENO: result: $HOSTNAME" >&5
-@@ -9236,43 +9237,8 @@
+@@ -9235,43 +9236,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,7 +61,26 @@
  
  echo "$as_me:$LINENO: result: \"$FIND_PROC\"" >&5
  echo "${ECHO_T}\"$FIND_PROC\"" >&6
-@@ -22310,7 +22276,7 @@
+@@ -12752,8 +12718,16 @@
+     ;;
+   *freebsd*)
+     echo "Adding fix for interrupted reads"
+-    CFLAGS="$CFLAGS -DHAVE_BROKEN_REALPATH"
+-    CXXFLAGS="$CXXFLAGS -DMYSQLD_NET_RETRY_COUNT=1000000 -DHAVE_BROKEN_REALPATH"
++    OSVERSION=`/sbin/sysctl -a | /usr/bin/grep osreldate | /usr/bin/awk '{ print $2 }'`
++    if test "$OSVERSION" -gt "480100" && \
++       test "$OSVERSION" -lt "500000" || \
++       test "$OSVERSION" -gt "500109"
++    then
++	CXXFLAGS="$CXXFLAGS -DMYSQLD_NET_RETRY_COUNT=1000000"
++    else
++	CFLAGS="$CFLAGS -DHAVE_BROKEN_REALPATH"
++	CXXFLAGS="$CXXFLAGS -DMYSQLD_NET_RETRY_COUNT=1000000 -DHAVE_BROKEN_REALPATH"
++    fi
+     ;;
+   *netbsd*)
+     echo "Adding flag -Dunix"
+@@ -23545,7 +23519,7 @@
  	/* ) rel_srcdir="$srcdir" ;;
  	* )  rel_srcdir="../$srcdir" ;;
      esac
diff --git a/databases/percona55-server/Makefile b/databases/percona55-server/Makefile
index 145b1ac72405..13383997dd60 100644
--- a/databases/percona55-server/Makefile
+++ b/databases/percona55-server/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME?=	mysql
 PORTVERSION=	4.1.0
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	databases
 MASTER_SITES=	ftp://mysql.secsup.org/pub/software/mysql/Downloads/MySQL-4.1/ \
 		http://mysql.tzone.it/Downloads/MySQL-4.1/ \
diff --git a/databases/percona55-server/files/patch-configure b/databases/percona55-server/files/patch-configure
index fdee2e7c639d..d0ecd4995cb0 100644
--- a/databases/percona55-server/files/patch-configure
+++ b/databases/percona55-server/files/patch-configure
@@ -1,5 +1,5 @@
---- configure.orig	Tue Feb 25 21:30:07 2003
-+++ configure	Thu Feb 27 12:42:12 2003
+--- configure.orig	Thu Apr  3 14:16:29 2003
++++ configure	Fri May 23 01:05:46 2003
 @@ -8101,6 +8101,7 @@
  
  # This can be used to rebuild libtool when needed
@@ -8,7 +8,7 @@
  
  # Always use our own libtool.
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -9044,7 +9045,7 @@
+@@ -9043,7 +9044,7 @@
    ;;
  esac
  fi
@@ -17,7 +17,7 @@
  
  if test -n "$HOSTNAME"; then
    echo "$as_me:$LINENO: result: $HOSTNAME" >&5
-@@ -9236,43 +9237,8 @@
+@@ -9235,43 +9236,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,7 +61,26 @@
  
  echo "$as_me:$LINENO: result: \"$FIND_PROC\"" >&5
  echo "${ECHO_T}\"$FIND_PROC\"" >&6
-@@ -22310,7 +22276,7 @@
+@@ -12752,8 +12718,16 @@
+     ;;
+   *freebsd*)
+     echo "Adding fix for interrupted reads"
+-    CFLAGS="$CFLAGS -DHAVE_BROKEN_REALPATH"
+-    CXXFLAGS="$CXXFLAGS -DMYSQLD_NET_RETRY_COUNT=1000000 -DHAVE_BROKEN_REALPATH"
++    OSVERSION=`/sbin/sysctl -a | /usr/bin/grep osreldate | /usr/bin/awk '{ print $2 }'`
++    if test "$OSVERSION" -gt "480100" && \
++       test "$OSVERSION" -lt "500000" || \
++       test "$OSVERSION" -gt "500109"
++    then
++	CXXFLAGS="$CXXFLAGS -DMYSQLD_NET_RETRY_COUNT=1000000"
++    else
++	CFLAGS="$CFLAGS -DHAVE_BROKEN_REALPATH"
++	CXXFLAGS="$CXXFLAGS -DMYSQLD_NET_RETRY_COUNT=1000000 -DHAVE_BROKEN_REALPATH"
++    fi
+     ;;
+   *netbsd*)
+     echo "Adding flag -Dunix"
+@@ -23545,7 +23519,7 @@
  	/* ) rel_srcdir="$srcdir" ;;
  	* )  rel_srcdir="../$srcdir" ;;
      esac