diff options
| author | Martin Blapp <mbr@FreeBSD.org> | 2003-05-22 23:15:15 +0000 |
|---|---|---|
| committer | Martin Blapp <mbr@FreeBSD.org> | 2003-05-22 23:15:15 +0000 |
| commit | 5f50990eced5d6a878875b2b4df31cc35010e49c (patch) | |
| tree | ec65e3b9f628cdc8d66dc375efd717533e35f098 /databases/mysql40-server | |
| parent | Track upstream update of the patch for WITH_BOUNDSCHECKING (which removed (diff) | |
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.
Notes
Notes:
svn path=/head/; revision=81751
Diffstat (limited to 'databases/mysql40-server')
| -rw-r--r-- | databases/mysql40-server/Makefile | 2 | ||||
| -rw-r--r-- | databases/mysql40-server/files/patch-configure | 31 |
2 files changed, 26 insertions, 7 deletions
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 |