diff options
36 files changed, 117 insertions, 90 deletions
diff --git a/databases/mysql323-server/Makefile b/databases/mysql323-server/Makefile index 03fde0ea75fd..32ab7ba1984b 100644 --- a/databases/mysql323-server/Makefile +++ b/databases/mysql323-server/Makefile @@ -6,7 +6,7 @@ # PORTNAME?= ${MASTERPORTNAME} -PORTVERSION= 3.23.29a +PORTVERSION= 3.23.30 CATEGORIES= databases MASTER_SITES= http://www.wipol.uni-bonn.de/MySQL/Downloads/MySQL-3.23/ \ http://www.mysql.net/Downloads/MySQL-3.23/ \ @@ -85,7 +85,9 @@ post-install: # MySQL-Client part .else -MAN1= mysql.1 +MAN1= isamchk.1 isamlog.1 mysql.1.gz mysql_zap.1 mysqlaccess.1 \ + mysqladmin.1 mysqld.1 mysqld_multi.1 mysqldump.1 mysqlshow.1 \ + perror.1 replace.1 safe_mysqld.1 INSTALLS_SHLIB= yes LDCONFIG_DIRS= %%PREFIX%%/lib/mysql diff --git a/databases/mysql323-server/distinfo b/databases/mysql323-server/distinfo index 38f4df633a20..8811475d4fef 100644 --- a/databases/mysql323-server/distinfo +++ b/databases/mysql323-server/distinfo @@ -1 +1 @@ -MD5 (mysql-3.23.29a-gamma.tar.gz) = 199021bf3f92a87c557606827cfd66e2 +MD5 (mysql-3.23.30-gamma.tar.gz) = 91c500db915ca8a48891080999328965 diff --git a/databases/mysql323-server/files/patch-af b/databases/mysql323-server/files/patch-af index a1e594c45b1d..ad1f5ae20877 100644 --- a/databases/mysql323-server/files/patch-af +++ b/databases/mysql323-server/files/patch-af @@ -1,6 +1,6 @@ ---- scripts/safe_mysqld.sh.orig Wed Nov 22 12:58:59 2000 -+++ scripts/safe_mysqld.sh Fri Dec 1 00:53:26 2000 -@@ -61,26 +61,9 @@ +--- scripts/safe_mysqld.sh.orig Thu Jan 4 03:03:55 2001 ++++ scripts/safe_mysqld.sh Fri Jan 5 14:05:04 2001 +@@ -64,26 +64,9 @@ done } @@ -30,7 +30,7 @@ MYSQL_UNIX_PORT=${MYSQL_UNIX_PORT:-@MYSQL_UNIX_ADDR@} MYSQL_TCP_PORT=${MYSQL_TCP_PORT:-@MYSQL_TCP_PORT@} -@@ -206,34 +189,6 @@ +@@ -220,34 +203,6 @@ if test ! -f $pid_file # This is removed if normal shutdown then break @@ -43,12 +43,12 @@ - # but should work for the rest of the servers. - # The only thing is ps x => redhat 5 gives warnings when using ps -x. - # kill -9 is used or the process won't react on the kill. -- numofproces=`ps xa | grep -v "grep" | grep -c $ledir/mysqld` +- numofproces=`ps xa | grep -v "grep" | grep -c $ledir/$MYSQLD` - echo -e "\nNumber of processes running now: $numofproces" | tee -a $err_log - I=1 - while test "$I" -le "$numofproces" - do -- PROC=`ps xa | grep $ledir/mysqld | grep -v "grep" | tail -1` +- PROC=`ps xa | grep $ledir/$MYSQLD | grep -v "grep" | tail -1` - for T in $PROC - do - break @@ -56,7 +56,7 @@ - # echo "TEST $I - $T **" - if kill -9 $T - then -- echo "mysqld process hanging, pid $T - killed" | tee -a $err_log +- echo "$MYSQLD process hanging, pid $T - killed" | tee -a $err_log - else - break - fi diff --git a/databases/mysql323-server/pkg-plist b/databases/mysql323-server/pkg-plist index ff6b445f2cb8..27275b2368a9 100644 --- a/databases/mysql323-server/pkg-plist +++ b/databases/mysql323-server/pkg-plist @@ -37,6 +37,7 @@ lib/mysql/libmystrings.a lib/mysql/libmysys.a lib/mysql/libnisam.a libexec/mysqld +share/doc/mysql/Flags/argentina.gif share/doc/mysql/Flags/australia.gif share/doc/mysql/Flags/austria.gif share/doc/mysql/Flags/brazil.gif diff --git a/databases/mysql40-server/Makefile b/databases/mysql40-server/Makefile index 03fde0ea75fd..32ab7ba1984b 100644 --- a/databases/mysql40-server/Makefile +++ b/databases/mysql40-server/Makefile @@ -6,7 +6,7 @@ # PORTNAME?= ${MASTERPORTNAME} -PORTVERSION= 3.23.29a +PORTVERSION= 3.23.30 CATEGORIES= databases MASTER_SITES= http://www.wipol.uni-bonn.de/MySQL/Downloads/MySQL-3.23/ \ http://www.mysql.net/Downloads/MySQL-3.23/ \ @@ -85,7 +85,9 @@ post-install: # MySQL-Client part .else -MAN1= mysql.1 +MAN1= isamchk.1 isamlog.1 mysql.1.gz mysql_zap.1 mysqlaccess.1 \ + mysqladmin.1 mysqld.1 mysqld_multi.1 mysqldump.1 mysqlshow.1 \ + perror.1 replace.1 safe_mysqld.1 INSTALLS_SHLIB= yes LDCONFIG_DIRS= %%PREFIX%%/lib/mysql diff --git a/databases/mysql40-server/distinfo b/databases/mysql40-server/distinfo index 38f4df633a20..8811475d4fef 100644 --- a/databases/mysql40-server/distinfo +++ b/databases/mysql40-server/distinfo @@ -1 +1 @@ -MD5 (mysql-3.23.29a-gamma.tar.gz) = 199021bf3f92a87c557606827cfd66e2 +MD5 (mysql-3.23.30-gamma.tar.gz) = 91c500db915ca8a48891080999328965 diff --git a/databases/mysql40-server/files/patch-af b/databases/mysql40-server/files/patch-af index a1e594c45b1d..ad1f5ae20877 100644 --- a/databases/mysql40-server/files/patch-af +++ b/databases/mysql40-server/files/patch-af @@ -1,6 +1,6 @@ ---- scripts/safe_mysqld.sh.orig Wed Nov 22 12:58:59 2000 -+++ scripts/safe_mysqld.sh Fri Dec 1 00:53:26 2000 -@@ -61,26 +61,9 @@ +--- scripts/safe_mysqld.sh.orig Thu Jan 4 03:03:55 2001 ++++ scripts/safe_mysqld.sh Fri Jan 5 14:05:04 2001 +@@ -64,26 +64,9 @@ done } @@ -30,7 +30,7 @@ MYSQL_UNIX_PORT=${MYSQL_UNIX_PORT:-@MYSQL_UNIX_ADDR@} MYSQL_TCP_PORT=${MYSQL_TCP_PORT:-@MYSQL_TCP_PORT@} -@@ -206,34 +189,6 @@ +@@ -220,34 +203,6 @@ if test ! -f $pid_file # This is removed if normal shutdown then break @@ -43,12 +43,12 @@ - # but should work for the rest of the servers. - # The only thing is ps x => redhat 5 gives warnings when using ps -x. - # kill -9 is used or the process won't react on the kill. -- numofproces=`ps xa | grep -v "grep" | grep -c $ledir/mysqld` +- numofproces=`ps xa | grep -v "grep" | grep -c $ledir/$MYSQLD` - echo -e "\nNumber of processes running now: $numofproces" | tee -a $err_log - I=1 - while test "$I" -le "$numofproces" - do -- PROC=`ps xa | grep $ledir/mysqld | grep -v "grep" | tail -1` +- PROC=`ps xa | grep $ledir/$MYSQLD | grep -v "grep" | tail -1` - for T in $PROC - do - break @@ -56,7 +56,7 @@ - # echo "TEST $I - $T **" - if kill -9 $T - then -- echo "mysqld process hanging, pid $T - killed" | tee -a $err_log +- echo "$MYSQLD process hanging, pid $T - killed" | tee -a $err_log - else - break - fi diff --git a/databases/mysql40-server/pkg-plist b/databases/mysql40-server/pkg-plist index ff6b445f2cb8..27275b2368a9 100644 --- a/databases/mysql40-server/pkg-plist +++ b/databases/mysql40-server/pkg-plist @@ -37,6 +37,7 @@ lib/mysql/libmystrings.a lib/mysql/libmysys.a lib/mysql/libnisam.a libexec/mysqld +share/doc/mysql/Flags/argentina.gif share/doc/mysql/Flags/australia.gif share/doc/mysql/Flags/austria.gif share/doc/mysql/Flags/brazil.gif diff --git a/databases/mysql41-server/Makefile b/databases/mysql41-server/Makefile index 03fde0ea75fd..32ab7ba1984b 100644 --- a/databases/mysql41-server/Makefile +++ b/databases/mysql41-server/Makefile @@ -6,7 +6,7 @@ # PORTNAME?= ${MASTERPORTNAME} -PORTVERSION= 3.23.29a +PORTVERSION= 3.23.30 CATEGORIES= databases MASTER_SITES= http://www.wipol.uni-bonn.de/MySQL/Downloads/MySQL-3.23/ \ http://www.mysql.net/Downloads/MySQL-3.23/ \ @@ -85,7 +85,9 @@ post-install: # MySQL-Client part .else -MAN1= mysql.1 +MAN1= isamchk.1 isamlog.1 mysql.1.gz mysql_zap.1 mysqlaccess.1 \ + mysqladmin.1 mysqld.1 mysqld_multi.1 mysqldump.1 mysqlshow.1 \ + perror.1 replace.1 safe_mysqld.1 INSTALLS_SHLIB= yes LDCONFIG_DIRS= %%PREFIX%%/lib/mysql diff --git a/databases/mysql41-server/distinfo b/databases/mysql41-server/distinfo index 38f4df633a20..8811475d4fef 100644 --- a/databases/mysql41-server/distinfo +++ b/databases/mysql41-server/distinfo @@ -1 +1 @@ -MD5 (mysql-3.23.29a-gamma.tar.gz) = 199021bf3f92a87c557606827cfd66e2 +MD5 (mysql-3.23.30-gamma.tar.gz) = 91c500db915ca8a48891080999328965 diff --git a/databases/mysql41-server/files/patch-af b/databases/mysql41-server/files/patch-af index a1e594c45b1d..ad1f5ae20877 100644 --- a/databases/mysql41-server/files/patch-af +++ b/databases/mysql41-server/files/patch-af @@ -1,6 +1,6 @@ ---- scripts/safe_mysqld.sh.orig Wed Nov 22 12:58:59 2000 -+++ scripts/safe_mysqld.sh Fri Dec 1 00:53:26 2000 -@@ -61,26 +61,9 @@ +--- scripts/safe_mysqld.sh.orig Thu Jan 4 03:03:55 2001 ++++ scripts/safe_mysqld.sh Fri Jan 5 14:05:04 2001 +@@ -64,26 +64,9 @@ done } @@ -30,7 +30,7 @@ MYSQL_UNIX_PORT=${MYSQL_UNIX_PORT:-@MYSQL_UNIX_ADDR@} MYSQL_TCP_PORT=${MYSQL_TCP_PORT:-@MYSQL_TCP_PORT@} -@@ -206,34 +189,6 @@ +@@ -220,34 +203,6 @@ if test ! -f $pid_file # This is removed if normal shutdown then break @@ -43,12 +43,12 @@ - # but should work for the rest of the servers. - # The only thing is ps x => redhat 5 gives warnings when using ps -x. - # kill -9 is used or the process won't react on the kill. -- numofproces=`ps xa | grep -v "grep" | grep -c $ledir/mysqld` +- numofproces=`ps xa | grep -v "grep" | grep -c $ledir/$MYSQLD` - echo -e "\nNumber of processes running now: $numofproces" | tee -a $err_log - I=1 - while test "$I" -le "$numofproces" - do -- PROC=`ps xa | grep $ledir/mysqld | grep -v "grep" | tail -1` +- PROC=`ps xa | grep $ledir/$MYSQLD | grep -v "grep" | tail -1` - for T in $PROC - do - break @@ -56,7 +56,7 @@ - # echo "TEST $I - $T **" - if kill -9 $T - then -- echo "mysqld process hanging, pid $T - killed" | tee -a $err_log +- echo "$MYSQLD process hanging, pid $T - killed" | tee -a $err_log - else - break - fi diff --git a/databases/mysql41-server/pkg-plist b/databases/mysql41-server/pkg-plist index ff6b445f2cb8..27275b2368a9 100644 --- a/databases/mysql41-server/pkg-plist +++ b/databases/mysql41-server/pkg-plist @@ -37,6 +37,7 @@ lib/mysql/libmystrings.a lib/mysql/libmysys.a lib/mysql/libnisam.a libexec/mysqld +share/doc/mysql/Flags/argentina.gif share/doc/mysql/Flags/australia.gif share/doc/mysql/Flags/austria.gif share/doc/mysql/Flags/brazil.gif diff --git a/databases/mysql50-server/Makefile b/databases/mysql50-server/Makefile index 03fde0ea75fd..32ab7ba1984b 100644 --- a/databases/mysql50-server/Makefile +++ b/databases/mysql50-server/Makefile @@ -6,7 +6,7 @@ # PORTNAME?= ${MASTERPORTNAME} -PORTVERSION= 3.23.29a +PORTVERSION= 3.23.30 CATEGORIES= databases MASTER_SITES= http://www.wipol.uni-bonn.de/MySQL/Downloads/MySQL-3.23/ \ http://www.mysql.net/Downloads/MySQL-3.23/ \ @@ -85,7 +85,9 @@ post-install: # MySQL-Client part .else -MAN1= mysql.1 +MAN1= isamchk.1 isamlog.1 mysql.1.gz mysql_zap.1 mysqlaccess.1 \ + mysqladmin.1 mysqld.1 mysqld_multi.1 mysqldump.1 mysqlshow.1 \ + perror.1 replace.1 safe_mysqld.1 INSTALLS_SHLIB= yes LDCONFIG_DIRS= %%PREFIX%%/lib/mysql diff --git a/databases/mysql50-server/distinfo b/databases/mysql50-server/distinfo index 38f4df633a20..8811475d4fef 100644 --- a/databases/mysql50-server/distinfo +++ b/databases/mysql50-server/distinfo @@ -1 +1 @@ -MD5 (mysql-3.23.29a-gamma.tar.gz) = 199021bf3f92a87c557606827cfd66e2 +MD5 (mysql-3.23.30-gamma.tar.gz) = 91c500db915ca8a48891080999328965 diff --git a/databases/mysql50-server/files/patch-af b/databases/mysql50-server/files/patch-af index a1e594c45b1d..ad1f5ae20877 100644 --- a/databases/mysql50-server/files/patch-af +++ b/databases/mysql50-server/files/patch-af @@ -1,6 +1,6 @@ ---- scripts/safe_mysqld.sh.orig Wed Nov 22 12:58:59 2000 -+++ scripts/safe_mysqld.sh Fri Dec 1 00:53:26 2000 -@@ -61,26 +61,9 @@ +--- scripts/safe_mysqld.sh.orig Thu Jan 4 03:03:55 2001 ++++ scripts/safe_mysqld.sh Fri Jan 5 14:05:04 2001 +@@ -64,26 +64,9 @@ done } @@ -30,7 +30,7 @@ MYSQL_UNIX_PORT=${MYSQL_UNIX_PORT:-@MYSQL_UNIX_ADDR@} MYSQL_TCP_PORT=${MYSQL_TCP_PORT:-@MYSQL_TCP_PORT@} -@@ -206,34 +189,6 @@ +@@ -220,34 +203,6 @@ if test ! -f $pid_file # This is removed if normal shutdown then break @@ -43,12 +43,12 @@ - # but should work for the rest of the servers. - # The only thing is ps x => redhat 5 gives warnings when using ps -x. - # kill -9 is used or the process won't react on the kill. -- numofproces=`ps xa | grep -v "grep" | grep -c $ledir/mysqld` +- numofproces=`ps xa | grep -v "grep" | grep -c $ledir/$MYSQLD` - echo -e "\nNumber of processes running now: $numofproces" | tee -a $err_log - I=1 - while test "$I" -le "$numofproces" - do -- PROC=`ps xa | grep $ledir/mysqld | grep -v "grep" | tail -1` +- PROC=`ps xa | grep $ledir/$MYSQLD | grep -v "grep" | tail -1` - for T in $PROC - do - break @@ -56,7 +56,7 @@ - # echo "TEST $I - $T **" - if kill -9 $T - then -- echo "mysqld process hanging, pid $T - killed" | tee -a $err_log +- echo "$MYSQLD process hanging, pid $T - killed" | tee -a $err_log - else - break - fi diff --git a/databases/mysql50-server/pkg-plist b/databases/mysql50-server/pkg-plist index ff6b445f2cb8..27275b2368a9 100644 --- a/databases/mysql50-server/pkg-plist +++ b/databases/mysql50-server/pkg-plist @@ -37,6 +37,7 @@ lib/mysql/libmystrings.a lib/mysql/libmysys.a lib/mysql/libnisam.a libexec/mysqld +share/doc/mysql/Flags/argentina.gif share/doc/mysql/Flags/australia.gif share/doc/mysql/Flags/austria.gif share/doc/mysql/Flags/brazil.gif diff --git a/databases/mysql51-server/Makefile b/databases/mysql51-server/Makefile index 03fde0ea75fd..32ab7ba1984b 100644 --- a/databases/mysql51-server/Makefile +++ b/databases/mysql51-server/Makefile @@ -6,7 +6,7 @@ # PORTNAME?= ${MASTERPORTNAME} -PORTVERSION= 3.23.29a +PORTVERSION= 3.23.30 CATEGORIES= databases MASTER_SITES= http://www.wipol.uni-bonn.de/MySQL/Downloads/MySQL-3.23/ \ http://www.mysql.net/Downloads/MySQL-3.23/ \ @@ -85,7 +85,9 @@ post-install: # MySQL-Client part .else -MAN1= mysql.1 +MAN1= isamchk.1 isamlog.1 mysql.1.gz mysql_zap.1 mysqlaccess.1 \ + mysqladmin.1 mysqld.1 mysqld_multi.1 mysqldump.1 mysqlshow.1 \ + perror.1 replace.1 safe_mysqld.1 INSTALLS_SHLIB= yes LDCONFIG_DIRS= %%PREFIX%%/lib/mysql diff --git a/databases/mysql51-server/distinfo b/databases/mysql51-server/distinfo index 38f4df633a20..8811475d4fef 100644 --- a/databases/mysql51-server/distinfo +++ b/databases/mysql51-server/distinfo @@ -1 +1 @@ -MD5 (mysql-3.23.29a-gamma.tar.gz) = 199021bf3f92a87c557606827cfd66e2 +MD5 (mysql-3.23.30-gamma.tar.gz) = 91c500db915ca8a48891080999328965 diff --git a/databases/mysql51-server/files/patch-af b/databases/mysql51-server/files/patch-af index a1e594c45b1d..ad1f5ae20877 100644 --- a/databases/mysql51-server/files/patch-af +++ b/databases/mysql51-server/files/patch-af @@ -1,6 +1,6 @@ ---- scripts/safe_mysqld.sh.orig Wed Nov 22 12:58:59 2000 -+++ scripts/safe_mysqld.sh Fri Dec 1 00:53:26 2000 -@@ -61,26 +61,9 @@ +--- scripts/safe_mysqld.sh.orig Thu Jan 4 03:03:55 2001 ++++ scripts/safe_mysqld.sh Fri Jan 5 14:05:04 2001 +@@ -64,26 +64,9 @@ done } @@ -30,7 +30,7 @@ MYSQL_UNIX_PORT=${MYSQL_UNIX_PORT:-@MYSQL_UNIX_ADDR@} MYSQL_TCP_PORT=${MYSQL_TCP_PORT:-@MYSQL_TCP_PORT@} -@@ -206,34 +189,6 @@ +@@ -220,34 +203,6 @@ if test ! -f $pid_file # This is removed if normal shutdown then break @@ -43,12 +43,12 @@ - # but should work for the rest of the servers. - # The only thing is ps x => redhat 5 gives warnings when using ps -x. - # kill -9 is used or the process won't react on the kill. -- numofproces=`ps xa | grep -v "grep" | grep -c $ledir/mysqld` +- numofproces=`ps xa | grep -v "grep" | grep -c $ledir/$MYSQLD` - echo -e "\nNumber of processes running now: $numofproces" | tee -a $err_log - I=1 - while test "$I" -le "$numofproces" - do -- PROC=`ps xa | grep $ledir/mysqld | grep -v "grep" | tail -1` +- PROC=`ps xa | grep $ledir/$MYSQLD | grep -v "grep" | tail -1` - for T in $PROC - do - break @@ -56,7 +56,7 @@ - # echo "TEST $I - $T **" - if kill -9 $T - then -- echo "mysqld process hanging, pid $T - killed" | tee -a $err_log +- echo "$MYSQLD process hanging, pid $T - killed" | tee -a $err_log - else - break - fi diff --git a/databases/mysql51-server/pkg-plist b/databases/mysql51-server/pkg-plist index ff6b445f2cb8..27275b2368a9 100644 --- a/databases/mysql51-server/pkg-plist +++ b/databases/mysql51-server/pkg-plist @@ -37,6 +37,7 @@ lib/mysql/libmystrings.a lib/mysql/libmysys.a lib/mysql/libnisam.a libexec/mysqld +share/doc/mysql/Flags/argentina.gif share/doc/mysql/Flags/australia.gif share/doc/mysql/Flags/austria.gif share/doc/mysql/Flags/brazil.gif diff --git a/databases/mysql54-server/Makefile b/databases/mysql54-server/Makefile index 03fde0ea75fd..32ab7ba1984b 100644 --- a/databases/mysql54-server/Makefile +++ b/databases/mysql54-server/Makefile @@ -6,7 +6,7 @@ # PORTNAME?= ${MASTERPORTNAME} -PORTVERSION= 3.23.29a +PORTVERSION= 3.23.30 CATEGORIES= databases MASTER_SITES= http://www.wipol.uni-bonn.de/MySQL/Downloads/MySQL-3.23/ \ http://www.mysql.net/Downloads/MySQL-3.23/ \ @@ -85,7 +85,9 @@ post-install: # MySQL-Client part .else -MAN1= mysql.1 +MAN1= isamchk.1 isamlog.1 mysql.1.gz mysql_zap.1 mysqlaccess.1 \ + mysqladmin.1 mysqld.1 mysqld_multi.1 mysqldump.1 mysqlshow.1 \ + perror.1 replace.1 safe_mysqld.1 INSTALLS_SHLIB= yes LDCONFIG_DIRS= %%PREFIX%%/lib/mysql diff --git a/databases/mysql54-server/distinfo b/databases/mysql54-server/distinfo index 38f4df633a20..8811475d4fef 100644 --- a/databases/mysql54-server/distinfo +++ b/databases/mysql54-server/distinfo @@ -1 +1 @@ -MD5 (mysql-3.23.29a-gamma.tar.gz) = 199021bf3f92a87c557606827cfd66e2 +MD5 (mysql-3.23.30-gamma.tar.gz) = 91c500db915ca8a48891080999328965 diff --git a/databases/mysql54-server/files/patch-af b/databases/mysql54-server/files/patch-af index a1e594c45b1d..ad1f5ae20877 100644 --- a/databases/mysql54-server/files/patch-af +++ b/databases/mysql54-server/files/patch-af @@ -1,6 +1,6 @@ ---- scripts/safe_mysqld.sh.orig Wed Nov 22 12:58:59 2000 -+++ scripts/safe_mysqld.sh Fri Dec 1 00:53:26 2000 -@@ -61,26 +61,9 @@ +--- scripts/safe_mysqld.sh.orig Thu Jan 4 03:03:55 2001 ++++ scripts/safe_mysqld.sh Fri Jan 5 14:05:04 2001 +@@ -64,26 +64,9 @@ done } @@ -30,7 +30,7 @@ MYSQL_UNIX_PORT=${MYSQL_UNIX_PORT:-@MYSQL_UNIX_ADDR@} MYSQL_TCP_PORT=${MYSQL_TCP_PORT:-@MYSQL_TCP_PORT@} -@@ -206,34 +189,6 @@ +@@ -220,34 +203,6 @@ if test ! -f $pid_file # This is removed if normal shutdown then break @@ -43,12 +43,12 @@ - # but should work for the rest of the servers. - # The only thing is ps x => redhat 5 gives warnings when using ps -x. - # kill -9 is used or the process won't react on the kill. -- numofproces=`ps xa | grep -v "grep" | grep -c $ledir/mysqld` +- numofproces=`ps xa | grep -v "grep" | grep -c $ledir/$MYSQLD` - echo -e "\nNumber of processes running now: $numofproces" | tee -a $err_log - I=1 - while test "$I" -le "$numofproces" - do -- PROC=`ps xa | grep $ledir/mysqld | grep -v "grep" | tail -1` +- PROC=`ps xa | grep $ledir/$MYSQLD | grep -v "grep" | tail -1` - for T in $PROC - do - break @@ -56,7 +56,7 @@ - # echo "TEST $I - $T **" - if kill -9 $T - then -- echo "mysqld process hanging, pid $T - killed" | tee -a $err_log +- echo "$MYSQLD process hanging, pid $T - killed" | tee -a $err_log - else - break - fi diff --git a/databases/mysql54-server/pkg-plist b/databases/mysql54-server/pkg-plist index ff6b445f2cb8..27275b2368a9 100644 --- a/databases/mysql54-server/pkg-plist +++ b/databases/mysql54-server/pkg-plist @@ -37,6 +37,7 @@ lib/mysql/libmystrings.a lib/mysql/libmysys.a lib/mysql/libnisam.a libexec/mysqld +share/doc/mysql/Flags/argentina.gif share/doc/mysql/Flags/australia.gif share/doc/mysql/Flags/austria.gif share/doc/mysql/Flags/brazil.gif diff --git a/databases/mysql55-server/Makefile b/databases/mysql55-server/Makefile index 03fde0ea75fd..32ab7ba1984b 100644 --- a/databases/mysql55-server/Makefile +++ b/databases/mysql55-server/Makefile @@ -6,7 +6,7 @@ # PORTNAME?= ${MASTERPORTNAME} -PORTVERSION= 3.23.29a +PORTVERSION= 3.23.30 CATEGORIES= databases MASTER_SITES= http://www.wipol.uni-bonn.de/MySQL/Downloads/MySQL-3.23/ \ http://www.mysql.net/Downloads/MySQL-3.23/ \ @@ -85,7 +85,9 @@ post-install: # MySQL-Client part .else -MAN1= mysql.1 +MAN1= isamchk.1 isamlog.1 mysql.1.gz mysql_zap.1 mysqlaccess.1 \ + mysqladmin.1 mysqld.1 mysqld_multi.1 mysqldump.1 mysqlshow.1 \ + perror.1 replace.1 safe_mysqld.1 INSTALLS_SHLIB= yes LDCONFIG_DIRS= %%PREFIX%%/lib/mysql diff --git a/databases/mysql55-server/distinfo b/databases/mysql55-server/distinfo index 38f4df633a20..8811475d4fef 100644 --- a/databases/mysql55-server/distinfo +++ b/databases/mysql55-server/distinfo @@ -1 +1 @@ -MD5 (mysql-3.23.29a-gamma.tar.gz) = 199021bf3f92a87c557606827cfd66e2 +MD5 (mysql-3.23.30-gamma.tar.gz) = 91c500db915ca8a48891080999328965 diff --git a/databases/mysql55-server/files/patch-af b/databases/mysql55-server/files/patch-af index a1e594c45b1d..ad1f5ae20877 100644 --- a/databases/mysql55-server/files/patch-af +++ b/databases/mysql55-server/files/patch-af @@ -1,6 +1,6 @@ ---- scripts/safe_mysqld.sh.orig Wed Nov 22 12:58:59 2000 -+++ scripts/safe_mysqld.sh Fri Dec 1 00:53:26 2000 -@@ -61,26 +61,9 @@ +--- scripts/safe_mysqld.sh.orig Thu Jan 4 03:03:55 2001 ++++ scripts/safe_mysqld.sh Fri Jan 5 14:05:04 2001 +@@ -64,26 +64,9 @@ done } @@ -30,7 +30,7 @@ MYSQL_UNIX_PORT=${MYSQL_UNIX_PORT:-@MYSQL_UNIX_ADDR@} MYSQL_TCP_PORT=${MYSQL_TCP_PORT:-@MYSQL_TCP_PORT@} -@@ -206,34 +189,6 @@ +@@ -220,34 +203,6 @@ if test ! -f $pid_file # This is removed if normal shutdown then break @@ -43,12 +43,12 @@ - # but should work for the rest of the servers. - # The only thing is ps x => redhat 5 gives warnings when using ps -x. - # kill -9 is used or the process won't react on the kill. -- numofproces=`ps xa | grep -v "grep" | grep -c $ledir/mysqld` +- numofproces=`ps xa | grep -v "grep" | grep -c $ledir/$MYSQLD` - echo -e "\nNumber of processes running now: $numofproces" | tee -a $err_log - I=1 - while test "$I" -le "$numofproces" - do -- PROC=`ps xa | grep $ledir/mysqld | grep -v "grep" | tail -1` +- PROC=`ps xa | grep $ledir/$MYSQLD | grep -v "grep" | tail -1` - for T in $PROC - do - break @@ -56,7 +56,7 @@ - # echo "TEST $I - $T **" - if kill -9 $T - then -- echo "mysqld process hanging, pid $T - killed" | tee -a $err_log +- echo "$MYSQLD process hanging, pid $T - killed" | tee -a $err_log - else - break - fi diff --git a/databases/mysql55-server/pkg-plist b/databases/mysql55-server/pkg-plist index ff6b445f2cb8..27275b2368a9 100644 --- a/databases/mysql55-server/pkg-plist +++ b/databases/mysql55-server/pkg-plist @@ -37,6 +37,7 @@ lib/mysql/libmystrings.a lib/mysql/libmysys.a lib/mysql/libnisam.a libexec/mysqld +share/doc/mysql/Flags/argentina.gif share/doc/mysql/Flags/australia.gif share/doc/mysql/Flags/austria.gif share/doc/mysql/Flags/brazil.gif diff --git a/databases/mysql60-server/Makefile b/databases/mysql60-server/Makefile index 03fde0ea75fd..32ab7ba1984b 100644 --- a/databases/mysql60-server/Makefile +++ b/databases/mysql60-server/Makefile @@ -6,7 +6,7 @@ # PORTNAME?= ${MASTERPORTNAME} -PORTVERSION= 3.23.29a +PORTVERSION= 3.23.30 CATEGORIES= databases MASTER_SITES= http://www.wipol.uni-bonn.de/MySQL/Downloads/MySQL-3.23/ \ http://www.mysql.net/Downloads/MySQL-3.23/ \ @@ -85,7 +85,9 @@ post-install: # MySQL-Client part .else -MAN1= mysql.1 +MAN1= isamchk.1 isamlog.1 mysql.1.gz mysql_zap.1 mysqlaccess.1 \ + mysqladmin.1 mysqld.1 mysqld_multi.1 mysqldump.1 mysqlshow.1 \ + perror.1 replace.1 safe_mysqld.1 INSTALLS_SHLIB= yes LDCONFIG_DIRS= %%PREFIX%%/lib/mysql diff --git a/databases/mysql60-server/distinfo b/databases/mysql60-server/distinfo index 38f4df633a20..8811475d4fef 100644 --- a/databases/mysql60-server/distinfo +++ b/databases/mysql60-server/distinfo @@ -1 +1 @@ -MD5 (mysql-3.23.29a-gamma.tar.gz) = 199021bf3f92a87c557606827cfd66e2 +MD5 (mysql-3.23.30-gamma.tar.gz) = 91c500db915ca8a48891080999328965 diff --git a/databases/mysql60-server/files/patch-af b/databases/mysql60-server/files/patch-af index a1e594c45b1d..ad1f5ae20877 100644 --- a/databases/mysql60-server/files/patch-af +++ b/databases/mysql60-server/files/patch-af @@ -1,6 +1,6 @@ ---- scripts/safe_mysqld.sh.orig Wed Nov 22 12:58:59 2000 -+++ scripts/safe_mysqld.sh Fri Dec 1 00:53:26 2000 -@@ -61,26 +61,9 @@ +--- scripts/safe_mysqld.sh.orig Thu Jan 4 03:03:55 2001 ++++ scripts/safe_mysqld.sh Fri Jan 5 14:05:04 2001 +@@ -64,26 +64,9 @@ done } @@ -30,7 +30,7 @@ MYSQL_UNIX_PORT=${MYSQL_UNIX_PORT:-@MYSQL_UNIX_ADDR@} MYSQL_TCP_PORT=${MYSQL_TCP_PORT:-@MYSQL_TCP_PORT@} -@@ -206,34 +189,6 @@ +@@ -220,34 +203,6 @@ if test ! -f $pid_file # This is removed if normal shutdown then break @@ -43,12 +43,12 @@ - # but should work for the rest of the servers. - # The only thing is ps x => redhat 5 gives warnings when using ps -x. - # kill -9 is used or the process won't react on the kill. -- numofproces=`ps xa | grep -v "grep" | grep -c $ledir/mysqld` +- numofproces=`ps xa | grep -v "grep" | grep -c $ledir/$MYSQLD` - echo -e "\nNumber of processes running now: $numofproces" | tee -a $err_log - I=1 - while test "$I" -le "$numofproces" - do -- PROC=`ps xa | grep $ledir/mysqld | grep -v "grep" | tail -1` +- PROC=`ps xa | grep $ledir/$MYSQLD | grep -v "grep" | tail -1` - for T in $PROC - do - break @@ -56,7 +56,7 @@ - # echo "TEST $I - $T **" - if kill -9 $T - then -- echo "mysqld process hanging, pid $T - killed" | tee -a $err_log +- echo "$MYSQLD process hanging, pid $T - killed" | tee -a $err_log - else - break - fi diff --git a/databases/mysql60-server/pkg-plist b/databases/mysql60-server/pkg-plist index ff6b445f2cb8..27275b2368a9 100644 --- a/databases/mysql60-server/pkg-plist +++ b/databases/mysql60-server/pkg-plist @@ -37,6 +37,7 @@ lib/mysql/libmystrings.a lib/mysql/libmysys.a lib/mysql/libnisam.a libexec/mysqld +share/doc/mysql/Flags/argentina.gif share/doc/mysql/Flags/australia.gif share/doc/mysql/Flags/austria.gif share/doc/mysql/Flags/brazil.gif diff --git a/databases/percona55-server/Makefile b/databases/percona55-server/Makefile index 03fde0ea75fd..32ab7ba1984b 100644 --- a/databases/percona55-server/Makefile +++ b/databases/percona55-server/Makefile @@ -6,7 +6,7 @@ # PORTNAME?= ${MASTERPORTNAME} -PORTVERSION= 3.23.29a +PORTVERSION= 3.23.30 CATEGORIES= databases MASTER_SITES= http://www.wipol.uni-bonn.de/MySQL/Downloads/MySQL-3.23/ \ http://www.mysql.net/Downloads/MySQL-3.23/ \ @@ -85,7 +85,9 @@ post-install: # MySQL-Client part .else -MAN1= mysql.1 +MAN1= isamchk.1 isamlog.1 mysql.1.gz mysql_zap.1 mysqlaccess.1 \ + mysqladmin.1 mysqld.1 mysqld_multi.1 mysqldump.1 mysqlshow.1 \ + perror.1 replace.1 safe_mysqld.1 INSTALLS_SHLIB= yes LDCONFIG_DIRS= %%PREFIX%%/lib/mysql diff --git a/databases/percona55-server/distinfo b/databases/percona55-server/distinfo index 38f4df633a20..8811475d4fef 100644 --- a/databases/percona55-server/distinfo +++ b/databases/percona55-server/distinfo @@ -1 +1 @@ -MD5 (mysql-3.23.29a-gamma.tar.gz) = 199021bf3f92a87c557606827cfd66e2 +MD5 (mysql-3.23.30-gamma.tar.gz) = 91c500db915ca8a48891080999328965 diff --git a/databases/percona55-server/files/patch-af b/databases/percona55-server/files/patch-af index a1e594c45b1d..ad1f5ae20877 100644 --- a/databases/percona55-server/files/patch-af +++ b/databases/percona55-server/files/patch-af @@ -1,6 +1,6 @@ ---- scripts/safe_mysqld.sh.orig Wed Nov 22 12:58:59 2000 -+++ scripts/safe_mysqld.sh Fri Dec 1 00:53:26 2000 -@@ -61,26 +61,9 @@ +--- scripts/safe_mysqld.sh.orig Thu Jan 4 03:03:55 2001 ++++ scripts/safe_mysqld.sh Fri Jan 5 14:05:04 2001 +@@ -64,26 +64,9 @@ done } @@ -30,7 +30,7 @@ MYSQL_UNIX_PORT=${MYSQL_UNIX_PORT:-@MYSQL_UNIX_ADDR@} MYSQL_TCP_PORT=${MYSQL_TCP_PORT:-@MYSQL_TCP_PORT@} -@@ -206,34 +189,6 @@ +@@ -220,34 +203,6 @@ if test ! -f $pid_file # This is removed if normal shutdown then break @@ -43,12 +43,12 @@ - # but should work for the rest of the servers. - # The only thing is ps x => redhat 5 gives warnings when using ps -x. - # kill -9 is used or the process won't react on the kill. -- numofproces=`ps xa | grep -v "grep" | grep -c $ledir/mysqld` +- numofproces=`ps xa | grep -v "grep" | grep -c $ledir/$MYSQLD` - echo -e "\nNumber of processes running now: $numofproces" | tee -a $err_log - I=1 - while test "$I" -le "$numofproces" - do -- PROC=`ps xa | grep $ledir/mysqld | grep -v "grep" | tail -1` +- PROC=`ps xa | grep $ledir/$MYSQLD | grep -v "grep" | tail -1` - for T in $PROC - do - break @@ -56,7 +56,7 @@ - # echo "TEST $I - $T **" - if kill -9 $T - then -- echo "mysqld process hanging, pid $T - killed" | tee -a $err_log +- echo "$MYSQLD process hanging, pid $T - killed" | tee -a $err_log - else - break - fi diff --git a/databases/percona55-server/pkg-plist b/databases/percona55-server/pkg-plist index ff6b445f2cb8..27275b2368a9 100644 --- a/databases/percona55-server/pkg-plist +++ b/databases/percona55-server/pkg-plist @@ -37,6 +37,7 @@ lib/mysql/libmystrings.a lib/mysql/libmysys.a lib/mysql/libnisam.a libexec/mysqld +share/doc/mysql/Flags/argentina.gif share/doc/mysql/Flags/australia.gif share/doc/mysql/Flags/austria.gif share/doc/mysql/Flags/brazil.gif |