Attachment #33437 for bug #54780

View | Details | Raw Unified | Return to bug 54780
Collapse All | Expand All

Lines 6-13 Link Here

(-)mysql40-server/Makefile (-3 / +3 lines)
6	#	6	#
7		7
8	PORTNAME?= mysql	8	PORTNAME?= mysql
9	PORTVERSION= 4.0.13	9	PORTVERSION= 4.0.14
10	PORTREVISION?= 1	10	PORTREVISION?= 0
11	CATEGORIES= databases	11	CATEGORIES= databases
12	MASTER_SITES= ftp://mysql.secsup.org/pub/software/mysql/Downloads/MySQL-4.0/ \	12	MASTER_SITES= ftp://mysql.secsup.org/pub/software/mysql/Downloads/MySQL-4.0/ \
13	http://mysql.tzone.it/Downloads/MySQL-4.0/ \	13	http://mysql.tzone.it/Downloads/MySQL-4.0/ \
Lines 163-169 Link Here
163	.else	163	.else
164	MAN1= isamchk.1 isamlog.1 mysql.1 mysql_zap.1 mysqlaccess.1 \	164	MAN1= isamchk.1 isamlog.1 mysql.1 mysql_zap.1 mysqlaccess.1 \
165	mysqladmin.1 mysqld.1 mysqld_multi.1 mysqld_safe.1 mysqldump.1 \	165	mysqladmin.1 mysqld.1 mysqld_multi.1 mysqld_safe.1 mysqldump.1 \
166	mysqlshow.1 perror.1 replace.1	166	mysql_fix_privilege_tables.1 mysqlshow.1 perror.1 replace.1
167		167
168	INSTALLS_SHLIB= yes	168	INSTALLS_SHLIB= yes
169	LDCONFIG_DIRS= %%PREFIX%%/lib/mysql	169	LDCONFIG_DIRS= %%PREFIX%%/lib/mysql

Line 1 Link Here

(-)mysql40-server/distinfo (-1 / +1 lines)
1	MD5 (mysql-4.0.13.tar.gz) = 4bad6dae73f53c16bfcf41c704681059	1	MD5 (mysql-4.0.14.tar.gz) = 9764f09c89692345d3b7800ab014f822




 
 echo "$as_me:$LINENO: result: \"$FIND_PROC\"" >&5
 echo "${ECHO_T}\"$FIND_PROC\"" >&6
@@ -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" ;;

Return to bug 54780

Lines 61-85 Link Here

(-)mysql40-server/files/patch-configure (-19 lines)
61		61
62	echo "$as_me:$LINENO: result: \"$FIND_PROC\"" >&5	62	echo "$as_me:$LINENO: result: \"$FIND_PROC\"" >&5
63	echo "${ECHO_T}\"$FIND_PROC\"" >&6	63	echo "${ECHO_T}\"$FIND_PROC\"" >&6
64	@@ -12763,8 +12729,16 @@
65	;;
66	freebsd)
67	echo "Adding fix for interrupted reads"
68	- CFLAGS="$CFLAGS -DHAVE_BROKEN_REALPATH"
69	- CXXFLAGS="$CXXFLAGS -DMYSQLD_NET_RETRY_COUNT=1000000 -DHAVE_BROKEN_REALPATH"
70	+ OSVERSION=`/sbin/sysctl -a \| /usr/bin/grep osreldate \| /usr/bin/awk '{ print $2 }'`
71	+ if test "$OSVERSION" -gt "480100" && \
72	+ test "$OSVERSION" -lt "500000" \|\| \
73	+ test "$OSVERSION" -gt "500109"
74	+ then
75	+ CXXFLAGS="$CXXFLAGS -DMYSQLD_NET_RETRY_COUNT=1000000"
76	+ else
77	+ CFLAGS="$CFLAGS -DHAVE_BROKEN_REALPATH"
78	+ CXXFLAGS="$CXXFLAGS -DMYSQLD_NET_RETRY_COUNT=1000000 -DHAVE_BROKEN_REALPATH"
79	+ fi
80	;;
81	netbsd)
82	echo "Adding flag -Dunix"
83	@@ -22320,7 +22294,7 @@	64	@@ -22320,7 +22294,7 @@
84	/* ) rel_srcdir="$srcdir" ;;	65	/* ) rel_srcdir="$srcdir" ;;
85	* ) rel_srcdir="../$srcdir" ;;	66	* ) rel_srcdir="../$srcdir" ;;