diff options
author | Dirk Froemberg <dirk@FreeBSD.org> | 2002-08-19 13:27:52 +0000 |
---|---|---|
committer | Dirk Froemberg <dirk@FreeBSD.org> | 2002-08-19 13:27:52 +0000 |
commit | 172ccca45ed36af7d5022fddc2dfab2d491d7933 (patch) | |
tree | 7d1001d3b1d341735ffec3d70e0cb1a97e3ce3f8 /databases/mysql54-server | |
parent | Update to 1.0.4. Change maintainer to submitter. (diff) |
Upgrade to 3.23.52.
Notes
Notes:
svn path=/head/; revision=64658
Diffstat (limited to 'databases/mysql54-server')
-rw-r--r-- | databases/mysql54-server/Makefile | 6 | ||||
-rw-r--r-- | databases/mysql54-server/distinfo | 2 | ||||
-rw-r--r-- | databases/mysql54-server/files/patch-ab | 15 | ||||
-rw-r--r-- | databases/mysql54-server/files/patch-configure | 47 | ||||
-rw-r--r-- | databases/mysql54-server/files/patch-sql_mysqld.cc | 11 |
5 files changed, 30 insertions, 51 deletions
diff --git a/databases/mysql54-server/Makefile b/databases/mysql54-server/Makefile index 25b04e4f9a2d..857d1e9790aa 100644 --- a/databases/mysql54-server/Makefile +++ b/databases/mysql54-server/Makefile @@ -6,8 +6,8 @@ # PORTNAME?= ${MASTERPORTNAME} -PORTVERSION= 3.23.51 -PORTREVISION?= 2 +PORTVERSION= 3.23.52 +PORTREVISION?= 0 CATEGORIES= databases MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ http://www.kernelnotes.de/MySQL/Downloads/MySQL-3.23/ \ @@ -79,6 +79,8 @@ RUN_DEPENDS= mysql:${PORTSDIR}/databases/mysql323-client \ PLIST_SUB= MYSQL_VERSION=${PORTVERSION} +ONLY_FOR_ARCHS= i386 alpha + pre-fetch: @${ECHO} "" @${ECHO} "You may use the following build options:" diff --git a/databases/mysql54-server/distinfo b/databases/mysql54-server/distinfo index e446a75b5300..ec57c410bccd 100644 --- a/databases/mysql54-server/distinfo +++ b/databases/mysql54-server/distinfo @@ -1 +1 @@ -MD5 (mysql-3.23.51.tar.gz) = af9f2aaba408898df82cccf462766542 +MD5 (mysql-3.23.52.tar.gz) = 88705b7f38e64b5c21ebb68c77b75e5a diff --git a/databases/mysql54-server/files/patch-ab b/databases/mysql54-server/files/patch-ab deleted file mode 100644 index 2aa8724dd21f..000000000000 --- a/databases/mysql54-server/files/patch-ab +++ /dev/null @@ -1,15 +0,0 @@ ---- scripts/mysql_install_db.sh.orig Sat Dec 16 22:49:02 2000 -+++ scripts/mysql_install_db.sh Mon Dec 18 11:55:07 2000 -@@ -301,12 +301,6 @@ - END_OF_DATA - then - echo "" -- if test "$IN_RPM" -eq 0 -- then -- echo "To start mysqld at boot time you have to copy support-files/mysql.server" -- echo "to the right place for your system" -- echo -- fi - echo "PLEASE REMEMBER TO SET A PASSWORD FOR THE MySQL root USER !" - echo "This is done with:" - echo "$bindir/mysqladmin -u root -p password 'new-password'" diff --git a/databases/mysql54-server/files/patch-configure b/databases/mysql54-server/files/patch-configure index ffa97b89ddd0..91d2a75bf216 100644 --- a/databases/mysql54-server/files/patch-configure +++ b/databases/mysql54-server/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig Mon Jun 3 12:39:20 2002 -+++ configure Mon Jun 17 19:16:58 2002 -@@ -4188,7 +4188,7 @@ +--- configure.orig Wed Aug 14 00:14:46 2002 ++++ configure Mon Aug 19 14:10:52 2002 +@@ -4220,7 +4220,7 @@ ;; esac fi @@ -8,11 +8,14 @@ +HOSTNAME="$ac_cv_path_HOSTNAME -s" if test -n "$HOSTNAME"; then - echo "$as_me:4194: result: $HOSTNAME" >&5 -@@ -4366,40 +4366,7 @@ - echo "$as_me:4366: 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 + echo "$as_me:4226: result: $HOSTNAME" >&5 +@@ -4395,43 +4395,7 @@ + echo "${ECHO_T}no" >&6 + fi + +-echo "$as_me:4398: 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 @@ -42,24 +45,24 @@ - FIND_PROC="$PS -e | grep mysqld | grep \" \$\$PID \" > /dev/null" - ;; - *) -- { { echo "$as_me:4398: error: Could not find the right ps switches. Which OS is this ?. See the Installation chapter in the Reference Manual." >&5 +- { { echo "$as_me:4430: 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 +FIND_PROC="$PS -uaxww | grep mysqld | grep \" \$\$PID \" > /dev/null" - echo "$as_me:4404: result: \"$FIND_PROC\"" >&5 + echo "$as_me:4436: result: \"$FIND_PROC\"" >&5 echo "${ECHO_T}\"$FIND_PROC\"" >&6 -@@ -7907,7 +7874,6 @@ +@@ -7939,7 +7903,6 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lc_r $LIBS" cat >conftest.$ac_ext <<_ACEOF - #line 7912 "configure" + #line 7944 "configure" #include "confdefs.h" -@@ -7955,7 +7921,6 @@ +@@ -7987,7 +7950,6 @@ #define HAVE_LIBC_R 1 EOF @@ -67,7 +70,7 @@ fi -@@ -8312,29 +8277,6 @@ +@@ -8344,29 +8306,6 @@ fi @@ -97,7 +100,7 @@ # Check whether --with-debug or --without-debug was given. if test "${with_debug+set}" = set; then withval="$with_debug" -@@ -10066,10 +10008,6 @@ +@@ -10098,10 +10037,6 @@ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_cxx_compiler_gnu @@ -107,8 +110,8 @@ -fi mysql_cv_btype_last_arg_accept=none cat >conftest.$ac_ext <<_ACEOF - #line 10075 "configure" -@@ -12739,13 +12677,6 @@ + #line 10107 "configure" +@@ -12771,13 +12706,6 @@ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_cxx_compiler_gnu @@ -120,9 +123,9 @@ - CXXFLAGS="$CXXFLAGS -Werror" -fi cat >conftest.$ac_ext <<_ACEOF - #line 12750 "configure" + #line 12782 "configure" #include "confdefs.h" -@@ -12822,10 +12753,6 @@ +@@ -12854,10 +12782,6 @@ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_cxx_compiler_gnu @@ -131,9 +134,9 @@ - CXXFLAGS="$CXXFLAGS -Werror" -fi cat >conftest.$ac_ext <<_ACEOF - #line 12830 "configure" + #line 12862 "configure" #include "confdefs.h" -@@ -12901,10 +12828,6 @@ +@@ -12933,10 +12857,6 @@ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_cxx_compiler_gnu @@ -142,5 +145,5 @@ - CXXFLAGS="$CXXFLAGS -Werror" -fi cat >conftest.$ac_ext <<_ACEOF - #line 12909 "configure" + #line 12941 "configure" #include "confdefs.h" diff --git a/databases/mysql54-server/files/patch-sql_mysqld.cc b/databases/mysql54-server/files/patch-sql_mysqld.cc deleted file mode 100644 index e1481206a280..000000000000 --- a/databases/mysql54-server/files/patch-sql_mysqld.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- sql/mysqld.cc.orig Mon Jun 3 12:39:02 2002 -+++ sql/mysqld.cc Mon Aug 12 11:15:20 2002 -@@ -90,7 +90,7 @@ - int allow_severity = LOG_INFO; - int deny_severity = LOG_WARNING; - --#ifdef __linux__ -+#if defined(__linux__) || defined(__FreeBSD__) - #define my_fromhost(A) fromhost() - #define my_hosts_access(A) hosts_access() - #define my_eval_client(A) eval_client() |