diff options
Diffstat (limited to 'databases/mysql40-server')
| -rw-r--r-- | databases/mysql40-server/Makefile | 4 | ||||
| -rw-r--r-- | databases/mysql40-server/distinfo | 4 | ||||
| -rw-r--r-- | databases/mysql40-server/files/patch-configure | 54 | ||||
| -rw-r--r-- | databases/mysql40-server/files/patch-scripts::Makefile.in | 16 | ||||
| -rw-r--r-- | databases/mysql40-server/pkg-plist | 7 |
5 files changed, 15 insertions, 70 deletions
diff --git a/databases/mysql40-server/Makefile b/databases/mysql40-server/Makefile index e789a368a358..e0958e28dd8a 100644 --- a/databases/mysql40-server/Makefile +++ b/databases/mysql40-server/Makefile @@ -6,7 +6,7 @@ # PORTNAME?= mysql -PORTVERSION= 4.0.25 +PORTVERSION= 4.0.26 PORTREVISION?= 0 CATEGORIES= databases MASTER_SITES= ${MASTER_SITE_MYSQL} @@ -104,8 +104,6 @@ LATEST_LINK= mysql40-server CONFLICTS= mysql-server-3.* mysql-server-4.[1-9].* mysql-server-5.* -PLIST_SUB= VER=${PORTVERSION} - MAN1= isamchk.1 isamlog.1 mysqld.1 \ mysqld_safe.1 perror.1 replace.1 diff --git a/databases/mysql40-server/distinfo b/databases/mysql40-server/distinfo index 4b355003be4a..9960bb2552cf 100644 --- a/databases/mysql40-server/distinfo +++ b/databases/mysql40-server/distinfo @@ -1,2 +1,2 @@ -MD5 (mysql-4.0.25.tar.gz) = 68a47ff8c1f0c24866a792f6b3bb59d6 -SIZE (mysql-4.0.25.tar.gz) = 11159288 +MD5 (mysql-4.0.26.tar.gz) = 4e2060a3875470e0d853391e8647a019 +SIZE (mysql-4.0.26.tar.gz) = 11144366 diff --git a/databases/mysql40-server/files/patch-configure b/databases/mysql40-server/files/patch-configure index 6b6152dac069..1604d36a6848 100644 --- a/databases/mysql40-server/files/patch-configure +++ b/databases/mysql40-server/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig Mon Dec 27 16:30:01 2004 -+++ configure Sun Jan 9 10:17:14 2005 -@@ -19609,8 +19609,6 @@ +--- configure.orig Sat Sep 3 00:38:41 2005 ++++ configure Tue Sep 13 07:48:06 2005 +@@ -19611,8 +19611,6 @@ # This can be used to rebuild libtool when needed LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" @@ -9,51 +9,7 @@ # Prevent multiple expansion -@@ -20786,43 +20784,7 @@ - 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 --# Linux style --if $PS p $$ 2> /dev/null | grep $0 > /dev/null --then -- FIND_PROC="$PS p \$\$PID | grep mysqld > /dev/null" --# Solaris --elif $PS -fp $$ 2> /dev/null | grep $0 > /dev/null --then -- FIND_PROC="$PS -p \$\$PID | grep mysqld > /dev/null" --# BSD style --elif $PS -uaxww 2> /dev/null | grep $0 > /dev/null --then - FIND_PROC="$PS -uaxww | grep mysqld | grep \" \$\$PID \" > /dev/null" --# SysV style --elif $PS -ef 2> /dev/null | grep $0 > /dev/null --then -- FIND_PROC="$PS -ef | grep mysqld | grep \" \$\$PID \" > /dev/null" --# Do anybody use this? --elif $PS $$ 2> /dev/null | grep $0 > /dev/null --then -- FIND_PROC="$PS \$\$PID | grep mysqld > /dev/null" --else -- case $SYSTEM_TYPE in -- *darwin*) -- FIND_PROC="$PS -uaxww | grep mysqld | grep \" \$\$PID \" > /dev/null" -- ;; -- *cygwin*) -- FIND_PROC="$PS -e | grep mysqld | grep \" \$\$PID \" > /dev/null" -- ;; -- *netware* | *modesto*) -- FIND_PROC= -- ;; -- *) -- { { echo "$as_me:$LINENO: error: Could not find the right ps switches. Which OS is this ?. See the Installation chapter in the Reference Manual." >&5 --echo "$as_me: error: Could not find the right ps switches. Which OS is this ?. See the Installation chapter in the Reference Manual." >&2;} -- { (exit 1); exit 1; }; } -- esac --fi - - echo "$as_me:$LINENO: result: \"$FIND_PROC\"" >&5 - echo "${ECHO_T}\"$FIND_PROC\"" >&6 -@@ -24753,8 +24715,8 @@ +@@ -24767,8 +24765,8 @@ # Some system specific hacks # @@ -64,7 +20,7 @@ # workaround for Sun Forte/x86 see BUG#4681 case $SYSTEM_TYPE-$MACHINE_TYPE-$ac_cv_c_compiler_gnu in -@@ -35738,7 +35700,7 @@ +@@ -35775,7 +35773,7 @@ /* ) rel_srcdir="$srcdir" ;; * ) rel_srcdir="../$srcdir" ;; esac diff --git a/databases/mysql40-server/files/patch-scripts::Makefile.in b/databases/mysql40-server/files/patch-scripts::Makefile.in index 2e577f7506b1..dcb6132e85fd 100644 --- a/databases/mysql40-server/files/patch-scripts::Makefile.in +++ b/databases/mysql40-server/files/patch-scripts::Makefile.in @@ -1,6 +1,6 @@ ---- scripts/Makefile.in.orig Mon Dec 27 16:29:57 2004 -+++ scripts/Makefile.in Sun Jan 9 10:27:55 2005 -@@ -292,25 +292,7 @@ +--- scripts/Makefile.in.orig Sat Sep 3 00:38:37 2005 ++++ scripts/Makefile.in Tue Sep 13 07:58:03 2005 +@@ -289,23 +289,7 @@ uname_prog = @uname_prog@ vio_dir = @vio_dir@ vio_libs = @vio_libs@ @@ -20,14 +20,12 @@ - mysqldumpslow \ - mysql_explain_log \ - mysql_tableinfo \ -- mysqld_multi \ -- make_win_src_distribution \ -- make_win_binary_distribution +- mysqld_multi +bin_SCRIPTS = - EXTRA_SCRIPTS = make_binary_distribution.sh \ - make_sharedlib_distribution.sh \ -@@ -489,7 +471,7 @@ + noinst_SCRIPTS = make_binary_distribution \ + make_sharedlib_distribution \ +@@ -469,7 +453,7 @@ uninstall: uninstall-am install-am: all-am diff --git a/databases/mysql40-server/pkg-plist b/databases/mysql40-server/pkg-plist index fffbf4552e43..6cf9c57cfffc 100644 --- a/databases/mysql40-server/pkg-plist +++ b/databases/mysql40-server/pkg-plist @@ -26,13 +26,7 @@ lib/mysql/libmysys.a lib/mysql/libnisam.a lib/mysql/libvio.a libexec/mysqld -%%DATADIR%%/Description.plist -%%DATADIR%%/Info.plist -%%DATADIR%%/MySQL-shared-compat.spec -%%DATADIR%%/StartupParameters.plist %%DATADIR%%/binary-configure -%%DATADIR%%/postinstall -%%DATADIR%%/preinstall %%DATADIR%%/charsets/Index %%DATADIR%%/charsets/README %%DATADIR%%/charsets/cp1251.conf @@ -88,7 +82,6 @@ libexec/mysqld %%DATADIR%%/my-large.cnf %%DATADIR%%/my-medium.cnf %%DATADIR%%/my-small.cnf -%%DATADIR%%/mysql-%%VER%%.spec %%DATADIR%%/mysql-log-rotate %%DATADIR%%/mysql.server %%DATADIR%%/norwegian-ny/errmsg.sys |