diff options
author | dirk <dirk@FreeBSD.org> | 2002-06-20 22:47:47 +0800 |
---|---|---|
committer | dirk <dirk@FreeBSD.org> | 2002-06-20 22:47:47 +0800 |
commit | 5ae5f160eda56b4dde33ebd1da1879f6c49b62f6 (patch) | |
tree | a6dd64e6d5bc077570cf5accacabe1ced8b71e86 /databases | |
parent | ab244b62ca6e56b23eb0161dc308cd45b3ad57ca (diff) | |
download | freebsd-ports-gnome-5ae5f160eda56b4dde33ebd1da1879f6c49b62f6.tar.gz freebsd-ports-gnome-5ae5f160eda56b4dde33ebd1da1879f6c49b62f6.tar.zst freebsd-ports-gnome-5ae5f160eda56b4dde33ebd1da1879f6c49b62f6.zip |
Upgrade to 3.23.51.
Diffstat (limited to 'databases')
63 files changed, 639 insertions, 783 deletions
diff --git a/databases/mysql323-server/Makefile b/databases/mysql323-server/Makefile index fe8dbda2459b..bbd4807d7c90 100644 --- a/databases/mysql323-server/Makefile +++ b/databases/mysql323-server/Makefile @@ -6,7 +6,7 @@ # PORTNAME?= ${MASTERPORTNAME} -PORTVERSION= 3.23.49 +PORTVERSION= 3.23.51 PORTREVISION?= 0 CATEGORIES= databases MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ @@ -32,7 +32,8 @@ CONFIGURE_ARGS= --localstatedir=${DB_DIR} \ --with-mit-threads=no \ --with-libwrap \ --with-low-memory \ - --with-comment='FreeBSD port: ${PKGNAME}' + --with-comment='FreeBSD port: ${PKGNAME}' \ + --program-prefix='' .if ${MACHINE_ARCH} == "i386" CONFIGURE_ARGS+=--enable-assembler --with-berkeley-db --with-innodb @@ -104,10 +105,6 @@ pre-fetch: @${ECHO} " is not recommended for production servers." @${ECHO} "" -post-patch: - ${MV} ${WRKSRC}/strings/strings-x86.s ${WRKSRC}/strings/strings-x86.S - ${MV} ${WRKSRC}/strings/longlong2str-x86.s ${WRKSRC}/strings/longlong2str-x86.S - .if exists(${DB_DIR}) && !defined(PACKAGE_BUILDING) && !defined(OVERWRITE_DB) && !defined(SKIP_INSTALL_DB) pre-install: @${ECHO} "You appear to already have a mysql database directory in ${DB_DIR}." diff --git a/databases/mysql323-server/distinfo b/databases/mysql323-server/distinfo index ee72e669d769..e446a75b5300 100644 --- a/databases/mysql323-server/distinfo +++ b/databases/mysql323-server/distinfo @@ -1 +1 @@ -MD5 (mysql-3.23.49.tar.gz) = 1eec75578df021ee22bb229268359d8f +MD5 (mysql-3.23.51.tar.gz) = af9f2aaba408898df82cccf462766542 diff --git a/databases/mysql323-server/files/patch-af b/databases/mysql323-server/files/patch-af index 9c4a0b951402..238e8b2d7115 100644 --- a/databases/mysql323-server/files/patch-af +++ b/databases/mysql323-server/files/patch-af @@ -1,6 +1,6 @@ ---- scripts/safe_mysqld.sh.orig Thu Apr 19 10:11:02 2001 -+++ scripts/safe_mysqld.sh Thu Apr 19 15:15:54 2001 -@@ -73,30 +73,9 @@ +--- scripts/safe_mysqld.sh.orig Mon Jun 3 12:39:02 2002 ++++ scripts/safe_mysqld.sh Mon Jun 17 19:07:26 2002 +@@ -68,30 +68,9 @@ done } @@ -34,7 +34,7 @@ MYSQL_UNIX_PORT=${MYSQL_UNIX_PORT:-@MYSQL_UNIX_ADDR@} MYSQL_TCP_PORT=${MYSQL_TCP_PORT:-@MYSQL_TCP_PORT@} -@@ -240,34 +219,6 @@ +@@ -239,34 +218,6 @@ if test ! -f $pid_file # This is removed if normal shutdown then break @@ -52,7 +52,7 @@ - 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" | sed -n '$p'` - for T in $PROC - do - break diff --git a/databases/mysql323-server/files/patch-ag b/databases/mysql323-server/files/patch-ag index f10ab97c44a8..ffa97b89ddd0 100644 --- a/databases/mysql323-server/files/patch-ag +++ b/databases/mysql323-server/files/patch-ag @@ -1,17 +1,17 @@ ---- configure.orig Wed May 9 22:34:50 2001 -+++ configure Sat May 12 11:23:21 2001 -@@ -2994,7 +2994,7 @@ +--- configure.orig Mon Jun 3 12:39:20 2002 ++++ configure Mon Jun 17 19:16:58 2002 +@@ -4188,7 +4188,7 @@ ;; esac fi --HOSTNAME="$ac_cv_path_HOSTNAME" +-HOSTNAME=$ac_cv_path_HOSTNAME +HOSTNAME="$ac_cv_path_HOSTNAME -s" + if test -n "$HOSTNAME"; then - echo "$ac_t""$HOSTNAME" 1>&6 - else -@@ -3128,38 +3128,7 @@ - echo $ac_n "checking "how to check if pid exists"""... $ac_c" 1>&6 - echo "configure:3130: checking "how to check if pid exists"" >&5 + 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 -# Linux style -if $PS p $$ 2> /dev/null | grep $0 > /dev/null @@ -42,28 +42,38 @@ - FIND_PROC="$PS -e | grep mysqld | grep \" \$\$PID \" > /dev/null" - ;; - *) -- { echo "configure: error: Could not find the right ps switches. Which OS is this ?. See the Installation chapter in the Reference Manual." 1>&2; exit 1; } +- { { 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: 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 "$ac_t"""$FIND_PROC"" 1>&6 - -@@ -5922,7 +5891,6 @@ - #define $ac_tr_lib 1 + echo "$as_me:4404: result: \"$FIND_PROC\"" >&5 + echo "${ECHO_T}\"$FIND_PROC\"" >&6 +@@ -7907,7 +7874,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" + #include "confdefs.h" +@@ -7955,7 +7921,6 @@ + #define HAVE_LIBC_R 1 EOF - LIBS="-lc_r $LIBS" - else - echo "$ac_t""no" 1>&6 -@@ -6154,28 +6122,6 @@ fi +@@ -8312,29 +8277,6 @@ + + fi -# Build optimized or debug version ? -# First check for gcc and g++ --if test "$ac_cv_prog_gcc" = "yes" +-if test "$ac_cv_c_compiler_gnu" = "yes" -then - DEBUG_CFLAGS="-g" - DEBUG_OPTIMIZE_CC="-O" @@ -83,50 +93,54 @@ - DEBUG_OPTIMIZE_CXX="" - OPTIMIZE_CXXFLAGS="-O" -fi +- # Check whether --with-debug or --without-debug was given. if test "${with_debug+set}" = set; then withval="$with_debug" -@@ -6856,10 +6802,6 @@ - ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' - cross_compiling=$ac_cv_prog_cxx_cross +@@ -10066,10 +10008,6 @@ + ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' + ac_compiler_gnu=$ac_cv_cxx_compiler_gnu --if test "$ac_cv_prog_gxx" = "yes" +-if test "$ac_cv_cxx_compiler_gnu" = "yes" -then - CXXFLAGS="$CXXFLAGS -Werror" -fi mysql_cv_btype_last_arg_accept=none - cat > conftest.$ac_ext <<EOF - #line 6866 "configure" -@@ -9019,10 +8961,6 @@ - #do not treat warnings as errors if we are linking agaist other libc - #this is to work around gcc not being permissive on non-system includes - #with respect to ANSI C++ --if test "$ac_cv_prog_gxx" = "yes" -a "$with_other_libc" = "no" + cat >conftest.$ac_ext <<_ACEOF + #line 10075 "configure" +@@ -12739,13 +12677,6 @@ + ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' + ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + +-# Do not treat warnings as errors if we are linking agaist other libc +-# this is to work around gcc not being permissive on non-system includes +-# with respect to ANSI C++ +-if test "$ac_cv_cxx_compiler_gnu" = "yes" -a "$with_other_libc" = "no" -then - CXXFLAGS="$CXXFLAGS -Werror" -fi - cat > conftest.$ac_ext <<EOF - #line 9028 "configure" + cat >conftest.$ac_ext <<_ACEOF + #line 12750 "configure" #include "confdefs.h" -@@ -9087,10 +9025,6 @@ - ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' - cross_compiling=$ac_cv_prog_cxx_cross +@@ -12822,10 +12753,6 @@ + ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' + ac_compiler_gnu=$ac_cv_cxx_compiler_gnu --if test "$ac_cv_prog_gxx" = "yes" -a "$with_other_libc" = "no" +-if test "$ac_cv_cxx_compiler_gnu" = "yes" -a "$with_other_libc" = "no" -then - CXXFLAGS="$CXXFLAGS -Werror" -fi - cat > conftest.$ac_ext <<EOF - #line 9096 "configure" + cat >conftest.$ac_ext <<_ACEOF + #line 12830 "configure" #include "confdefs.h" -@@ -9154,10 +9088,6 @@ - ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' - cross_compiling=$ac_cv_prog_cxx_cross +@@ -12901,10 +12828,6 @@ + ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' + ac_compiler_gnu=$ac_cv_cxx_compiler_gnu --if test "$ac_cv_prog_gxx" = "yes" -a "$with_other_libc" = "no" +-if test "$ac_cv_cxx_compiler_gnu" = "yes" -a "$with_other_libc" = "no" -then - CXXFLAGS="$CXXFLAGS -Werror" -fi - cat > conftest.$ac_ext <<EOF - #line 9163 "configure" + cat >conftest.$ac_ext <<_ACEOF + #line 12909 "configure" #include "confdefs.h" diff --git a/databases/mysql323-server/files/patch-an b/databases/mysql323-server/files/patch-an index bed75f614ccc..b002d685b504 100644 --- a/databases/mysql323-server/files/patch-an +++ b/databases/mysql323-server/files/patch-an @@ -1,11 +1,11 @@ ---- Makefile.in.orig Wed Apr 18 10:54:42 2001 -+++ Makefile.in Sat Apr 21 13:00:23 2001 -@@ -181,8 +181,12 @@ +--- Makefile.in.orig Mon Jun 3 12:45:17 2002 ++++ Makefile.in Mon Jun 17 20:57:29 2002 +@@ -185,8 +185,11 @@ # These are built from source in the Docs directory EXTRA_DIST = INSTALL-SOURCE README COPYING COPYING.LIB MIRRORS --SUBDIRS = include @docs_dirs@ @readline_dir@ @thread_dirs@ @sql_client_dirs@ @sql_server_dirs@ scripts tests man @bench_dirs@ support-files - +-SUBDIRS = include @docs_dirs@ @readline_dir@ @thread_dirs@ @sql_client_dirs@ @sql_server_dirs@ scripts tests man @bench_dirs@ support-files os2 +- +.if defined(CLIENT_ONLY) +SUBDIRS = include @readline_dir@ @sql_client_dirs@ tests man +.else diff --git a/databases/mysql323-server/files/patch-ap b/databases/mysql323-server/files/patch-ap deleted file mode 100644 index 097b449a181a..000000000000 --- a/databases/mysql323-server/files/patch-ap +++ /dev/null @@ -1,11 +0,0 @@ ---- strings/Makefile.in.orig Sat Jan 1 18:00:30 2000 -+++ strings/Makefile.in Mon Jan 3 17:21:19 2000 -@@ -145,7 +145,7 @@ - INCLUDES = @MT_INCLUDES@ -I$(srcdir)/../include -I../include - pkglib_LIBRARIES = libmystrings.a - #no assembler --@ASSEMBLER_x86_TRUE@ASRCS = strings-x86.s longlong2str-x86.s -+@ASSEMBLER_x86_TRUE@ASRCS = strings-x86.S longlong2str-x86.S - @ASSEMBLER_x86_FALSE@@ASSEMBLER_sparc_TRUE@ASRCS = bmove_upp-sparc.s strappend-sparc.s strend-sparc.s strinstr-sparc.s strmake-sparc.s strmov-sparc.s strnmov-sparc.s strstr-sparc.s strxmov-sparc.s - @ASSEMBLER_x86_FALSE@@ASSEMBLER_sparc_FALSE@ASRCS = - # These file MUST all be on the same line!! Otherwise automake diff --git a/databases/mysql323-server/files/patch-as b/databases/mysql323-server/files/patch-as deleted file mode 100644 index 903bc9950a28..000000000000 --- a/databases/mysql323-server/files/patch-as +++ /dev/null @@ -1,16 +0,0 @@ ---- sql/mysqld.cc.orig Sun Feb 13 02:40:18 2000 -+++ sql/mysqld.cc Mon Feb 21 21:24:51 2000 -@@ -63,8 +63,11 @@ - inline void reset_floating_point_exceptions() - { - /* Don't fall for overflow, underflow,divide-by-zero or loss of precision */ -- fpsetmask(~(FP_X_INV | FP_X_DNML | FP_X_OFL | FP_X_UFL | -- FP_X_DZ | FP_X_IMP)); -+#if defined(__i386__) -+ fpsetmask(~(FP_X_INV | FP_X_DNML | FP_X_OFL | FP_X_UFL | FP_X_DZ | FP_X_IMP)); -+#else -+ fpsetmask(~(FP_X_INV | FP_X_OFL | FP_X_UFL | FP_X_DZ | FP_X_IMP)); -+#endif - } - #else - #define reset_floating_point_exceptions() diff --git a/databases/mysql40-server/Makefile b/databases/mysql40-server/Makefile index fe8dbda2459b..bbd4807d7c90 100644 --- a/databases/mysql40-server/Makefile +++ b/databases/mysql40-server/Makefile @@ -6,7 +6,7 @@ # PORTNAME?= ${MASTERPORTNAME} -PORTVERSION= 3.23.49 +PORTVERSION= 3.23.51 PORTREVISION?= 0 CATEGORIES= databases MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ @@ -32,7 +32,8 @@ CONFIGURE_ARGS= --localstatedir=${DB_DIR} \ --with-mit-threads=no \ --with-libwrap \ --with-low-memory \ - --with-comment='FreeBSD port: ${PKGNAME}' + --with-comment='FreeBSD port: ${PKGNAME}' \ + --program-prefix='' .if ${MACHINE_ARCH} == "i386" CONFIGURE_ARGS+=--enable-assembler --with-berkeley-db --with-innodb @@ -104,10 +105,6 @@ pre-fetch: @${ECHO} " is not recommended for production servers." @${ECHO} "" -post-patch: - ${MV} ${WRKSRC}/strings/strings-x86.s ${WRKSRC}/strings/strings-x86.S - ${MV} ${WRKSRC}/strings/longlong2str-x86.s ${WRKSRC}/strings/longlong2str-x86.S - .if exists(${DB_DIR}) && !defined(PACKAGE_BUILDING) && !defined(OVERWRITE_DB) && !defined(SKIP_INSTALL_DB) pre-install: @${ECHO} "You appear to already have a mysql database directory in ${DB_DIR}." diff --git a/databases/mysql40-server/distinfo b/databases/mysql40-server/distinfo index ee72e669d769..e446a75b5300 100644 --- a/databases/mysql40-server/distinfo +++ b/databases/mysql40-server/distinfo @@ -1 +1 @@ -MD5 (mysql-3.23.49.tar.gz) = 1eec75578df021ee22bb229268359d8f +MD5 (mysql-3.23.51.tar.gz) = af9f2aaba408898df82cccf462766542 diff --git a/databases/mysql40-server/files/patch-Makefile.in b/databases/mysql40-server/files/patch-Makefile.in index bed75f614ccc..b002d685b504 100644 --- a/databases/mysql40-server/files/patch-Makefile.in +++ b/databases/mysql40-server/files/patch-Makefile.in @@ -1,11 +1,11 @@ ---- Makefile.in.orig Wed Apr 18 10:54:42 2001 -+++ Makefile.in Sat Apr 21 13:00:23 2001 -@@ -181,8 +181,12 @@ +--- Makefile.in.orig Mon Jun 3 12:45:17 2002 ++++ Makefile.in Mon Jun 17 20:57:29 2002 +@@ -185,8 +185,11 @@ # These are built from source in the Docs directory EXTRA_DIST = INSTALL-SOURCE README COPYING COPYING.LIB MIRRORS --SUBDIRS = include @docs_dirs@ @readline_dir@ @thread_dirs@ @sql_client_dirs@ @sql_server_dirs@ scripts tests man @bench_dirs@ support-files - +-SUBDIRS = include @docs_dirs@ @readline_dir@ @thread_dirs@ @sql_client_dirs@ @sql_server_dirs@ scripts tests man @bench_dirs@ support-files os2 +- +.if defined(CLIENT_ONLY) +SUBDIRS = include @readline_dir@ @sql_client_dirs@ tests man +.else diff --git a/databases/mysql40-server/files/patch-af b/databases/mysql40-server/files/patch-af index 9c4a0b951402..238e8b2d7115 100644 --- a/databases/mysql40-server/files/patch-af +++ b/databases/mysql40-server/files/patch-af @@ -1,6 +1,6 @@ ---- scripts/safe_mysqld.sh.orig Thu Apr 19 10:11:02 2001 -+++ scripts/safe_mysqld.sh Thu Apr 19 15:15:54 2001 -@@ -73,30 +73,9 @@ +--- scripts/safe_mysqld.sh.orig Mon Jun 3 12:39:02 2002 ++++ scripts/safe_mysqld.sh Mon Jun 17 19:07:26 2002 +@@ -68,30 +68,9 @@ done } @@ -34,7 +34,7 @@ MYSQL_UNIX_PORT=${MYSQL_UNIX_PORT:-@MYSQL_UNIX_ADDR@} MYSQL_TCP_PORT=${MYSQL_TCP_PORT:-@MYSQL_TCP_PORT@} -@@ -240,34 +219,6 @@ +@@ -239,34 +218,6 @@ if test ! -f $pid_file # This is removed if normal shutdown then break @@ -52,7 +52,7 @@ - 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" | sed -n '$p'` - for T in $PROC - do - break diff --git a/databases/mysql40-server/files/patch-ap b/databases/mysql40-server/files/patch-ap deleted file mode 100644 index 097b449a181a..000000000000 --- a/databases/mysql40-server/files/patch-ap +++ /dev/null @@ -1,11 +0,0 @@ ---- strings/Makefile.in.orig Sat Jan 1 18:00:30 2000 -+++ strings/Makefile.in Mon Jan 3 17:21:19 2000 -@@ -145,7 +145,7 @@ - INCLUDES = @MT_INCLUDES@ -I$(srcdir)/../include -I../include - pkglib_LIBRARIES = libmystrings.a - #no assembler --@ASSEMBLER_x86_TRUE@ASRCS = strings-x86.s longlong2str-x86.s -+@ASSEMBLER_x86_TRUE@ASRCS = strings-x86.S longlong2str-x86.S - @ASSEMBLER_x86_FALSE@@ASSEMBLER_sparc_TRUE@ASRCS = bmove_upp-sparc.s strappend-sparc.s strend-sparc.s strinstr-sparc.s strmake-sparc.s strmov-sparc.s strnmov-sparc.s strstr-sparc.s strxmov-sparc.s - @ASSEMBLER_x86_FALSE@@ASSEMBLER_sparc_FALSE@ASRCS = - # These file MUST all be on the same line!! Otherwise automake diff --git a/databases/mysql40-server/files/patch-as b/databases/mysql40-server/files/patch-as deleted file mode 100644 index 903bc9950a28..000000000000 --- a/databases/mysql40-server/files/patch-as +++ /dev/null @@ -1,16 +0,0 @@ ---- sql/mysqld.cc.orig Sun Feb 13 02:40:18 2000 -+++ sql/mysqld.cc Mon Feb 21 21:24:51 2000 -@@ -63,8 +63,11 @@ - inline void reset_floating_point_exceptions() - { - /* Don't fall for overflow, underflow,divide-by-zero or loss of precision */ -- fpsetmask(~(FP_X_INV | FP_X_DNML | FP_X_OFL | FP_X_UFL | -- FP_X_DZ | FP_X_IMP)); -+#if defined(__i386__) -+ fpsetmask(~(FP_X_INV | FP_X_DNML | FP_X_OFL | FP_X_UFL | FP_X_DZ | FP_X_IMP)); -+#else -+ fpsetmask(~(FP_X_INV | FP_X_OFL | FP_X_UFL | FP_X_DZ | FP_X_IMP)); -+#endif - } - #else - #define reset_floating_point_exceptions() diff --git a/databases/mysql40-server/files/patch-configure b/databases/mysql40-server/files/patch-configure index f10ab97c44a8..ffa97b89ddd0 100644 --- a/databases/mysql40-server/files/patch-configure +++ b/databases/mysql40-server/files/patch-configure @@ -1,17 +1,17 @@ ---- configure.orig Wed May 9 22:34:50 2001 -+++ configure Sat May 12 11:23:21 2001 -@@ -2994,7 +2994,7 @@ +--- configure.orig Mon Jun 3 12:39:20 2002 ++++ configure Mon Jun 17 19:16:58 2002 +@@ -4188,7 +4188,7 @@ ;; esac fi --HOSTNAME="$ac_cv_path_HOSTNAME" +-HOSTNAME=$ac_cv_path_HOSTNAME +HOSTNAME="$ac_cv_path_HOSTNAME -s" + if test -n "$HOSTNAME"; then - echo "$ac_t""$HOSTNAME" 1>&6 - else -@@ -3128,38 +3128,7 @@ - echo $ac_n "checking "how to check if pid exists"""... $ac_c" 1>&6 - echo "configure:3130: checking "how to check if pid exists"" >&5 + 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 -# Linux style -if $PS p $$ 2> /dev/null | grep $0 > /dev/null @@ -42,28 +42,38 @@ - FIND_PROC="$PS -e | grep mysqld | grep \" \$\$PID \" > /dev/null" - ;; - *) -- { echo "configure: error: Could not find the right ps switches. Which OS is this ?. See the Installation chapter in the Reference Manual." 1>&2; exit 1; } +- { { 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: 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 "$ac_t"""$FIND_PROC"" 1>&6 - -@@ -5922,7 +5891,6 @@ - #define $ac_tr_lib 1 + echo "$as_me:4404: result: \"$FIND_PROC\"" >&5 + echo "${ECHO_T}\"$FIND_PROC\"" >&6 +@@ -7907,7 +7874,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" + #include "confdefs.h" +@@ -7955,7 +7921,6 @@ + #define HAVE_LIBC_R 1 EOF - LIBS="-lc_r $LIBS" - else - echo "$ac_t""no" 1>&6 -@@ -6154,28 +6122,6 @@ fi +@@ -8312,29 +8277,6 @@ + + fi -# Build optimized or debug version ? -# First check for gcc and g++ --if test "$ac_cv_prog_gcc" = "yes" +-if test "$ac_cv_c_compiler_gnu" = "yes" -then - DEBUG_CFLAGS="-g" - DEBUG_OPTIMIZE_CC="-O" @@ -83,50 +93,54 @@ - DEBUG_OPTIMIZE_CXX="" - OPTIMIZE_CXXFLAGS="-O" -fi +- # Check whether --with-debug or --without-debug was given. if test "${with_debug+set}" = set; then withval="$with_debug" -@@ -6856,10 +6802,6 @@ - ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' - cross_compiling=$ac_cv_prog_cxx_cross +@@ -10066,10 +10008,6 @@ + ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' + ac_compiler_gnu=$ac_cv_cxx_compiler_gnu --if test "$ac_cv_prog_gxx" = "yes" +-if test "$ac_cv_cxx_compiler_gnu" = "yes" -then - CXXFLAGS="$CXXFLAGS -Werror" -fi mysql_cv_btype_last_arg_accept=none - cat > conftest.$ac_ext <<EOF - #line 6866 "configure" -@@ -9019,10 +8961,6 @@ - #do not treat warnings as errors if we are linking agaist other libc - #this is to work around gcc not being permissive on non-system includes - #with respect to ANSI C++ --if test "$ac_cv_prog_gxx" = "yes" -a "$with_other_libc" = "no" + cat >conftest.$ac_ext <<_ACEOF + #line 10075 "configure" +@@ -12739,13 +12677,6 @@ + ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' + ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + +-# Do not treat warnings as errors if we are linking agaist other libc +-# this is to work around gcc not being permissive on non-system includes +-# with respect to ANSI C++ +-if test "$ac_cv_cxx_compiler_gnu" = "yes" -a "$with_other_libc" = "no" -then - CXXFLAGS="$CXXFLAGS -Werror" -fi - cat > conftest.$ac_ext <<EOF - #line 9028 "configure" + cat >conftest.$ac_ext <<_ACEOF + #line 12750 "configure" #include "confdefs.h" -@@ -9087,10 +9025,6 @@ - ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' - cross_compiling=$ac_cv_prog_cxx_cross +@@ -12822,10 +12753,6 @@ + ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' + ac_compiler_gnu=$ac_cv_cxx_compiler_gnu --if test "$ac_cv_prog_gxx" = "yes" -a "$with_other_libc" = "no" +-if test "$ac_cv_cxx_compiler_gnu" = "yes" -a "$with_other_libc" = "no" -then - CXXFLAGS="$CXXFLAGS -Werror" -fi - cat > conftest.$ac_ext <<EOF - #line 9096 "configure" + cat >conftest.$ac_ext <<_ACEOF + #line 12830 "configure" #include "confdefs.h" -@@ -9154,10 +9088,6 @@ - ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' - cross_compiling=$ac_cv_prog_cxx_cross +@@ -12901,10 +12828,6 @@ + ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' + ac_compiler_gnu=$ac_cv_cxx_compiler_gnu --if test "$ac_cv_prog_gxx" = "yes" -a "$with_other_libc" = "no" +-if test "$ac_cv_cxx_compiler_gnu" = "yes" -a "$with_other_libc" = "no" -then - CXXFLAGS="$CXXFLAGS -Werror" -fi - cat > conftest.$ac_ext <<EOF - #line 9163 "configure" + cat >conftest.$ac_ext <<_ACEOF + #line 12909 "configure" #include "confdefs.h" diff --git a/databases/mysql41-server/Makefile b/databases/mysql41-server/Makefile index fe8dbda2459b..bbd4807d7c90 100644 --- a/databases/mysql41-server/Makefile +++ b/databases/mysql41-server/Makefile @@ -6,7 +6,7 @@ # PORTNAME?= ${MASTERPORTNAME} -PORTVERSION= 3.23.49 +PORTVERSION= 3.23.51 PORTREVISION?= 0 CATEGORIES= databases MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ @@ -32,7 +32,8 @@ CONFIGURE_ARGS= --localstatedir=${DB_DIR} \ --with-mit-threads=no \ --with-libwrap \ --with-low-memory \ - --with-comment='FreeBSD port: ${PKGNAME}' + --with-comment='FreeBSD port: ${PKGNAME}' \ + --program-prefix='' .if ${MACHINE_ARCH} == "i386" CONFIGURE_ARGS+=--enable-assembler --with-berkeley-db --with-innodb @@ -104,10 +105,6 @@ pre-fetch: @${ECHO} " is not recommended for production servers." @${ECHO} "" -post-patch: - ${MV} ${WRKSRC}/strings/strings-x86.s ${WRKSRC}/strings/strings-x86.S - ${MV} ${WRKSRC}/strings/longlong2str-x86.s ${WRKSRC}/strings/longlong2str-x86.S - .if exists(${DB_DIR}) && !defined(PACKAGE_BUILDING) && !defined(OVERWRITE_DB) && !defined(SKIP_INSTALL_DB) pre-install: @${ECHO} "You appear to already have a mysql database directory in ${DB_DIR}." diff --git a/databases/mysql41-server/distinfo b/databases/mysql41-server/distinfo index ee72e669d769..e446a75b5300 100644 --- a/databases/mysql41-server/distinfo +++ b/databases/mysql41-server/distinfo @@ -1 +1 @@ -MD5 (mysql-3.23.49.tar.gz) = 1eec75578df021ee22bb229268359d8f +MD5 (mysql-3.23.51.tar.gz) = af9f2aaba408898df82cccf462766542 diff --git a/databases/mysql41-server/files/patch-Makefile.in b/databases/mysql41-server/files/patch-Makefile.in index bed75f614ccc..b002d685b504 100644 --- a/databases/mysql41-server/files/patch-Makefile.in +++ b/databases/mysql41-server/files/patch-Makefile.in @@ -1,11 +1,11 @@ ---- Makefile.in.orig Wed Apr 18 10:54:42 2001 -+++ Makefile.in Sat Apr 21 13:00:23 2001 -@@ -181,8 +181,12 @@ +--- Makefile.in.orig Mon Jun 3 12:45:17 2002 ++++ Makefile.in Mon Jun 17 20:57:29 2002 +@@ -185,8 +185,11 @@ # These are built from source in the Docs directory EXTRA_DIST = INSTALL-SOURCE README COPYING COPYING.LIB MIRRORS --SUBDIRS = include @docs_dirs@ @readline_dir@ @thread_dirs@ @sql_client_dirs@ @sql_server_dirs@ scripts tests man @bench_dirs@ support-files - +-SUBDIRS = include @docs_dirs@ @readline_dir@ @thread_dirs@ @sql_client_dirs@ @sql_server_dirs@ scripts tests man @bench_dirs@ support-files os2 +- +.if defined(CLIENT_ONLY) +SUBDIRS = include @readline_dir@ @sql_client_dirs@ tests man +.else diff --git a/databases/mysql41-server/files/patch-af b/databases/mysql41-server/files/patch-af index 9c4a0b951402..238e8b2d7115 100644 --- a/databases/mysql41-server/files/patch-af +++ b/databases/mysql41-server/files/patch-af @@ -1,6 +1,6 @@ ---- scripts/safe_mysqld.sh.orig Thu Apr 19 10:11:02 2001 -+++ scripts/safe_mysqld.sh Thu Apr 19 15:15:54 2001 -@@ -73,30 +73,9 @@ +--- scripts/safe_mysqld.sh.orig Mon Jun 3 12:39:02 2002 ++++ scripts/safe_mysqld.sh Mon Jun 17 19:07:26 2002 +@@ -68,30 +68,9 @@ done } @@ -34,7 +34,7 @@ MYSQL_UNIX_PORT=${MYSQL_UNIX_PORT:-@MYSQL_UNIX_ADDR@} MYSQL_TCP_PORT=${MYSQL_TCP_PORT:-@MYSQL_TCP_PORT@} -@@ -240,34 +219,6 @@ +@@ -239,34 +218,6 @@ if test ! -f $pid_file # This is removed if normal shutdown then break @@ -52,7 +52,7 @@ - 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" | sed -n '$p'` - for T in $PROC - do - break diff --git a/databases/mysql41-server/files/patch-ap b/databases/mysql41-server/files/patch-ap deleted file mode 100644 index 097b449a181a..000000000000 --- a/databases/mysql41-server/files/patch-ap +++ /dev/null @@ -1,11 +0,0 @@ ---- strings/Makefile.in.orig Sat Jan 1 18:00:30 2000 -+++ strings/Makefile.in Mon Jan 3 17:21:19 2000 -@@ -145,7 +145,7 @@ - INCLUDES = @MT_INCLUDES@ -I$(srcdir)/../include -I../include - pkglib_LIBRARIES = libmystrings.a - #no assembler --@ASSEMBLER_x86_TRUE@ASRCS = strings-x86.s longlong2str-x86.s -+@ASSEMBLER_x86_TRUE@ASRCS = strings-x86.S longlong2str-x86.S - @ASSEMBLER_x86_FALSE@@ASSEMBLER_sparc_TRUE@ASRCS = bmove_upp-sparc.s strappend-sparc.s strend-sparc.s strinstr-sparc.s strmake-sparc.s strmov-sparc.s strnmov-sparc.s strstr-sparc.s strxmov-sparc.s - @ASSEMBLER_x86_FALSE@@ASSEMBLER_sparc_FALSE@ASRCS = - # These file MUST all be on the same line!! Otherwise automake diff --git a/databases/mysql41-server/files/patch-as b/databases/mysql41-server/files/patch-as deleted file mode 100644 index 903bc9950a28..000000000000 --- a/databases/mysql41-server/files/patch-as +++ /dev/null @@ -1,16 +0,0 @@ ---- sql/mysqld.cc.orig Sun Feb 13 02:40:18 2000 -+++ sql/mysqld.cc Mon Feb 21 21:24:51 2000 -@@ -63,8 +63,11 @@ - inline void reset_floating_point_exceptions() - { - /* Don't fall for overflow, underflow,divide-by-zero or loss of precision */ -- fpsetmask(~(FP_X_INV | FP_X_DNML | FP_X_OFL | FP_X_UFL | -- FP_X_DZ | FP_X_IMP)); -+#if defined(__i386__) -+ fpsetmask(~(FP_X_INV | FP_X_DNML | FP_X_OFL | FP_X_UFL | FP_X_DZ | FP_X_IMP)); -+#else -+ fpsetmask(~(FP_X_INV | FP_X_OFL | FP_X_UFL | FP_X_DZ | FP_X_IMP)); -+#endif - } - #else - #define reset_floating_point_exceptions() diff --git a/databases/mysql41-server/files/patch-configure b/databases/mysql41-server/files/patch-configure index f10ab97c44a8..ffa97b89ddd0 100644 --- a/databases/mysql41-server/files/patch-configure +++ b/databases/mysql41-server/files/patch-configure @@ -1,17 +1,17 @@ ---- configure.orig Wed May 9 22:34:50 2001 -+++ configure Sat May 12 11:23:21 2001 -@@ -2994,7 +2994,7 @@ +--- configure.orig Mon Jun 3 12:39:20 2002 ++++ configure Mon Jun 17 19:16:58 2002 +@@ -4188,7 +4188,7 @@ ;; esac fi --HOSTNAME="$ac_cv_path_HOSTNAME" +-HOSTNAME=$ac_cv_path_HOSTNAME +HOSTNAME="$ac_cv_path_HOSTNAME -s" + if test -n "$HOSTNAME"; then - echo "$ac_t""$HOSTNAME" 1>&6 - else -@@ -3128,38 +3128,7 @@ - echo $ac_n "checking "how to check if pid exists"""... $ac_c" 1>&6 - echo "configure:3130: checking "how to check if pid exists"" >&5 + 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 -# Linux style -if $PS p $$ 2> /dev/null | grep $0 > /dev/null @@ -42,28 +42,38 @@ - FIND_PROC="$PS -e | grep mysqld | grep \" \$\$PID \" > /dev/null" - ;; - *) -- { echo "configure: error: Could not find the right ps switches. Which OS is this ?. See the Installation chapter in the Reference Manual." 1>&2; exit 1; } +- { { 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: 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 "$ac_t"""$FIND_PROC"" 1>&6 - -@@ -5922,7 +5891,6 @@ - #define $ac_tr_lib 1 + echo "$as_me:4404: result: \"$FIND_PROC\"" >&5 + echo "${ECHO_T}\"$FIND_PROC\"" >&6 +@@ -7907,7 +7874,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" + #include "confdefs.h" +@@ -7955,7 +7921,6 @@ + #define HAVE_LIBC_R 1 EOF - LIBS="-lc_r $LIBS" - else - echo "$ac_t""no" 1>&6 -@@ -6154,28 +6122,6 @@ fi +@@ -8312,29 +8277,6 @@ + + fi -# Build optimized or debug version ? -# First check for gcc and g++ --if test "$ac_cv_prog_gcc" = "yes" +-if test "$ac_cv_c_compiler_gnu" = "yes" -then - DEBUG_CFLAGS="-g" - DEBUG_OPTIMIZE_CC="-O" @@ -83,50 +93,54 @@ - DEBUG_OPTIMIZE_CXX="" - OPTIMIZE_CXXFLAGS="-O" -fi +- # Check whether --with-debug or --without-debug was given. if test "${with_debug+set}" = set; then withval="$with_debug" -@@ -6856,10 +6802,6 @@ - ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' - cross_compiling=$ac_cv_prog_cxx_cross +@@ -10066,10 +10008,6 @@ + ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' + ac_compiler_gnu=$ac_cv_cxx_compiler_gnu --if test "$ac_cv_prog_gxx" = "yes" +-if test "$ac_cv_cxx_compiler_gnu" = "yes" -then - CXXFLAGS="$CXXFLAGS -Werror" -fi mysql_cv_btype_last_arg_accept=none - cat > conftest.$ac_ext <<EOF - #line 6866 "configure" -@@ -9019,10 +8961,6 @@ - #do not treat warnings as errors if we are linking agaist other libc - #this is to work around gcc not being permissive on non-system includes - #with respect to ANSI C++ --if test "$ac_cv_prog_gxx" = "yes" -a "$with_other_libc" = "no" + cat >conftest.$ac_ext <<_ACEOF + #line 10075 "configure" +@@ -12739,13 +12677,6 @@ + ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' + ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + +-# Do not treat warnings as errors if we are linking agaist other libc +-# this is to work around gcc not being permissive on non-system includes +-# with respect to ANSI C++ +-if test "$ac_cv_cxx_compiler_gnu" = "yes" -a "$with_other_libc" = "no" -then - CXXFLAGS="$CXXFLAGS -Werror" -fi - cat > conftest.$ac_ext <<EOF - #line 9028 "configure" + cat >conftest.$ac_ext <<_ACEOF + #line 12750 "configure" #include "confdefs.h" -@@ -9087,10 +9025,6 @@ - ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' - cross_compiling=$ac_cv_prog_cxx_cross +@@ -12822,10 +12753,6 @@ + ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' + ac_compiler_gnu=$ac_cv_cxx_compiler_gnu --if test "$ac_cv_prog_gxx" = "yes" -a "$with_other_libc" = "no" +-if test "$ac_cv_cxx_compiler_gnu" = "yes" -a "$with_other_libc" = "no" -then - CXXFLAGS="$CXXFLAGS -Werror" -fi - cat > conftest.$ac_ext <<EOF - #line 9096 "configure" + cat >conftest.$ac_ext <<_ACEOF + #line 12830 "configure" #include "confdefs.h" -@@ -9154,10 +9088,6 @@ - ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' - cross_compiling=$ac_cv_prog_cxx_cross +@@ -12901,10 +12828,6 @@ + ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' + ac_compiler_gnu=$ac_cv_cxx_compiler_gnu --if test "$ac_cv_prog_gxx" = "yes" -a "$with_other_libc" = "no" +-if test "$ac_cv_cxx_compiler_gnu" = "yes" -a "$with_other_libc" = "no" -then - CXXFLAGS="$CXXFLAGS -Werror" -fi - cat > conftest.$ac_ext <<EOF - #line 9163 "configure" + cat >conftest.$ac_ext <<_ACEOF + #line 12909 "configure" #include "confdefs.h" diff --git a/databases/mysql50-server/Makefile b/databases/mysql50-server/Makefile index fe8dbda2459b..bbd4807d7c90 100644 --- a/databases/mysql50-server/Makefile +++ b/databases/mysql50-server/Makefile @@ -6,7 +6,7 @@ # PORTNAME?= ${MASTERPORTNAME} -PORTVERSION= 3.23.49 +PORTVERSION= 3.23.51 PORTREVISION?= 0 CATEGORIES= databases MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ @@ -32,7 +32,8 @@ CONFIGURE_ARGS= --localstatedir=${DB_DIR} \ --with-mit-threads=no \ --with-libwrap \ --with-low-memory \ - --with-comment='FreeBSD port: ${PKGNAME}' + --with-comment='FreeBSD port: ${PKGNAME}' \ + --program-prefix='' .if ${MACHINE_ARCH} == "i386" CONFIGURE_ARGS+=--enable-assembler --with-berkeley-db --with-innodb @@ -104,10 +105,6 @@ pre-fetch: @${ECHO} " is not recommended for production servers." @${ECHO} "" -post-patch: - ${MV} ${WRKSRC}/strings/strings-x86.s ${WRKSRC}/strings/strings-x86.S - ${MV} ${WRKSRC}/strings/longlong2str-x86.s ${WRKSRC}/strings/longlong2str-x86.S - .if exists(${DB_DIR}) && !defined(PACKAGE_BUILDING) && !defined(OVERWRITE_DB) && !defined(SKIP_INSTALL_DB) pre-install: @${ECHO} "You appear to already have a mysql database directory in ${DB_DIR}." diff --git a/databases/mysql50-server/distinfo b/databases/mysql50-server/distinfo index ee72e669d769..e446a75b5300 100644 --- a/databases/mysql50-server/distinfo +++ b/databases/mysql50-server/distinfo @@ -1 +1 @@ -MD5 (mysql-3.23.49.tar.gz) = 1eec75578df021ee22bb229268359d8f +MD5 (mysql-3.23.51.tar.gz) = af9f2aaba408898df82cccf462766542 diff --git a/databases/mysql50-server/files/patch-Makefile.in b/databases/mysql50-server/files/patch-Makefile.in index bed75f614ccc..b002d685b504 100644 --- a/databases/mysql50-server/files/patch-Makefile.in +++ b/databases/mysql50-server/files/patch-Makefile.in @@ -1,11 +1,11 @@ ---- Makefile.in.orig Wed Apr 18 10:54:42 2001 -+++ Makefile.in Sat Apr 21 13:00:23 2001 -@@ -181,8 +181,12 @@ +--- Makefile.in.orig Mon Jun 3 12:45:17 2002 ++++ Makefile.in Mon Jun 17 20:57:29 2002 +@@ -185,8 +185,11 @@ # These are built from source in the Docs directory EXTRA_DIST = INSTALL-SOURCE README COPYING COPYING.LIB MIRRORS --SUBDIRS = include @docs_dirs@ @readline_dir@ @thread_dirs@ @sql_client_dirs@ @sql_server_dirs@ scripts tests man @bench_dirs@ support-files - +-SUBDIRS = include @docs_dirs@ @readline_dir@ @thread_dirs@ @sql_client_dirs@ @sql_server_dirs@ scripts tests man @bench_dirs@ support-files os2 +- +.if defined(CLIENT_ONLY) +SUBDIRS = include @readline_dir@ @sql_client_dirs@ tests man +.else diff --git a/databases/mysql50-server/files/patch-af b/databases/mysql50-server/files/patch-af index 9c4a0b951402..238e8b2d7115 100644 --- a/databases/mysql50-server/files/patch-af +++ b/databases/mysql50-server/files/patch-af @@ -1,6 +1,6 @@ ---- scripts/safe_mysqld.sh.orig Thu Apr 19 10:11:02 2001 -+++ scripts/safe_mysqld.sh Thu Apr 19 15:15:54 2001 -@@ -73,30 +73,9 @@ +--- scripts/safe_mysqld.sh.orig Mon Jun 3 12:39:02 2002 ++++ scripts/safe_mysqld.sh Mon Jun 17 19:07:26 2002 +@@ -68,30 +68,9 @@ done } @@ -34,7 +34,7 @@ MYSQL_UNIX_PORT=${MYSQL_UNIX_PORT:-@MYSQL_UNIX_ADDR@} MYSQL_TCP_PORT=${MYSQL_TCP_PORT:-@MYSQL_TCP_PORT@} -@@ -240,34 +219,6 @@ +@@ -239,34 +218,6 @@ if test ! -f $pid_file # This is removed if normal shutdown then break @@ -52,7 +52,7 @@ - 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" | sed -n '$p'` - for T in $PROC - do - break diff --git a/databases/mysql50-server/files/patch-ap b/databases/mysql50-server/files/patch-ap deleted file mode 100644 index 097b449a181a..000000000000 --- a/databases/mysql50-server/files/patch-ap +++ /dev/null @@ -1,11 +0,0 @@ ---- strings/Makefile.in.orig Sat Jan 1 18:00:30 2000 -+++ strings/Makefile.in Mon Jan 3 17:21:19 2000 -@@ -145,7 +145,7 @@ - INCLUDES = @MT_INCLUDES@ -I$(srcdir)/../include -I../include - pkglib_LIBRARIES = libmystrings.a - #no assembler --@ASSEMBLER_x86_TRUE@ASRCS = strings-x86.s longlong2str-x86.s -+@ASSEMBLER_x86_TRUE@ASRCS = strings-x86.S longlong2str-x86.S - @ASSEMBLER_x86_FALSE@@ASSEMBLER_sparc_TRUE@ASRCS = bmove_upp-sparc.s strappend-sparc.s strend-sparc.s strinstr-sparc.s strmake-sparc.s strmov-sparc.s strnmov-sparc.s strstr-sparc.s strxmov-sparc.s - @ASSEMBLER_x86_FALSE@@ASSEMBLER_sparc_FALSE@ASRCS = - # These file MUST all be on the same line!! Otherwise automake diff --git a/databases/mysql50-server/files/patch-as b/databases/mysql50-server/files/patch-as deleted file mode 100644 index 903bc9950a28..000000000000 --- a/databases/mysql50-server/files/patch-as +++ /dev/null @@ -1,16 +0,0 @@ ---- sql/mysqld.cc.orig Sun Feb 13 02:40:18 2000 -+++ sql/mysqld.cc Mon Feb 21 21:24:51 2000 -@@ -63,8 +63,11 @@ - inline void reset_floating_point_exceptions() - { - /* Don't fall for overflow, underflow,divide-by-zero or loss of precision */ -- fpsetmask(~(FP_X_INV | FP_X_DNML | FP_X_OFL | FP_X_UFL | -- FP_X_DZ | FP_X_IMP)); -+#if defined(__i386__) -+ fpsetmask(~(FP_X_INV | FP_X_DNML | FP_X_OFL | FP_X_UFL | FP_X_DZ | FP_X_IMP)); -+#else -+ fpsetmask(~(FP_X_INV | FP_X_OFL | FP_X_UFL | FP_X_DZ | FP_X_IMP)); -+#endif - } - #else - #define reset_floating_point_exceptions() diff --git a/databases/mysql50-server/files/patch-configure b/databases/mysql50-server/files/patch-configure index f10ab97c44a8..ffa97b89ddd0 100644 --- a/databases/mysql50-server/files/patch-configure +++ b/databases/mysql50-server/files/patch-configure @@ -1,17 +1,17 @@ ---- configure.orig Wed May 9 22:34:50 2001 -+++ configure Sat May 12 11:23:21 2001 -@@ -2994,7 +2994,7 @@ +--- configure.orig Mon Jun 3 12:39:20 2002 ++++ configure Mon Jun 17 19:16:58 2002 +@@ -4188,7 +4188,7 @@ ;; esac fi --HOSTNAME="$ac_cv_path_HOSTNAME" +-HOSTNAME=$ac_cv_path_HOSTNAME +HOSTNAME="$ac_cv_path_HOSTNAME -s" + if test -n "$HOSTNAME"; then - echo "$ac_t""$HOSTNAME" 1>&6 - else -@@ -3128,38 +3128,7 @@ - echo $ac_n "checking "how to check if pid exists"""... $ac_c" 1>&6 - echo "configure:3130: checking "how to check if pid exists"" >&5 + 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 -# Linux style -if $PS p $$ 2> /dev/null | grep $0 > /dev/null @@ -42,28 +42,38 @@ - FIND_PROC="$PS -e | grep mysqld | grep \" \$\$PID \" > /dev/null" - ;; - *) -- { echo "configure: error: Could not find the right ps switches. Which OS is this ?. See the Installation chapter in the Reference Manual." 1>&2; exit 1; } +- { { 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: 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 "$ac_t"""$FIND_PROC"" 1>&6 - -@@ -5922,7 +5891,6 @@ - #define $ac_tr_lib 1 + echo "$as_me:4404: result: \"$FIND_PROC\"" >&5 + echo "${ECHO_T}\"$FIND_PROC\"" >&6 +@@ -7907,7 +7874,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" + #include "confdefs.h" +@@ -7955,7 +7921,6 @@ + #define HAVE_LIBC_R 1 EOF - LIBS="-lc_r $LIBS" - else - echo "$ac_t""no" 1>&6 -@@ -6154,28 +6122,6 @@ fi +@@ -8312,29 +8277,6 @@ + + fi -# Build optimized or debug version ? -# First check for gcc and g++ --if test "$ac_cv_prog_gcc" = "yes" +-if test "$ac_cv_c_compiler_gnu" = "yes" -then - DEBUG_CFLAGS="-g" - DEBUG_OPTIMIZE_CC="-O" @@ -83,50 +93,54 @@ - DEBUG_OPTIMIZE_CXX="" - OPTIMIZE_CXXFLAGS="-O" -fi +- # Check whether --with-debug or --without-debug was given. if test "${with_debug+set}" = set; then withval="$with_debug" -@@ -6856,10 +6802,6 @@ - ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' - cross_compiling=$ac_cv_prog_cxx_cross +@@ -10066,10 +10008,6 @@ + ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' + ac_compiler_gnu=$ac_cv_cxx_compiler_gnu --if test "$ac_cv_prog_gxx" = "yes" +-if test "$ac_cv_cxx_compiler_gnu" = "yes" -then - CXXFLAGS="$CXXFLAGS -Werror" -fi mysql_cv_btype_last_arg_accept=none - cat > conftest.$ac_ext <<EOF - #line 6866 "configure" -@@ -9019,10 +8961,6 @@ - #do not treat warnings as errors if we are linking agaist other libc - #this is to work around gcc not being permissive on non-system includes - #with respect to ANSI C++ --if test "$ac_cv_prog_gxx" = "yes" -a "$with_other_libc" = "no" + cat >conftest.$ac_ext <<_ACEOF + #line 10075 "configure" +@@ -12739,13 +12677,6 @@ + ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' + ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + +-# Do not treat warnings as errors if we are linking agaist other libc +-# this is to work around gcc not being permissive on non-system includes +-# with respect to ANSI C++ +-if test "$ac_cv_cxx_compiler_gnu" = "yes" -a "$with_other_libc" = "no" -then - CXXFLAGS="$CXXFLAGS -Werror" -fi - cat > conftest.$ac_ext <<EOF - #line 9028 "configure" + cat >conftest.$ac_ext <<_ACEOF + #line 12750 "configure" #include "confdefs.h" -@@ -9087,10 +9025,6 @@ - ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' - cross_compiling=$ac_cv_prog_cxx_cross +@@ -12822,10 +12753,6 @@ + ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' + ac_compiler_gnu=$ac_cv_cxx_compiler_gnu --if test "$ac_cv_prog_gxx" = "yes" -a "$with_other_libc" = "no" +-if test "$ac_cv_cxx_compiler_gnu" = "yes" -a "$with_other_libc" = "no" -then - CXXFLAGS="$CXXFLAGS -Werror" -fi - cat > conftest.$ac_ext <<EOF - #line 9096 "configure" + cat >conftest.$ac_ext <<_ACEOF + #line 12830 "configure" #include "confdefs.h" -@@ -9154,10 +9088,6 @@ - ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' - cross_compiling=$ac_cv_prog_cxx_cross +@@ -12901,10 +12828,6 @@ + ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' + ac_compiler_gnu=$ac_cv_cxx_compiler_gnu --if test "$ac_cv_prog_gxx" = "yes" -a "$with_other_libc" = "no" +-if test "$ac_cv_cxx_compiler_gnu" = "yes" -a "$with_other_libc" = "no" -then - CXXFLAGS="$CXXFLAGS -Werror" -fi - cat > conftest.$ac_ext <<EOF - #line 9163 "configure" + cat >conftest.$ac_ext <<_ACEOF + #line 12909 "configure" #include "confdefs.h" diff --git a/databases/mysql51-server/Makefile b/databases/mysql51-server/Makefile index fe8dbda2459b..bbd4807d7c90 100644 --- a/databases/mysql51-server/Makefile +++ b/databases/mysql51-server/Makefile @@ -6,7 +6,7 @@ # PORTNAME?= ${MASTERPORTNAME} -PORTVERSION= 3.23.49 +PORTVERSION= 3.23.51 PORTREVISION?= 0 CATEGORIES= databases MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ @@ -32,7 +32,8 @@ CONFIGURE_ARGS= --localstatedir=${DB_DIR} \ --with-mit-threads=no \ --with-libwrap \ --with-low-memory \ - --with-comment='FreeBSD port: ${PKGNAME}' + --with-comment='FreeBSD port: ${PKGNAME}' \ + --program-prefix='' .if ${MACHINE_ARCH} == "i386" CONFIGURE_ARGS+=--enable-assembler --with-berkeley-db --with-innodb @@ -104,10 +105,6 @@ pre-fetch: @${ECHO} " is not recommended for production servers." @${ECHO} "" -post-patch: - ${MV} ${WRKSRC}/strings/strings-x86.s ${WRKSRC}/strings/strings-x86.S - ${MV} ${WRKSRC}/strings/longlong2str-x86.s ${WRKSRC}/strings/longlong2str-x86.S - .if exists(${DB_DIR}) && !defined(PACKAGE_BUILDING) && !defined(OVERWRITE_DB) && !defined(SKIP_INSTALL_DB) pre-install: @${ECHO} "You appear to already have a mysql database directory in ${DB_DIR}." diff --git a/databases/mysql51-server/distinfo b/databases/mysql51-server/distinfo index ee72e669d769..e446a75b5300 100644 --- a/databases/mysql51-server/distinfo +++ b/databases/mysql51-server/distinfo @@ -1 +1 @@ -MD5 (mysql-3.23.49.tar.gz) = 1eec75578df021ee22bb229268359d8f +MD5 (mysql-3.23.51.tar.gz) = af9f2aaba408898df82cccf462766542 diff --git a/databases/mysql51-server/files/patch-Makefile.in b/databases/mysql51-server/files/patch-Makefile.in index bed75f614ccc..b002d685b504 100644 --- a/databases/mysql51-server/files/patch-Makefile.in +++ b/databases/mysql51-server/files/patch-Makefile.in @@ -1,11 +1,11 @@ ---- Makefile.in.orig Wed Apr 18 10:54:42 2001 -+++ Makefile.in Sat Apr 21 13:00:23 2001 -@@ -181,8 +181,12 @@ +--- Makefile.in.orig Mon Jun 3 12:45:17 2002 ++++ Makefile.in Mon Jun 17 20:57:29 2002 +@@ -185,8 +185,11 @@ # These are built from source in the Docs directory EXTRA_DIST = INSTALL-SOURCE README COPYING COPYING.LIB MIRRORS --SUBDIRS = include @docs_dirs@ @readline_dir@ @thread_dirs@ @sql_client_dirs@ @sql_server_dirs@ scripts tests man @bench_dirs@ support-files - +-SUBDIRS = include @docs_dirs@ @readline_dir@ @thread_dirs@ @sql_client_dirs@ @sql_server_dirs@ scripts tests man @bench_dirs@ support-files os2 +- +.if defined(CLIENT_ONLY) +SUBDIRS = include @readline_dir@ @sql_client_dirs@ tests man +.else diff --git a/databases/mysql51-server/files/patch-af b/databases/mysql51-server/files/patch-af index 9c4a0b951402..238e8b2d7115 100644 --- a/databases/mysql51-server/files/patch-af +++ b/databases/mysql51-server/files/patch-af @@ -1,6 +1,6 @@ ---- scripts/safe_mysqld.sh.orig Thu Apr 19 10:11:02 2001 -+++ scripts/safe_mysqld.sh Thu Apr 19 15:15:54 2001 -@@ -73,30 +73,9 @@ +--- scripts/safe_mysqld.sh.orig Mon Jun 3 12:39:02 2002 ++++ scripts/safe_mysqld.sh Mon Jun 17 19:07:26 2002 +@@ -68,30 +68,9 @@ done } @@ -34,7 +34,7 @@ MYSQL_UNIX_PORT=${MYSQL_UNIX_PORT:-@MYSQL_UNIX_ADDR@} MYSQL_TCP_PORT=${MYSQL_TCP_PORT:-@MYSQL_TCP_PORT@} -@@ -240,34 +219,6 @@ +@@ -239,34 +218,6 @@ if test ! -f $pid_file # This is removed if normal shutdown then break @@ -52,7 +52,7 @@ - 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" | sed -n '$p'` - for T in $PROC - do - break diff --git a/databases/mysql51-server/files/patch-ap b/databases/mysql51-server/files/patch-ap deleted file mode 100644 index 097b449a181a..000000000000 --- a/databases/mysql51-server/files/patch-ap +++ /dev/null @@ -1,11 +0,0 @@ ---- strings/Makefile.in.orig Sat Jan 1 18:00:30 2000 -+++ strings/Makefile.in Mon Jan 3 17:21:19 2000 -@@ -145,7 +145,7 @@ - INCLUDES = @MT_INCLUDES@ -I$(srcdir)/../include -I../include - pkglib_LIBRARIES = libmystrings.a - #no assembler --@ASSEMBLER_x86_TRUE@ASRCS = strings-x86.s longlong2str-x86.s -+@ASSEMBLER_x86_TRUE@ASRCS = strings-x86.S longlong2str-x86.S - @ASSEMBLER_x86_FALSE@@ASSEMBLER_sparc_TRUE@ASRCS = bmove_upp-sparc.s strappend-sparc.s strend-sparc.s strinstr-sparc.s strmake-sparc.s strmov-sparc.s strnmov-sparc.s strstr-sparc.s strxmov-sparc.s - @ASSEMBLER_x86_FALSE@@ASSEMBLER_sparc_FALSE@ASRCS = - # These file MUST all be on the same line!! Otherwise automake diff --git a/databases/mysql51-server/files/patch-as b/databases/mysql51-server/files/patch-as deleted file mode 100644 index 903bc9950a28..000000000000 --- a/databases/mysql51-server/files/patch-as +++ /dev/null @@ -1,16 +0,0 @@ ---- sql/mysqld.cc.orig Sun Feb 13 02:40:18 2000 -+++ sql/mysqld.cc Mon Feb 21 21:24:51 2000 -@@ -63,8 +63,11 @@ - inline void reset_floating_point_exceptions() - { - /* Don't fall for overflow, underflow,divide-by-zero or loss of precision */ -- fpsetmask(~(FP_X_INV | FP_X_DNML | FP_X_OFL | FP_X_UFL | -- FP_X_DZ | FP_X_IMP)); -+#if defined(__i386__) -+ fpsetmask(~(FP_X_INV | FP_X_DNML | FP_X_OFL | FP_X_UFL | FP_X_DZ | FP_X_IMP)); -+#else -+ fpsetmask(~(FP_X_INV | FP_X_OFL | FP_X_UFL | FP_X_DZ | FP_X_IMP)); -+#endif - } - #else - #define reset_floating_point_exceptions() diff --git a/databases/mysql51-server/files/patch-configure b/databases/mysql51-server/files/patch-configure index f10ab97c44a8..ffa97b89ddd0 100644 --- a/databases/mysql51-server/files/patch-configure +++ b/databases/mysql51-server/files/patch-configure @@ -1,17 +1,17 @@ ---- configure.orig Wed May 9 22:34:50 2001 -+++ configure Sat May 12 11:23:21 2001 -@@ -2994,7 +2994,7 @@ +--- configure.orig Mon Jun 3 12:39:20 2002 ++++ configure Mon Jun 17 19:16:58 2002 +@@ -4188,7 +4188,7 @@ ;; esac fi --HOSTNAME="$ac_cv_path_HOSTNAME" +-HOSTNAME=$ac_cv_path_HOSTNAME +HOSTNAME="$ac_cv_path_HOSTNAME -s" + if test -n "$HOSTNAME"; then - echo "$ac_t""$HOSTNAME" 1>&6 - else -@@ -3128,38 +3128,7 @@ - echo $ac_n "checking "how to check if pid exists"""... $ac_c" 1>&6 - echo "configure:3130: checking "how to check if pid exists"" >&5 + 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 -# Linux style -if $PS p $$ 2> /dev/null | grep $0 > /dev/null @@ -42,28 +42,38 @@ - FIND_PROC="$PS -e | grep mysqld | grep \" \$\$PID \" > /dev/null" - ;; - *) -- { echo "configure: error: Could not find the right ps switches. Which OS is this ?. See the Installation chapter in the Reference Manual." 1>&2; exit 1; } +- { { 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: 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 "$ac_t"""$FIND_PROC"" 1>&6 - -@@ -5922,7 +5891,6 @@ - #define $ac_tr_lib 1 + echo "$as_me:4404: result: \"$FIND_PROC\"" >&5 + echo "${ECHO_T}\"$FIND_PROC\"" >&6 +@@ -7907,7 +7874,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" + #include "confdefs.h" +@@ -7955,7 +7921,6 @@ + #define HAVE_LIBC_R 1 EOF - LIBS="-lc_r $LIBS" - else - echo "$ac_t""no" 1>&6 -@@ -6154,28 +6122,6 @@ fi +@@ -8312,29 +8277,6 @@ + + fi -# Build optimized or debug version ? -# First check for gcc and g++ --if test "$ac_cv_prog_gcc" = "yes" +-if test "$ac_cv_c_compiler_gnu" = "yes" -then - DEBUG_CFLAGS="-g" - DEBUG_OPTIMIZE_CC="-O" @@ -83,50 +93,54 @@ - DEBUG_OPTIMIZE_CXX="" - OPTIMIZE_CXXFLAGS="-O" -fi +- # Check whether --with-debug or --without-debug was given. if test "${with_debug+set}" = set; then withval="$with_debug" -@@ -6856,10 +6802,6 @@ - ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' - cross_compiling=$ac_cv_prog_cxx_cross +@@ -10066,10 +10008,6 @@ + ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' + ac_compiler_gnu=$ac_cv_cxx_compiler_gnu --if test "$ac_cv_prog_gxx" = "yes" +-if test "$ac_cv_cxx_compiler_gnu" = "yes" -then - CXXFLAGS="$CXXFLAGS -Werror" -fi mysql_cv_btype_last_arg_accept=none - cat > conftest.$ac_ext <<EOF - #line 6866 "configure" -@@ -9019,10 +8961,6 @@ - #do not treat warnings as errors if we are linking agaist other libc - #this is to work around gcc not being permissive on non-system includes - #with respect to ANSI C++ --if test "$ac_cv_prog_gxx" = "yes" -a "$with_other_libc" = "no" + cat >conftest.$ac_ext <<_ACEOF + #line 10075 "configure" +@@ -12739,13 +12677,6 @@ + ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' + ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + +-# Do not treat warnings as errors if we are linking agaist other libc +-# this is to work around gcc not being permissive on non-system includes +-# with respect to ANSI C++ +-if test "$ac_cv_cxx_compiler_gnu" = "yes" -a "$with_other_libc" = "no" -then - CXXFLAGS="$CXXFLAGS -Werror" -fi - cat > conftest.$ac_ext <<EOF - #line 9028 "configure" + cat >conftest.$ac_ext <<_ACEOF + #line 12750 "configure" #include "confdefs.h" -@@ -9087,10 +9025,6 @@ - ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' - cross_compiling=$ac_cv_prog_cxx_cross +@@ -12822,10 +12753,6 @@ + ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' + ac_compiler_gnu=$ac_cv_cxx_compiler_gnu --if test "$ac_cv_prog_gxx" = "yes" -a "$with_other_libc" = "no" +-if test "$ac_cv_cxx_compiler_gnu" = "yes" -a "$with_other_libc" = "no" -then - CXXFLAGS="$CXXFLAGS -Werror" -fi - cat > conftest.$ac_ext <<EOF - #line 9096 "configure" + cat >conftest.$ac_ext <<_ACEOF + #line 12830 "configure" #include "confdefs.h" -@@ -9154,10 +9088,6 @@ - ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' - cross_compiling=$ac_cv_prog_cxx_cross +@@ -12901,10 +12828,6 @@ + ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' + ac_compiler_gnu=$ac_cv_cxx_compiler_gnu --if test "$ac_cv_prog_gxx" = "yes" -a "$with_other_libc" = "no" +-if test "$ac_cv_cxx_compiler_gnu" = "yes" -a "$with_other_libc" = "no" -then - CXXFLAGS="$CXXFLAGS -Werror" -fi - cat > conftest.$ac_ext <<EOF - #line 9163 "configure" + cat >conftest.$ac_ext <<_ACEOF + #line 12909 "configure" #include "confdefs.h" diff --git a/databases/mysql54-server/Makefile b/databases/mysql54-server/Makefile index fe8dbda2459b..bbd4807d7c90 100644 --- a/databases/mysql54-server/Makefile +++ b/databases/mysql54-server/Makefile @@ -6,7 +6,7 @@ # PORTNAME?= ${MASTERPORTNAME} -PORTVERSION= 3.23.49 +PORTVERSION= 3.23.51 PORTREVISION?= 0 CATEGORIES= databases MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ @@ -32,7 +32,8 @@ CONFIGURE_ARGS= --localstatedir=${DB_DIR} \ --with-mit-threads=no \ --with-libwrap \ --with-low-memory \ - --with-comment='FreeBSD port: ${PKGNAME}' + --with-comment='FreeBSD port: ${PKGNAME}' \ + --program-prefix='' .if ${MACHINE_ARCH} == "i386" CONFIGURE_ARGS+=--enable-assembler --with-berkeley-db --with-innodb @@ -104,10 +105,6 @@ pre-fetch: @${ECHO} " is not recommended for production servers." @${ECHO} "" -post-patch: - ${MV} ${WRKSRC}/strings/strings-x86.s ${WRKSRC}/strings/strings-x86.S - ${MV} ${WRKSRC}/strings/longlong2str-x86.s ${WRKSRC}/strings/longlong2str-x86.S - .if exists(${DB_DIR}) && !defined(PACKAGE_BUILDING) && !defined(OVERWRITE_DB) && !defined(SKIP_INSTALL_DB) pre-install: @${ECHO} "You appear to already have a mysql database directory in ${DB_DIR}." diff --git a/databases/mysql54-server/distinfo b/databases/mysql54-server/distinfo index ee72e669d769..e446a75b5300 100644 --- a/databases/mysql54-server/distinfo +++ b/databases/mysql54-server/distinfo @@ -1 +1 @@ -MD5 (mysql-3.23.49.tar.gz) = 1eec75578df021ee22bb229268359d8f +MD5 (mysql-3.23.51.tar.gz) = af9f2aaba408898df82cccf462766542 diff --git a/databases/mysql54-server/files/patch-Makefile.in b/databases/mysql54-server/files/patch-Makefile.in index bed75f614ccc..b002d685b504 100644 --- a/databases/mysql54-server/files/patch-Makefile.in +++ b/databases/mysql54-server/files/patch-Makefile.in @@ -1,11 +1,11 @@ ---- Makefile.in.orig Wed Apr 18 10:54:42 2001 -+++ Makefile.in Sat Apr 21 13:00:23 2001 -@@ -181,8 +181,12 @@ +--- Makefile.in.orig Mon Jun 3 12:45:17 2002 ++++ Makefile.in Mon Jun 17 20:57:29 2002 +@@ -185,8 +185,11 @@ # These are built from source in the Docs directory EXTRA_DIST = INSTALL-SOURCE README COPYING COPYING.LIB MIRRORS --SUBDIRS = include @docs_dirs@ @readline_dir@ @thread_dirs@ @sql_client_dirs@ @sql_server_dirs@ scripts tests man @bench_dirs@ support-files - +-SUBDIRS = include @docs_dirs@ @readline_dir@ @thread_dirs@ @sql_client_dirs@ @sql_server_dirs@ scripts tests man @bench_dirs@ support-files os2 +- +.if defined(CLIENT_ONLY) +SUBDIRS = include @readline_dir@ @sql_client_dirs@ tests man +.else diff --git a/databases/mysql54-server/files/patch-af b/databases/mysql54-server/files/patch-af index 9c4a0b951402..238e8b2d7115 100644 --- a/databases/mysql54-server/files/patch-af +++ b/databases/mysql54-server/files/patch-af @@ -1,6 +1,6 @@ ---- scripts/safe_mysqld.sh.orig Thu Apr 19 10:11:02 2001 -+++ scripts/safe_mysqld.sh Thu Apr 19 15:15:54 2001 -@@ -73,30 +73,9 @@ +--- scripts/safe_mysqld.sh.orig Mon Jun 3 12:39:02 2002 ++++ scripts/safe_mysqld.sh Mon Jun 17 19:07:26 2002 +@@ -68,30 +68,9 @@ done } @@ -34,7 +34,7 @@ MYSQL_UNIX_PORT=${MYSQL_UNIX_PORT:-@MYSQL_UNIX_ADDR@} MYSQL_TCP_PORT=${MYSQL_TCP_PORT:-@MYSQL_TCP_PORT@} -@@ -240,34 +219,6 @@ +@@ -239,34 +218,6 @@ if test ! -f $pid_file # This is removed if normal shutdown then break @@ -52,7 +52,7 @@ - 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" | sed -n '$p'` - for T in $PROC - do - break diff --git a/databases/mysql54-server/files/patch-ap b/databases/mysql54-server/files/patch-ap deleted file mode 100644 index 097b449a181a..000000000000 --- a/databases/mysql54-server/files/patch-ap +++ /dev/null @@ -1,11 +0,0 @@ ---- strings/Makefile.in.orig Sat Jan 1 18:00:30 2000 -+++ strings/Makefile.in Mon Jan 3 17:21:19 2000 -@@ -145,7 +145,7 @@ - INCLUDES = @MT_INCLUDES@ -I$(srcdir)/../include -I../include - pkglib_LIBRARIES = libmystrings.a - #no assembler --@ASSEMBLER_x86_TRUE@ASRCS = strings-x86.s longlong2str-x86.s -+@ASSEMBLER_x86_TRUE@ASRCS = strings-x86.S longlong2str-x86.S - @ASSEMBLER_x86_FALSE@@ASSEMBLER_sparc_TRUE@ASRCS = bmove_upp-sparc.s strappend-sparc.s strend-sparc.s strinstr-sparc.s strmake-sparc.s strmov-sparc.s strnmov-sparc.s strstr-sparc.s strxmov-sparc.s - @ASSEMBLER_x86_FALSE@@ASSEMBLER_sparc_FALSE@ASRCS = - # These file MUST all be on the same line!! Otherwise automake diff --git a/databases/mysql54-server/files/patch-as b/databases/mysql54-server/files/patch-as deleted file mode 100644 index 903bc9950a28..000000000000 --- a/databases/mysql54-server/files/patch-as +++ /dev/null @@ -1,16 +0,0 @@ ---- sql/mysqld.cc.orig Sun Feb 13 02:40:18 2000 -+++ sql/mysqld.cc Mon Feb 21 21:24:51 2000 -@@ -63,8 +63,11 @@ - inline void reset_floating_point_exceptions() - { - /* Don't fall for overflow, underflow,divide-by-zero or loss of precision */ -- fpsetmask(~(FP_X_INV | FP_X_DNML | FP_X_OFL | FP_X_UFL | -- FP_X_DZ | FP_X_IMP)); -+#if defined(__i386__) -+ fpsetmask(~(FP_X_INV | FP_X_DNML | FP_X_OFL | FP_X_UFL | FP_X_DZ | FP_X_IMP)); -+#else -+ fpsetmask(~(FP_X_INV | FP_X_OFL | FP_X_UFL | FP_X_DZ | FP_X_IMP)); -+#endif - } - #else - #define reset_floating_point_exceptions() diff --git a/databases/mysql54-server/files/patch-configure b/databases/mysql54-server/files/patch-configure index f10ab97c44a8..ffa97b89ddd0 100644 --- a/databases/mysql54-server/files/patch-configure +++ b/databases/mysql54-server/files/patch-configure @@ -1,17 +1,17 @@ ---- configure.orig Wed May 9 22:34:50 2001 -+++ configure Sat May 12 11:23:21 2001 -@@ -2994,7 +2994,7 @@ +--- configure.orig Mon Jun 3 12:39:20 2002 ++++ configure Mon Jun 17 19:16:58 2002 +@@ -4188,7 +4188,7 @@ ;; esac fi --HOSTNAME="$ac_cv_path_HOSTNAME" +-HOSTNAME=$ac_cv_path_HOSTNAME +HOSTNAME="$ac_cv_path_HOSTNAME -s" + if test -n "$HOSTNAME"; then - echo "$ac_t""$HOSTNAME" 1>&6 - else -@@ -3128,38 +3128,7 @@ - echo $ac_n "checking "how to check if pid exists"""... $ac_c" 1>&6 - echo "configure:3130: checking "how to check if pid exists"" >&5 + 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 -# Linux style -if $PS p $$ 2> /dev/null | grep $0 > /dev/null @@ -42,28 +42,38 @@ - FIND_PROC="$PS -e | grep mysqld | grep \" \$\$PID \" > /dev/null" - ;; - *) -- { echo "configure: error: Could not find the right ps switches. Which OS is this ?. See the Installation chapter in the Reference Manual." 1>&2; exit 1; } +- { { 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: 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 "$ac_t"""$FIND_PROC"" 1>&6 - -@@ -5922,7 +5891,6 @@ - #define $ac_tr_lib 1 + echo "$as_me:4404: result: \"$FIND_PROC\"" >&5 + echo "${ECHO_T}\"$FIND_PROC\"" >&6 +@@ -7907,7 +7874,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" + #include "confdefs.h" +@@ -7955,7 +7921,6 @@ + #define HAVE_LIBC_R 1 EOF - LIBS="-lc_r $LIBS" - else - echo "$ac_t""no" 1>&6 -@@ -6154,28 +6122,6 @@ fi +@@ -8312,29 +8277,6 @@ + + fi -# Build optimized or debug version ? -# First check for gcc and g++ --if test "$ac_cv_prog_gcc" = "yes" +-if test "$ac_cv_c_compiler_gnu" = "yes" -then - DEBUG_CFLAGS="-g" - DEBUG_OPTIMIZE_CC="-O" @@ -83,50 +93,54 @@ - DEBUG_OPTIMIZE_CXX="" - OPTIMIZE_CXXFLAGS="-O" -fi +- # Check whether --with-debug or --without-debug was given. if test "${with_debug+set}" = set; then withval="$with_debug" -@@ -6856,10 +6802,6 @@ - ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' - cross_compiling=$ac_cv_prog_cxx_cross +@@ -10066,10 +10008,6 @@ + ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' + ac_compiler_gnu=$ac_cv_cxx_compiler_gnu --if test "$ac_cv_prog_gxx" = "yes" +-if test "$ac_cv_cxx_compiler_gnu" = "yes" -then - CXXFLAGS="$CXXFLAGS -Werror" -fi mysql_cv_btype_last_arg_accept=none - cat > conftest.$ac_ext <<EOF - #line 6866 "configure" -@@ -9019,10 +8961,6 @@ - #do not treat warnings as errors if we are linking agaist other libc - #this is to work around gcc not being permissive on non-system includes - #with respect to ANSI C++ --if test "$ac_cv_prog_gxx" = "yes" -a "$with_other_libc" = "no" + cat >conftest.$ac_ext <<_ACEOF + #line 10075 "configure" +@@ -12739,13 +12677,6 @@ + ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' + ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + +-# Do not treat warnings as errors if we are linking agaist other libc +-# this is to work around gcc not being permissive on non-system includes +-# with respect to ANSI C++ +-if test "$ac_cv_cxx_compiler_gnu" = "yes" -a "$with_other_libc" = "no" -then - CXXFLAGS="$CXXFLAGS -Werror" -fi - cat > conftest.$ac_ext <<EOF - #line 9028 "configure" + cat >conftest.$ac_ext <<_ACEOF + #line 12750 "configure" #include "confdefs.h" -@@ -9087,10 +9025,6 @@ - ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' - cross_compiling=$ac_cv_prog_cxx_cross +@@ -12822,10 +12753,6 @@ + ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' + ac_compiler_gnu=$ac_cv_cxx_compiler_gnu --if test "$ac_cv_prog_gxx" = "yes" -a "$with_other_libc" = "no" +-if test "$ac_cv_cxx_compiler_gnu" = "yes" -a "$with_other_libc" = "no" -then - CXXFLAGS="$CXXFLAGS -Werror" -fi - cat > conftest.$ac_ext <<EOF - #line 9096 "configure" + cat >conftest.$ac_ext <<_ACEOF + #line 12830 "configure" #include "confdefs.h" -@@ -9154,10 +9088,6 @@ - ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' - cross_compiling=$ac_cv_prog_cxx_cross +@@ -12901,10 +12828,6 @@ + ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' + ac_compiler_gnu=$ac_cv_cxx_compiler_gnu --if test "$ac_cv_prog_gxx" = "yes" -a "$with_other_libc" = "no" +-if test "$ac_cv_cxx_compiler_gnu" = "yes" -a "$with_other_libc" = "no" -then - CXXFLAGS="$CXXFLAGS -Werror" -fi - cat > conftest.$ac_ext <<EOF - #line 9163 "configure" + cat >conftest.$ac_ext <<_ACEOF + #line 12909 "configure" #include "confdefs.h" diff --git a/databases/mysql55-server/Makefile b/databases/mysql55-server/Makefile index fe8dbda2459b..bbd4807d7c90 100644 --- a/databases/mysql55-server/Makefile +++ b/databases/mysql55-server/Makefile @@ -6,7 +6,7 @@ # PORTNAME?= ${MASTERPORTNAME} -PORTVERSION= 3.23.49 +PORTVERSION= 3.23.51 PORTREVISION?= 0 CATEGORIES= databases MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ @@ -32,7 +32,8 @@ CONFIGURE_ARGS= --localstatedir=${DB_DIR} \ --with-mit-threads=no \ --with-libwrap \ --with-low-memory \ - --with-comment='FreeBSD port: ${PKGNAME}' + --with-comment='FreeBSD port: ${PKGNAME}' \ + --program-prefix='' .if ${MACHINE_ARCH} == "i386" CONFIGURE_ARGS+=--enable-assembler --with-berkeley-db --with-innodb @@ -104,10 +105,6 @@ pre-fetch: @${ECHO} " is not recommended for production servers." @${ECHO} "" -post-patch: - ${MV} ${WRKSRC}/strings/strings-x86.s ${WRKSRC}/strings/strings-x86.S - ${MV} ${WRKSRC}/strings/longlong2str-x86.s ${WRKSRC}/strings/longlong2str-x86.S - .if exists(${DB_DIR}) && !defined(PACKAGE_BUILDING) && !defined(OVERWRITE_DB) && !defined(SKIP_INSTALL_DB) pre-install: @${ECHO} "You appear to already have a mysql database directory in ${DB_DIR}." diff --git a/databases/mysql55-server/distinfo b/databases/mysql55-server/distinfo index ee72e669d769..e446a75b5300 100644 --- a/databases/mysql55-server/distinfo +++ b/databases/mysql55-server/distinfo @@ -1 +1 @@ -MD5 (mysql-3.23.49.tar.gz) = 1eec75578df021ee22bb229268359d8f +MD5 (mysql-3.23.51.tar.gz) = af9f2aaba408898df82cccf462766542 diff --git a/databases/mysql55-server/files/patch-Makefile.in b/databases/mysql55-server/files/patch-Makefile.in index bed75f614ccc..b002d685b504 100644 --- a/databases/mysql55-server/files/patch-Makefile.in +++ b/databases/mysql55-server/files/patch-Makefile.in @@ -1,11 +1,11 @@ ---- Makefile.in.orig Wed Apr 18 10:54:42 2001 -+++ Makefile.in Sat Apr 21 13:00:23 2001 -@@ -181,8 +181,12 @@ +--- Makefile.in.orig Mon Jun 3 12:45:17 2002 ++++ Makefile.in Mon Jun 17 20:57:29 2002 +@@ -185,8 +185,11 @@ # These are built from source in the Docs directory EXTRA_DIST = INSTALL-SOURCE README COPYING COPYING.LIB MIRRORS --SUBDIRS = include @docs_dirs@ @readline_dir@ @thread_dirs@ @sql_client_dirs@ @sql_server_dirs@ scripts tests man @bench_dirs@ support-files - +-SUBDIRS = include @docs_dirs@ @readline_dir@ @thread_dirs@ @sql_client_dirs@ @sql_server_dirs@ scripts tests man @bench_dirs@ support-files os2 +- +.if defined(CLIENT_ONLY) +SUBDIRS = include @readline_dir@ @sql_client_dirs@ tests man +.else diff --git a/databases/mysql55-server/files/patch-af b/databases/mysql55-server/files/patch-af index 9c4a0b951402..238e8b2d7115 100644 --- a/databases/mysql55-server/files/patch-af +++ b/databases/mysql55-server/files/patch-af @@ -1,6 +1,6 @@ ---- scripts/safe_mysqld.sh.orig Thu Apr 19 10:11:02 2001 -+++ scripts/safe_mysqld.sh Thu Apr 19 15:15:54 2001 -@@ -73,30 +73,9 @@ +--- scripts/safe_mysqld.sh.orig Mon Jun 3 12:39:02 2002 ++++ scripts/safe_mysqld.sh Mon Jun 17 19:07:26 2002 +@@ -68,30 +68,9 @@ done } @@ -34,7 +34,7 @@ MYSQL_UNIX_PORT=${MYSQL_UNIX_PORT:-@MYSQL_UNIX_ADDR@} MYSQL_TCP_PORT=${MYSQL_TCP_PORT:-@MYSQL_TCP_PORT@} -@@ -240,34 +219,6 @@ +@@ -239,34 +218,6 @@ if test ! -f $pid_file # This is removed if normal shutdown then break @@ -52,7 +52,7 @@ - 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" | sed -n '$p'` - for T in $PROC - do - break diff --git a/databases/mysql55-server/files/patch-ap b/databases/mysql55-server/files/patch-ap deleted file mode 100644 index 097b449a181a..000000000000 --- a/databases/mysql55-server/files/patch-ap +++ /dev/null @@ -1,11 +0,0 @@ ---- strings/Makefile.in.orig Sat Jan 1 18:00:30 2000 -+++ strings/Makefile.in Mon Jan 3 17:21:19 2000 -@@ -145,7 +145,7 @@ - INCLUDES = @MT_INCLUDES@ -I$(srcdir)/../include -I../include - pkglib_LIBRARIES = libmystrings.a - #no assembler --@ASSEMBLER_x86_TRUE@ASRCS = strings-x86.s longlong2str-x86.s -+@ASSEMBLER_x86_TRUE@ASRCS = strings-x86.S longlong2str-x86.S - @ASSEMBLER_x86_FALSE@@ASSEMBLER_sparc_TRUE@ASRCS = bmove_upp-sparc.s strappend-sparc.s strend-sparc.s strinstr-sparc.s strmake-sparc.s strmov-sparc.s strnmov-sparc.s strstr-sparc.s strxmov-sparc.s - @ASSEMBLER_x86_FALSE@@ASSEMBLER_sparc_FALSE@ASRCS = - # These file MUST all be on the same line!! Otherwise automake diff --git a/databases/mysql55-server/files/patch-as b/databases/mysql55-server/files/patch-as deleted file mode 100644 index 903bc9950a28..000000000000 --- a/databases/mysql55-server/files/patch-as +++ /dev/null @@ -1,16 +0,0 @@ ---- sql/mysqld.cc.orig Sun Feb 13 02:40:18 2000 -+++ sql/mysqld.cc Mon Feb 21 21:24:51 2000 -@@ -63,8 +63,11 @@ - inline void reset_floating_point_exceptions() - { - /* Don't fall for overflow, underflow,divide-by-zero or loss of precision */ -- fpsetmask(~(FP_X_INV | FP_X_DNML | FP_X_OFL | FP_X_UFL | -- FP_X_DZ | FP_X_IMP)); -+#if defined(__i386__) -+ fpsetmask(~(FP_X_INV | FP_X_DNML | FP_X_OFL | FP_X_UFL | FP_X_DZ | FP_X_IMP)); -+#else -+ fpsetmask(~(FP_X_INV | FP_X_OFL | FP_X_UFL | FP_X_DZ | FP_X_IMP)); -+#endif - } - #else - #define reset_floating_point_exceptions() diff --git a/databases/mysql55-server/files/patch-configure b/databases/mysql55-server/files/patch-configure index f10ab97c44a8..ffa97b89ddd0 100644 --- a/databases/mysql55-server/files/patch-configure +++ b/databases/mysql55-server/files/patch-configure @@ -1,17 +1,17 @@ ---- configure.orig Wed May 9 22:34:50 2001 -+++ configure Sat May 12 11:23:21 2001 -@@ -2994,7 +2994,7 @@ +--- configure.orig Mon Jun 3 12:39:20 2002 ++++ configure Mon Jun 17 19:16:58 2002 +@@ -4188,7 +4188,7 @@ ;; esac fi --HOSTNAME="$ac_cv_path_HOSTNAME" +-HOSTNAME=$ac_cv_path_HOSTNAME +HOSTNAME="$ac_cv_path_HOSTNAME -s" + if test -n "$HOSTNAME"; then - echo "$ac_t""$HOSTNAME" 1>&6 - else -@@ -3128,38 +3128,7 @@ - echo $ac_n "checking "how to check if pid exists"""... $ac_c" 1>&6 - echo "configure:3130: checking "how to check if pid exists"" >&5 + 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 -# Linux style -if $PS p $$ 2> /dev/null | grep $0 > /dev/null @@ -42,28 +42,38 @@ - FIND_PROC="$PS -e | grep mysqld | grep \" \$\$PID \" > /dev/null" - ;; - *) -- { echo "configure: error: Could not find the right ps switches. Which OS is this ?. See the Installation chapter in the Reference Manual." 1>&2; exit 1; } +- { { 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: 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 "$ac_t"""$FIND_PROC"" 1>&6 - -@@ -5922,7 +5891,6 @@ - #define $ac_tr_lib 1 + echo "$as_me:4404: result: \"$FIND_PROC\"" >&5 + echo "${ECHO_T}\"$FIND_PROC\"" >&6 +@@ -7907,7 +7874,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" + #include "confdefs.h" +@@ -7955,7 +7921,6 @@ + #define HAVE_LIBC_R 1 EOF - LIBS="-lc_r $LIBS" - else - echo "$ac_t""no" 1>&6 -@@ -6154,28 +6122,6 @@ fi +@@ -8312,29 +8277,6 @@ + + fi -# Build optimized or debug version ? -# First check for gcc and g++ --if test "$ac_cv_prog_gcc" = "yes" +-if test "$ac_cv_c_compiler_gnu" = "yes" -then - DEBUG_CFLAGS="-g" - DEBUG_OPTIMIZE_CC="-O" @@ -83,50 +93,54 @@ - DEBUG_OPTIMIZE_CXX="" - OPTIMIZE_CXXFLAGS="-O" -fi +- # Check whether --with-debug or --without-debug was given. if test "${with_debug+set}" = set; then withval="$with_debug" -@@ -6856,10 +6802,6 @@ - ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' - cross_compiling=$ac_cv_prog_cxx_cross +@@ -10066,10 +10008,6 @@ + ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' + ac_compiler_gnu=$ac_cv_cxx_compiler_gnu --if test "$ac_cv_prog_gxx" = "yes" +-if test "$ac_cv_cxx_compiler_gnu" = "yes" -then - CXXFLAGS="$CXXFLAGS -Werror" -fi mysql_cv_btype_last_arg_accept=none - cat > conftest.$ac_ext <<EOF - #line 6866 "configure" -@@ -9019,10 +8961,6 @@ - #do not treat warnings as errors if we are linking agaist other libc - #this is to work around gcc not being permissive on non-system includes - #with respect to ANSI C++ --if test "$ac_cv_prog_gxx" = "yes" -a "$with_other_libc" = "no" + cat >conftest.$ac_ext <<_ACEOF + #line 10075 "configure" +@@ -12739,13 +12677,6 @@ + ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' + ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + +-# Do not treat warnings as errors if we are linking agaist other libc +-# this is to work around gcc not being permissive on non-system includes +-# with respect to ANSI C++ +-if test "$ac_cv_cxx_compiler_gnu" = "yes" -a "$with_other_libc" = "no" -then - CXXFLAGS="$CXXFLAGS -Werror" -fi - cat > conftest.$ac_ext <<EOF - #line 9028 "configure" + cat >conftest.$ac_ext <<_ACEOF + #line 12750 "configure" #include "confdefs.h" -@@ -9087,10 +9025,6 @@ - ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' - cross_compiling=$ac_cv_prog_cxx_cross +@@ -12822,10 +12753,6 @@ + ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' + ac_compiler_gnu=$ac_cv_cxx_compiler_gnu --if test "$ac_cv_prog_gxx" = "yes" -a "$with_other_libc" = "no" +-if test "$ac_cv_cxx_compiler_gnu" = "yes" -a "$with_other_libc" = "no" -then - CXXFLAGS="$CXXFLAGS -Werror" -fi - cat > conftest.$ac_ext <<EOF - #line 9096 "configure" + cat >conftest.$ac_ext <<_ACEOF + #line 12830 "configure" #include "confdefs.h" -@@ -9154,10 +9088,6 @@ - ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' - cross_compiling=$ac_cv_prog_cxx_cross +@@ -12901,10 +12828,6 @@ + ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' + ac_compiler_gnu=$ac_cv_cxx_compiler_gnu --if test "$ac_cv_prog_gxx" = "yes" -a "$with_other_libc" = "no" +-if test "$ac_cv_cxx_compiler_gnu" = "yes" -a "$with_other_libc" = "no" -then - CXXFLAGS="$CXXFLAGS -Werror" -fi - cat > conftest.$ac_ext <<EOF - #line 9163 "configure" + cat >conftest.$ac_ext <<_ACEOF + #line 12909 "configure" #include "confdefs.h" diff --git a/databases/mysql60-server/Makefile b/databases/mysql60-server/Makefile index fe8dbda2459b..bbd4807d7c90 100644 --- a/databases/mysql60-server/Makefile +++ b/databases/mysql60-server/Makefile @@ -6,7 +6,7 @@ # PORTNAME?= ${MASTERPORTNAME} -PORTVERSION= 3.23.49 +PORTVERSION= 3.23.51 PORTREVISION?= 0 CATEGORIES= databases MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ @@ -32,7 +32,8 @@ CONFIGURE_ARGS= --localstatedir=${DB_DIR} \ --with-mit-threads=no \ --with-libwrap \ --with-low-memory \ - --with-comment='FreeBSD port: ${PKGNAME}' + --with-comment='FreeBSD port: ${PKGNAME}' \ + --program-prefix='' .if ${MACHINE_ARCH} == "i386" CONFIGURE_ARGS+=--enable-assembler --with-berkeley-db --with-innodb @@ -104,10 +105,6 @@ pre-fetch: @${ECHO} " is not recommended for production servers." @${ECHO} "" -post-patch: - ${MV} ${WRKSRC}/strings/strings-x86.s ${WRKSRC}/strings/strings-x86.S - ${MV} ${WRKSRC}/strings/longlong2str-x86.s ${WRKSRC}/strings/longlong2str-x86.S - .if exists(${DB_DIR}) && !defined(PACKAGE_BUILDING) && !defined(OVERWRITE_DB) && !defined(SKIP_INSTALL_DB) pre-install: @${ECHO} "You appear to already have a mysql database directory in ${DB_DIR}." diff --git a/databases/mysql60-server/distinfo b/databases/mysql60-server/distinfo index ee72e669d769..e446a75b5300 100644 --- a/databases/mysql60-server/distinfo +++ b/databases/mysql60-server/distinfo @@ -1 +1 @@ -MD5 (mysql-3.23.49.tar.gz) = 1eec75578df021ee22bb229268359d8f +MD5 (mysql-3.23.51.tar.gz) = af9f2aaba408898df82cccf462766542 diff --git a/databases/mysql60-server/files/patch-Makefile.in b/databases/mysql60-server/files/patch-Makefile.in index bed75f614ccc..b002d685b504 100644 --- a/databases/mysql60-server/files/patch-Makefile.in +++ b/databases/mysql60-server/files/patch-Makefile.in @@ -1,11 +1,11 @@ ---- Makefile.in.orig Wed Apr 18 10:54:42 2001 -+++ Makefile.in Sat Apr 21 13:00:23 2001 -@@ -181,8 +181,12 @@ +--- Makefile.in.orig Mon Jun 3 12:45:17 2002 ++++ Makefile.in Mon Jun 17 20:57:29 2002 +@@ -185,8 +185,11 @@ # These are built from source in the Docs directory EXTRA_DIST = INSTALL-SOURCE README COPYING COPYING.LIB MIRRORS --SUBDIRS = include @docs_dirs@ @readline_dir@ @thread_dirs@ @sql_client_dirs@ @sql_server_dirs@ scripts tests man @bench_dirs@ support-files - +-SUBDIRS = include @docs_dirs@ @readline_dir@ @thread_dirs@ @sql_client_dirs@ @sql_server_dirs@ scripts tests man @bench_dirs@ support-files os2 +- +.if defined(CLIENT_ONLY) +SUBDIRS = include @readline_dir@ @sql_client_dirs@ tests man +.else diff --git a/databases/mysql60-server/files/patch-af b/databases/mysql60-server/files/patch-af index 9c4a0b951402..238e8b2d7115 100644 --- a/databases/mysql60-server/files/patch-af +++ b/databases/mysql60-server/files/patch-af @@ -1,6 +1,6 @@ ---- scripts/safe_mysqld.sh.orig Thu Apr 19 10:11:02 2001 -+++ scripts/safe_mysqld.sh Thu Apr 19 15:15:54 2001 -@@ -73,30 +73,9 @@ +--- scripts/safe_mysqld.sh.orig Mon Jun 3 12:39:02 2002 ++++ scripts/safe_mysqld.sh Mon Jun 17 19:07:26 2002 +@@ -68,30 +68,9 @@ done } @@ -34,7 +34,7 @@ MYSQL_UNIX_PORT=${MYSQL_UNIX_PORT:-@MYSQL_UNIX_ADDR@} MYSQL_TCP_PORT=${MYSQL_TCP_PORT:-@MYSQL_TCP_PORT@} -@@ -240,34 +219,6 @@ +@@ -239,34 +218,6 @@ if test ! -f $pid_file # This is removed if normal shutdown then break @@ -52,7 +52,7 @@ - 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" | sed -n '$p'` - for T in $PROC - do - break diff --git a/databases/mysql60-server/files/patch-ap b/databases/mysql60-server/files/patch-ap deleted file mode 100644 index 097b449a181a..000000000000 --- a/databases/mysql60-server/files/patch-ap +++ /dev/null @@ -1,11 +0,0 @@ ---- strings/Makefile.in.orig Sat Jan 1 18:00:30 2000 -+++ strings/Makefile.in Mon Jan 3 17:21:19 2000 -@@ -145,7 +145,7 @@ - INCLUDES = @MT_INCLUDES@ -I$(srcdir)/../include -I../include - pkglib_LIBRARIES = libmystrings.a - #no assembler --@ASSEMBLER_x86_TRUE@ASRCS = strings-x86.s longlong2str-x86.s -+@ASSEMBLER_x86_TRUE@ASRCS = strings-x86.S longlong2str-x86.S - @ASSEMBLER_x86_FALSE@@ASSEMBLER_sparc_TRUE@ASRCS = bmove_upp-sparc.s strappend-sparc.s strend-sparc.s strinstr-sparc.s strmake-sparc.s strmov-sparc.s strnmov-sparc.s strstr-sparc.s strxmov-sparc.s - @ASSEMBLER_x86_FALSE@@ASSEMBLER_sparc_FALSE@ASRCS = - # These file MUST all be on the same line!! Otherwise automake diff --git a/databases/mysql60-server/files/patch-as b/databases/mysql60-server/files/patch-as deleted file mode 100644 index 903bc9950a28..000000000000 --- a/databases/mysql60-server/files/patch-as +++ /dev/null @@ -1,16 +0,0 @@ ---- sql/mysqld.cc.orig Sun Feb 13 02:40:18 2000 -+++ sql/mysqld.cc Mon Feb 21 21:24:51 2000 -@@ -63,8 +63,11 @@ - inline void reset_floating_point_exceptions() - { - /* Don't fall for overflow, underflow,divide-by-zero or loss of precision */ -- fpsetmask(~(FP_X_INV | FP_X_DNML | FP_X_OFL | FP_X_UFL | -- FP_X_DZ | FP_X_IMP)); -+#if defined(__i386__) -+ fpsetmask(~(FP_X_INV | FP_X_DNML | FP_X_OFL | FP_X_UFL | FP_X_DZ | FP_X_IMP)); -+#else -+ fpsetmask(~(FP_X_INV | FP_X_OFL | FP_X_UFL | FP_X_DZ | FP_X_IMP)); -+#endif - } - #else - #define reset_floating_point_exceptions() diff --git a/databases/mysql60-server/files/patch-configure b/databases/mysql60-server/files/patch-configure index f10ab97c44a8..ffa97b89ddd0 100644 --- a/databases/mysql60-server/files/patch-configure +++ b/databases/mysql60-server/files/patch-configure @@ -1,17 +1,17 @@ ---- configure.orig Wed May 9 22:34:50 2001 -+++ configure Sat May 12 11:23:21 2001 -@@ -2994,7 +2994,7 @@ +--- configure.orig Mon Jun 3 12:39:20 2002 ++++ configure Mon Jun 17 19:16:58 2002 +@@ -4188,7 +4188,7 @@ ;; esac fi --HOSTNAME="$ac_cv_path_HOSTNAME" +-HOSTNAME=$ac_cv_path_HOSTNAME +HOSTNAME="$ac_cv_path_HOSTNAME -s" + if test -n "$HOSTNAME"; then - echo "$ac_t""$HOSTNAME" 1>&6 - else -@@ -3128,38 +3128,7 @@ - echo $ac_n "checking "how to check if pid exists"""... $ac_c" 1>&6 - echo "configure:3130: checking "how to check if pid exists"" >&5 + 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 -# Linux style -if $PS p $$ 2> /dev/null | grep $0 > /dev/null @@ -42,28 +42,38 @@ - FIND_PROC="$PS -e | grep mysqld | grep \" \$\$PID \" > /dev/null" - ;; - *) -- { echo "configure: error: Could not find the right ps switches. Which OS is this ?. See the Installation chapter in the Reference Manual." 1>&2; exit 1; } +- { { 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: 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 "$ac_t"""$FIND_PROC"" 1>&6 - -@@ -5922,7 +5891,6 @@ - #define $ac_tr_lib 1 + echo "$as_me:4404: result: \"$FIND_PROC\"" >&5 + echo "${ECHO_T}\"$FIND_PROC\"" >&6 +@@ -7907,7 +7874,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" + #include "confdefs.h" +@@ -7955,7 +7921,6 @@ + #define HAVE_LIBC_R 1 EOF - LIBS="-lc_r $LIBS" - else - echo "$ac_t""no" 1>&6 -@@ -6154,28 +6122,6 @@ fi +@@ -8312,29 +8277,6 @@ + + fi -# Build optimized or debug version ? -# First check for gcc and g++ --if test "$ac_cv_prog_gcc" = "yes" +-if test "$ac_cv_c_compiler_gnu" = "yes" -then - DEBUG_CFLAGS="-g" - DEBUG_OPTIMIZE_CC="-O" @@ -83,50 +93,54 @@ - DEBUG_OPTIMIZE_CXX="" - OPTIMIZE_CXXFLAGS="-O" -fi +- # Check whether --with-debug or --without-debug was given. if test "${with_debug+set}" = set; then withval="$with_debug" -@@ -6856,10 +6802,6 @@ - ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' - cross_compiling=$ac_cv_prog_cxx_cross +@@ -10066,10 +10008,6 @@ + ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' + ac_compiler_gnu=$ac_cv_cxx_compiler_gnu --if test "$ac_cv_prog_gxx" = "yes" +-if test "$ac_cv_cxx_compiler_gnu" = "yes" -then - CXXFLAGS="$CXXFLAGS -Werror" -fi mysql_cv_btype_last_arg_accept=none - cat > conftest.$ac_ext <<EOF - #line 6866 "configure" -@@ -9019,10 +8961,6 @@ - #do not treat warnings as errors if we are linking agaist other libc - #this is to work around gcc not being permissive on non-system includes - #with respect to ANSI C++ --if test "$ac_cv_prog_gxx" = "yes" -a "$with_other_libc" = "no" + cat >conftest.$ac_ext <<_ACEOF + #line 10075 "configure" +@@ -12739,13 +12677,6 @@ + ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' + ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + +-# Do not treat warnings as errors if we are linking agaist other libc +-# this is to work around gcc not being permissive on non-system includes +-# with respect to ANSI C++ +-if test "$ac_cv_cxx_compiler_gnu" = "yes" -a "$with_other_libc" = "no" -then - CXXFLAGS="$CXXFLAGS -Werror" -fi - cat > conftest.$ac_ext <<EOF - #line 9028 "configure" + cat >conftest.$ac_ext <<_ACEOF + #line 12750 "configure" #include "confdefs.h" -@@ -9087,10 +9025,6 @@ - ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' - cross_compiling=$ac_cv_prog_cxx_cross +@@ -12822,10 +12753,6 @@ + ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' + ac_compiler_gnu=$ac_cv_cxx_compiler_gnu --if test "$ac_cv_prog_gxx" = "yes" -a "$with_other_libc" = "no" +-if test "$ac_cv_cxx_compiler_gnu" = "yes" -a "$with_other_libc" = "no" -then - CXXFLAGS="$CXXFLAGS -Werror" -fi - cat > conftest.$ac_ext <<EOF - #line 9096 "configure" + cat >conftest.$ac_ext <<_ACEOF + #line 12830 "configure" #include "confdefs.h" -@@ -9154,10 +9088,6 @@ - ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' - cross_compiling=$ac_cv_prog_cxx_cross +@@ -12901,10 +12828,6 @@ + ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' + ac_compiler_gnu=$ac_cv_cxx_compiler_gnu --if test "$ac_cv_prog_gxx" = "yes" -a "$with_other_libc" = "no" +-if test "$ac_cv_cxx_compiler_gnu" = "yes" -a "$with_other_libc" = "no" -then - CXXFLAGS="$CXXFLAGS -Werror" -fi - cat > conftest.$ac_ext <<EOF - #line 9163 "configure" + cat >conftest.$ac_ext <<_ACEOF + #line 12909 "configure" #include "confdefs.h" diff --git a/databases/percona55-server/Makefile b/databases/percona55-server/Makefile index fe8dbda2459b..bbd4807d7c90 100644 --- a/databases/percona55-server/Makefile +++ b/databases/percona55-server/Makefile @@ -6,7 +6,7 @@ # PORTNAME?= ${MASTERPORTNAME} -PORTVERSION= 3.23.49 +PORTVERSION= 3.23.51 PORTREVISION?= 0 CATEGORIES= databases MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ @@ -32,7 +32,8 @@ CONFIGURE_ARGS= --localstatedir=${DB_DIR} \ --with-mit-threads=no \ --with-libwrap \ --with-low-memory \ - --with-comment='FreeBSD port: ${PKGNAME}' + --with-comment='FreeBSD port: ${PKGNAME}' \ + --program-prefix='' .if ${MACHINE_ARCH} == "i386" CONFIGURE_ARGS+=--enable-assembler --with-berkeley-db --with-innodb @@ -104,10 +105,6 @@ pre-fetch: @${ECHO} " is not recommended for production servers." @${ECHO} "" -post-patch: - ${MV} ${WRKSRC}/strings/strings-x86.s ${WRKSRC}/strings/strings-x86.S - ${MV} ${WRKSRC}/strings/longlong2str-x86.s ${WRKSRC}/strings/longlong2str-x86.S - .if exists(${DB_DIR}) && !defined(PACKAGE_BUILDING) && !defined(OVERWRITE_DB) && !defined(SKIP_INSTALL_DB) pre-install: @${ECHO} "You appear to already have a mysql database directory in ${DB_DIR}." diff --git a/databases/percona55-server/distinfo b/databases/percona55-server/distinfo index ee72e669d769..e446a75b5300 100644 --- a/databases/percona55-server/distinfo +++ b/databases/percona55-server/distinfo @@ -1 +1 @@ -MD5 (mysql-3.23.49.tar.gz) = 1eec75578df021ee22bb229268359d8f +MD5 (mysql-3.23.51.tar.gz) = af9f2aaba408898df82cccf462766542 diff --git a/databases/percona55-server/files/patch-Makefile.in b/databases/percona55-server/files/patch-Makefile.in index bed75f614ccc..b002d685b504 100644 --- a/databases/percona55-server/files/patch-Makefile.in +++ b/databases/percona55-server/files/patch-Makefile.in @@ -1,11 +1,11 @@ ---- Makefile.in.orig Wed Apr 18 10:54:42 2001 -+++ Makefile.in Sat Apr 21 13:00:23 2001 -@@ -181,8 +181,12 @@ +--- Makefile.in.orig Mon Jun 3 12:45:17 2002 ++++ Makefile.in Mon Jun 17 20:57:29 2002 +@@ -185,8 +185,11 @@ # These are built from source in the Docs directory EXTRA_DIST = INSTALL-SOURCE README COPYING COPYING.LIB MIRRORS --SUBDIRS = include @docs_dirs@ @readline_dir@ @thread_dirs@ @sql_client_dirs@ @sql_server_dirs@ scripts tests man @bench_dirs@ support-files - +-SUBDIRS = include @docs_dirs@ @readline_dir@ @thread_dirs@ @sql_client_dirs@ @sql_server_dirs@ scripts tests man @bench_dirs@ support-files os2 +- +.if defined(CLIENT_ONLY) +SUBDIRS = include @readline_dir@ @sql_client_dirs@ tests man +.else diff --git a/databases/percona55-server/files/patch-af b/databases/percona55-server/files/patch-af index 9c4a0b951402..238e8b2d7115 100644 --- a/databases/percona55-server/files/patch-af +++ b/databases/percona55-server/files/patch-af @@ -1,6 +1,6 @@ ---- scripts/safe_mysqld.sh.orig Thu Apr 19 10:11:02 2001 -+++ scripts/safe_mysqld.sh Thu Apr 19 15:15:54 2001 -@@ -73,30 +73,9 @@ +--- scripts/safe_mysqld.sh.orig Mon Jun 3 12:39:02 2002 ++++ scripts/safe_mysqld.sh Mon Jun 17 19:07:26 2002 +@@ -68,30 +68,9 @@ done } @@ -34,7 +34,7 @@ MYSQL_UNIX_PORT=${MYSQL_UNIX_PORT:-@MYSQL_UNIX_ADDR@} MYSQL_TCP_PORT=${MYSQL_TCP_PORT:-@MYSQL_TCP_PORT@} -@@ -240,34 +219,6 @@ +@@ -239,34 +218,6 @@ if test ! -f $pid_file # This is removed if normal shutdown then break @@ -52,7 +52,7 @@ - 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" | sed -n '$p'` - for T in $PROC - do - break diff --git a/databases/percona55-server/files/patch-ap b/databases/percona55-server/files/patch-ap deleted file mode 100644 index 097b449a181a..000000000000 --- a/databases/percona55-server/files/patch-ap +++ /dev/null @@ -1,11 +0,0 @@ ---- strings/Makefile.in.orig Sat Jan 1 18:00:30 2000 -+++ strings/Makefile.in Mon Jan 3 17:21:19 2000 -@@ -145,7 +145,7 @@ - INCLUDES = @MT_INCLUDES@ -I$(srcdir)/../include -I../include - pkglib_LIBRARIES = libmystrings.a - #no assembler --@ASSEMBLER_x86_TRUE@ASRCS = strings-x86.s longlong2str-x86.s -+@ASSEMBLER_x86_TRUE@ASRCS = strings-x86.S longlong2str-x86.S - @ASSEMBLER_x86_FALSE@@ASSEMBLER_sparc_TRUE@ASRCS = bmove_upp-sparc.s strappend-sparc.s strend-sparc.s strinstr-sparc.s strmake-sparc.s strmov-sparc.s strnmov-sparc.s strstr-sparc.s strxmov-sparc.s - @ASSEMBLER_x86_FALSE@@ASSEMBLER_sparc_FALSE@ASRCS = - # These file MUST all be on the same line!! Otherwise automake diff --git a/databases/percona55-server/files/patch-as b/databases/percona55-server/files/patch-as deleted file mode 100644 index 903bc9950a28..000000000000 --- a/databases/percona55-server/files/patch-as +++ /dev/null @@ -1,16 +0,0 @@ ---- sql/mysqld.cc.orig Sun Feb 13 02:40:18 2000 -+++ sql/mysqld.cc Mon Feb 21 21:24:51 2000 -@@ -63,8 +63,11 @@ - inline void reset_floating_point_exceptions() - { - /* Don't fall for overflow, underflow,divide-by-zero or loss of precision */ -- fpsetmask(~(FP_X_INV | FP_X_DNML | FP_X_OFL | FP_X_UFL | -- FP_X_DZ | FP_X_IMP)); -+#if defined(__i386__) -+ fpsetmask(~(FP_X_INV | FP_X_DNML | FP_X_OFL | FP_X_UFL | FP_X_DZ | FP_X_IMP)); -+#else -+ fpsetmask(~(FP_X_INV | FP_X_OFL | FP_X_UFL | FP_X_DZ | FP_X_IMP)); -+#endif - } - #else - #define reset_floating_point_exceptions() diff --git a/databases/percona55-server/files/patch-configure b/databases/percona55-server/files/patch-configure index f10ab97c44a8..ffa97b89ddd0 100644 --- a/databases/percona55-server/files/patch-configure +++ b/databases/percona55-server/files/patch-configure @@ -1,17 +1,17 @@ ---- configure.orig Wed May 9 22:34:50 2001 -+++ configure Sat May 12 11:23:21 2001 -@@ -2994,7 +2994,7 @@ +--- configure.orig Mon Jun 3 12:39:20 2002 ++++ configure Mon Jun 17 19:16:58 2002 +@@ -4188,7 +4188,7 @@ ;; esac fi --HOSTNAME="$ac_cv_path_HOSTNAME" +-HOSTNAME=$ac_cv_path_HOSTNAME +HOSTNAME="$ac_cv_path_HOSTNAME -s" + if test -n "$HOSTNAME"; then - echo "$ac_t""$HOSTNAME" 1>&6 - else -@@ -3128,38 +3128,7 @@ - echo $ac_n "checking "how to check if pid exists"""... $ac_c" 1>&6 - echo "configure:3130: checking "how to check if pid exists"" >&5 + 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 -# Linux style -if $PS p $$ 2> /dev/null | grep $0 > /dev/null @@ -42,28 +42,38 @@ - FIND_PROC="$PS -e | grep mysqld | grep \" \$\$PID \" > /dev/null" - ;; - *) -- { echo "configure: error: Could not find the right ps switches. Which OS is this ?. See the Installation chapter in the Reference Manual." 1>&2; exit 1; } +- { { 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: 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 "$ac_t"""$FIND_PROC"" 1>&6 - -@@ -5922,7 +5891,6 @@ - #define $ac_tr_lib 1 + echo "$as_me:4404: result: \"$FIND_PROC\"" >&5 + echo "${ECHO_T}\"$FIND_PROC\"" >&6 +@@ -7907,7 +7874,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" + #include "confdefs.h" +@@ -7955,7 +7921,6 @@ + #define HAVE_LIBC_R 1 EOF - LIBS="-lc_r $LIBS" - else - echo "$ac_t""no" 1>&6 -@@ -6154,28 +6122,6 @@ fi +@@ -8312,29 +8277,6 @@ + + fi -# Build optimized or debug version ? -# First check for gcc and g++ --if test "$ac_cv_prog_gcc" = "yes" +-if test "$ac_cv_c_compiler_gnu" = "yes" -then - DEBUG_CFLAGS="-g" - DEBUG_OPTIMIZE_CC="-O" @@ -83,50 +93,54 @@ - DEBUG_OPTIMIZE_CXX="" - OPTIMIZE_CXXFLAGS="-O" -fi +- # Check whether --with-debug or --without-debug was given. if test "${with_debug+set}" = set; then withval="$with_debug" -@@ -6856,10 +6802,6 @@ - ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' - cross_compiling=$ac_cv_prog_cxx_cross +@@ -10066,10 +10008,6 @@ + ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' + ac_compiler_gnu=$ac_cv_cxx_compiler_gnu --if test "$ac_cv_prog_gxx" = "yes" +-if test "$ac_cv_cxx_compiler_gnu" = "yes" -then - CXXFLAGS="$CXXFLAGS -Werror" -fi mysql_cv_btype_last_arg_accept=none - cat > conftest.$ac_ext <<EOF - #line 6866 "configure" -@@ -9019,10 +8961,6 @@ - #do not treat warnings as errors if we are linking agaist other libc - #this is to work around gcc not being permissive on non-system includes - #with respect to ANSI C++ --if test "$ac_cv_prog_gxx" = "yes" -a "$with_other_libc" = "no" + cat >conftest.$ac_ext <<_ACEOF + #line 10075 "configure" +@@ -12739,13 +12677,6 @@ + ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' + ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + +-# Do not treat warnings as errors if we are linking agaist other libc +-# this is to work around gcc not being permissive on non-system includes +-# with respect to ANSI C++ +-if test "$ac_cv_cxx_compiler_gnu" = "yes" -a "$with_other_libc" = "no" -then - CXXFLAGS="$CXXFLAGS -Werror" -fi - cat > conftest.$ac_ext <<EOF - #line 9028 "configure" + cat >conftest.$ac_ext <<_ACEOF + #line 12750 "configure" #include "confdefs.h" -@@ -9087,10 +9025,6 @@ - ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' - cross_compiling=$ac_cv_prog_cxx_cross +@@ -12822,10 +12753,6 @@ + ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' + ac_compiler_gnu=$ac_cv_cxx_compiler_gnu --if test "$ac_cv_prog_gxx" = "yes" -a "$with_other_libc" = "no" +-if test "$ac_cv_cxx_compiler_gnu" = "yes" -a "$with_other_libc" = "no" -then - CXXFLAGS="$CXXFLAGS -Werror" -fi - cat > conftest.$ac_ext <<EOF - #line 9096 "configure" + cat >conftest.$ac_ext <<_ACEOF + #line 12830 "configure" #include "confdefs.h" -@@ -9154,10 +9088,6 @@ - ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' - cross_compiling=$ac_cv_prog_cxx_cross +@@ -12901,10 +12828,6 @@ + ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' + ac_compiler_gnu=$ac_cv_cxx_compiler_gnu --if test "$ac_cv_prog_gxx" = "yes" -a "$with_other_libc" = "no" +-if test "$ac_cv_cxx_compiler_gnu" = "yes" -a "$with_other_libc" = "no" -then - CXXFLAGS="$CXXFLAGS -Werror" -fi - cat > conftest.$ac_ext <<EOF - #line 9163 "configure" + cat >conftest.$ac_ext <<_ACEOF + #line 12909 "configure" #include "confdefs.h" |