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/mysql323-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/mysql323-server')
| -rw-r--r-- | databases/mysql323-server/Makefile | 2 | ||||
| -rw-r--r-- | databases/mysql323-server/files/patch-ag | 37 |
2 files changed, 29 insertions, 10 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 |