diff options
| author | mbr <mbr@FreeBSD.org> | 2003-05-22 23:15:15 +0000 |
|---|---|---|
| committer | mbr <mbr@FreeBSD.org> | 2003-05-22 23:15:15 +0000 |
| commit | 1aefa4671fa85c6c023973a303d6adbf9714cea2 (patch) | |
| tree | 8c293badcb71a6fbdfe8bab12436adf63d9d3c41 /databases/mysql60-server | |
| parent | 59667dc1f6fb32a1577dd54fd17b4d7f14e6e759 (diff) | |
| download | FreeBSD-ports-1aefa4671fa85c6c023973a303d6adbf9714cea2.zip FreeBSD-ports-1aefa4671fa85c6c023973a303d6adbf9714cea2.tar.gz | |
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.
Diffstat (limited to 'databases/mysql60-server')
| -rw-r--r-- | databases/mysql60-server/Makefile | 2 | ||||
| -rw-r--r-- | databases/mysql60-server/files/patch-configure | 29 |
2 files changed, 25 insertions, 6 deletions
diff --git a/databases/mysql60-server/Makefile b/databases/mysql60-server/Makefile index 145b1ac..1338399 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 fdee2e7..d0ecd49 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 |
