diff options
96 files changed, 1000 insertions, 2664 deletions
diff --git a/databases/mysql40-client/Makefile b/databases/mysql40-client/Makefile index b5f3065ac95f..e9f4c3c3277e 100644 --- a/databases/mysql40-client/Makefile +++ b/databases/mysql40-client/Makefile @@ -1,14 +1,15 @@ -# ports collection makefile for: MySQL-client -# Date created: Sun Sep 24 21:21:20 CEST 2000 -# Whom: Dirk Froemberg <dirk@FreeBSD.org> +# New ports collection makefile for: MySQL-client +# Date created: Sun Mar 3 12:20:35 CET 2002 +# Whom: Alex Dupre <sysadmin@alexdupre.com> # # $FreeBSD$ # -PORTNAME= mysql-client +PORTNAME= mysql PORTREVISION= 0 +PKGNAMESUFFIX= -client -MASTERDIR= ${.CURDIR}/../mysql323-server +MASTERDIR= ${.CURDIR}/../mysql40-server COMMENT= ${PKGDIR}/pkg-comment.client PKGINSTALL= mustnotexist PLIST= ${PKGDIR}/pkg-plist.client diff --git a/databases/mysql40-server/Makefile b/databases/mysql40-server/Makefile index bb9329b3c669..b499fd55b10d 100644 --- a/databases/mysql40-server/Makefile +++ b/databases/mysql40-server/Makefile @@ -1,42 +1,51 @@ -# ports collection makefile for: MySQL-server -# Date created: Sun Sep 24 21:20:46 CEST 2000 -# Whom: Dirk Froemberg <dirk@FreeBSD.org> +# New ports collection makefile for: MySQL-server +# Date created: Sun Mar 3 12:20:35 CET 2002 +# Whom: Alex Dupre <sysadmin@alexdupre.com> # # $FreeBSD$ # -PORTNAME?= ${MASTERPORTNAME} -PORTVERSION= 3.23.55 +PORTNAME?= mysql +PORTVERSION= 4.0.9 PORTREVISION?= 0 CATEGORIES= databases -MASTER_SITES= http://www.kernelnotes.de/MySQL/Downloads/MySQL-3.23/ \ - http://mysql.he.net/Downloads/MySQL-3.23/ \ - ftp://ftp.sunet.se/pub/unix/databases/relational/mysql/Downloads/MySQL-3.23/ \ - ftp://mysql.secsup.org/pub/software/mysql/Downloads/MySQL-3.23/ \ - http://mysql.orst.edu/Downloads/MySQL-3.23/ \ - http://web.tryc.on.ca/mysql/Downloads/MySQL-3.23/ \ - ftp://ftp.gwdg.de/pub/misc/mysql/Downloads/MySQL-3.23/ -DISTFILES= mysql-${PORTVERSION}${EXTRACT_SUFX} - -MAINTAINER= dirk@FreeBSD.org - -WRKSRC= ${WRKDIR}/mysql-${PORTVERSION} -SLAVEDIRS= databases/mysql323-client -MASTERPORTNAME= mysql-server +MASTER_SITES= ftp://mysql.secsup.org/pub/software/mysql/Downloads/MySQL-4.0/ \ + http://mysql.tzone.it/Downloads/MySQL-4.0/ \ + ftp://planetmirror.com/pub/mysql/Downloads/MySQL-4.0/ \ + http://www.softagency.co.jp/MySQL/Downloads/MySQL-4.0/ \ + ftp://sunsite.dk/mirrors/mysql/Downloads/MySQL-4.0/ \ + http://mysql.mediatraffic.fi/Downloads/MySQL-4.0/ \ + ftp://filepile.tiscali.de/mirror/mysql/Downloads/MySQL-4.0/ \ + http://mirrors.tilian.co.uk/mysql.com/Downloads/MySQL-4.0/ \ + ftp://ftp.rtfm.no/pub/mysql/Downloads/MySQL-4.0/ \ + http://www.mysql.cz/Downloads/MySQL-4.0/ \ + ftp://ftp.u-paris10.fr/mysql.com/Downloads/MySQL-4.0/ \ + http://mysql.oms-net.nl/Downloads/MySQL-4.0/ \ + ftp://ftp.free.fr/pub/MySQL/Downloads/MySQL-4.0/ +PKGNAMESUFFIX?= -server +DISTNAME= ${PORTNAME}-${PORTVERSION}-gamma + +MAINTAINER= sysadmin@alexdupre.com + +SLAVEDIRS= databases/mysql40-client DB_DIR?= /var/db/mysql -USE_PERL5= yes +USE_PERL5_RUN= yes USE_LIBTOOL= yes + +GNU_CONFIGURE= yes CONFIGURE_ARGS= --localstatedir=${DB_DIR} \ - --without-perl \ --without-debug \ --without-readline \ --without-bench \ - --with-mit-threads=no \ + --without-extra-tools \ --with-libwrap \ + --with-raid \ + --with-mysqlfs \ + --with-vio \ --with-low-memory \ --with-comment='FreeBSD port: ${PKGNAME}' \ - --program-prefix='' \ - --with-innodb + --with-server-suffix='' \ + --program-prefix='' .if ${MACHINE_ARCH} == "i386" CONFIGURE_ARGS+=--enable-assembler --with-berkeley-db @@ -47,71 +56,68 @@ CONFIGURE_ARGS+=--with-charset=${WITH_CHARSET} .if defined(WITH_XCHARSET) && ${WITH_XCHARSET} != "" CONFIGURE_ARGS+=--with-extra-charsets=${WITH_XCHARSET} .endif +.if defined(WITH_OPENSSL) +USE_OPENSSL= yes +CONFIGURE_ARGS+=--with-openssl +.endif .if defined(BUILD_STATIC) -CONFIGURE_ARGS+=--with-mysqld-ldflags=--static +CONFIGURE_ARGS+=--with-mysqld-ldflags=-all-static .endif .if defined(BUILD_OPTIMIZED) -CFLAGS+= -mcpu=pentiumpro -O3 -.endif -.if defined(WITH_LINUXTHREADS) -CONFIGURE_ARGS+=--with-named-thread-libs='-DHAVE_GLIBC2_STYLE_GETHOSTBYNAME_R -D_THREAD_SAFE -I${LOCALBASE}/include/pthread/linuxthreads -L${LOCALBASE}/lib -llthread -llgcc_r' -CFLAGS+= -D__USE_UNIX98 -D_REENTRANT -D_THREAD_SAFE -I${LOCALBASE}/include/pthread/linuxthreads -LIB_DEPENDS+= lthread.2:${PORTSDIR}/devel/linuxthreads +CFLAGS+= -mcpu=i686 .endif .if defined(THREAD_SAFE_CLIENT) CONFIGURE_ARGS+=--enable-thread-safe-client .endif -CONFIGURE_ENV+= PERL=${PERL} \ - PERL5=${PERL} \ - INSTALL_SCRIPT="${INSTALL_SCRIPT}" \ - CFLAGS="${CFLAGS}" \ - CONFIGURE_ARGS="${CONFIGURE_ARGS}" -.include <bsd.port.pre.mk> -# without including these flags mysqld may crash under heavy load -# and multiple connections at the same time +CFLAGS+= -O3 -fno-omit-frame-pointer CXXFLAGS= ${CFLAGS} -felide-constructors -fno-rtti + +.include <bsd.port.pre.mk> .if ${OSVERSION} >= 400002 CXXFLAGS+= -fno-exceptions .endif .if ${OSVERSION} < 500000 -CONFIGURE_ENV+= CXX="${CC}" +CXX= ${CC} .endif # MySQL-Server part .if !defined(CLIENT_ONLY) -RUN_DEPENDS= mysql:${PORTSDIR}/databases/mysql323-client \ +RUN_DEPENDS= mysql:${PORTSDIR}/databases/mysql40-client \ ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Mysql.pm:${PORTSDIR}/databases/p5-Mysql -PLIST_SUB= MYSQL_VERSION=${PORTVERSION} +PLIST_SUB= MYSQL_VERSION=${PORTVERSION}-gamma -ONLY_FOR_ARCHS= i386 alpha sparc64 +ONLY_FOR_ARCHS= i386 alpha + +DOCS= manual.html manual.ps manual_toc.html manual.txt manual.texi \ + include.texi pre-fetch: @${ECHO} "" @${ECHO} "You may use the following build options:" @${ECHO} "" - @${ECHO} " WITH_CHARSET=charset define the primary built-in charset (latin1);" - @${ECHO} " WITH_XCHARSET=list define other built-in charsets (may be 'all');" + @${ECHO} " WITH_CHARSET=charset Define the primary built-in charset (latin1)." + @${ECHO} " WITH_XCHARSET=list Define other built-in charsets (may be 'all')." + @${ECHO} " WITH_OPENSSL=yes Enable secure connections." @${ECHO} " DB_DIR=directory Set alternate directory for database files" @${ECHO} " (default is /var/db/mysql)." - @${ECHO} " WITH_LINUXTHREADS=yes Use the linuxthreads pthread library." - @${ECHO} " This is _NOT_ recommended for production" - @${ECHO} " servers. Expect problems when enabled." - @${ECHO} " SKIP_INSTALL_DB=yes Skip mysql_install_db" - @${ECHO} " (i. e. leave ${DB_DIR} alone)." - @${ECHO} " This is useful for upgrades." - @${ECHO} " Be sure to know what you are doing!" - @${ECHO} " SKIP_DNS_CHECK=yes don't run resolveip to do an additional" + @${ECHO} " SKIP_INSTALL_DB=yes Skip database initialization" + @${ECHO} " (useful for upgrades)." + @${ECHO} " SKIP_DNS_CHECK=yes Don't run resolveip to do an additional" @${ECHO} " DNS check before inserting local hostname to" - @${ECHO} " mysql database." - @${ECHO} " Use if your machine has no offical DNS entry." + @${ECHO} " mysql database" + @${ECHO} " (use if your machine has no official DNS entry)." @${ECHO} " BUILD_STATIC=yes Build a static version of mysqld." - @${ECHO} " BUILD_OPTIMIZED=yes Add -mcpu=pentiumpro -O3 to CFLAGS." - @${ECHO} " This setting may produce broken code and thus" - @${ECHO} " is not recommended for production servers." + @${ECHO} " BUILD_OPTIMIZED=yes Add -mcpu=i686 to CFLAGS." @${ECHO} "" +.if defined(WITH_OPENSSL) && defined(BUILD_STATIC) +pre-configure: + @${ECHO} "You can't use the BUILD_STATIC option when using OpenSSL." + @${FALSE} +.endif + .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}." @@ -145,20 +151,18 @@ post-install: @${CHMOD} 750 ${PREFIX}/etc/rc.d/mysql-server.sh .if !defined(NOPORTDOCS) - ${MKDIR} ${PREFIX}/share/doc/mysql/Flags -.for doc in manual.html manual.ps manual_toc.html manual.txt manual.texi include.texi - ${INSTALL_DATA} ${WRKSRC}/Docs/${doc} ${PREFIX}/share/doc/mysql + ${MKDIR} ${DOCSDIR}/Flags +.for doc in ${DOCS} + ${INSTALL_DATA} ${WRKSRC}/Docs/${doc} ${DOCSDIR} .endfor - ${INSTALL_DATA} ${WRKSRC}/Docs/Flags/*.gif ${PREFIX}/share/doc/mysql/Flags - ${INSTALL_DATA} ${WRKSRC}/Docs/mysql.info ${PREFIX}/info - @install-info ${PREFIX}/info/mysql.info ${PREFIX}/info/dir + ${INSTALL_DATA} ${WRKSRC}/Docs/Flags/*.gif ${DOCSDIR}/Flags .endif # MySQL-Client part .else MAN1= isamchk.1 isamlog.1 mysql.1 mysql_zap.1 mysqlaccess.1 \ - mysqladmin.1 mysqld.1 mysqld_multi.1 mysqldump.1 mysqlshow.1 \ - perror.1 replace.1 safe_mysqld.1 + mysqladmin.1 mysqld.1 mysqld_multi.1 mysqld_safe.1 mysqldump.1 \ + mysqlshow.1 perror.1 replace.1 INSTALLS_SHLIB= yes LDCONFIG_DIRS= %%PREFIX%%/lib/mysql @@ -172,9 +176,4 @@ post-install: .endif -# This is for the maintainer only... -make-plist: - /usr/bin/find foo -type f -or -type l | /usr/bin/cut -d / -f 2- | /usr/bin/sort > ${.CURDIR}/pkg-plist.new - /usr/bin/perl -i -ne 'if (m#share/doc/#) { print "%%PORTDOCS%%", $$_; } else { print $$_; }' ${.CURDIR}/pkg-plist.new - .include <bsd.port.post.mk> diff --git a/databases/mysql40-server/distinfo b/databases/mysql40-server/distinfo index b56d22caad75..4c809e2ce104 100644 --- a/databases/mysql40-server/distinfo +++ b/databases/mysql40-server/distinfo @@ -1 +1 @@ -MD5 (mysql-3.23.55.tar.gz) = 259196ddc00c94051dceb9e86574d17e +MD5 (mysql-4.0.9-gamma.tar.gz) = 75d582f3e71e21cd6ffa7c84a6db26c3 diff --git a/databases/mysql40-server/files/mysql-server.sh b/databases/mysql40-server/files/mysql-server.sh index 6a5acb39a962..5180b9c0c1eb 100644 --- a/databases/mysql40-server/files/mysql-server.sh +++ b/databases/mysql40-server/files/mysql-server.sh @@ -5,9 +5,9 @@ PIDFILE=${DB_DIR}/`/bin/hostname -s`.pid case "$1" in start) - if [ -x %%PREFIX%%/bin/safe_mysqld ]; then + if [ -x %%PREFIX%%/bin/mysqld_safe ]; then /usr/bin/limits -U mysql \ - %%PREFIX%%/bin/safe_mysqld --user=mysql --datadir=${DB_DIR} --pid-file=${PIDFILE} > /dev/null & + %%PREFIX%%/bin/mysqld_safe --user=mysql --datadir=${DB_DIR} --pid-file=${PIDFILE} > /dev/null & echo -n ' mysqld' fi ;; diff --git a/databases/mysql40-server/files/patch-Makefile.in b/databases/mysql40-server/files/patch-Makefile.in index 987cf407da8f..c8bf28bc02bc 100644 --- a/databases/mysql40-server/files/patch-Makefile.in +++ b/databases/mysql40-server/files/patch-Makefile.in @@ -1,19 +1,20 @@ ---- Makefile.in.orig Thu Jan 23 16:13:43 2003 -+++ Makefile.in Wed Jan 29 17:11:29 2003 -@@ -195,11 +195,11 @@ +--- Makefile.in.orig Wed Nov 20 00:06:37 2002 ++++ Makefile.in Wed Nov 20 00:07:31 2002 +@@ -207,12 +207,11 @@ EXTRA_DIST = INSTALL-SOURCE README \ - COPYING COPYING.LIB MIRRORS + COPYING COPYING.LIB --SUBDIRS = . include @docs_dirs@ @readline_dir@ \ -- @thread_dirs@ @sql_client_dirs@ \ -- @sql_server_dirs@ scripts tests man \ -- @bench_dirs@ support-files os2 +-SUBDIRS = include @docs_dirs@ @readline_dir@ \ +- @thread_dirs@ pstack @sql_client_dirs@ \ +- @sql_server_dirs@ @libmysqld_dirs@ scripts man \ +- tests BUILD os2 \ +- @bench_dirs@ support-files @fs_dirs@ @tools_dirs@ - +.if defined(CLIENT_ONLY) -+SUBDIRS = include @readline_dir@ @sql_client_dirs@ tests man ++SUBDIRS = include @sql_client_dirs@ tests man +.else -+SUBDIRS = include @thread_dirs@ @docs_dirs@ @sql_server_dirs@ scripts support-files ++SUBDIRS = include @docs_dirs@ @sql_server_dirs@ scripts support-files +.endif # Relink after clean - CLEANFILES = linked_client_sources linked_server_sources linked_libmysql_sources linked_libmysql_r_sources linked_include_sources + linked_sources = linked_client_sources linked_server_sources \ diff --git a/databases/mysql40-server/files/patch-af b/databases/mysql40-server/files/patch-af deleted file mode 100644 index 8d2d1003f2e4..000000000000 --- a/databases/mysql40-server/files/patch-af +++ /dev/null @@ -1,79 +0,0 @@ ---- scripts/safe_mysqld.sh.orig Thu Oct 10 12:17:29 2002 -+++ scripts/safe_mysqld.sh Sun Nov 10 21:27:46 2002 -@@ -68,30 +68,9 @@ - done - } - --MY_PWD=`pwd` --# Check if we are starting this relative (for the binary release) --if test -d $MY_PWD/data/mysql -a -f ./share/mysql/english/errmsg.sys -a \ -- -x ./bin/mysqld --then -- MY_BASEDIR_VERSION=$MY_PWD # Where bin, share and data are -- ledir=$MY_BASEDIR_VERSION/bin # Where mysqld is -- DATADIR=$MY_BASEDIR_VERSION/data -- if test -z "$defaults" -- then -- defaults="--defaults-extra-file=$MY_BASEDIR_VERSION/data/my.cnf" -- fi --# Check if this is a 'moved install directory' --elif test -f ./var/mysql/db.frm -a -f ./share/mysql/english/errmsg.sys -a \ -- -x ./libexec/mysqld --then -- MY_BASEDIR_VERSION=$MY_PWD # Where libexec, share and var are -- ledir=$MY_BASEDIR_VERSION/libexec # Where mysqld is -- DATADIR=$MY_BASEDIR_VERSION/var --else -- MY_BASEDIR_VERSION=@prefix@ -- DATADIR=@localstatedir@ -- ledir=@libexecdir@ --fi -+MY_BASEDIR_VERSION=@prefix@ -+DATADIR=@localstatedir@ -+ledir=@libexecdir@ - - MYSQL_UNIX_PORT=${MYSQL_UNIX_PORT:-@MYSQL_UNIX_ADDR@} - MYSQL_TCP_PORT=${MYSQL_TCP_PORT:-@MYSQL_TCP_PORT@} -@@ -106,7 +85,6 @@ - fi - - # these rely on $DATADIR by default, so we'll set them later on --pid_file= - err_log= - SET_USER=0 - -@@ -239,34 +217,6 @@ - if test ! -f $pid_file # This is removed if normal shutdown - then - break -- fi -- -- if @IS_LINUX@ -- then -- # Test if one process was hanging. -- # This is only a fix for Linux (running as base 3 mysqld processes) -- # but should work for the rest of the servers. -- # The only thing is ps x => redhat 5 gives warnings when using ps -x. -- # kill -9 is used or the process won't react on the kill. -- numofproces=`ps xa | grep -v "grep" | grep -c $ledir/$MYSQLD` -- echo -e "\nNumber of processes running now: $numofproces" | tee -a $err_log -- I=1 -- while test "$I" -le "$numofproces" -- do -- PROC=`ps xa | grep $ledir/$MYSQLD | grep -v "grep" | sed -n '$p'` -- for T in $PROC -- do -- break -- done -- # echo "TEST $I - $T **" -- if kill -9 $T -- then -- echo "$MYSQLD process hanging, pid $T - killed" | tee -a $err_log -- else -- break -- fi -- I=`expr $I + 1` -- done - fi - - echo "`date +'%y%m%d %H:%M:%S'` mysqld restarted" | tee -a $err_log diff --git a/databases/mysql40-server/files/patch-configure b/databases/mysql40-server/files/patch-configure index 6c6e0ad044fa..5f5155735ee1 100644 --- a/databases/mysql40-server/files/patch-configure +++ b/databases/mysql40-server/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig Thu Dec 5 10:37:31 2002 -+++ configure Mon Dec 16 19:49:41 2002 -@@ -8059,6 +8059,7 @@ +--- configure.orig Mon Dec 16 10:12:16 2002 ++++ configure Fri Dec 20 18:11:14 2002 +@@ -8071,6 +8071,7 @@ # This can be used to rebuild libtool when needed LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" @@ -8,7 +8,7 @@ # Always use our own libtool. LIBTOOL='$(SHELL) $(top_builddir)/libtool' -@@ -8988,7 +8989,7 @@ +@@ -9000,7 +9001,7 @@ ;; esac fi @@ -17,142 +17,3 @@ if test -n "$HOSTNAME"; then echo "$as_me:$LINENO: result: $HOSTNAME" >&5 -@@ -9177,43 +9178,7 @@ - echo "${ECHO_T}no" >&6 - fi - --echo "$as_me:$LINENO: checking \"how to check if pid exists\"" >&5 --echo $ECHO_N "checking \"how to check if pid exists\"... $ECHO_C" >&6 --PS=$ac_cv_path_PS --# Linux style --if $PS p $$ 2> /dev/null | grep $0 > /dev/null --then -- FIND_PROC="$PS p \$\$PID | grep mysqld > /dev/null" --# Solaris --elif $PS -p $$ 2> /dev/null | grep $0 > /dev/null --then -- FIND_PROC="$PS -p \$\$PID | grep mysqld > /dev/null" --# BSD style --elif $PS -uaxww 2> /dev/null | grep $0 > /dev/null --then -- FIND_PROC="$PS -uaxww | grep mysqld | grep \" \$\$PID \" > /dev/null" --# SysV style --elif $PS -ef 2> /dev/null | grep $0 > /dev/null --then -- FIND_PROC="$PS -ef | grep mysqld | grep \" \$\$PID \" > /dev/null" --# Do anybody use this? --elif $PS $$ 2> /dev/null | grep $0 > /dev/null --then -- FIND_PROC="$PS \$\$PID | grep mysqld > /dev/null" --else -- case $SYSTEM_TYPE in -- *darwin*) -- FIND_PROC="$PS -uaxww | grep mysqld | grep \" \$\$PID \" > /dev/null" -- ;; -- *cygwin*) -- FIND_PROC="$PS -e | grep mysqld | grep \" \$\$PID \" > /dev/null" -- ;; -- *) -- { { echo "$as_me:$LINENO: error: Could not find the right ps switches. Which OS is this ?. See the Installation chapter in the Reference Manual." >&5 --echo "$as_me: error: Could not find the right ps switches. Which OS is this ?. See the Installation chapter in the Reference Manual." >&2;} -- { (exit 1); exit 1; }; } -- esac --fi -+FIND_PROC="$PS -uaxww | grep mysqld | grep \" \$\$PID \" > /dev/null" - - echo "$as_me:$LINENO: result: \"$FIND_PROC\"" >&5 - echo "${ECHO_T}\"$FIND_PROC\"" >&6 -@@ -13208,7 +13173,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 $LINENO "configure" - #include "confdefs.h" -@@ -13262,7 +13226,6 @@ - #define HAVE_LIBC_R 1 - _ACEOF - -- LIBS="-lc_r $LIBS" - - fi - -@@ -13706,29 +13669,6 @@ - fi - - --# Build optimized or debug version ? --# First check for gcc and g++ --if test "$ac_cv_c_compiler_gnu" = "yes" --then -- DEBUG_CFLAGS="-g" -- DEBUG_OPTIMIZE_CC="-O" -- OPTIMIZE_CFLAGS="$MAX_C_OPTIMIZE" --else -- DEBUG_CFLAGS="-g" -- DEBUG_OPTIMIZE_CC="" -- OPTIMIZE_CFLAGS="-O" --fi --if test "$ac_cv_prog_cxx_g" = "yes" --then -- DEBUG_CXXFLAGS="-g" -- DEBUG_OPTIMIZE_CXX="-O" -- OPTIMIZE_CXXFLAGS="-O3" --else -- DEBUG_CXXFLAGS="-g" -- DEBUG_OPTIMIZE_CXX="" -- OPTIMIZE_CXXFLAGS="-O" --fi -- - - # Check whether --with-debug or --without-debug was given. - if test "${with_debug+set}" = set; then -@@ -16081,10 +16021,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_cxx_compiler_gnu" = "yes" --then -- CXXFLAGS="$CXXFLAGS -Werror" --fi - mysql_cv_btype_last_arg_accept=none - cat >conftest.$ac_ext <<_ACEOF - #line $LINENO "configure" -@@ -19222,14 +19158,6 @@ - ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - - --# Do not treat warnings as errors if we are linking against 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 <<_ACEOF - #line $LINENO "configure" - #include "confdefs.h" -@@ -19313,10 +19241,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_cxx_compiler_gnu" = "yes" -a "$with_other_libc" = "no" --then -- CXXFLAGS="$CXXFLAGS -Werror" --fi - cat >conftest.$ac_ext <<_ACEOF - #line $LINENO "configure" - #include "confdefs.h" -@@ -19399,10 +19323,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_cxx_compiler_gnu" = "yes" -a "$with_other_libc" = "no" --then -- CXXFLAGS="$CXXFLAGS -Werror" --fi - cat >conftest.$ac_ext <<_ACEOF - #line $LINENO "configure" - #include "confdefs.h" diff --git a/databases/mysql40-server/files/patch-include::Makefile.in b/databases/mysql40-server/files/patch-include::Makefile.in index 3ff10ce708d5..34b404c0a255 100644 --- a/databases/mysql40-server/files/patch-include::Makefile.in +++ b/databases/mysql40-server/files/patch-include::Makefile.in @@ -1,6 +1,6 @@ ---- include/Makefile.in.orig Thu Dec 5 10:37:22 2002 -+++ include/Makefile.in Sat Dec 14 16:26:53 2002 -@@ -324,7 +324,11 @@ +--- include/Makefile.in.orig Tue Nov 19 17:13:35 2002 ++++ include/Makefile.in Tue Nov 19 17:14:10 2002 +@@ -335,7 +335,11 @@ installdirs: $(mkinstalldirs) $(DESTDIR)$(pkgincludedir) diff --git a/databases/mysql40-server/files/patch-sql_mysqld.cc b/databases/mysql40-server/files/patch-sql_mysqld.cc deleted file mode 100644 index 5155bd5f33cd..000000000000 --- a/databases/mysql40-server/files/patch-sql_mysqld.cc +++ /dev/null @@ -1,12 +0,0 @@ ---- sql/mysqld.cc.orig Thu Oct 10 12:17:28 2002 -+++ sql/mysqld.cc Tue Nov 12 23:23:27 2002 -@@ -92,7 +92,8 @@ - int allow_severity = LOG_INFO; - int deny_severity = LOG_WARNING; - --#ifdef __STDC__ -+#include <osreldate.h> -+#if defined(__STDC__) && __FreeBSD_version < 500000 - #define my_fromhost(A) fromhost(A) - #define my_hosts_access(A) hosts_access(A) - #define my_eval_client(A) eval_client(A) diff --git a/databases/mysql40-server/pkg-descr b/databases/mysql40-server/pkg-descr index 8f4acf36e853..cd19c135f9cc 100644 --- a/databases/mysql40-server/pkg-descr +++ b/databases/mysql40-server/pkg-descr @@ -2,3 +2,6 @@ MySQL is a very fast, multi-threaded, multi-user and robust SQL (Structured Query Language) database server. WWW: http://www.mysql.com/ + +- Alex Dupre +sysadmin@alexdupre.com diff --git a/databases/mysql40-server/pkg-plist b/databases/mysql40-server/pkg-plist index 7a482d60bc34..692b3053f8c6 100644 --- a/databases/mysql40-server/pkg-plist +++ b/databases/mysql40-server/pkg-plist @@ -8,14 +8,21 @@ bin/myisamlog bin/myisampack bin/mysql_config bin/mysql_convert_table_format +bin/mysql_explain_log bin/mysql_find_rows +bin/mysql_fix_extensions bin/mysql_fix_privilege_tables +bin/mysql_install bin/mysql_install_db +bin/mysql_secure_installation bin/mysql_setpermission +bin/mysql_tableinfo +bin/mysql_waitpid bin/mysql_zap bin/mysqlaccess bin/mysqlbug bin/mysqld_multi +bin/mysqld_safe bin/mysqldumpslow bin/mysqlhotcopy bin/pack_isam @@ -23,7 +30,6 @@ bin/perror bin/replace bin/resolve_stack_dump bin/resolveip -bin/safe_mysqld etc/rc.d/mysql-server.sh %%PORTDOCS%%@unexec install-info --delete %D/info/mysql.info %D/info/dir %%PORTDOCS%%info/mysql.info @@ -36,15 +42,19 @@ lib/mysql/libmyisammrg.a lib/mysql/libmystrings.a lib/mysql/libmysys.a lib/mysql/libnisam.a +lib/mysql/libvio.a libexec/mysqld %%PORTDOCS%%share/doc/mysql/Flags/argentina.gif +%%PORTDOCS%%share/doc/mysql/Flags/armenia.gif %%PORTDOCS%%share/doc/mysql/Flags/australia.gif %%PORTDOCS%%share/doc/mysql/Flags/austria.gif +%%PORTDOCS%%share/doc/mysql/Flags/belgium.gif %%PORTDOCS%%share/doc/mysql/Flags/brazil.gif %%PORTDOCS%%share/doc/mysql/Flags/bulgaria.gif %%PORTDOCS%%share/doc/mysql/Flags/canada.gif %%PORTDOCS%%share/doc/mysql/Flags/chile.gif %%PORTDOCS%%share/doc/mysql/Flags/china.gif +%%PORTDOCS%%share/doc/mysql/Flags/costa-rica.gif %%PORTDOCS%%share/doc/mysql/Flags/croatia.gif %%PORTDOCS%%share/doc/mysql/Flags/czech-republic.gif %%PORTDOCS%%share/doc/mysql/Flags/denmark.gif @@ -58,25 +68,28 @@ libexec/mysqld %%PORTDOCS%%share/doc/mysql/Flags/iceland.gif %%PORTDOCS%%share/doc/mysql/Flags/indonesia.gif %%PORTDOCS%%share/doc/mysql/Flags/ireland.gif -%%PORTDOCS%%share/doc/mysql/Flags/island.gif %%PORTDOCS%%share/doc/mysql/Flags/israel.gif %%PORTDOCS%%share/doc/mysql/Flags/italy.gif %%PORTDOCS%%share/doc/mysql/Flags/japan.gif -%%PORTDOCS%%share/doc/mysql/Flags/kroatia.gif %%PORTDOCS%%share/doc/mysql/Flags/latvia.gif +%%PORTDOCS%%share/doc/mysql/Flags/mexico.gif %%PORTDOCS%%share/doc/mysql/Flags/netherlands.gif +%%PORTDOCS%%share/doc/mysql/Flags/new-zealand.gif +%%PORTDOCS%%share/doc/mysql/Flags/norway.gif +%%PORTDOCS%%share/doc/mysql/Flags/philippines.gif %%PORTDOCS%%share/doc/mysql/Flags/poland.gif %%PORTDOCS%%share/doc/mysql/Flags/portugal.gif %%PORTDOCS%%share/doc/mysql/Flags/romania.gif %%PORTDOCS%%share/doc/mysql/Flags/russia.gif %%PORTDOCS%%share/doc/mysql/Flags/singapore.gif +%%PORTDOCS%%share/doc/mysql/Flags/slovenia.gif %%PORTDOCS%%share/doc/mysql/Flags/south-africa.gif -%%PORTDOCS%%share/doc/mysql/Flags/south-africa1.gif %%PORTDOCS%%share/doc/mysql/Flags/south-korea.gif %%PORTDOCS%%share/doc/mysql/Flags/spain.gif %%PORTDOCS%%share/doc/mysql/Flags/sweden.gif %%PORTDOCS%%share/doc/mysql/Flags/switzerland.gif %%PORTDOCS%%share/doc/mysql/Flags/taiwan.gif +%%PORTDOCS%%share/doc/mysql/Flags/turkey.gif %%PORTDOCS%%share/doc/mysql/Flags/ukraine.gif %%PORTDOCS%%share/doc/mysql/Flags/usa.gif %%PORTDOCS%%share/doc/mysql/Flags/yugoslavia.gif diff --git a/databases/mysql40-server/pkg-plist.client b/databases/mysql40-server/pkg-plist.client index 13d787a27fb7..e7ad0a65b8a1 100644 --- a/databases/mysql40-server/pkg-plist.client +++ b/databases/mysql40-server/pkg-plist.client @@ -4,6 +4,8 @@ bin/mysqlbinlog bin/mysqlcheck bin/mysqldump bin/mysqlimport +bin/mysqlmanager-pwgen +bin/mysqlmanagerc bin/mysqlshow bin/mysqltest etc/rc.d/000.mysql-client.sh @@ -11,24 +13,27 @@ include/mysql/dbug.h include/mysql/errmsg.h include/mysql/m_ctype.h include/mysql/m_string.h +include/mysql/my_alloc.h include/mysql/my_config.h +include/mysql/my_getopt.h include/mysql/my_global.h include/mysql/my_list.h include/mysql/my_net.h include/mysql/my_no_pthread.h include/mysql/my_pthread.h +include/mysql/my_semaphore.h include/mysql/my_sys.h include/mysql/mysql.h include/mysql/mysql_com.h +include/mysql/mysql_embed.h include/mysql/mysql_version.h include/mysql/mysqld_error.h include/mysql/raid.h include/mysql/sslopt-case.h include/mysql/sslopt-longopts.h -include/mysql/sslopt-usage.h include/mysql/sslopt-vars.h lib/mysql/libmysqlclient.a lib/mysql/libmysqlclient.so -lib/mysql/libmysqlclient.so.10 +lib/mysql/libmysqlclient.so.12 @dirrm include/mysql @dirrm lib/mysql diff --git a/databases/mysql41-client/Makefile b/databases/mysql41-client/Makefile index b5f3065ac95f..e9f4c3c3277e 100644 --- a/databases/mysql41-client/Makefile +++ b/databases/mysql41-client/Makefile @@ -1,14 +1,15 @@ -# ports collection makefile for: MySQL-client -# Date created: Sun Sep 24 21:21:20 CEST 2000 -# Whom: Dirk Froemberg <dirk@FreeBSD.org> +# New ports collection makefile for: MySQL-client +# Date created: Sun Mar 3 12:20:35 CET 2002 +# Whom: Alex Dupre <sysadmin@alexdupre.com> # # $FreeBSD$ # -PORTNAME= mysql-client +PORTNAME= mysql PORTREVISION= 0 +PKGNAMESUFFIX= -client -MASTERDIR= ${.CURDIR}/../mysql323-server +MASTERDIR= ${.CURDIR}/../mysql40-server COMMENT= ${PKGDIR}/pkg-comment.client PKGINSTALL= mustnotexist PLIST= ${PKGDIR}/pkg-plist.client diff --git a/databases/mysql41-server/Makefile b/databases/mysql41-server/Makefile index bb9329b3c669..b499fd55b10d 100644 --- a/databases/mysql41-server/Makefile +++ b/databases/mysql41-server/Makefile @@ -1,42 +1,51 @@ -# ports collection makefile for: MySQL-server -# Date created: Sun Sep 24 21:20:46 CEST 2000 -# Whom: Dirk Froemberg <dirk@FreeBSD.org> +# New ports collection makefile for: MySQL-server +# Date created: Sun Mar 3 12:20:35 CET 2002 +# Whom: Alex Dupre <sysadmin@alexdupre.com> # # $FreeBSD$ # -PORTNAME?= ${MASTERPORTNAME} -PORTVERSION= 3.23.55 +PORTNAME?= mysql +PORTVERSION= 4.0.9 PORTREVISION?= 0 CATEGORIES= databases -MASTER_SITES= http://www.kernelnotes.de/MySQL/Downloads/MySQL-3.23/ \ - http://mysql.he.net/Downloads/MySQL-3.23/ \ - ftp://ftp.sunet.se/pub/unix/databases/relational/mysql/Downloads/MySQL-3.23/ \ - ftp://mysql.secsup.org/pub/software/mysql/Downloads/MySQL-3.23/ \ - http://mysql.orst.edu/Downloads/MySQL-3.23/ \ - http://web.tryc.on.ca/mysql/Downloads/MySQL-3.23/ \ - ftp://ftp.gwdg.de/pub/misc/mysql/Downloads/MySQL-3.23/ -DISTFILES= mysql-${PORTVERSION}${EXTRACT_SUFX} - -MAINTAINER= dirk@FreeBSD.org - -WRKSRC= ${WRKDIR}/mysql-${PORTVERSION} -SLAVEDIRS= databases/mysql323-client -MASTERPORTNAME= mysql-server +MASTER_SITES= ftp://mysql.secsup.org/pub/software/mysql/Downloads/MySQL-4.0/ \ + http://mysql.tzone.it/Downloads/MySQL-4.0/ \ + ftp://planetmirror.com/pub/mysql/Downloads/MySQL-4.0/ \ + http://www.softagency.co.jp/MySQL/Downloads/MySQL-4.0/ \ + ftp://sunsite.dk/mirrors/mysql/Downloads/MySQL-4.0/ \ + http://mysql.mediatraffic.fi/Downloads/MySQL-4.0/ \ + ftp://filepile.tiscali.de/mirror/mysql/Downloads/MySQL-4.0/ \ + http://mirrors.tilian.co.uk/mysql.com/Downloads/MySQL-4.0/ \ + ftp://ftp.rtfm.no/pub/mysql/Downloads/MySQL-4.0/ \ + http://www.mysql.cz/Downloads/MySQL-4.0/ \ + ftp://ftp.u-paris10.fr/mysql.com/Downloads/MySQL-4.0/ \ + http://mysql.oms-net.nl/Downloads/MySQL-4.0/ \ + ftp://ftp.free.fr/pub/MySQL/Downloads/MySQL-4.0/ +PKGNAMESUFFIX?= -server +DISTNAME= ${PORTNAME}-${PORTVERSION}-gamma + +MAINTAINER= sysadmin@alexdupre.com + +SLAVEDIRS= databases/mysql40-client DB_DIR?= /var/db/mysql -USE_PERL5= yes +USE_PERL5_RUN= yes USE_LIBTOOL= yes + +GNU_CONFIGURE= yes CONFIGURE_ARGS= --localstatedir=${DB_DIR} \ - --without-perl \ --without-debug \ --without-readline \ --without-bench \ - --with-mit-threads=no \ + --without-extra-tools \ --with-libwrap \ + --with-raid \ + --with-mysqlfs \ + --with-vio \ --with-low-memory \ --with-comment='FreeBSD port: ${PKGNAME}' \ - --program-prefix='' \ - --with-innodb + --with-server-suffix='' \ + --program-prefix='' .if ${MACHINE_ARCH} == "i386" CONFIGURE_ARGS+=--enable-assembler --with-berkeley-db @@ -47,71 +56,68 @@ CONFIGURE_ARGS+=--with-charset=${WITH_CHARSET} .if defined(WITH_XCHARSET) && ${WITH_XCHARSET} != "" CONFIGURE_ARGS+=--with-extra-charsets=${WITH_XCHARSET} .endif +.if defined(WITH_OPENSSL) +USE_OPENSSL= yes +CONFIGURE_ARGS+=--with-openssl +.endif .if defined(BUILD_STATIC) -CONFIGURE_ARGS+=--with-mysqld-ldflags=--static +CONFIGURE_ARGS+=--with-mysqld-ldflags=-all-static .endif .if defined(BUILD_OPTIMIZED) -CFLAGS+= -mcpu=pentiumpro -O3 -.endif -.if defined(WITH_LINUXTHREADS) -CONFIGURE_ARGS+=--with-named-thread-libs='-DHAVE_GLIBC2_STYLE_GETHOSTBYNAME_R -D_THREAD_SAFE -I${LOCALBASE}/include/pthread/linuxthreads -L${LOCALBASE}/lib -llthread -llgcc_r' -CFLAGS+= -D__USE_UNIX98 -D_REENTRANT -D_THREAD_SAFE -I${LOCALBASE}/include/pthread/linuxthreads -LIB_DEPENDS+= lthread.2:${PORTSDIR}/devel/linuxthreads +CFLAGS+= -mcpu=i686 .endif .if defined(THREAD_SAFE_CLIENT) CONFIGURE_ARGS+=--enable-thread-safe-client .endif -CONFIGURE_ENV+= PERL=${PERL} \ - PERL5=${PERL} \ - INSTALL_SCRIPT="${INSTALL_SCRIPT}" \ - CFLAGS="${CFLAGS}" \ - CONFIGURE_ARGS="${CONFIGURE_ARGS}" -.include <bsd.port.pre.mk> -# without including these flags mysqld may crash under heavy load -# and multiple connections at the same time +CFLAGS+= -O3 -fno-omit-frame-pointer CXXFLAGS= ${CFLAGS} -felide-constructors -fno-rtti + +.include <bsd.port.pre.mk> .if ${OSVERSION} >= 400002 CXXFLAGS+= -fno-exceptions .endif .if ${OSVERSION} < 500000 -CONFIGURE_ENV+= CXX="${CC}" +CXX= ${CC} .endif # MySQL-Server part .if !defined(CLIENT_ONLY) -RUN_DEPENDS= mysql:${PORTSDIR}/databases/mysql323-client \ +RUN_DEPENDS= mysql:${PORTSDIR}/databases/mysql40-client \ ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Mysql.pm:${PORTSDIR}/databases/p5-Mysql -PLIST_SUB= MYSQL_VERSION=${PORTVERSION} +PLIST_SUB= MYSQL_VERSION=${PORTVERSION}-gamma -ONLY_FOR_ARCHS= i386 alpha sparc64 +ONLY_FOR_ARCHS= i386 alpha + +DOCS= manual.html manual.ps manual_toc.html manual.txt manual.texi \ + include.texi pre-fetch: @${ECHO} "" @${ECHO} "You may use the following build options:" @${ECHO} "" - @${ECHO} " WITH_CHARSET=charset define the primary built-in charset (latin1);" - @${ECHO} " WITH_XCHARSET=list define other built-in charsets (may be 'all');" + @${ECHO} " WITH_CHARSET=charset Define the primary built-in charset (latin1)." + @${ECHO} " WITH_XCHARSET=list Define other built-in charsets (may be 'all')." + @${ECHO} " WITH_OPENSSL=yes Enable secure connections." @${ECHO} " DB_DIR=directory Set alternate directory for database files" @${ECHO} " (default is /var/db/mysql)." - @${ECHO} " WITH_LINUXTHREADS=yes Use the linuxthreads pthread library." - @${ECHO} " This is _NOT_ recommended for production" - @${ECHO} " servers. Expect problems when enabled." - @${ECHO} " SKIP_INSTALL_DB=yes Skip mysql_install_db" - @${ECHO} " (i. e. leave ${DB_DIR} alone)." - @${ECHO} " This is useful for upgrades." - @${ECHO} " Be sure to know what you are doing!" - @${ECHO} " SKIP_DNS_CHECK=yes don't run resolveip to do an additional" + @${ECHO} " SKIP_INSTALL_DB=yes Skip database initialization" + @${ECHO} " (useful for upgrades)." + @${ECHO} " SKIP_DNS_CHECK=yes Don't run resolveip to do an additional" @${ECHO} " DNS check before inserting local hostname to" - @${ECHO} " mysql database." - @${ECHO} " Use if your machine has no offical DNS entry." + @${ECHO} " mysql database" + @${ECHO} " (use if your machine has no official DNS entry)." @${ECHO} " BUILD_STATIC=yes Build a static version of mysqld." - @${ECHO} " BUILD_OPTIMIZED=yes Add -mcpu=pentiumpro -O3 to CFLAGS." - @${ECHO} " This setting may produce broken code and thus" - @${ECHO} " is not recommended for production servers." + @${ECHO} " BUILD_OPTIMIZED=yes Add -mcpu=i686 to CFLAGS." @${ECHO} "" +.if defined(WITH_OPENSSL) && defined(BUILD_STATIC) +pre-configure: + @${ECHO} "You can't use the BUILD_STATIC option when using OpenSSL." + @${FALSE} +.endif + .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}." @@ -145,20 +151,18 @@ post-install: @${CHMOD} 750 ${PREFIX}/etc/rc.d/mysql-server.sh .if !defined(NOPORTDOCS) - ${MKDIR} ${PREFIX}/share/doc/mysql/Flags -.for doc in manual.html manual.ps manual_toc.html manual.txt manual.texi include.texi - ${INSTALL_DATA} ${WRKSRC}/Docs/${doc} ${PREFIX}/share/doc/mysql + ${MKDIR} ${DOCSDIR}/Flags +.for doc in ${DOCS} + ${INSTALL_DATA} ${WRKSRC}/Docs/${doc} ${DOCSDIR} .endfor - ${INSTALL_DATA} ${WRKSRC}/Docs/Flags/*.gif ${PREFIX}/share/doc/mysql/Flags - ${INSTALL_DATA} ${WRKSRC}/Docs/mysql.info ${PREFIX}/info - @install-info ${PREFIX}/info/mysql.info ${PREFIX}/info/dir + ${INSTALL_DATA} ${WRKSRC}/Docs/Flags/*.gif ${DOCSDIR}/Flags .endif # MySQL-Client part .else MAN1= isamchk.1 isamlog.1 mysql.1 mysql_zap.1 mysqlaccess.1 \ - mysqladmin.1 mysqld.1 mysqld_multi.1 mysqldump.1 mysqlshow.1 \ - perror.1 replace.1 safe_mysqld.1 + mysqladmin.1 mysqld.1 mysqld_multi.1 mysqld_safe.1 mysqldump.1 \ + mysqlshow.1 perror.1 replace.1 INSTALLS_SHLIB= yes LDCONFIG_DIRS= %%PREFIX%%/lib/mysql @@ -172,9 +176,4 @@ post-install: .endif -# This is for the maintainer only... -make-plist: - /usr/bin/find foo -type f -or -type l | /usr/bin/cut -d / -f 2- | /usr/bin/sort > ${.CURDIR}/pkg-plist.new - /usr/bin/perl -i -ne 'if (m#share/doc/#) { print "%%PORTDOCS%%", $$_; } else { print $$_; }' ${.CURDIR}/pkg-plist.new - .include <bsd.port.post.mk> diff --git a/databases/mysql41-server/distinfo b/databases/mysql41-server/distinfo index b56d22caad75..4c809e2ce104 100644 --- a/databases/mysql41-server/distinfo +++ b/databases/mysql41-server/distinfo @@ -1 +1 @@ -MD5 (mysql-3.23.55.tar.gz) = 259196ddc00c94051dceb9e86574d17e +MD5 (mysql-4.0.9-gamma.tar.gz) = 75d582f3e71e21cd6ffa7c84a6db26c3 diff --git a/databases/mysql41-server/files/mysql-server.sh b/databases/mysql41-server/files/mysql-server.sh index 6a5acb39a962..5180b9c0c1eb 100644 --- a/databases/mysql41-server/files/mysql-server.sh +++ b/databases/mysql41-server/files/mysql-server.sh @@ -5,9 +5,9 @@ PIDFILE=${DB_DIR}/`/bin/hostname -s`.pid case "$1" in start) - if [ -x %%PREFIX%%/bin/safe_mysqld ]; then + if [ -x %%PREFIX%%/bin/mysqld_safe ]; then /usr/bin/limits -U mysql \ - %%PREFIX%%/bin/safe_mysqld --user=mysql --datadir=${DB_DIR} --pid-file=${PIDFILE} > /dev/null & + %%PREFIX%%/bin/mysqld_safe --user=mysql --datadir=${DB_DIR} --pid-file=${PIDFILE} > /dev/null & echo -n ' mysqld' fi ;; diff --git a/databases/mysql41-server/files/patch-Makefile.in b/databases/mysql41-server/files/patch-Makefile.in index 987cf407da8f..c8bf28bc02bc 100644 --- a/databases/mysql41-server/files/patch-Makefile.in +++ b/databases/mysql41-server/files/patch-Makefile.in @@ -1,19 +1,20 @@ ---- Makefile.in.orig Thu Jan 23 16:13:43 2003 -+++ Makefile.in Wed Jan 29 17:11:29 2003 -@@ -195,11 +195,11 @@ +--- Makefile.in.orig Wed Nov 20 00:06:37 2002 ++++ Makefile.in Wed Nov 20 00:07:31 2002 +@@ -207,12 +207,11 @@ EXTRA_DIST = INSTALL-SOURCE README \ - COPYING COPYING.LIB MIRRORS + COPYING COPYING.LIB --SUBDIRS = . include @docs_dirs@ @readline_dir@ \ -- @thread_dirs@ @sql_client_dirs@ \ -- @sql_server_dirs@ scripts tests man \ -- @bench_dirs@ support-files os2 +-SUBDIRS = include @docs_dirs@ @readline_dir@ \ +- @thread_dirs@ pstack @sql_client_dirs@ \ +- @sql_server_dirs@ @libmysqld_dirs@ scripts man \ +- tests BUILD os2 \ +- @bench_dirs@ support-files @fs_dirs@ @tools_dirs@ - +.if defined(CLIENT_ONLY) -+SUBDIRS = include @readline_dir@ @sql_client_dirs@ tests man ++SUBDIRS = include @sql_client_dirs@ tests man +.else -+SUBDIRS = include @thread_dirs@ @docs_dirs@ @sql_server_dirs@ scripts support-files ++SUBDIRS = include @docs_dirs@ @sql_server_dirs@ scripts support-files +.endif # Relink after clean - CLEANFILES = linked_client_sources linked_server_sources linked_libmysql_sources linked_libmysql_r_sources linked_include_sources + linked_sources = linked_client_sources linked_server_sources \ diff --git a/databases/mysql41-server/files/patch-af b/databases/mysql41-server/files/patch-af deleted file mode 100644 index 8d2d1003f2e4..000000000000 --- a/databases/mysql41-server/files/patch-af +++ /dev/null @@ -1,79 +0,0 @@ ---- scripts/safe_mysqld.sh.orig Thu Oct 10 12:17:29 2002 -+++ scripts/safe_mysqld.sh Sun Nov 10 21:27:46 2002 -@@ -68,30 +68,9 @@ - done - } - --MY_PWD=`pwd` --# Check if we are starting this relative (for the binary release) --if test -d $MY_PWD/data/mysql -a -f ./share/mysql/english/errmsg.sys -a \ -- -x ./bin/mysqld --then -- MY_BASEDIR_VERSION=$MY_PWD # Where bin, share and data are -- ledir=$MY_BASEDIR_VERSION/bin # Where mysqld is -- DATADIR=$MY_BASEDIR_VERSION/data -- if test -z "$defaults" -- then -- defaults="--defaults-extra-file=$MY_BASEDIR_VERSION/data/my.cnf" -- fi --# Check if this is a 'moved install directory' --elif test -f ./var/mysql/db.frm -a -f ./share/mysql/english/errmsg.sys -a \ -- -x ./libexec/mysqld --then -- MY_BASEDIR_VERSION=$MY_PWD # Where libexec, share and var are -- ledir=$MY_BASEDIR_VERSION/libexec # Where mysqld is -- DATADIR=$MY_BASEDIR_VERSION/var --else -- MY_BASEDIR_VERSION=@prefix@ -- DATADIR=@localstatedir@ -- ledir=@libexecdir@ --fi -+MY_BASEDIR_VERSION=@prefix@ -+DATADIR=@localstatedir@ -+ledir=@libexecdir@ - - MYSQL_UNIX_PORT=${MYSQL_UNIX_PORT:-@MYSQL_UNIX_ADDR@} - MYSQL_TCP_PORT=${MYSQL_TCP_PORT:-@MYSQL_TCP_PORT@} -@@ -106,7 +85,6 @@ - fi - - # these rely on $DATADIR by default, so we'll set them later on --pid_file= - err_log= - SET_USER=0 - -@@ -239,34 +217,6 @@ - if test ! -f $pid_file # This is removed if normal shutdown - then - break -- fi -- -- if @IS_LINUX@ -- then -- # Test if one process was hanging. -- # This is only a fix for Linux (running as base 3 mysqld processes) -- # but should work for the rest of the servers. -- # The only thing is ps x => redhat 5 gives warnings when using ps -x. -- # kill -9 is used or the process won't react on the kill. -- numofproces=`ps xa | grep -v "grep" | grep -c $ledir/$MYSQLD` -- echo -e "\nNumber of processes running now: $numofproces" | tee -a $err_log -- I=1 -- while test "$I" -le "$numofproces" -- do -- PROC=`ps xa | grep $ledir/$MYSQLD | grep -v "grep" | sed -n '$p'` -- for T in $PROC -- do -- break -- done -- # echo "TEST $I - $T **" -- if kill -9 $T -- then -- echo "$MYSQLD process hanging, pid $T - killed" | tee -a $err_log -- else -- break -- fi -- I=`expr $I + 1` -- done - fi - - echo "`date +'%y%m%d %H:%M:%S'` mysqld restarted" | tee -a $err_log diff --git a/databases/mysql41-server/files/patch-configure b/databases/mysql41-server/files/patch-configure index 6c6e0ad044fa..5f5155735ee1 100644 --- a/databases/mysql41-server/files/patch-configure +++ b/databases/mysql41-server/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig Thu Dec 5 10:37:31 2002 -+++ configure Mon Dec 16 19:49:41 2002 -@@ -8059,6 +8059,7 @@ +--- configure.orig Mon Dec 16 10:12:16 2002 ++++ configure Fri Dec 20 18:11:14 2002 +@@ -8071,6 +8071,7 @@ # This can be used to rebuild libtool when needed LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" @@ -8,7 +8,7 @@ # Always use our own libtool. LIBTOOL='$(SHELL) $(top_builddir)/libtool' -@@ -8988,7 +8989,7 @@ +@@ -9000,7 +9001,7 @@ ;; esac fi @@ -17,142 +17,3 @@ if test -n "$HOSTNAME"; then echo "$as_me:$LINENO: result: $HOSTNAME" >&5 -@@ -9177,43 +9178,7 @@ - echo "${ECHO_T}no" >&6 - fi - --echo "$as_me:$LINENO: checking \"how to check if pid exists\"" >&5 --echo $ECHO_N "checking \"how to check if pid exists\"... $ECHO_C" >&6 --PS=$ac_cv_path_PS --# Linux style --if $PS p $$ 2> /dev/null | grep $0 > /dev/null --then -- FIND_PROC="$PS p \$\$PID | grep mysqld > /dev/null" --# Solaris --elif $PS -p $$ 2> /dev/null | grep $0 > /dev/null --then -- FIND_PROC="$PS -p \$\$PID | grep mysqld > /dev/null" --# BSD style --elif $PS -uaxww 2> /dev/null | grep $0 > /dev/null --then -- FIND_PROC="$PS -uaxww | grep mysqld | grep \" \$\$PID \" > /dev/null" --# SysV style --elif $PS -ef 2> /dev/null | grep $0 > /dev/null --then -- FIND_PROC="$PS -ef | grep mysqld | grep \" \$\$PID \" > /dev/null" --# Do anybody use this? --elif $PS $$ 2> /dev/null | grep $0 > /dev/null --then -- FIND_PROC="$PS \$\$PID | grep mysqld > /dev/null" --else -- case $SYSTEM_TYPE in -- *darwin*) -- FIND_PROC="$PS -uaxww | grep mysqld | grep \" \$\$PID \" > /dev/null" -- ;; -- *cygwin*) -- FIND_PROC="$PS -e | grep mysqld | grep \" \$\$PID \" > /dev/null" -- ;; -- *) -- { { echo "$as_me:$LINENO: error: Could not find the right ps switches. Which OS is this ?. See the Installation chapter in the Reference Manual." >&5 --echo "$as_me: error: Could not find the right ps switches. Which OS is this ?. See the Installation chapter in the Reference Manual." >&2;} -- { (exit 1); exit 1; }; } -- esac --fi -+FIND_PROC="$PS -uaxww | grep mysqld | grep \" \$\$PID \" > /dev/null" - - echo "$as_me:$LINENO: result: \"$FIND_PROC\"" >&5 - echo "${ECHO_T}\"$FIND_PROC\"" >&6 -@@ -13208,7 +13173,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 $LINENO "configure" - #include "confdefs.h" -@@ -13262,7 +13226,6 @@ - #define HAVE_LIBC_R 1 - _ACEOF - -- LIBS="-lc_r $LIBS" - - fi - -@@ -13706,29 +13669,6 @@ - fi - - --# Build optimized or debug version ? --# First check for gcc and g++ --if test "$ac_cv_c_compiler_gnu" = "yes" --then -- DEBUG_CFLAGS="-g" -- DEBUG_OPTIMIZE_CC="-O" -- OPTIMIZE_CFLAGS="$MAX_C_OPTIMIZE" --else -- DEBUG_CFLAGS="-g" -- DEBUG_OPTIMIZE_CC="" -- OPTIMIZE_CFLAGS="-O" --fi --if test "$ac_cv_prog_cxx_g" = "yes" --then -- DEBUG_CXXFLAGS="-g" -- DEBUG_OPTIMIZE_CXX="-O" -- OPTIMIZE_CXXFLAGS="-O3" --else -- DEBUG_CXXFLAGS="-g" -- DEBUG_OPTIMIZE_CXX="" -- OPTIMIZE_CXXFLAGS="-O" --fi -- - - # Check whether --with-debug or --without-debug was given. - if test "${with_debug+set}" = set; then -@@ -16081,10 +16021,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_cxx_compiler_gnu" = "yes" --then -- CXXFLAGS="$CXXFLAGS -Werror" --fi - mysql_cv_btype_last_arg_accept=none - cat >conftest.$ac_ext <<_ACEOF - #line $LINENO "configure" -@@ -19222,14 +19158,6 @@ - ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - - --# Do not treat warnings as errors if we are linking against 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 <<_ACEOF - #line $LINENO "configure" - #include "confdefs.h" -@@ -19313,10 +19241,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_cxx_compiler_gnu" = "yes" -a "$with_other_libc" = "no" --then -- CXXFLAGS="$CXXFLAGS -Werror" --fi - cat >conftest.$ac_ext <<_ACEOF - #line $LINENO "configure" - #include "confdefs.h" -@@ -19399,10 +19323,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_cxx_compiler_gnu" = "yes" -a "$with_other_libc" = "no" --then -- CXXFLAGS="$CXXFLAGS -Werror" --fi - cat >conftest.$ac_ext <<_ACEOF - #line $LINENO "configure" - #include "confdefs.h" diff --git a/databases/mysql41-server/files/patch-include::Makefile.in b/databases/mysql41-server/files/patch-include::Makefile.in index 3ff10ce708d5..34b404c0a255 100644 --- a/databases/mysql41-server/files/patch-include::Makefile.in +++ b/databases/mysql41-server/files/patch-include::Makefile.in @@ -1,6 +1,6 @@ ---- include/Makefile.in.orig Thu Dec 5 10:37:22 2002 -+++ include/Makefile.in Sat Dec 14 16:26:53 2002 -@@ -324,7 +324,11 @@ +--- include/Makefile.in.orig Tue Nov 19 17:13:35 2002 ++++ include/Makefile.in Tue Nov 19 17:14:10 2002 +@@ -335,7 +335,11 @@ installdirs: $(mkinstalldirs) $(DESTDIR)$(pkgincludedir) diff --git a/databases/mysql41-server/files/patch-sql_mysqld.cc b/databases/mysql41-server/files/patch-sql_mysqld.cc deleted file mode 100644 index 5155bd5f33cd..000000000000 --- a/databases/mysql41-server/files/patch-sql_mysqld.cc +++ /dev/null @@ -1,12 +0,0 @@ ---- sql/mysqld.cc.orig Thu Oct 10 12:17:28 2002 -+++ sql/mysqld.cc Tue Nov 12 23:23:27 2002 -@@ -92,7 +92,8 @@ - int allow_severity = LOG_INFO; - int deny_severity = LOG_WARNING; - --#ifdef __STDC__ -+#include <osreldate.h> -+#if defined(__STDC__) && __FreeBSD_version < 500000 - #define my_fromhost(A) fromhost(A) - #define my_hosts_access(A) hosts_access(A) - #define my_eval_client(A) eval_client(A) diff --git a/databases/mysql41-server/pkg-descr b/databases/mysql41-server/pkg-descr index 8f4acf36e853..cd19c135f9cc 100644 --- a/databases/mysql41-server/pkg-descr +++ b/databases/mysql41-server/pkg-descr @@ -2,3 +2,6 @@ MySQL is a very fast, multi-threaded, multi-user and robust SQL (Structured Query Language) database server. WWW: http://www.mysql.com/ + +- Alex Dupre +sysadmin@alexdupre.com diff --git a/databases/mysql41-server/pkg-plist b/databases/mysql41-server/pkg-plist index 7a482d60bc34..692b3053f8c6 100644 --- a/databases/mysql41-server/pkg-plist +++ b/databases/mysql41-server/pkg-plist @@ -8,14 +8,21 @@ bin/myisamlog bin/myisampack bin/mysql_config bin/mysql_convert_table_format +bin/mysql_explain_log bin/mysql_find_rows +bin/mysql_fix_extensions bin/mysql_fix_privilege_tables +bin/mysql_install bin/mysql_install_db +bin/mysql_secure_installation bin/mysql_setpermission +bin/mysql_tableinfo +bin/mysql_waitpid bin/mysql_zap bin/mysqlaccess bin/mysqlbug bin/mysqld_multi +bin/mysqld_safe bin/mysqldumpslow bin/mysqlhotcopy bin/pack_isam @@ -23,7 +30,6 @@ bin/perror bin/replace bin/resolve_stack_dump bin/resolveip -bin/safe_mysqld etc/rc.d/mysql-server.sh %%PORTDOCS%%@unexec install-info --delete %D/info/mysql.info %D/info/dir %%PORTDOCS%%info/mysql.info @@ -36,15 +42,19 @@ lib/mysql/libmyisammrg.a lib/mysql/libmystrings.a lib/mysql/libmysys.a lib/mysql/libnisam.a +lib/mysql/libvio.a libexec/mysqld %%PORTDOCS%%share/doc/mysql/Flags/argentina.gif +%%PORTDOCS%%share/doc/mysql/Flags/armenia.gif %%PORTDOCS%%share/doc/mysql/Flags/australia.gif %%PORTDOCS%%share/doc/mysql/Flags/austria.gif +%%PORTDOCS%%share/doc/mysql/Flags/belgium.gif %%PORTDOCS%%share/doc/mysql/Flags/brazil.gif %%PORTDOCS%%share/doc/mysql/Flags/bulgaria.gif %%PORTDOCS%%share/doc/mysql/Flags/canada.gif %%PORTDOCS%%share/doc/mysql/Flags/chile.gif %%PORTDOCS%%share/doc/mysql/Flags/china.gif +%%PORTDOCS%%share/doc/mysql/Flags/costa-rica.gif %%PORTDOCS%%share/doc/mysql/Flags/croatia.gif %%PORTDOCS%%share/doc/mysql/Flags/czech-republic.gif %%PORTDOCS%%share/doc/mysql/Flags/denmark.gif @@ -58,25 +68,28 @@ libexec/mysqld %%PORTDOCS%%share/doc/mysql/Flags/iceland.gif %%PORTDOCS%%share/doc/mysql/Flags/indonesia.gif %%PORTDOCS%%share/doc/mysql/Flags/ireland.gif -%%PORTDOCS%%share/doc/mysql/Flags/island.gif %%PORTDOCS%%share/doc/mysql/Flags/israel.gif %%PORTDOCS%%share/doc/mysql/Flags/italy.gif %%PORTDOCS%%share/doc/mysql/Flags/japan.gif -%%PORTDOCS%%share/doc/mysql/Flags/kroatia.gif %%PORTDOCS%%share/doc/mysql/Flags/latvia.gif +%%PORTDOCS%%share/doc/mysql/Flags/mexico.gif %%PORTDOCS%%share/doc/mysql/Flags/netherlands.gif +%%PORTDOCS%%share/doc/mysql/Flags/new-zealand.gif +%%PORTDOCS%%share/doc/mysql/Flags/norway.gif +%%PORTDOCS%%share/doc/mysql/Flags/philippines.gif %%PORTDOCS%%share/doc/mysql/Flags/poland.gif %%PORTDOCS%%share/doc/mysql/Flags/portugal.gif %%PORTDOCS%%share/doc/mysql/Flags/romania.gif %%PORTDOCS%%share/doc/mysql/Flags/russia.gif %%PORTDOCS%%share/doc/mysql/Flags/singapore.gif +%%PORTDOCS%%share/doc/mysql/Flags/slovenia.gif %%PORTDOCS%%share/doc/mysql/Flags/south-africa.gif -%%PORTDOCS%%share/doc/mysql/Flags/south-africa1.gif %%PORTDOCS%%share/doc/mysql/Flags/south-korea.gif %%PORTDOCS%%share/doc/mysql/Flags/spain.gif %%PORTDOCS%%share/doc/mysql/Flags/sweden.gif %%PORTDOCS%%share/doc/mysql/Flags/switzerland.gif %%PORTDOCS%%share/doc/mysql/Flags/taiwan.gif +%%PORTDOCS%%share/doc/mysql/Flags/turkey.gif %%PORTDOCS%%share/doc/mysql/Flags/ukraine.gif %%PORTDOCS%%share/doc/mysql/Flags/usa.gif %%PORTDOCS%%share/doc/mysql/Flags/yugoslavia.gif diff --git a/databases/mysql41-server/pkg-plist.client b/databases/mysql41-server/pkg-plist.client index 13d787a27fb7..e7ad0a65b8a1 100644 --- a/databases/mysql41-server/pkg-plist.client +++ b/databases/mysql41-server/pkg-plist.client @@ -4,6 +4,8 @@ bin/mysqlbinlog bin/mysqlcheck bin/mysqldump bin/mysqlimport +bin/mysqlmanager-pwgen +bin/mysqlmanagerc bin/mysqlshow bin/mysqltest etc/rc.d/000.mysql-client.sh @@ -11,24 +13,27 @@ include/mysql/dbug.h include/mysql/errmsg.h include/mysql/m_ctype.h include/mysql/m_string.h +include/mysql/my_alloc.h include/mysql/my_config.h +include/mysql/my_getopt.h include/mysql/my_global.h include/mysql/my_list.h include/mysql/my_net.h include/mysql/my_no_pthread.h include/mysql/my_pthread.h +include/mysql/my_semaphore.h include/mysql/my_sys.h include/mysql/mysql.h include/mysql/mysql_com.h +include/mysql/mysql_embed.h include/mysql/mysql_version.h include/mysql/mysqld_error.h include/mysql/raid.h include/mysql/sslopt-case.h include/mysql/sslopt-longopts.h -include/mysql/sslopt-usage.h include/mysql/sslopt-vars.h lib/mysql/libmysqlclient.a lib/mysql/libmysqlclient.so -lib/mysql/libmysqlclient.so.10 +lib/mysql/libmysqlclient.so.12 @dirrm include/mysql @dirrm lib/mysql diff --git a/databases/mysql50-client/Makefile b/databases/mysql50-client/Makefile index b5f3065ac95f..e9f4c3c3277e 100644 --- a/databases/mysql50-client/Makefile +++ b/databases/mysql50-client/Makefile @@ -1,14 +1,15 @@ -# ports collection makefile for: MySQL-client -# Date created: Sun Sep 24 21:21:20 CEST 2000 -# Whom: Dirk Froemberg <dirk@FreeBSD.org> +# New ports collection makefile for: MySQL-client +# Date created: Sun Mar 3 12:20:35 CET 2002 +# Whom: Alex Dupre <sysadmin@alexdupre.com> # # $FreeBSD$ # -PORTNAME= mysql-client +PORTNAME= mysql PORTREVISION= 0 +PKGNAMESUFFIX= -client -MASTERDIR= ${.CURDIR}/../mysql323-server +MASTERDIR= ${.CURDIR}/../mysql40-server COMMENT= ${PKGDIR}/pkg-comment.client PKGINSTALL= mustnotexist PLIST= ${PKGDIR}/pkg-plist.client diff --git a/databases/mysql50-server/Makefile b/databases/mysql50-server/Makefile index bb9329b3c669..b499fd55b10d 100644 --- a/databases/mysql50-server/Makefile +++ b/databases/mysql50-server/Makefile @@ -1,42 +1,51 @@ -# ports collection makefile for: MySQL-server -# Date created: Sun Sep 24 21:20:46 CEST 2000 -# Whom: Dirk Froemberg <dirk@FreeBSD.org> +# New ports collection makefile for: MySQL-server +# Date created: Sun Mar 3 12:20:35 CET 2002 +# Whom: Alex Dupre <sysadmin@alexdupre.com> # # $FreeBSD$ # -PORTNAME?= ${MASTERPORTNAME} -PORTVERSION= 3.23.55 +PORTNAME?= mysql +PORTVERSION= 4.0.9 PORTREVISION?= 0 CATEGORIES= databases -MASTER_SITES= http://www.kernelnotes.de/MySQL/Downloads/MySQL-3.23/ \ - http://mysql.he.net/Downloads/MySQL-3.23/ \ - ftp://ftp.sunet.se/pub/unix/databases/relational/mysql/Downloads/MySQL-3.23/ \ - ftp://mysql.secsup.org/pub/software/mysql/Downloads/MySQL-3.23/ \ - http://mysql.orst.edu/Downloads/MySQL-3.23/ \ - http://web.tryc.on.ca/mysql/Downloads/MySQL-3.23/ \ - ftp://ftp.gwdg.de/pub/misc/mysql/Downloads/MySQL-3.23/ -DISTFILES= mysql-${PORTVERSION}${EXTRACT_SUFX} - -MAINTAINER= dirk@FreeBSD.org - -WRKSRC= ${WRKDIR}/mysql-${PORTVERSION} -SLAVEDIRS= databases/mysql323-client -MASTERPORTNAME= mysql-server +MASTER_SITES= ftp://mysql.secsup.org/pub/software/mysql/Downloads/MySQL-4.0/ \ + http://mysql.tzone.it/Downloads/MySQL-4.0/ \ + ftp://planetmirror.com/pub/mysql/Downloads/MySQL-4.0/ \ + http://www.softagency.co.jp/MySQL/Downloads/MySQL-4.0/ \ + ftp://sunsite.dk/mirrors/mysql/Downloads/MySQL-4.0/ \ + http://mysql.mediatraffic.fi/Downloads/MySQL-4.0/ \ + ftp://filepile.tiscali.de/mirror/mysql/Downloads/MySQL-4.0/ \ + http://mirrors.tilian.co.uk/mysql.com/Downloads/MySQL-4.0/ \ + ftp://ftp.rtfm.no/pub/mysql/Downloads/MySQL-4.0/ \ + http://www.mysql.cz/Downloads/MySQL-4.0/ \ + ftp://ftp.u-paris10.fr/mysql.com/Downloads/MySQL-4.0/ \ + http://mysql.oms-net.nl/Downloads/MySQL-4.0/ \ + ftp://ftp.free.fr/pub/MySQL/Downloads/MySQL-4.0/ +PKGNAMESUFFIX?= -server +DISTNAME= ${PORTNAME}-${PORTVERSION}-gamma + +MAINTAINER= sysadmin@alexdupre.com + +SLAVEDIRS= databases/mysql40-client DB_DIR?= /var/db/mysql -USE_PERL5= yes +USE_PERL5_RUN= yes USE_LIBTOOL= yes + +GNU_CONFIGURE= yes CONFIGURE_ARGS= --localstatedir=${DB_DIR} \ - --without-perl \ --without-debug \ --without-readline \ --without-bench \ - --with-mit-threads=no \ + --without-extra-tools \ --with-libwrap \ + --with-raid \ + --with-mysqlfs \ + --with-vio \ --with-low-memory \ --with-comment='FreeBSD port: ${PKGNAME}' \ - --program-prefix='' \ - --with-innodb + --with-server-suffix='' \ + --program-prefix='' .if ${MACHINE_ARCH} == "i386" CONFIGURE_ARGS+=--enable-assembler --with-berkeley-db @@ -47,71 +56,68 @@ CONFIGURE_ARGS+=--with-charset=${WITH_CHARSET} .if defined(WITH_XCHARSET) && ${WITH_XCHARSET} != "" CONFIGURE_ARGS+=--with-extra-charsets=${WITH_XCHARSET} .endif +.if defined(WITH_OPENSSL) +USE_OPENSSL= yes +CONFIGURE_ARGS+=--with-openssl +.endif .if defined(BUILD_STATIC) -CONFIGURE_ARGS+=--with-mysqld-ldflags=--static +CONFIGURE_ARGS+=--with-mysqld-ldflags=-all-static .endif .if defined(BUILD_OPTIMIZED) -CFLAGS+= -mcpu=pentiumpro -O3 -.endif -.if defined(WITH_LINUXTHREADS) -CONFIGURE_ARGS+=--with-named-thread-libs='-DHAVE_GLIBC2_STYLE_GETHOSTBYNAME_R -D_THREAD_SAFE -I${LOCALBASE}/include/pthread/linuxthreads -L${LOCALBASE}/lib -llthread -llgcc_r' -CFLAGS+= -D__USE_UNIX98 -D_REENTRANT -D_THREAD_SAFE -I${LOCALBASE}/include/pthread/linuxthreads -LIB_DEPENDS+= lthread.2:${PORTSDIR}/devel/linuxthreads +CFLAGS+= -mcpu=i686 .endif .if defined(THREAD_SAFE_CLIENT) CONFIGURE_ARGS+=--enable-thread-safe-client .endif -CONFIGURE_ENV+= PERL=${PERL} \ - PERL5=${PERL} \ - INSTALL_SCRIPT="${INSTALL_SCRIPT}" \ - CFLAGS="${CFLAGS}" \ - CONFIGURE_ARGS="${CONFIGURE_ARGS}" -.include <bsd.port.pre.mk> -# without including these flags mysqld may crash under heavy load -# and multiple connections at the same time +CFLAGS+= -O3 -fno-omit-frame-pointer CXXFLAGS= ${CFLAGS} -felide-constructors -fno-rtti + +.include <bsd.port.pre.mk> .if ${OSVERSION} >= 400002 CXXFLAGS+= -fno-exceptions .endif .if ${OSVERSION} < 500000 -CONFIGURE_ENV+= CXX="${CC}" +CXX= ${CC} .endif # MySQL-Server part .if !defined(CLIENT_ONLY) -RUN_DEPENDS= mysql:${PORTSDIR}/databases/mysql323-client \ +RUN_DEPENDS= mysql:${PORTSDIR}/databases/mysql40-client \ ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Mysql.pm:${PORTSDIR}/databases/p5-Mysql -PLIST_SUB= MYSQL_VERSION=${PORTVERSION} +PLIST_SUB= MYSQL_VERSION=${PORTVERSION}-gamma -ONLY_FOR_ARCHS= i386 alpha sparc64 +ONLY_FOR_ARCHS= i386 alpha + +DOCS= manual.html manual.ps manual_toc.html manual.txt manual.texi \ + include.texi pre-fetch: @${ECHO} "" @${ECHO} "You may use the following build options:" @${ECHO} "" - @${ECHO} " WITH_CHARSET=charset define the primary built-in charset (latin1);" - @${ECHO} " WITH_XCHARSET=list define other built-in charsets (may be 'all');" + @${ECHO} " WITH_CHARSET=charset Define the primary built-in charset (latin1)." + @${ECHO} " WITH_XCHARSET=list Define other built-in charsets (may be 'all')." + @${ECHO} " WITH_OPENSSL=yes Enable secure connections." @${ECHO} " DB_DIR=directory Set alternate directory for database files" @${ECHO} " (default is /var/db/mysql)." - @${ECHO} " WITH_LINUXTHREADS=yes Use the linuxthreads pthread library." - @${ECHO} " This is _NOT_ recommended for production" - @${ECHO} " servers. Expect problems when enabled." - @${ECHO} " SKIP_INSTALL_DB=yes Skip mysql_install_db" - @${ECHO} " (i. e. leave ${DB_DIR} alone)." - @${ECHO} " This is useful for upgrades." - @${ECHO} " Be sure to know what you are doing!" - @${ECHO} " SKIP_DNS_CHECK=yes don't run resolveip to do an additional" + @${ECHO} " SKIP_INSTALL_DB=yes Skip database initialization" + @${ECHO} " (useful for upgrades)." + @${ECHO} " SKIP_DNS_CHECK=yes Don't run resolveip to do an additional" @${ECHO} " DNS check before inserting local hostname to" - @${ECHO} " mysql database." - @${ECHO} " Use if your machine has no offical DNS entry." + @${ECHO} " mysql database" + @${ECHO} " (use if your machine has no official DNS entry)." @${ECHO} " BUILD_STATIC=yes Build a static version of mysqld." - @${ECHO} " BUILD_OPTIMIZED=yes Add -mcpu=pentiumpro -O3 to CFLAGS." - @${ECHO} " This setting may produce broken code and thus" - @${ECHO} " is not recommended for production servers." + @${ECHO} " BUILD_OPTIMIZED=yes Add -mcpu=i686 to CFLAGS." @${ECHO} "" +.if defined(WITH_OPENSSL) && defined(BUILD_STATIC) +pre-configure: + @${ECHO} "You can't use the BUILD_STATIC option when using OpenSSL." + @${FALSE} +.endif + .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}." @@ -145,20 +151,18 @@ post-install: @${CHMOD} 750 ${PREFIX}/etc/rc.d/mysql-server.sh .if !defined(NOPORTDOCS) - ${MKDIR} ${PREFIX}/share/doc/mysql/Flags -.for doc in manual.html manual.ps manual_toc.html manual.txt manual.texi include.texi - ${INSTALL_DATA} ${WRKSRC}/Docs/${doc} ${PREFIX}/share/doc/mysql + ${MKDIR} ${DOCSDIR}/Flags +.for doc in ${DOCS} + ${INSTALL_DATA} ${WRKSRC}/Docs/${doc} ${DOCSDIR} .endfor - ${INSTALL_DATA} ${WRKSRC}/Docs/Flags/*.gif ${PREFIX}/share/doc/mysql/Flags - ${INSTALL_DATA} ${WRKSRC}/Docs/mysql.info ${PREFIX}/info - @install-info ${PREFIX}/info/mysql.info ${PREFIX}/info/dir + ${INSTALL_DATA} ${WRKSRC}/Docs/Flags/*.gif ${DOCSDIR}/Flags .endif # MySQL-Client part .else MAN1= isamchk.1 isamlog.1 mysql.1 mysql_zap.1 mysqlaccess.1 \ - mysqladmin.1 mysqld.1 mysqld_multi.1 mysqldump.1 mysqlshow.1 \ - perror.1 replace.1 safe_mysqld.1 + mysqladmin.1 mysqld.1 mysqld_multi.1 mysqld_safe.1 mysqldump.1 \ + mysqlshow.1 perror.1 replace.1 INSTALLS_SHLIB= yes LDCONFIG_DIRS= %%PREFIX%%/lib/mysql @@ -172,9 +176,4 @@ post-install: .endif -# This is for the maintainer only... -make-plist: - /usr/bin/find foo -type f -or -type l | /usr/bin/cut -d / -f 2- | /usr/bin/sort > ${.CURDIR}/pkg-plist.new - /usr/bin/perl -i -ne 'if (m#share/doc/#) { print "%%PORTDOCS%%", $$_; } else { print $$_; }' ${.CURDIR}/pkg-plist.new - .include <bsd.port.post.mk> diff --git a/databases/mysql50-server/distinfo b/databases/mysql50-server/distinfo index b56d22caad75..4c809e2ce104 100644 --- a/databases/mysql50-server/distinfo +++ b/databases/mysql50-server/distinfo @@ -1 +1 @@ -MD5 (mysql-3.23.55.tar.gz) = 259196ddc00c94051dceb9e86574d17e +MD5 (mysql-4.0.9-gamma.tar.gz) = 75d582f3e71e21cd6ffa7c84a6db26c3 diff --git a/databases/mysql50-server/files/mysql-server.sh b/databases/mysql50-server/files/mysql-server.sh index 6a5acb39a962..5180b9c0c1eb 100644 --- a/databases/mysql50-server/files/mysql-server.sh +++ b/databases/mysql50-server/files/mysql-server.sh @@ -5,9 +5,9 @@ PIDFILE=${DB_DIR}/`/bin/hostname -s`.pid case "$1" in start) - if [ -x %%PREFIX%%/bin/safe_mysqld ]; then + if [ -x %%PREFIX%%/bin/mysqld_safe ]; then /usr/bin/limits -U mysql \ - %%PREFIX%%/bin/safe_mysqld --user=mysql --datadir=${DB_DIR} --pid-file=${PIDFILE} > /dev/null & + %%PREFIX%%/bin/mysqld_safe --user=mysql --datadir=${DB_DIR} --pid-file=${PIDFILE} > /dev/null & echo -n ' mysqld' fi ;; diff --git a/databases/mysql50-server/files/patch-Makefile.in b/databases/mysql50-server/files/patch-Makefile.in index 987cf407da8f..c8bf28bc02bc 100644 --- a/databases/mysql50-server/files/patch-Makefile.in +++ b/databases/mysql50-server/files/patch-Makefile.in @@ -1,19 +1,20 @@ ---- Makefile.in.orig Thu Jan 23 16:13:43 2003 -+++ Makefile.in Wed Jan 29 17:11:29 2003 -@@ -195,11 +195,11 @@ +--- Makefile.in.orig Wed Nov 20 00:06:37 2002 ++++ Makefile.in Wed Nov 20 00:07:31 2002 +@@ -207,12 +207,11 @@ EXTRA_DIST = INSTALL-SOURCE README \ - COPYING COPYING.LIB MIRRORS + COPYING COPYING.LIB --SUBDIRS = . include @docs_dirs@ @readline_dir@ \ -- @thread_dirs@ @sql_client_dirs@ \ -- @sql_server_dirs@ scripts tests man \ -- @bench_dirs@ support-files os2 +-SUBDIRS = include @docs_dirs@ @readline_dir@ \ +- @thread_dirs@ pstack @sql_client_dirs@ \ +- @sql_server_dirs@ @libmysqld_dirs@ scripts man \ +- tests BUILD os2 \ +- @bench_dirs@ support-files @fs_dirs@ @tools_dirs@ - +.if defined(CLIENT_ONLY) -+SUBDIRS = include @readline_dir@ @sql_client_dirs@ tests man ++SUBDIRS = include @sql_client_dirs@ tests man +.else -+SUBDIRS = include @thread_dirs@ @docs_dirs@ @sql_server_dirs@ scripts support-files ++SUBDIRS = include @docs_dirs@ @sql_server_dirs@ scripts support-files +.endif # Relink after clean - CLEANFILES = linked_client_sources linked_server_sources linked_libmysql_sources linked_libmysql_r_sources linked_include_sources + linked_sources = linked_client_sources linked_server_sources \ diff --git a/databases/mysql50-server/files/patch-af b/databases/mysql50-server/files/patch-af deleted file mode 100644 index 8d2d1003f2e4..000000000000 --- a/databases/mysql50-server/files/patch-af +++ /dev/null @@ -1,79 +0,0 @@ ---- scripts/safe_mysqld.sh.orig Thu Oct 10 12:17:29 2002 -+++ scripts/safe_mysqld.sh Sun Nov 10 21:27:46 2002 -@@ -68,30 +68,9 @@ - done - } - --MY_PWD=`pwd` --# Check if we are starting this relative (for the binary release) --if test -d $MY_PWD/data/mysql -a -f ./share/mysql/english/errmsg.sys -a \ -- -x ./bin/mysqld --then -- MY_BASEDIR_VERSION=$MY_PWD # Where bin, share and data are -- ledir=$MY_BASEDIR_VERSION/bin # Where mysqld is -- DATADIR=$MY_BASEDIR_VERSION/data -- if test -z "$defaults" -- then -- defaults="--defaults-extra-file=$MY_BASEDIR_VERSION/data/my.cnf" -- fi --# Check if this is a 'moved install directory' --elif test -f ./var/mysql/db.frm -a -f ./share/mysql/english/errmsg.sys -a \ -- -x ./libexec/mysqld --then -- MY_BASEDIR_VERSION=$MY_PWD # Where libexec, share and var are -- ledir=$MY_BASEDIR_VERSION/libexec # Where mysqld is -- DATADIR=$MY_BASEDIR_VERSION/var --else -- MY_BASEDIR_VERSION=@prefix@ -- DATADIR=@localstatedir@ -- ledir=@libexecdir@ --fi -+MY_BASEDIR_VERSION=@prefix@ -+DATADIR=@localstatedir@ -+ledir=@libexecdir@ - - MYSQL_UNIX_PORT=${MYSQL_UNIX_PORT:-@MYSQL_UNIX_ADDR@} - MYSQL_TCP_PORT=${MYSQL_TCP_PORT:-@MYSQL_TCP_PORT@} -@@ -106,7 +85,6 @@ - fi - - # these rely on $DATADIR by default, so we'll set them later on --pid_file= - err_log= - SET_USER=0 - -@@ -239,34 +217,6 @@ - if test ! -f $pid_file # This is removed if normal shutdown - then - break -- fi -- -- if @IS_LINUX@ -- then -- # Test if one process was hanging. -- # This is only a fix for Linux (running as base 3 mysqld processes) -- # but should work for the rest of the servers. -- # The only thing is ps x => redhat 5 gives warnings when using ps -x. -- # kill -9 is used or the process won't react on the kill. -- numofproces=`ps xa | grep -v "grep" | grep -c $ledir/$MYSQLD` -- echo -e "\nNumber of processes running now: $numofproces" | tee -a $err_log -- I=1 -- while test "$I" -le "$numofproces" -- do -- PROC=`ps xa | grep $ledir/$MYSQLD | grep -v "grep" | sed -n '$p'` -- for T in $PROC -- do -- break -- done -- # echo "TEST $I - $T **" -- if kill -9 $T -- then -- echo "$MYSQLD process hanging, pid $T - killed" | tee -a $err_log -- else -- break -- fi -- I=`expr $I + 1` -- done - fi - - echo "`date +'%y%m%d %H:%M:%S'` mysqld restarted" | tee -a $err_log diff --git a/databases/mysql50-server/files/patch-configure b/databases/mysql50-server/files/patch-configure index 6c6e0ad044fa..5f5155735ee1 100644 --- a/databases/mysql50-server/files/patch-configure +++ b/databases/mysql50-server/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig Thu Dec 5 10:37:31 2002 -+++ configure Mon Dec 16 19:49:41 2002 -@@ -8059,6 +8059,7 @@ +--- configure.orig Mon Dec 16 10:12:16 2002 ++++ configure Fri Dec 20 18:11:14 2002 +@@ -8071,6 +8071,7 @@ # This can be used to rebuild libtool when needed LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" @@ -8,7 +8,7 @@ # Always use our own libtool. LIBTOOL='$(SHELL) $(top_builddir)/libtool' -@@ -8988,7 +8989,7 @@ +@@ -9000,7 +9001,7 @@ ;; esac fi @@ -17,142 +17,3 @@ if test -n "$HOSTNAME"; then echo "$as_me:$LINENO: result: $HOSTNAME" >&5 -@@ -9177,43 +9178,7 @@ - echo "${ECHO_T}no" >&6 - fi - --echo "$as_me:$LINENO: checking \"how to check if pid exists\"" >&5 --echo $ECHO_N "checking \"how to check if pid exists\"... $ECHO_C" >&6 --PS=$ac_cv_path_PS --# Linux style --if $PS p $$ 2> /dev/null | grep $0 > /dev/null --then -- FIND_PROC="$PS p \$\$PID | grep mysqld > /dev/null" --# Solaris --elif $PS -p $$ 2> /dev/null | grep $0 > /dev/null --then -- FIND_PROC="$PS -p \$\$PID | grep mysqld > /dev/null" --# BSD style --elif $PS -uaxww 2> /dev/null | grep $0 > /dev/null --then -- FIND_PROC="$PS -uaxww | grep mysqld | grep \" \$\$PID \" > /dev/null" --# SysV style --elif $PS -ef 2> /dev/null | grep $0 > /dev/null --then -- FIND_PROC="$PS -ef | grep mysqld | grep \" \$\$PID \" > /dev/null" --# Do anybody use this? --elif $PS $$ 2> /dev/null | grep $0 > /dev/null --then -- FIND_PROC="$PS \$\$PID | grep mysqld > /dev/null" --else -- case $SYSTEM_TYPE in -- *darwin*) -- FIND_PROC="$PS -uaxww | grep mysqld | grep \" \$\$PID \" > /dev/null" -- ;; -- *cygwin*) -- FIND_PROC="$PS -e | grep mysqld | grep \" \$\$PID \" > /dev/null" -- ;; -- *) -- { { echo "$as_me:$LINENO: error: Could not find the right ps switches. Which OS is this ?. See the Installation chapter in the Reference Manual." >&5 --echo "$as_me: error: Could not find the right ps switches. Which OS is this ?. See the Installation chapter in the Reference Manual." >&2;} -- { (exit 1); exit 1; }; } -- esac --fi -+FIND_PROC="$PS -uaxww | grep mysqld | grep \" \$\$PID \" > /dev/null" - - echo "$as_me:$LINENO: result: \"$FIND_PROC\"" >&5 - echo "${ECHO_T}\"$FIND_PROC\"" >&6 -@@ -13208,7 +13173,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 $LINENO "configure" - #include "confdefs.h" -@@ -13262,7 +13226,6 @@ - #define HAVE_LIBC_R 1 - _ACEOF - -- LIBS="-lc_r $LIBS" - - fi - -@@ -13706,29 +13669,6 @@ - fi - - --# Build optimized or debug version ? --# First check for gcc and g++ --if test "$ac_cv_c_compiler_gnu" = "yes" --then -- DEBUG_CFLAGS="-g" -- DEBUG_OPTIMIZE_CC="-O" -- OPTIMIZE_CFLAGS="$MAX_C_OPTIMIZE" --else -- DEBUG_CFLAGS="-g" -- DEBUG_OPTIMIZE_CC="" -- OPTIMIZE_CFLAGS="-O" --fi --if test "$ac_cv_prog_cxx_g" = "yes" --then -- DEBUG_CXXFLAGS="-g" -- DEBUG_OPTIMIZE_CXX="-O" -- OPTIMIZE_CXXFLAGS="-O3" --else -- DEBUG_CXXFLAGS="-g" -- DEBUG_OPTIMIZE_CXX="" -- OPTIMIZE_CXXFLAGS="-O" --fi -- - - # Check whether --with-debug or --without-debug was given. - if test "${with_debug+set}" = set; then -@@ -16081,10 +16021,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_cxx_compiler_gnu" = "yes" --then -- CXXFLAGS="$CXXFLAGS -Werror" --fi - mysql_cv_btype_last_arg_accept=none - cat >conftest.$ac_ext <<_ACEOF - #line $LINENO "configure" -@@ -19222,14 +19158,6 @@ - ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - - --# Do not treat warnings as errors if we are linking against 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 <<_ACEOF - #line $LINENO "configure" - #include "confdefs.h" -@@ -19313,10 +19241,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_cxx_compiler_gnu" = "yes" -a "$with_other_libc" = "no" --then -- CXXFLAGS="$CXXFLAGS -Werror" --fi - cat >conftest.$ac_ext <<_ACEOF - #line $LINENO "configure" - #include "confdefs.h" -@@ -19399,10 +19323,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_cxx_compiler_gnu" = "yes" -a "$with_other_libc" = "no" --then -- CXXFLAGS="$CXXFLAGS -Werror" --fi - cat >conftest.$ac_ext <<_ACEOF - #line $LINENO "configure" - #include "confdefs.h" diff --git a/databases/mysql50-server/files/patch-include::Makefile.in b/databases/mysql50-server/files/patch-include::Makefile.in index 3ff10ce708d5..34b404c0a255 100644 --- a/databases/mysql50-server/files/patch-include::Makefile.in +++ b/databases/mysql50-server/files/patch-include::Makefile.in @@ -1,6 +1,6 @@ ---- include/Makefile.in.orig Thu Dec 5 10:37:22 2002 -+++ include/Makefile.in Sat Dec 14 16:26:53 2002 -@@ -324,7 +324,11 @@ +--- include/Makefile.in.orig Tue Nov 19 17:13:35 2002 ++++ include/Makefile.in Tue Nov 19 17:14:10 2002 +@@ -335,7 +335,11 @@ installdirs: $(mkinstalldirs) $(DESTDIR)$(pkgincludedir) diff --git a/databases/mysql50-server/files/patch-sql_mysqld.cc b/databases/mysql50-server/files/patch-sql_mysqld.cc deleted file mode 100644 index 5155bd5f33cd..000000000000 --- a/databases/mysql50-server/files/patch-sql_mysqld.cc +++ /dev/null @@ -1,12 +0,0 @@ ---- sql/mysqld.cc.orig Thu Oct 10 12:17:28 2002 -+++ sql/mysqld.cc Tue Nov 12 23:23:27 2002 -@@ -92,7 +92,8 @@ - int allow_severity = LOG_INFO; - int deny_severity = LOG_WARNING; - --#ifdef __STDC__ -+#include <osreldate.h> -+#if defined(__STDC__) && __FreeBSD_version < 500000 - #define my_fromhost(A) fromhost(A) - #define my_hosts_access(A) hosts_access(A) - #define my_eval_client(A) eval_client(A) diff --git a/databases/mysql50-server/pkg-descr b/databases/mysql50-server/pkg-descr index 8f4acf36e853..cd19c135f9cc 100644 --- a/databases/mysql50-server/pkg-descr +++ b/databases/mysql50-server/pkg-descr @@ -2,3 +2,6 @@ MySQL is a very fast, multi-threaded, multi-user and robust SQL (Structured Query Language) database server. WWW: http://www.mysql.com/ + +- Alex Dupre +sysadmin@alexdupre.com diff --git a/databases/mysql50-server/pkg-plist b/databases/mysql50-server/pkg-plist index 7a482d60bc34..692b3053f8c6 100644 --- a/databases/mysql50-server/pkg-plist +++ b/databases/mysql50-server/pkg-plist @@ -8,14 +8,21 @@ bin/myisamlog bin/myisampack bin/mysql_config bin/mysql_convert_table_format +bin/mysql_explain_log bin/mysql_find_rows +bin/mysql_fix_extensions bin/mysql_fix_privilege_tables +bin/mysql_install bin/mysql_install_db +bin/mysql_secure_installation bin/mysql_setpermission +bin/mysql_tableinfo +bin/mysql_waitpid bin/mysql_zap bin/mysqlaccess bin/mysqlbug bin/mysqld_multi +bin/mysqld_safe bin/mysqldumpslow bin/mysqlhotcopy bin/pack_isam @@ -23,7 +30,6 @@ bin/perror bin/replace bin/resolve_stack_dump bin/resolveip -bin/safe_mysqld etc/rc.d/mysql-server.sh %%PORTDOCS%%@unexec install-info --delete %D/info/mysql.info %D/info/dir %%PORTDOCS%%info/mysql.info @@ -36,15 +42,19 @@ lib/mysql/libmyisammrg.a lib/mysql/libmystrings.a lib/mysql/libmysys.a lib/mysql/libnisam.a +lib/mysql/libvio.a libexec/mysqld %%PORTDOCS%%share/doc/mysql/Flags/argentina.gif +%%PORTDOCS%%share/doc/mysql/Flags/armenia.gif %%PORTDOCS%%share/doc/mysql/Flags/australia.gif %%PORTDOCS%%share/doc/mysql/Flags/austria.gif +%%PORTDOCS%%share/doc/mysql/Flags/belgium.gif %%PORTDOCS%%share/doc/mysql/Flags/brazil.gif %%PORTDOCS%%share/doc/mysql/Flags/bulgaria.gif %%PORTDOCS%%share/doc/mysql/Flags/canada.gif %%PORTDOCS%%share/doc/mysql/Flags/chile.gif %%PORTDOCS%%share/doc/mysql/Flags/china.gif +%%PORTDOCS%%share/doc/mysql/Flags/costa-rica.gif %%PORTDOCS%%share/doc/mysql/Flags/croatia.gif %%PORTDOCS%%share/doc/mysql/Flags/czech-republic.gif %%PORTDOCS%%share/doc/mysql/Flags/denmark.gif @@ -58,25 +68,28 @@ libexec/mysqld %%PORTDOCS%%share/doc/mysql/Flags/iceland.gif %%PORTDOCS%%share/doc/mysql/Flags/indonesia.gif %%PORTDOCS%%share/doc/mysql/Flags/ireland.gif -%%PORTDOCS%%share/doc/mysql/Flags/island.gif %%PORTDOCS%%share/doc/mysql/Flags/israel.gif %%PORTDOCS%%share/doc/mysql/Flags/italy.gif %%PORTDOCS%%share/doc/mysql/Flags/japan.gif -%%PORTDOCS%%share/doc/mysql/Flags/kroatia.gif %%PORTDOCS%%share/doc/mysql/Flags/latvia.gif +%%PORTDOCS%%share/doc/mysql/Flags/mexico.gif %%PORTDOCS%%share/doc/mysql/Flags/netherlands.gif +%%PORTDOCS%%share/doc/mysql/Flags/new-zealand.gif +%%PORTDOCS%%share/doc/mysql/Flags/norway.gif +%%PORTDOCS%%share/doc/mysql/Flags/philippines.gif %%PORTDOCS%%share/doc/mysql/Flags/poland.gif %%PORTDOCS%%share/doc/mysql/Flags/portugal.gif %%PORTDOCS%%share/doc/mysql/Flags/romania.gif %%PORTDOCS%%share/doc/mysql/Flags/russia.gif %%PORTDOCS%%share/doc/mysql/Flags/singapore.gif +%%PORTDOCS%%share/doc/mysql/Flags/slovenia.gif %%PORTDOCS%%share/doc/mysql/Flags/south-africa.gif -%%PORTDOCS%%share/doc/mysql/Flags/south-africa1.gif %%PORTDOCS%%share/doc/mysql/Flags/south-korea.gif %%PORTDOCS%%share/doc/mysql/Flags/spain.gif %%PORTDOCS%%share/doc/mysql/Flags/sweden.gif %%PORTDOCS%%share/doc/mysql/Flags/switzerland.gif %%PORTDOCS%%share/doc/mysql/Flags/taiwan.gif +%%PORTDOCS%%share/doc/mysql/Flags/turkey.gif %%PORTDOCS%%share/doc/mysql/Flags/ukraine.gif %%PORTDOCS%%share/doc/mysql/Flags/usa.gif %%PORTDOCS%%share/doc/mysql/Flags/yugoslavia.gif diff --git a/databases/mysql50-server/pkg-plist.client b/databases/mysql50-server/pkg-plist.client index 13d787a27fb7..e7ad0a65b8a1 100644 --- a/databases/mysql50-server/pkg-plist.client +++ b/databases/mysql50-server/pkg-plist.client @@ -4,6 +4,8 @@ bin/mysqlbinlog bin/mysqlcheck bin/mysqldump bin/mysqlimport +bin/mysqlmanager-pwgen +bin/mysqlmanagerc bin/mysqlshow bin/mysqltest etc/rc.d/000.mysql-client.sh @@ -11,24 +13,27 @@ include/mysql/dbug.h include/mysql/errmsg.h include/mysql/m_ctype.h include/mysql/m_string.h +include/mysql/my_alloc.h include/mysql/my_config.h +include/mysql/my_getopt.h include/mysql/my_global.h include/mysql/my_list.h include/mysql/my_net.h include/mysql/my_no_pthread.h include/mysql/my_pthread.h +include/mysql/my_semaphore.h include/mysql/my_sys.h include/mysql/mysql.h include/mysql/mysql_com.h +include/mysql/mysql_embed.h include/mysql/mysql_version.h include/mysql/mysqld_error.h include/mysql/raid.h include/mysql/sslopt-case.h include/mysql/sslopt-longopts.h -include/mysql/sslopt-usage.h include/mysql/sslopt-vars.h lib/mysql/libmysqlclient.a lib/mysql/libmysqlclient.so -lib/mysql/libmysqlclient.so.10 +lib/mysql/libmysqlclient.so.12 @dirrm include/mysql @dirrm lib/mysql diff --git a/databases/mysql51-client/Makefile b/databases/mysql51-client/Makefile index b5f3065ac95f..e9f4c3c3277e 100644 --- a/databases/mysql51-client/Makefile +++ b/databases/mysql51-client/Makefile @@ -1,14 +1,15 @@ -# ports collection makefile for: MySQL-client -# Date created: Sun Sep 24 21:21:20 CEST 2000 -# Whom: Dirk Froemberg <dirk@FreeBSD.org> +# New ports collection makefile for: MySQL-client +# Date created: Sun Mar 3 12:20:35 CET 2002 +# Whom: Alex Dupre <sysadmin@alexdupre.com> # # $FreeBSD$ # -PORTNAME= mysql-client +PORTNAME= mysql PORTREVISION= 0 +PKGNAMESUFFIX= -client -MASTERDIR= ${.CURDIR}/../mysql323-server +MASTERDIR= ${.CURDIR}/../mysql40-server COMMENT= ${PKGDIR}/pkg-comment.client PKGINSTALL= mustnotexist PLIST= ${PKGDIR}/pkg-plist.client diff --git a/databases/mysql51-server/Makefile b/databases/mysql51-server/Makefile index bb9329b3c669..b499fd55b10d 100644 --- a/databases/mysql51-server/Makefile +++ b/databases/mysql51-server/Makefile @@ -1,42 +1,51 @@ -# ports collection makefile for: MySQL-server -# Date created: Sun Sep 24 21:20:46 CEST 2000 -# Whom: Dirk Froemberg <dirk@FreeBSD.org> +# New ports collection makefile for: MySQL-server +# Date created: Sun Mar 3 12:20:35 CET 2002 +# Whom: Alex Dupre <sysadmin@alexdupre.com> # # $FreeBSD$ # -PORTNAME?= ${MASTERPORTNAME} -PORTVERSION= 3.23.55 +PORTNAME?= mysql +PORTVERSION= 4.0.9 PORTREVISION?= 0 CATEGORIES= databases -MASTER_SITES= http://www.kernelnotes.de/MySQL/Downloads/MySQL-3.23/ \ - http://mysql.he.net/Downloads/MySQL-3.23/ \ - ftp://ftp.sunet.se/pub/unix/databases/relational/mysql/Downloads/MySQL-3.23/ \ - ftp://mysql.secsup.org/pub/software/mysql/Downloads/MySQL-3.23/ \ - http://mysql.orst.edu/Downloads/MySQL-3.23/ \ - http://web.tryc.on.ca/mysql/Downloads/MySQL-3.23/ \ - ftp://ftp.gwdg.de/pub/misc/mysql/Downloads/MySQL-3.23/ -DISTFILES= mysql-${PORTVERSION}${EXTRACT_SUFX} - -MAINTAINER= dirk@FreeBSD.org - -WRKSRC= ${WRKDIR}/mysql-${PORTVERSION} -SLAVEDIRS= databases/mysql323-client -MASTERPORTNAME= mysql-server +MASTER_SITES= ftp://mysql.secsup.org/pub/software/mysql/Downloads/MySQL-4.0/ \ + http://mysql.tzone.it/Downloads/MySQL-4.0/ \ + ftp://planetmirror.com/pub/mysql/Downloads/MySQL-4.0/ \ + http://www.softagency.co.jp/MySQL/Downloads/MySQL-4.0/ \ + ftp://sunsite.dk/mirrors/mysql/Downloads/MySQL-4.0/ \ + http://mysql.mediatraffic.fi/Downloads/MySQL-4.0/ \ + ftp://filepile.tiscali.de/mirror/mysql/Downloads/MySQL-4.0/ \ + http://mirrors.tilian.co.uk/mysql.com/Downloads/MySQL-4.0/ \ + ftp://ftp.rtfm.no/pub/mysql/Downloads/MySQL-4.0/ \ + http://www.mysql.cz/Downloads/MySQL-4.0/ \ + ftp://ftp.u-paris10.fr/mysql.com/Downloads/MySQL-4.0/ \ + http://mysql.oms-net.nl/Downloads/MySQL-4.0/ \ + ftp://ftp.free.fr/pub/MySQL/Downloads/MySQL-4.0/ +PKGNAMESUFFIX?= -server +DISTNAME= ${PORTNAME}-${PORTVERSION}-gamma + +MAINTAINER= sysadmin@alexdupre.com + +SLAVEDIRS= databases/mysql40-client DB_DIR?= /var/db/mysql -USE_PERL5= yes +USE_PERL5_RUN= yes USE_LIBTOOL= yes + +GNU_CONFIGURE= yes CONFIGURE_ARGS= --localstatedir=${DB_DIR} \ - --without-perl \ --without-debug \ --without-readline \ --without-bench \ - --with-mit-threads=no \ + --without-extra-tools \ --with-libwrap \ + --with-raid \ + --with-mysqlfs \ + --with-vio \ --with-low-memory \ --with-comment='FreeBSD port: ${PKGNAME}' \ - --program-prefix='' \ - --with-innodb + --with-server-suffix='' \ + --program-prefix='' .if ${MACHINE_ARCH} == "i386" CONFIGURE_ARGS+=--enable-assembler --with-berkeley-db @@ -47,71 +56,68 @@ CONFIGURE_ARGS+=--with-charset=${WITH_CHARSET} .if defined(WITH_XCHARSET) && ${WITH_XCHARSET} != "" CONFIGURE_ARGS+=--with-extra-charsets=${WITH_XCHARSET} .endif +.if defined(WITH_OPENSSL) +USE_OPENSSL= yes +CONFIGURE_ARGS+=--with-openssl +.endif .if defined(BUILD_STATIC) -CONFIGURE_ARGS+=--with-mysqld-ldflags=--static +CONFIGURE_ARGS+=--with-mysqld-ldflags=-all-static .endif .if defined(BUILD_OPTIMIZED) -CFLAGS+= -mcpu=pentiumpro -O3 -.endif -.if defined(WITH_LINUXTHREADS) -CONFIGURE_ARGS+=--with-named-thread-libs='-DHAVE_GLIBC2_STYLE_GETHOSTBYNAME_R -D_THREAD_SAFE -I${LOCALBASE}/include/pthread/linuxthreads -L${LOCALBASE}/lib -llthread -llgcc_r' -CFLAGS+= -D__USE_UNIX98 -D_REENTRANT -D_THREAD_SAFE -I${LOCALBASE}/include/pthread/linuxthreads -LIB_DEPENDS+= lthread.2:${PORTSDIR}/devel/linuxthreads +CFLAGS+= -mcpu=i686 .endif .if defined(THREAD_SAFE_CLIENT) CONFIGURE_ARGS+=--enable-thread-safe-client .endif -CONFIGURE_ENV+= PERL=${PERL} \ - PERL5=${PERL} \ - INSTALL_SCRIPT="${INSTALL_SCRIPT}" \ - CFLAGS="${CFLAGS}" \ - CONFIGURE_ARGS="${CONFIGURE_ARGS}" -.include <bsd.port.pre.mk> -# without including these flags mysqld may crash under heavy load -# and multiple connections at the same time +CFLAGS+= -O3 -fno-omit-frame-pointer CXXFLAGS= ${CFLAGS} -felide-constructors -fno-rtti + +.include <bsd.port.pre.mk> .if ${OSVERSION} >= 400002 CXXFLAGS+= -fno-exceptions .endif .if ${OSVERSION} < 500000 -CONFIGURE_ENV+= CXX="${CC}" +CXX= ${CC} .endif # MySQL-Server part .if !defined(CLIENT_ONLY) -RUN_DEPENDS= mysql:${PORTSDIR}/databases/mysql323-client \ +RUN_DEPENDS= mysql:${PORTSDIR}/databases/mysql40-client \ ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Mysql.pm:${PORTSDIR}/databases/p5-Mysql -PLIST_SUB= MYSQL_VERSION=${PORTVERSION} +PLIST_SUB= MYSQL_VERSION=${PORTVERSION}-gamma -ONLY_FOR_ARCHS= i386 alpha sparc64 +ONLY_FOR_ARCHS= i386 alpha + +DOCS= manual.html manual.ps manual_toc.html manual.txt manual.texi \ + include.texi pre-fetch: @${ECHO} "" @${ECHO} "You may use the following build options:" @${ECHO} "" - @${ECHO} " WITH_CHARSET=charset define the primary built-in charset (latin1);" - @${ECHO} " WITH_XCHARSET=list define other built-in charsets (may be 'all');" + @${ECHO} " WITH_CHARSET=charset Define the primary built-in charset (latin1)." + @${ECHO} " WITH_XCHARSET=list Define other built-in charsets (may be 'all')." + @${ECHO} " WITH_OPENSSL=yes Enable secure connections." @${ECHO} " DB_DIR=directory Set alternate directory for database files" @${ECHO} " (default is /var/db/mysql)." - @${ECHO} " WITH_LINUXTHREADS=yes Use the linuxthreads pthread library." - @${ECHO} " This is _NOT_ recommended for production" - @${ECHO} " servers. Expect problems when enabled." - @${ECHO} " SKIP_INSTALL_DB=yes Skip mysql_install_db" - @${ECHO} " (i. e. leave ${DB_DIR} alone)." - @${ECHO} " This is useful for upgrades." - @${ECHO} " Be sure to know what you are doing!" - @${ECHO} " SKIP_DNS_CHECK=yes don't run resolveip to do an additional" + @${ECHO} " SKIP_INSTALL_DB=yes Skip database initialization" + @${ECHO} " (useful for upgrades)." + @${ECHO} " SKIP_DNS_CHECK=yes Don't run resolveip to do an additional" @${ECHO} " DNS check before inserting local hostname to" - @${ECHO} " mysql database." - @${ECHO} " Use if your machine has no offical DNS entry." + @${ECHO} " mysql database" + @${ECHO} " (use if your machine has no official DNS entry)." @${ECHO} " BUILD_STATIC=yes Build a static version of mysqld." - @${ECHO} " BUILD_OPTIMIZED=yes Add -mcpu=pentiumpro -O3 to CFLAGS." - @${ECHO} " This setting may produce broken code and thus" - @${ECHO} " is not recommended for production servers." + @${ECHO} " BUILD_OPTIMIZED=yes Add -mcpu=i686 to CFLAGS." @${ECHO} "" +.if defined(WITH_OPENSSL) && defined(BUILD_STATIC) +pre-configure: + @${ECHO} "You can't use the BUILD_STATIC option when using OpenSSL." + @${FALSE} +.endif + .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}." @@ -145,20 +151,18 @@ post-install: @${CHMOD} 750 ${PREFIX}/etc/rc.d/mysql-server.sh .if !defined(NOPORTDOCS) - ${MKDIR} ${PREFIX}/share/doc/mysql/Flags -.for doc in manual.html manual.ps manual_toc.html manual.txt manual.texi include.texi - ${INSTALL_DATA} ${WRKSRC}/Docs/${doc} ${PREFIX}/share/doc/mysql + ${MKDIR} ${DOCSDIR}/Flags +.for doc in ${DOCS} + ${INSTALL_DATA} ${WRKSRC}/Docs/${doc} ${DOCSDIR} .endfor - ${INSTALL_DATA} ${WRKSRC}/Docs/Flags/*.gif ${PREFIX}/share/doc/mysql/Flags - ${INSTALL_DATA} ${WRKSRC}/Docs/mysql.info ${PREFIX}/info - @install-info ${PREFIX}/info/mysql.info ${PREFIX}/info/dir + ${INSTALL_DATA} ${WRKSRC}/Docs/Flags/*.gif ${DOCSDIR}/Flags .endif # MySQL-Client part .else MAN1= isamchk.1 isamlog.1 mysql.1 mysql_zap.1 mysqlaccess.1 \ - mysqladmin.1 mysqld.1 mysqld_multi.1 mysqldump.1 mysqlshow.1 \ - perror.1 replace.1 safe_mysqld.1 + mysqladmin.1 mysqld.1 mysqld_multi.1 mysqld_safe.1 mysqldump.1 \ + mysqlshow.1 perror.1 replace.1 INSTALLS_SHLIB= yes LDCONFIG_DIRS= %%PREFIX%%/lib/mysql @@ -172,9 +176,4 @@ post-install: .endif -# This is for the maintainer only... -make-plist: - /usr/bin/find foo -type f -or -type l | /usr/bin/cut -d / -f 2- | /usr/bin/sort > ${.CURDIR}/pkg-plist.new - /usr/bin/perl -i -ne 'if (m#share/doc/#) { print "%%PORTDOCS%%", $$_; } else { print $$_; }' ${.CURDIR}/pkg-plist.new - .include <bsd.port.post.mk> diff --git a/databases/mysql51-server/distinfo b/databases/mysql51-server/distinfo index b56d22caad75..4c809e2ce104 100644 --- a/databases/mysql51-server/distinfo +++ b/databases/mysql51-server/distinfo @@ -1 +1 @@ -MD5 (mysql-3.23.55.tar.gz) = 259196ddc00c94051dceb9e86574d17e +MD5 (mysql-4.0.9-gamma.tar.gz) = 75d582f3e71e21cd6ffa7c84a6db26c3 diff --git a/databases/mysql51-server/files/mysql-server.sh b/databases/mysql51-server/files/mysql-server.sh index 6a5acb39a962..5180b9c0c1eb 100644 --- a/databases/mysql51-server/files/mysql-server.sh +++ b/databases/mysql51-server/files/mysql-server.sh @@ -5,9 +5,9 @@ PIDFILE=${DB_DIR}/`/bin/hostname -s`.pid case "$1" in start) - if [ -x %%PREFIX%%/bin/safe_mysqld ]; then + if [ -x %%PREFIX%%/bin/mysqld_safe ]; then /usr/bin/limits -U mysql \ - %%PREFIX%%/bin/safe_mysqld --user=mysql --datadir=${DB_DIR} --pid-file=${PIDFILE} > /dev/null & + %%PREFIX%%/bin/mysqld_safe --user=mysql --datadir=${DB_DIR} --pid-file=${PIDFILE} > /dev/null & echo -n ' mysqld' fi ;; diff --git a/databases/mysql51-server/files/patch-Makefile.in b/databases/mysql51-server/files/patch-Makefile.in index 987cf407da8f..c8bf28bc02bc 100644 --- a/databases/mysql51-server/files/patch-Makefile.in +++ b/databases/mysql51-server/files/patch-Makefile.in @@ -1,19 +1,20 @@ ---- Makefile.in.orig Thu Jan 23 16:13:43 2003 -+++ Makefile.in Wed Jan 29 17:11:29 2003 -@@ -195,11 +195,11 @@ +--- Makefile.in.orig Wed Nov 20 00:06:37 2002 ++++ Makefile.in Wed Nov 20 00:07:31 2002 +@@ -207,12 +207,11 @@ EXTRA_DIST = INSTALL-SOURCE README \ - COPYING COPYING.LIB MIRRORS + COPYING COPYING.LIB --SUBDIRS = . include @docs_dirs@ @readline_dir@ \ -- @thread_dirs@ @sql_client_dirs@ \ -- @sql_server_dirs@ scripts tests man \ -- @bench_dirs@ support-files os2 +-SUBDIRS = include @docs_dirs@ @readline_dir@ \ +- @thread_dirs@ pstack @sql_client_dirs@ \ +- @sql_server_dirs@ @libmysqld_dirs@ scripts man \ +- tests BUILD os2 \ +- @bench_dirs@ support-files @fs_dirs@ @tools_dirs@ - +.if defined(CLIENT_ONLY) -+SUBDIRS = include @readline_dir@ @sql_client_dirs@ tests man ++SUBDIRS = include @sql_client_dirs@ tests man +.else -+SUBDIRS = include @thread_dirs@ @docs_dirs@ @sql_server_dirs@ scripts support-files ++SUBDIRS = include @docs_dirs@ @sql_server_dirs@ scripts support-files +.endif # Relink after clean - CLEANFILES = linked_client_sources linked_server_sources linked_libmysql_sources linked_libmysql_r_sources linked_include_sources + linked_sources = linked_client_sources linked_server_sources \ diff --git a/databases/mysql51-server/files/patch-af b/databases/mysql51-server/files/patch-af deleted file mode 100644 index 8d2d1003f2e4..000000000000 --- a/databases/mysql51-server/files/patch-af +++ /dev/null @@ -1,79 +0,0 @@ ---- scripts/safe_mysqld.sh.orig Thu Oct 10 12:17:29 2002 -+++ scripts/safe_mysqld.sh Sun Nov 10 21:27:46 2002 -@@ -68,30 +68,9 @@ - done - } - --MY_PWD=`pwd` --# Check if we are starting this relative (for the binary release) --if test -d $MY_PWD/data/mysql -a -f ./share/mysql/english/errmsg.sys -a \ -- -x ./bin/mysqld --then -- MY_BASEDIR_VERSION=$MY_PWD # Where bin, share and data are -- ledir=$MY_BASEDIR_VERSION/bin # Where mysqld is -- DATADIR=$MY_BASEDIR_VERSION/data -- if test -z "$defaults" -- then -- defaults="--defaults-extra-file=$MY_BASEDIR_VERSION/data/my.cnf" -- fi --# Check if this is a 'moved install directory' --elif test -f ./var/mysql/db.frm -a -f ./share/mysql/english/errmsg.sys -a \ -- -x ./libexec/mysqld --then -- MY_BASEDIR_VERSION=$MY_PWD # Where libexec, share and var are -- ledir=$MY_BASEDIR_VERSION/libexec # Where mysqld is -- DATADIR=$MY_BASEDIR_VERSION/var --else -- MY_BASEDIR_VERSION=@prefix@ -- DATADIR=@localstatedir@ -- ledir=@libexecdir@ --fi -+MY_BASEDIR_VERSION=@prefix@ -+DATADIR=@localstatedir@ -+ledir=@libexecdir@ - - MYSQL_UNIX_PORT=${MYSQL_UNIX_PORT:-@MYSQL_UNIX_ADDR@} - MYSQL_TCP_PORT=${MYSQL_TCP_PORT:-@MYSQL_TCP_PORT@} -@@ -106,7 +85,6 @@ - fi - - # these rely on $DATADIR by default, so we'll set them later on --pid_file= - err_log= - SET_USER=0 - -@@ -239,34 +217,6 @@ - if test ! -f $pid_file # This is removed if normal shutdown - then - break -- fi -- -- if @IS_LINUX@ -- then -- # Test if one process was hanging. -- # This is only a fix for Linux (running as base 3 mysqld processes) -- # but should work for the rest of the servers. -- # The only thing is ps x => redhat 5 gives warnings when using ps -x. -- # kill -9 is used or the process won't react on the kill. -- numofproces=`ps xa | grep -v "grep" | grep -c $ledir/$MYSQLD` -- echo -e "\nNumber of processes running now: $numofproces" | tee -a $err_log -- I=1 -- while test "$I" -le "$numofproces" -- do -- PROC=`ps xa | grep $ledir/$MYSQLD | grep -v "grep" | sed -n '$p'` -- for T in $PROC -- do -- break -- done -- # echo "TEST $I - $T **" -- if kill -9 $T -- then -- echo "$MYSQLD process hanging, pid $T - killed" | tee -a $err_log -- else -- break -- fi -- I=`expr $I + 1` -- done - fi - - echo "`date +'%y%m%d %H:%M:%S'` mysqld restarted" | tee -a $err_log diff --git a/databases/mysql51-server/files/patch-configure b/databases/mysql51-server/files/patch-configure index 6c6e0ad044fa..5f5155735ee1 100644 --- a/databases/mysql51-server/files/patch-configure +++ b/databases/mysql51-server/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig Thu Dec 5 10:37:31 2002 -+++ configure Mon Dec 16 19:49:41 2002 -@@ -8059,6 +8059,7 @@ +--- configure.orig Mon Dec 16 10:12:16 2002 ++++ configure Fri Dec 20 18:11:14 2002 +@@ -8071,6 +8071,7 @@ # This can be used to rebuild libtool when needed LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" @@ -8,7 +8,7 @@ # Always use our own libtool. LIBTOOL='$(SHELL) $(top_builddir)/libtool' -@@ -8988,7 +8989,7 @@ +@@ -9000,7 +9001,7 @@ ;; esac fi @@ -17,142 +17,3 @@ if test -n "$HOSTNAME"; then echo "$as_me:$LINENO: result: $HOSTNAME" >&5 -@@ -9177,43 +9178,7 @@ - echo "${ECHO_T}no" >&6 - fi - --echo "$as_me:$LINENO: checking \"how to check if pid exists\"" >&5 --echo $ECHO_N "checking \"how to check if pid exists\"... $ECHO_C" >&6 --PS=$ac_cv_path_PS --# Linux style --if $PS p $$ 2> /dev/null | grep $0 > /dev/null --then -- FIND_PROC="$PS p \$\$PID | grep mysqld > /dev/null" --# Solaris --elif $PS -p $$ 2> /dev/null | grep $0 > /dev/null --then -- FIND_PROC="$PS -p \$\$PID | grep mysqld > /dev/null" --# BSD style --elif $PS -uaxww 2> /dev/null | grep $0 > /dev/null --then -- FIND_PROC="$PS -uaxww | grep mysqld | grep \" \$\$PID \" > /dev/null" --# SysV style --elif $PS -ef 2> /dev/null | grep $0 > /dev/null --then -- FIND_PROC="$PS -ef | grep mysqld | grep \" \$\$PID \" > /dev/null" --# Do anybody use this? --elif $PS $$ 2> /dev/null | grep $0 > /dev/null --then -- FIND_PROC="$PS \$\$PID | grep mysqld > /dev/null" --else -- case $SYSTEM_TYPE in -- *darwin*) -- FIND_PROC="$PS -uaxww | grep mysqld | grep \" \$\$PID \" > /dev/null" -- ;; -- *cygwin*) -- FIND_PROC="$PS -e | grep mysqld | grep \" \$\$PID \" > /dev/null" -- ;; -- *) -- { { echo "$as_me:$LINENO: error: Could not find the right ps switches. Which OS is this ?. See the Installation chapter in the Reference Manual." >&5 --echo "$as_me: error: Could not find the right ps switches. Which OS is this ?. See the Installation chapter in the Reference Manual." >&2;} -- { (exit 1); exit 1; }; } -- esac --fi -+FIND_PROC="$PS -uaxww | grep mysqld | grep \" \$\$PID \" > /dev/null" - - echo "$as_me:$LINENO: result: \"$FIND_PROC\"" >&5 - echo "${ECHO_T}\"$FIND_PROC\"" >&6 -@@ -13208,7 +13173,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 $LINENO "configure" - #include "confdefs.h" -@@ -13262,7 +13226,6 @@ - #define HAVE_LIBC_R 1 - _ACEOF - -- LIBS="-lc_r $LIBS" - - fi - -@@ -13706,29 +13669,6 @@ - fi - - --# Build optimized or debug version ? --# First check for gcc and g++ --if test "$ac_cv_c_compiler_gnu" = "yes" --then -- DEBUG_CFLAGS="-g" -- DEBUG_OPTIMIZE_CC="-O" -- OPTIMIZE_CFLAGS="$MAX_C_OPTIMIZE" --else -- DEBUG_CFLAGS="-g" -- DEBUG_OPTIMIZE_CC="" -- OPTIMIZE_CFLAGS="-O" --fi --if test "$ac_cv_prog_cxx_g" = "yes" --then -- DEBUG_CXXFLAGS="-g" -- DEBUG_OPTIMIZE_CXX="-O" -- OPTIMIZE_CXXFLAGS="-O3" --else -- DEBUG_CXXFLAGS="-g" -- DEBUG_OPTIMIZE_CXX="" -- OPTIMIZE_CXXFLAGS="-O" --fi -- - - # Check whether --with-debug or --without-debug was given. - if test "${with_debug+set}" = set; then -@@ -16081,10 +16021,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_cxx_compiler_gnu" = "yes" --then -- CXXFLAGS="$CXXFLAGS -Werror" --fi - mysql_cv_btype_last_arg_accept=none - cat >conftest.$ac_ext <<_ACEOF - #line $LINENO "configure" -@@ -19222,14 +19158,6 @@ - ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - - --# Do not treat warnings as errors if we are linking against 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 <<_ACEOF - #line $LINENO "configure" - #include "confdefs.h" -@@ -19313,10 +19241,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_cxx_compiler_gnu" = "yes" -a "$with_other_libc" = "no" --then -- CXXFLAGS="$CXXFLAGS -Werror" --fi - cat >conftest.$ac_ext <<_ACEOF - #line $LINENO "configure" - #include "confdefs.h" -@@ -19399,10 +19323,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_cxx_compiler_gnu" = "yes" -a "$with_other_libc" = "no" --then -- CXXFLAGS="$CXXFLAGS -Werror" --fi - cat >conftest.$ac_ext <<_ACEOF - #line $LINENO "configure" - #include "confdefs.h" diff --git a/databases/mysql51-server/files/patch-include::Makefile.in b/databases/mysql51-server/files/patch-include::Makefile.in index 3ff10ce708d5..34b404c0a255 100644 --- a/databases/mysql51-server/files/patch-include::Makefile.in +++ b/databases/mysql51-server/files/patch-include::Makefile.in @@ -1,6 +1,6 @@ ---- include/Makefile.in.orig Thu Dec 5 10:37:22 2002 -+++ include/Makefile.in Sat Dec 14 16:26:53 2002 -@@ -324,7 +324,11 @@ +--- include/Makefile.in.orig Tue Nov 19 17:13:35 2002 ++++ include/Makefile.in Tue Nov 19 17:14:10 2002 +@@ -335,7 +335,11 @@ installdirs: $(mkinstalldirs) $(DESTDIR)$(pkgincludedir) diff --git a/databases/mysql51-server/files/patch-sql_mysqld.cc b/databases/mysql51-server/files/patch-sql_mysqld.cc deleted file mode 100644 index 5155bd5f33cd..000000000000 --- a/databases/mysql51-server/files/patch-sql_mysqld.cc +++ /dev/null @@ -1,12 +0,0 @@ ---- sql/mysqld.cc.orig Thu Oct 10 12:17:28 2002 -+++ sql/mysqld.cc Tue Nov 12 23:23:27 2002 -@@ -92,7 +92,8 @@ - int allow_severity = LOG_INFO; - int deny_severity = LOG_WARNING; - --#ifdef __STDC__ -+#include <osreldate.h> -+#if defined(__STDC__) && __FreeBSD_version < 500000 - #define my_fromhost(A) fromhost(A) - #define my_hosts_access(A) hosts_access(A) - #define my_eval_client(A) eval_client(A) diff --git a/databases/mysql51-server/pkg-descr b/databases/mysql51-server/pkg-descr index 8f4acf36e853..cd19c135f9cc 100644 --- a/databases/mysql51-server/pkg-descr +++ b/databases/mysql51-server/pkg-descr @@ -2,3 +2,6 @@ MySQL is a very fast, multi-threaded, multi-user and robust SQL (Structured Query Language) database server. WWW: http://www.mysql.com/ + +- Alex Dupre +sysadmin@alexdupre.com diff --git a/databases/mysql51-server/pkg-plist b/databases/mysql51-server/pkg-plist index 7a482d60bc34..692b3053f8c6 100644 --- a/databases/mysql51-server/pkg-plist +++ b/databases/mysql51-server/pkg-plist @@ -8,14 +8,21 @@ bin/myisamlog bin/myisampack bin/mysql_config bin/mysql_convert_table_format +bin/mysql_explain_log bin/mysql_find_rows +bin/mysql_fix_extensions bin/mysql_fix_privilege_tables +bin/mysql_install bin/mysql_install_db +bin/mysql_secure_installation bin/mysql_setpermission +bin/mysql_tableinfo +bin/mysql_waitpid bin/mysql_zap bin/mysqlaccess bin/mysqlbug bin/mysqld_multi +bin/mysqld_safe bin/mysqldumpslow bin/mysqlhotcopy bin/pack_isam @@ -23,7 +30,6 @@ bin/perror bin/replace bin/resolve_stack_dump bin/resolveip -bin/safe_mysqld etc/rc.d/mysql-server.sh %%PORTDOCS%%@unexec install-info --delete %D/info/mysql.info %D/info/dir %%PORTDOCS%%info/mysql.info @@ -36,15 +42,19 @@ lib/mysql/libmyisammrg.a lib/mysql/libmystrings.a lib/mysql/libmysys.a lib/mysql/libnisam.a +lib/mysql/libvio.a libexec/mysqld %%PORTDOCS%%share/doc/mysql/Flags/argentina.gif +%%PORTDOCS%%share/doc/mysql/Flags/armenia.gif %%PORTDOCS%%share/doc/mysql/Flags/australia.gif %%PORTDOCS%%share/doc/mysql/Flags/austria.gif +%%PORTDOCS%%share/doc/mysql/Flags/belgium.gif %%PORTDOCS%%share/doc/mysql/Flags/brazil.gif %%PORTDOCS%%share/doc/mysql/Flags/bulgaria.gif %%PORTDOCS%%share/doc/mysql/Flags/canada.gif %%PORTDOCS%%share/doc/mysql/Flags/chile.gif %%PORTDOCS%%share/doc/mysql/Flags/china.gif +%%PORTDOCS%%share/doc/mysql/Flags/costa-rica.gif %%PORTDOCS%%share/doc/mysql/Flags/croatia.gif %%PORTDOCS%%share/doc/mysql/Flags/czech-republic.gif %%PORTDOCS%%share/doc/mysql/Flags/denmark.gif @@ -58,25 +68,28 @@ libexec/mysqld %%PORTDOCS%%share/doc/mysql/Flags/iceland.gif %%PORTDOCS%%share/doc/mysql/Flags/indonesia.gif %%PORTDOCS%%share/doc/mysql/Flags/ireland.gif -%%PORTDOCS%%share/doc/mysql/Flags/island.gif %%PORTDOCS%%share/doc/mysql/Flags/israel.gif %%PORTDOCS%%share/doc/mysql/Flags/italy.gif %%PORTDOCS%%share/doc/mysql/Flags/japan.gif -%%PORTDOCS%%share/doc/mysql/Flags/kroatia.gif %%PORTDOCS%%share/doc/mysql/Flags/latvia.gif +%%PORTDOCS%%share/doc/mysql/Flags/mexico.gif %%PORTDOCS%%share/doc/mysql/Flags/netherlands.gif +%%PORTDOCS%%share/doc/mysql/Flags/new-zealand.gif +%%PORTDOCS%%share/doc/mysql/Flags/norway.gif +%%PORTDOCS%%share/doc/mysql/Flags/philippines.gif %%PORTDOCS%%share/doc/mysql/Flags/poland.gif %%PORTDOCS%%share/doc/mysql/Flags/portugal.gif %%PORTDOCS%%share/doc/mysql/Flags/romania.gif %%PORTDOCS%%share/doc/mysql/Flags/russia.gif %%PORTDOCS%%share/doc/mysql/Flags/singapore.gif +%%PORTDOCS%%share/doc/mysql/Flags/slovenia.gif %%PORTDOCS%%share/doc/mysql/Flags/south-africa.gif -%%PORTDOCS%%share/doc/mysql/Flags/south-africa1.gif %%PORTDOCS%%share/doc/mysql/Flags/south-korea.gif %%PORTDOCS%%share/doc/mysql/Flags/spain.gif %%PORTDOCS%%share/doc/mysql/Flags/sweden.gif %%PORTDOCS%%share/doc/mysql/Flags/switzerland.gif %%PORTDOCS%%share/doc/mysql/Flags/taiwan.gif +%%PORTDOCS%%share/doc/mysql/Flags/turkey.gif %%PORTDOCS%%share/doc/mysql/Flags/ukraine.gif %%PORTDOCS%%share/doc/mysql/Flags/usa.gif %%PORTDOCS%%share/doc/mysql/Flags/yugoslavia.gif diff --git a/databases/mysql51-server/pkg-plist.client b/databases/mysql51-server/pkg-plist.client index 13d787a27fb7..e7ad0a65b8a1 100644 --- a/databases/mysql51-server/pkg-plist.client +++ b/databases/mysql51-server/pkg-plist.client @@ -4,6 +4,8 @@ bin/mysqlbinlog bin/mysqlcheck bin/mysqldump bin/mysqlimport +bin/mysqlmanager-pwgen +bin/mysqlmanagerc bin/mysqlshow bin/mysqltest etc/rc.d/000.mysql-client.sh @@ -11,24 +13,27 @@ include/mysql/dbug.h include/mysql/errmsg.h include/mysql/m_ctype.h include/mysql/m_string.h +include/mysql/my_alloc.h include/mysql/my_config.h +include/mysql/my_getopt.h include/mysql/my_global.h include/mysql/my_list.h include/mysql/my_net.h include/mysql/my_no_pthread.h include/mysql/my_pthread.h +include/mysql/my_semaphore.h include/mysql/my_sys.h include/mysql/mysql.h include/mysql/mysql_com.h +include/mysql/mysql_embed.h include/mysql/mysql_version.h include/mysql/mysqld_error.h include/mysql/raid.h include/mysql/sslopt-case.h include/mysql/sslopt-longopts.h -include/mysql/sslopt-usage.h include/mysql/sslopt-vars.h lib/mysql/libmysqlclient.a lib/mysql/libmysqlclient.so -lib/mysql/libmysqlclient.so.10 +lib/mysql/libmysqlclient.so.12 @dirrm include/mysql @dirrm lib/mysql diff --git a/databases/mysql54-client/Makefile b/databases/mysql54-client/Makefile index b5f3065ac95f..e9f4c3c3277e 100644 --- a/databases/mysql54-client/Makefile +++ b/databases/mysql54-client/Makefile @@ -1,14 +1,15 @@ -# ports collection makefile for: MySQL-client -# Date created: Sun Sep 24 21:21:20 CEST 2000 -# Whom: Dirk Froemberg <dirk@FreeBSD.org> +# New ports collection makefile for: MySQL-client +# Date created: Sun Mar 3 12:20:35 CET 2002 +# Whom: Alex Dupre <sysadmin@alexdupre.com> # # $FreeBSD$ # -PORTNAME= mysql-client +PORTNAME= mysql PORTREVISION= 0 +PKGNAMESUFFIX= -client -MASTERDIR= ${.CURDIR}/../mysql323-server +MASTERDIR= ${.CURDIR}/../mysql40-server COMMENT= ${PKGDIR}/pkg-comment.client PKGINSTALL= mustnotexist PLIST= ${PKGDIR}/pkg-plist.client diff --git a/databases/mysql54-server/Makefile b/databases/mysql54-server/Makefile index bb9329b3c669..b499fd55b10d 100644 --- a/databases/mysql54-server/Makefile +++ b/databases/mysql54-server/Makefile @@ -1,42 +1,51 @@ -# ports collection makefile for: MySQL-server -# Date created: Sun Sep 24 21:20:46 CEST 2000 -# Whom: Dirk Froemberg <dirk@FreeBSD.org> +# New ports collection makefile for: MySQL-server +# Date created: Sun Mar 3 12:20:35 CET 2002 +# Whom: Alex Dupre <sysadmin@alexdupre.com> # # $FreeBSD$ # -PORTNAME?= ${MASTERPORTNAME} -PORTVERSION= 3.23.55 +PORTNAME?= mysql +PORTVERSION= 4.0.9 PORTREVISION?= 0 CATEGORIES= databases -MASTER_SITES= http://www.kernelnotes.de/MySQL/Downloads/MySQL-3.23/ \ - http://mysql.he.net/Downloads/MySQL-3.23/ \ - ftp://ftp.sunet.se/pub/unix/databases/relational/mysql/Downloads/MySQL-3.23/ \ - ftp://mysql.secsup.org/pub/software/mysql/Downloads/MySQL-3.23/ \ - http://mysql.orst.edu/Downloads/MySQL-3.23/ \ - http://web.tryc.on.ca/mysql/Downloads/MySQL-3.23/ \ - ftp://ftp.gwdg.de/pub/misc/mysql/Downloads/MySQL-3.23/ -DISTFILES= mysql-${PORTVERSION}${EXTRACT_SUFX} - -MAINTAINER= dirk@FreeBSD.org - -WRKSRC= ${WRKDIR}/mysql-${PORTVERSION} -SLAVEDIRS= databases/mysql323-client -MASTERPORTNAME= mysql-server +MASTER_SITES= ftp://mysql.secsup.org/pub/software/mysql/Downloads/MySQL-4.0/ \ + http://mysql.tzone.it/Downloads/MySQL-4.0/ \ + ftp://planetmirror.com/pub/mysql/Downloads/MySQL-4.0/ \ + http://www.softagency.co.jp/MySQL/Downloads/MySQL-4.0/ \ + ftp://sunsite.dk/mirrors/mysql/Downloads/MySQL-4.0/ \ + http://mysql.mediatraffic.fi/Downloads/MySQL-4.0/ \ + ftp://filepile.tiscali.de/mirror/mysql/Downloads/MySQL-4.0/ \ + http://mirrors.tilian.co.uk/mysql.com/Downloads/MySQL-4.0/ \ + ftp://ftp.rtfm.no/pub/mysql/Downloads/MySQL-4.0/ \ + http://www.mysql.cz/Downloads/MySQL-4.0/ \ + ftp://ftp.u-paris10.fr/mysql.com/Downloads/MySQL-4.0/ \ + http://mysql.oms-net.nl/Downloads/MySQL-4.0/ \ + ftp://ftp.free.fr/pub/MySQL/Downloads/MySQL-4.0/ +PKGNAMESUFFIX?= -server +DISTNAME= ${PORTNAME}-${PORTVERSION}-gamma + +MAINTAINER= sysadmin@alexdupre.com + +SLAVEDIRS= databases/mysql40-client DB_DIR?= /var/db/mysql -USE_PERL5= yes +USE_PERL5_RUN= yes USE_LIBTOOL= yes + +GNU_CONFIGURE= yes CONFIGURE_ARGS= --localstatedir=${DB_DIR} \ - --without-perl \ --without-debug \ --without-readline \ --without-bench \ - --with-mit-threads=no \ + --without-extra-tools \ --with-libwrap \ + --with-raid \ + --with-mysqlfs \ + --with-vio \ --with-low-memory \ --with-comment='FreeBSD port: ${PKGNAME}' \ - --program-prefix='' \ - --with-innodb + --with-server-suffix='' \ + --program-prefix='' .if ${MACHINE_ARCH} == "i386" CONFIGURE_ARGS+=--enable-assembler --with-berkeley-db @@ -47,71 +56,68 @@ CONFIGURE_ARGS+=--with-charset=${WITH_CHARSET} .if defined(WITH_XCHARSET) && ${WITH_XCHARSET} != "" CONFIGURE_ARGS+=--with-extra-charsets=${WITH_XCHARSET} .endif +.if defined(WITH_OPENSSL) +USE_OPENSSL= yes +CONFIGURE_ARGS+=--with-openssl +.endif .if defined(BUILD_STATIC) -CONFIGURE_ARGS+=--with-mysqld-ldflags=--static +CONFIGURE_ARGS+=--with-mysqld-ldflags=-all-static .endif .if defined(BUILD_OPTIMIZED) -CFLAGS+= -mcpu=pentiumpro -O3 -.endif -.if defined(WITH_LINUXTHREADS) -CONFIGURE_ARGS+=--with-named-thread-libs='-DHAVE_GLIBC2_STYLE_GETHOSTBYNAME_R -D_THREAD_SAFE -I${LOCALBASE}/include/pthread/linuxthreads -L${LOCALBASE}/lib -llthread -llgcc_r' -CFLAGS+= -D__USE_UNIX98 -D_REENTRANT -D_THREAD_SAFE -I${LOCALBASE}/include/pthread/linuxthreads -LIB_DEPENDS+= lthread.2:${PORTSDIR}/devel/linuxthreads +CFLAGS+= -mcpu=i686 .endif .if defined(THREAD_SAFE_CLIENT) CONFIGURE_ARGS+=--enable-thread-safe-client .endif -CONFIGURE_ENV+= PERL=${PERL} \ - PERL5=${PERL} \ - INSTALL_SCRIPT="${INSTALL_SCRIPT}" \ - CFLAGS="${CFLAGS}" \ - CONFIGURE_ARGS="${CONFIGURE_ARGS}" -.include <bsd.port.pre.mk> -# without including these flags mysqld may crash under heavy load -# and multiple connections at the same time +CFLAGS+= -O3 -fno-omit-frame-pointer CXXFLAGS= ${CFLAGS} -felide-constructors -fno-rtti + +.include <bsd.port.pre.mk> .if ${OSVERSION} >= 400002 CXXFLAGS+= -fno-exceptions .endif .if ${OSVERSION} < 500000 -CONFIGURE_ENV+= CXX="${CC}" +CXX= ${CC} .endif # MySQL-Server part .if !defined(CLIENT_ONLY) -RUN_DEPENDS= mysql:${PORTSDIR}/databases/mysql323-client \ +RUN_DEPENDS= mysql:${PORTSDIR}/databases/mysql40-client \ ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Mysql.pm:${PORTSDIR}/databases/p5-Mysql -PLIST_SUB= MYSQL_VERSION=${PORTVERSION} +PLIST_SUB= MYSQL_VERSION=${PORTVERSION}-gamma -ONLY_FOR_ARCHS= i386 alpha sparc64 +ONLY_FOR_ARCHS= i386 alpha + +DOCS= manual.html manual.ps manual_toc.html manual.txt manual.texi \ + include.texi pre-fetch: @${ECHO} "" @${ECHO} "You may use the following build options:" @${ECHO} "" - @${ECHO} " WITH_CHARSET=charset define the primary built-in charset (latin1);" - @${ECHO} " WITH_XCHARSET=list define other built-in charsets (may be 'all');" + @${ECHO} " WITH_CHARSET=charset Define the primary built-in charset (latin1)." + @${ECHO} " WITH_XCHARSET=list Define other built-in charsets (may be 'all')." + @${ECHO} " WITH_OPENSSL=yes Enable secure connections." @${ECHO} " DB_DIR=directory Set alternate directory for database files" @${ECHO} " (default is /var/db/mysql)." - @${ECHO} " WITH_LINUXTHREADS=yes Use the linuxthreads pthread library." - @${ECHO} " This is _NOT_ recommended for production" - @${ECHO} " servers. Expect problems when enabled." - @${ECHO} " SKIP_INSTALL_DB=yes Skip mysql_install_db" - @${ECHO} " (i. e. leave ${DB_DIR} alone)." - @${ECHO} " This is useful for upgrades." - @${ECHO} " Be sure to know what you are doing!" - @${ECHO} " SKIP_DNS_CHECK=yes don't run resolveip to do an additional" + @${ECHO} " SKIP_INSTALL_DB=yes Skip database initialization" + @${ECHO} " (useful for upgrades)." + @${ECHO} " SKIP_DNS_CHECK=yes Don't run resolveip to do an additional" @${ECHO} " DNS check before inserting local hostname to" - @${ECHO} " mysql database." - @${ECHO} " Use if your machine has no offical DNS entry." + @${ECHO} " mysql database" + @${ECHO} " (use if your machine has no official DNS entry)." @${ECHO} " BUILD_STATIC=yes Build a static version of mysqld." - @${ECHO} " BUILD_OPTIMIZED=yes Add -mcpu=pentiumpro -O3 to CFLAGS." - @${ECHO} " This setting may produce broken code and thus" - @${ECHO} " is not recommended for production servers." + @${ECHO} " BUILD_OPTIMIZED=yes Add -mcpu=i686 to CFLAGS." @${ECHO} "" +.if defined(WITH_OPENSSL) && defined(BUILD_STATIC) +pre-configure: + @${ECHO} "You can't use the BUILD_STATIC option when using OpenSSL." + @${FALSE} +.endif + .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}." @@ -145,20 +151,18 @@ post-install: @${CHMOD} 750 ${PREFIX}/etc/rc.d/mysql-server.sh .if !defined(NOPORTDOCS) - ${MKDIR} ${PREFIX}/share/doc/mysql/Flags -.for doc in manual.html manual.ps manual_toc.html manual.txt manual.texi include.texi - ${INSTALL_DATA} ${WRKSRC}/Docs/${doc} ${PREFIX}/share/doc/mysql + ${MKDIR} ${DOCSDIR}/Flags +.for doc in ${DOCS} + ${INSTALL_DATA} ${WRKSRC}/Docs/${doc} ${DOCSDIR} .endfor - ${INSTALL_DATA} ${WRKSRC}/Docs/Flags/*.gif ${PREFIX}/share/doc/mysql/Flags - ${INSTALL_DATA} ${WRKSRC}/Docs/mysql.info ${PREFIX}/info - @install-info ${PREFIX}/info/mysql.info ${PREFIX}/info/dir + ${INSTALL_DATA} ${WRKSRC}/Docs/Flags/*.gif ${DOCSDIR}/Flags .endif # MySQL-Client part .else MAN1= isamchk.1 isamlog.1 mysql.1 mysql_zap.1 mysqlaccess.1 \ - mysqladmin.1 mysqld.1 mysqld_multi.1 mysqldump.1 mysqlshow.1 \ - perror.1 replace.1 safe_mysqld.1 + mysqladmin.1 mysqld.1 mysqld_multi.1 mysqld_safe.1 mysqldump.1 \ + mysqlshow.1 perror.1 replace.1 INSTALLS_SHLIB= yes LDCONFIG_DIRS= %%PREFIX%%/lib/mysql @@ -172,9 +176,4 @@ post-install: .endif -# This is for the maintainer only... -make-plist: - /usr/bin/find foo -type f -or -type l | /usr/bin/cut -d / -f 2- | /usr/bin/sort > ${.CURDIR}/pkg-plist.new - /usr/bin/perl -i -ne 'if (m#share/doc/#) { print "%%PORTDOCS%%", $$_; } else { print $$_; }' ${.CURDIR}/pkg-plist.new - .include <bsd.port.post.mk> diff --git a/databases/mysql54-server/distinfo b/databases/mysql54-server/distinfo index b56d22caad75..4c809e2ce104 100644 --- a/databases/mysql54-server/distinfo +++ b/databases/mysql54-server/distinfo @@ -1 +1 @@ -MD5 (mysql-3.23.55.tar.gz) = 259196ddc00c94051dceb9e86574d17e +MD5 (mysql-4.0.9-gamma.tar.gz) = 75d582f3e71e21cd6ffa7c84a6db26c3 diff --git a/databases/mysql54-server/files/mysql-server.sh b/databases/mysql54-server/files/mysql-server.sh index 6a5acb39a962..5180b9c0c1eb 100644 --- a/databases/mysql54-server/files/mysql-server.sh +++ b/databases/mysql54-server/files/mysql-server.sh @@ -5,9 +5,9 @@ PIDFILE=${DB_DIR}/`/bin/hostname -s`.pid case "$1" in start) - if [ -x %%PREFIX%%/bin/safe_mysqld ]; then + if [ -x %%PREFIX%%/bin/mysqld_safe ]; then /usr/bin/limits -U mysql \ - %%PREFIX%%/bin/safe_mysqld --user=mysql --datadir=${DB_DIR} --pid-file=${PIDFILE} > /dev/null & + %%PREFIX%%/bin/mysqld_safe --user=mysql --datadir=${DB_DIR} --pid-file=${PIDFILE} > /dev/null & echo -n ' mysqld' fi ;; diff --git a/databases/mysql54-server/files/patch-Makefile.in b/databases/mysql54-server/files/patch-Makefile.in index 987cf407da8f..c8bf28bc02bc 100644 --- a/databases/mysql54-server/files/patch-Makefile.in +++ b/databases/mysql54-server/files/patch-Makefile.in @@ -1,19 +1,20 @@ ---- Makefile.in.orig Thu Jan 23 16:13:43 2003 -+++ Makefile.in Wed Jan 29 17:11:29 2003 -@@ -195,11 +195,11 @@ +--- Makefile.in.orig Wed Nov 20 00:06:37 2002 ++++ Makefile.in Wed Nov 20 00:07:31 2002 +@@ -207,12 +207,11 @@ EXTRA_DIST = INSTALL-SOURCE README \ - COPYING COPYING.LIB MIRRORS + COPYING COPYING.LIB --SUBDIRS = . include @docs_dirs@ @readline_dir@ \ -- @thread_dirs@ @sql_client_dirs@ \ -- @sql_server_dirs@ scripts tests man \ -- @bench_dirs@ support-files os2 +-SUBDIRS = include @docs_dirs@ @readline_dir@ \ +- @thread_dirs@ pstack @sql_client_dirs@ \ +- @sql_server_dirs@ @libmysqld_dirs@ scripts man \ +- tests BUILD os2 \ +- @bench_dirs@ support-files @fs_dirs@ @tools_dirs@ - +.if defined(CLIENT_ONLY) -+SUBDIRS = include @readline_dir@ @sql_client_dirs@ tests man ++SUBDIRS = include @sql_client_dirs@ tests man +.else -+SUBDIRS = include @thread_dirs@ @docs_dirs@ @sql_server_dirs@ scripts support-files ++SUBDIRS = include @docs_dirs@ @sql_server_dirs@ scripts support-files +.endif # Relink after clean - CLEANFILES = linked_client_sources linked_server_sources linked_libmysql_sources linked_libmysql_r_sources linked_include_sources + linked_sources = linked_client_sources linked_server_sources \ diff --git a/databases/mysql54-server/files/patch-af b/databases/mysql54-server/files/patch-af deleted file mode 100644 index 8d2d1003f2e4..000000000000 --- a/databases/mysql54-server/files/patch-af +++ /dev/null @@ -1,79 +0,0 @@ ---- scripts/safe_mysqld.sh.orig Thu Oct 10 12:17:29 2002 -+++ scripts/safe_mysqld.sh Sun Nov 10 21:27:46 2002 -@@ -68,30 +68,9 @@ - done - } - --MY_PWD=`pwd` --# Check if we are starting this relative (for the binary release) --if test -d $MY_PWD/data/mysql -a -f ./share/mysql/english/errmsg.sys -a \ -- -x ./bin/mysqld --then -- MY_BASEDIR_VERSION=$MY_PWD # Where bin, share and data are -- ledir=$MY_BASEDIR_VERSION/bin # Where mysqld is -- DATADIR=$MY_BASEDIR_VERSION/data -- if test -z "$defaults" -- then -- defaults="--defaults-extra-file=$MY_BASEDIR_VERSION/data/my.cnf" -- fi --# Check if this is a 'moved install directory' --elif test -f ./var/mysql/db.frm -a -f ./share/mysql/english/errmsg.sys -a \ -- -x ./libexec/mysqld --then -- MY_BASEDIR_VERSION=$MY_PWD # Where libexec, share and var are -- ledir=$MY_BASEDIR_VERSION/libexec # Where mysqld is -- DATADIR=$MY_BASEDIR_VERSION/var --else -- MY_BASEDIR_VERSION=@prefix@ -- DATADIR=@localstatedir@ -- ledir=@libexecdir@ --fi -+MY_BASEDIR_VERSION=@prefix@ -+DATADIR=@localstatedir@ -+ledir=@libexecdir@ - - MYSQL_UNIX_PORT=${MYSQL_UNIX_PORT:-@MYSQL_UNIX_ADDR@} - MYSQL_TCP_PORT=${MYSQL_TCP_PORT:-@MYSQL_TCP_PORT@} -@@ -106,7 +85,6 @@ - fi - - # these rely on $DATADIR by default, so we'll set them later on --pid_file= - err_log= - SET_USER=0 - -@@ -239,34 +217,6 @@ - if test ! -f $pid_file # This is removed if normal shutdown - then - break -- fi -- -- if @IS_LINUX@ -- then -- # Test if one process was hanging. -- # This is only a fix for Linux (running as base 3 mysqld processes) -- # but should work for the rest of the servers. -- # The only thing is ps x => redhat 5 gives warnings when using ps -x. -- # kill -9 is used or the process won't react on the kill. -- numofproces=`ps xa | grep -v "grep" | grep -c $ledir/$MYSQLD` -- echo -e "\nNumber of processes running now: $numofproces" | tee -a $err_log -- I=1 -- while test "$I" -le "$numofproces" -- do -- PROC=`ps xa | grep $ledir/$MYSQLD | grep -v "grep" | sed -n '$p'` -- for T in $PROC -- do -- break -- done -- # echo "TEST $I - $T **" -- if kill -9 $T -- then -- echo "$MYSQLD process hanging, pid $T - killed" | tee -a $err_log -- else -- break -- fi -- I=`expr $I + 1` -- done - fi - - echo "`date +'%y%m%d %H:%M:%S'` mysqld restarted" | tee -a $err_log diff --git a/databases/mysql54-server/files/patch-configure b/databases/mysql54-server/files/patch-configure index 6c6e0ad044fa..5f5155735ee1 100644 --- a/databases/mysql54-server/files/patch-configure +++ b/databases/mysql54-server/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig Thu Dec 5 10:37:31 2002 -+++ configure Mon Dec 16 19:49:41 2002 -@@ -8059,6 +8059,7 @@ +--- configure.orig Mon Dec 16 10:12:16 2002 ++++ configure Fri Dec 20 18:11:14 2002 +@@ -8071,6 +8071,7 @@ # This can be used to rebuild libtool when needed LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" @@ -8,7 +8,7 @@ # Always use our own libtool. LIBTOOL='$(SHELL) $(top_builddir)/libtool' -@@ -8988,7 +8989,7 @@ +@@ -9000,7 +9001,7 @@ ;; esac fi @@ -17,142 +17,3 @@ if test -n "$HOSTNAME"; then echo "$as_me:$LINENO: result: $HOSTNAME" >&5 -@@ -9177,43 +9178,7 @@ - echo "${ECHO_T}no" >&6 - fi - --echo "$as_me:$LINENO: checking \"how to check if pid exists\"" >&5 --echo $ECHO_N "checking \"how to check if pid exists\"... $ECHO_C" >&6 --PS=$ac_cv_path_PS --# Linux style --if $PS p $$ 2> /dev/null | grep $0 > /dev/null --then -- FIND_PROC="$PS p \$\$PID | grep mysqld > /dev/null" --# Solaris --elif $PS -p $$ 2> /dev/null | grep $0 > /dev/null --then -- FIND_PROC="$PS -p \$\$PID | grep mysqld > /dev/null" --# BSD style --elif $PS -uaxww 2> /dev/null | grep $0 > /dev/null --then -- FIND_PROC="$PS -uaxww | grep mysqld | grep \" \$\$PID \" > /dev/null" --# SysV style --elif $PS -ef 2> /dev/null | grep $0 > /dev/null --then -- FIND_PROC="$PS -ef | grep mysqld | grep \" \$\$PID \" > /dev/null" --# Do anybody use this? --elif $PS $$ 2> /dev/null | grep $0 > /dev/null --then -- FIND_PROC="$PS \$\$PID | grep mysqld > /dev/null" --else -- case $SYSTEM_TYPE in -- *darwin*) -- FIND_PROC="$PS -uaxww | grep mysqld | grep \" \$\$PID \" > /dev/null" -- ;; -- *cygwin*) -- FIND_PROC="$PS -e | grep mysqld | grep \" \$\$PID \" > /dev/null" -- ;; -- *) -- { { echo "$as_me:$LINENO: error: Could not find the right ps switches. Which OS is this ?. See the Installation chapter in the Reference Manual." >&5 --echo "$as_me: error: Could not find the right ps switches. Which OS is this ?. See the Installation chapter in the Reference Manual." >&2;} -- { (exit 1); exit 1; }; } -- esac --fi -+FIND_PROC="$PS -uaxww | grep mysqld | grep \" \$\$PID \" > /dev/null" - - echo "$as_me:$LINENO: result: \"$FIND_PROC\"" >&5 - echo "${ECHO_T}\"$FIND_PROC\"" >&6 -@@ -13208,7 +13173,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 $LINENO "configure" - #include "confdefs.h" -@@ -13262,7 +13226,6 @@ - #define HAVE_LIBC_R 1 - _ACEOF - -- LIBS="-lc_r $LIBS" - - fi - -@@ -13706,29 +13669,6 @@ - fi - - --# Build optimized or debug version ? --# First check for gcc and g++ --if test "$ac_cv_c_compiler_gnu" = "yes" --then -- DEBUG_CFLAGS="-g" -- DEBUG_OPTIMIZE_CC="-O" -- OPTIMIZE_CFLAGS="$MAX_C_OPTIMIZE" --else -- DEBUG_CFLAGS="-g" -- DEBUG_OPTIMIZE_CC="" -- OPTIMIZE_CFLAGS="-O" --fi --if test "$ac_cv_prog_cxx_g" = "yes" --then -- DEBUG_CXXFLAGS="-g" -- DEBUG_OPTIMIZE_CXX="-O" -- OPTIMIZE_CXXFLAGS="-O3" --else -- DEBUG_CXXFLAGS="-g" -- DEBUG_OPTIMIZE_CXX="" -- OPTIMIZE_CXXFLAGS="-O" --fi -- - - # Check whether --with-debug or --without-debug was given. - if test "${with_debug+set}" = set; then -@@ -16081,10 +16021,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_cxx_compiler_gnu" = "yes" --then -- CXXFLAGS="$CXXFLAGS -Werror" --fi - mysql_cv_btype_last_arg_accept=none - cat >conftest.$ac_ext <<_ACEOF - #line $LINENO "configure" -@@ -19222,14 +19158,6 @@ - ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - - --# Do not treat warnings as errors if we are linking against 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 <<_ACEOF - #line $LINENO "configure" - #include "confdefs.h" -@@ -19313,10 +19241,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_cxx_compiler_gnu" = "yes" -a "$with_other_libc" = "no" --then -- CXXFLAGS="$CXXFLAGS -Werror" --fi - cat >conftest.$ac_ext <<_ACEOF - #line $LINENO "configure" - #include "confdefs.h" -@@ -19399,10 +19323,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_cxx_compiler_gnu" = "yes" -a "$with_other_libc" = "no" --then -- CXXFLAGS="$CXXFLAGS -Werror" --fi - cat >conftest.$ac_ext <<_ACEOF - #line $LINENO "configure" - #include "confdefs.h" diff --git a/databases/mysql54-server/files/patch-include::Makefile.in b/databases/mysql54-server/files/patch-include::Makefile.in index 3ff10ce708d5..34b404c0a255 100644 --- a/databases/mysql54-server/files/patch-include::Makefile.in +++ b/databases/mysql54-server/files/patch-include::Makefile.in @@ -1,6 +1,6 @@ ---- include/Makefile.in.orig Thu Dec 5 10:37:22 2002 -+++ include/Makefile.in Sat Dec 14 16:26:53 2002 -@@ -324,7 +324,11 @@ +--- include/Makefile.in.orig Tue Nov 19 17:13:35 2002 ++++ include/Makefile.in Tue Nov 19 17:14:10 2002 +@@ -335,7 +335,11 @@ installdirs: $(mkinstalldirs) $(DESTDIR)$(pkgincludedir) diff --git a/databases/mysql54-server/files/patch-sql_mysqld.cc b/databases/mysql54-server/files/patch-sql_mysqld.cc deleted file mode 100644 index 5155bd5f33cd..000000000000 --- a/databases/mysql54-server/files/patch-sql_mysqld.cc +++ /dev/null @@ -1,12 +0,0 @@ ---- sql/mysqld.cc.orig Thu Oct 10 12:17:28 2002 -+++ sql/mysqld.cc Tue Nov 12 23:23:27 2002 -@@ -92,7 +92,8 @@ - int allow_severity = LOG_INFO; - int deny_severity = LOG_WARNING; - --#ifdef __STDC__ -+#include <osreldate.h> -+#if defined(__STDC__) && __FreeBSD_version < 500000 - #define my_fromhost(A) fromhost(A) - #define my_hosts_access(A) hosts_access(A) - #define my_eval_client(A) eval_client(A) diff --git a/databases/mysql54-server/pkg-descr b/databases/mysql54-server/pkg-descr index 8f4acf36e853..cd19c135f9cc 100644 --- a/databases/mysql54-server/pkg-descr +++ b/databases/mysql54-server/pkg-descr @@ -2,3 +2,6 @@ MySQL is a very fast, multi-threaded, multi-user and robust SQL (Structured Query Language) database server. WWW: http://www.mysql.com/ + +- Alex Dupre +sysadmin@alexdupre.com diff --git a/databases/mysql54-server/pkg-plist b/databases/mysql54-server/pkg-plist index 7a482d60bc34..692b3053f8c6 100644 --- a/databases/mysql54-server/pkg-plist +++ b/databases/mysql54-server/pkg-plist @@ -8,14 +8,21 @@ bin/myisamlog bin/myisampack bin/mysql_config bin/mysql_convert_table_format +bin/mysql_explain_log bin/mysql_find_rows +bin/mysql_fix_extensions bin/mysql_fix_privilege_tables +bin/mysql_install bin/mysql_install_db +bin/mysql_secure_installation bin/mysql_setpermission +bin/mysql_tableinfo +bin/mysql_waitpid bin/mysql_zap bin/mysqlaccess bin/mysqlbug bin/mysqld_multi +bin/mysqld_safe bin/mysqldumpslow bin/mysqlhotcopy bin/pack_isam @@ -23,7 +30,6 @@ bin/perror bin/replace bin/resolve_stack_dump bin/resolveip -bin/safe_mysqld etc/rc.d/mysql-server.sh %%PORTDOCS%%@unexec install-info --delete %D/info/mysql.info %D/info/dir %%PORTDOCS%%info/mysql.info @@ -36,15 +42,19 @@ lib/mysql/libmyisammrg.a lib/mysql/libmystrings.a lib/mysql/libmysys.a lib/mysql/libnisam.a +lib/mysql/libvio.a libexec/mysqld %%PORTDOCS%%share/doc/mysql/Flags/argentina.gif +%%PORTDOCS%%share/doc/mysql/Flags/armenia.gif %%PORTDOCS%%share/doc/mysql/Flags/australia.gif %%PORTDOCS%%share/doc/mysql/Flags/austria.gif +%%PORTDOCS%%share/doc/mysql/Flags/belgium.gif %%PORTDOCS%%share/doc/mysql/Flags/brazil.gif %%PORTDOCS%%share/doc/mysql/Flags/bulgaria.gif %%PORTDOCS%%share/doc/mysql/Flags/canada.gif %%PORTDOCS%%share/doc/mysql/Flags/chile.gif %%PORTDOCS%%share/doc/mysql/Flags/china.gif +%%PORTDOCS%%share/doc/mysql/Flags/costa-rica.gif %%PORTDOCS%%share/doc/mysql/Flags/croatia.gif %%PORTDOCS%%share/doc/mysql/Flags/czech-republic.gif %%PORTDOCS%%share/doc/mysql/Flags/denmark.gif @@ -58,25 +68,28 @@ libexec/mysqld %%PORTDOCS%%share/doc/mysql/Flags/iceland.gif %%PORTDOCS%%share/doc/mysql/Flags/indonesia.gif %%PORTDOCS%%share/doc/mysql/Flags/ireland.gif -%%PORTDOCS%%share/doc/mysql/Flags/island.gif %%PORTDOCS%%share/doc/mysql/Flags/israel.gif %%PORTDOCS%%share/doc/mysql/Flags/italy.gif %%PORTDOCS%%share/doc/mysql/Flags/japan.gif -%%PORTDOCS%%share/doc/mysql/Flags/kroatia.gif %%PORTDOCS%%share/doc/mysql/Flags/latvia.gif +%%PORTDOCS%%share/doc/mysql/Flags/mexico.gif %%PORTDOCS%%share/doc/mysql/Flags/netherlands.gif +%%PORTDOCS%%share/doc/mysql/Flags/new-zealand.gif +%%PORTDOCS%%share/doc/mysql/Flags/norway.gif +%%PORTDOCS%%share/doc/mysql/Flags/philippines.gif %%PORTDOCS%%share/doc/mysql/Flags/poland.gif %%PORTDOCS%%share/doc/mysql/Flags/portugal.gif %%PORTDOCS%%share/doc/mysql/Flags/romania.gif %%PORTDOCS%%share/doc/mysql/Flags/russia.gif %%PORTDOCS%%share/doc/mysql/Flags/singapore.gif +%%PORTDOCS%%share/doc/mysql/Flags/slovenia.gif %%PORTDOCS%%share/doc/mysql/Flags/south-africa.gif -%%PORTDOCS%%share/doc/mysql/Flags/south-africa1.gif %%PORTDOCS%%share/doc/mysql/Flags/south-korea.gif %%PORTDOCS%%share/doc/mysql/Flags/spain.gif %%PORTDOCS%%share/doc/mysql/Flags/sweden.gif %%PORTDOCS%%share/doc/mysql/Flags/switzerland.gif %%PORTDOCS%%share/doc/mysql/Flags/taiwan.gif +%%PORTDOCS%%share/doc/mysql/Flags/turkey.gif %%PORTDOCS%%share/doc/mysql/Flags/ukraine.gif %%PORTDOCS%%share/doc/mysql/Flags/usa.gif %%PORTDOCS%%share/doc/mysql/Flags/yugoslavia.gif diff --git a/databases/mysql54-server/pkg-plist.client b/databases/mysql54-server/pkg-plist.client index 13d787a27fb7..e7ad0a65b8a1 100644 --- a/databases/mysql54-server/pkg-plist.client +++ b/databases/mysql54-server/pkg-plist.client @@ -4,6 +4,8 @@ bin/mysqlbinlog bin/mysqlcheck bin/mysqldump bin/mysqlimport +bin/mysqlmanager-pwgen +bin/mysqlmanagerc bin/mysqlshow bin/mysqltest etc/rc.d/000.mysql-client.sh @@ -11,24 +13,27 @@ include/mysql/dbug.h include/mysql/errmsg.h include/mysql/m_ctype.h include/mysql/m_string.h +include/mysql/my_alloc.h include/mysql/my_config.h +include/mysql/my_getopt.h include/mysql/my_global.h include/mysql/my_list.h include/mysql/my_net.h include/mysql/my_no_pthread.h include/mysql/my_pthread.h +include/mysql/my_semaphore.h include/mysql/my_sys.h include/mysql/mysql.h include/mysql/mysql_com.h +include/mysql/mysql_embed.h include/mysql/mysql_version.h include/mysql/mysqld_error.h include/mysql/raid.h include/mysql/sslopt-case.h include/mysql/sslopt-longopts.h -include/mysql/sslopt-usage.h include/mysql/sslopt-vars.h lib/mysql/libmysqlclient.a lib/mysql/libmysqlclient.so -lib/mysql/libmysqlclient.so.10 +lib/mysql/libmysqlclient.so.12 @dirrm include/mysql @dirrm lib/mysql diff --git a/databases/mysql55-client/Makefile b/databases/mysql55-client/Makefile index b5f3065ac95f..e9f4c3c3277e 100644 --- a/databases/mysql55-client/Makefile +++ b/databases/mysql55-client/Makefile @@ -1,14 +1,15 @@ -# ports collection makefile for: MySQL-client -# Date created: Sun Sep 24 21:21:20 CEST 2000 -# Whom: Dirk Froemberg <dirk@FreeBSD.org> +# New ports collection makefile for: MySQL-client +# Date created: Sun Mar 3 12:20:35 CET 2002 +# Whom: Alex Dupre <sysadmin@alexdupre.com> # # $FreeBSD$ # -PORTNAME= mysql-client +PORTNAME= mysql PORTREVISION= 0 +PKGNAMESUFFIX= -client -MASTERDIR= ${.CURDIR}/../mysql323-server +MASTERDIR= ${.CURDIR}/../mysql40-server COMMENT= ${PKGDIR}/pkg-comment.client PKGINSTALL= mustnotexist PLIST= ${PKGDIR}/pkg-plist.client diff --git a/databases/mysql55-server/Makefile b/databases/mysql55-server/Makefile index bb9329b3c669..b499fd55b10d 100644 --- a/databases/mysql55-server/Makefile +++ b/databases/mysql55-server/Makefile @@ -1,42 +1,51 @@ -# ports collection makefile for: MySQL-server -# Date created: Sun Sep 24 21:20:46 CEST 2000 -# Whom: Dirk Froemberg <dirk@FreeBSD.org> +# New ports collection makefile for: MySQL-server +# Date created: Sun Mar 3 12:20:35 CET 2002 +# Whom: Alex Dupre <sysadmin@alexdupre.com> # # $FreeBSD$ # -PORTNAME?= ${MASTERPORTNAME} -PORTVERSION= 3.23.55 +PORTNAME?= mysql +PORTVERSION= 4.0.9 PORTREVISION?= 0 CATEGORIES= databases -MASTER_SITES= http://www.kernelnotes.de/MySQL/Downloads/MySQL-3.23/ \ - http://mysql.he.net/Downloads/MySQL-3.23/ \ - ftp://ftp.sunet.se/pub/unix/databases/relational/mysql/Downloads/MySQL-3.23/ \ - ftp://mysql.secsup.org/pub/software/mysql/Downloads/MySQL-3.23/ \ - http://mysql.orst.edu/Downloads/MySQL-3.23/ \ - http://web.tryc.on.ca/mysql/Downloads/MySQL-3.23/ \ - ftp://ftp.gwdg.de/pub/misc/mysql/Downloads/MySQL-3.23/ -DISTFILES= mysql-${PORTVERSION}${EXTRACT_SUFX} - -MAINTAINER= dirk@FreeBSD.org - -WRKSRC= ${WRKDIR}/mysql-${PORTVERSION} -SLAVEDIRS= databases/mysql323-client -MASTERPORTNAME= mysql-server +MASTER_SITES= ftp://mysql.secsup.org/pub/software/mysql/Downloads/MySQL-4.0/ \ + http://mysql.tzone.it/Downloads/MySQL-4.0/ \ + ftp://planetmirror.com/pub/mysql/Downloads/MySQL-4.0/ \ + http://www.softagency.co.jp/MySQL/Downloads/MySQL-4.0/ \ + ftp://sunsite.dk/mirrors/mysql/Downloads/MySQL-4.0/ \ + http://mysql.mediatraffic.fi/Downloads/MySQL-4.0/ \ + ftp://filepile.tiscali.de/mirror/mysql/Downloads/MySQL-4.0/ \ + http://mirrors.tilian.co.uk/mysql.com/Downloads/MySQL-4.0/ \ + ftp://ftp.rtfm.no/pub/mysql/Downloads/MySQL-4.0/ \ + http://www.mysql.cz/Downloads/MySQL-4.0/ \ + ftp://ftp.u-paris10.fr/mysql.com/Downloads/MySQL-4.0/ \ + http://mysql.oms-net.nl/Downloads/MySQL-4.0/ \ + ftp://ftp.free.fr/pub/MySQL/Downloads/MySQL-4.0/ +PKGNAMESUFFIX?= -server +DISTNAME= ${PORTNAME}-${PORTVERSION}-gamma + +MAINTAINER= sysadmin@alexdupre.com + +SLAVEDIRS= databases/mysql40-client DB_DIR?= /var/db/mysql -USE_PERL5= yes +USE_PERL5_RUN= yes USE_LIBTOOL= yes + +GNU_CONFIGURE= yes CONFIGURE_ARGS= --localstatedir=${DB_DIR} \ - --without-perl \ --without-debug \ --without-readline \ --without-bench \ - --with-mit-threads=no \ + --without-extra-tools \ --with-libwrap \ + --with-raid \ + --with-mysqlfs \ + --with-vio \ --with-low-memory \ --with-comment='FreeBSD port: ${PKGNAME}' \ - --program-prefix='' \ - --with-innodb + --with-server-suffix='' \ + --program-prefix='' .if ${MACHINE_ARCH} == "i386" CONFIGURE_ARGS+=--enable-assembler --with-berkeley-db @@ -47,71 +56,68 @@ CONFIGURE_ARGS+=--with-charset=${WITH_CHARSET} .if defined(WITH_XCHARSET) && ${WITH_XCHARSET} != "" CONFIGURE_ARGS+=--with-extra-charsets=${WITH_XCHARSET} .endif +.if defined(WITH_OPENSSL) +USE_OPENSSL= yes +CONFIGURE_ARGS+=--with-openssl +.endif .if defined(BUILD_STATIC) -CONFIGURE_ARGS+=--with-mysqld-ldflags=--static +CONFIGURE_ARGS+=--with-mysqld-ldflags=-all-static .endif .if defined(BUILD_OPTIMIZED) -CFLAGS+= -mcpu=pentiumpro -O3 -.endif -.if defined(WITH_LINUXTHREADS) -CONFIGURE_ARGS+=--with-named-thread-libs='-DHAVE_GLIBC2_STYLE_GETHOSTBYNAME_R -D_THREAD_SAFE -I${LOCALBASE}/include/pthread/linuxthreads -L${LOCALBASE}/lib -llthread -llgcc_r' -CFLAGS+= -D__USE_UNIX98 -D_REENTRANT -D_THREAD_SAFE -I${LOCALBASE}/include/pthread/linuxthreads -LIB_DEPENDS+= lthread.2:${PORTSDIR}/devel/linuxthreads +CFLAGS+= -mcpu=i686 .endif .if defined(THREAD_SAFE_CLIENT) CONFIGURE_ARGS+=--enable-thread-safe-client .endif -CONFIGURE_ENV+= PERL=${PERL} \ - PERL5=${PERL} \ - INSTALL_SCRIPT="${INSTALL_SCRIPT}" \ - CFLAGS="${CFLAGS}" \ - CONFIGURE_ARGS="${CONFIGURE_ARGS}" -.include <bsd.port.pre.mk> -# without including these flags mysqld may crash under heavy load -# and multiple connections at the same time +CFLAGS+= -O3 -fno-omit-frame-pointer CXXFLAGS= ${CFLAGS} -felide-constructors -fno-rtti + +.include <bsd.port.pre.mk> .if ${OSVERSION} >= 400002 CXXFLAGS+= -fno-exceptions .endif .if ${OSVERSION} < 500000 -CONFIGURE_ENV+= CXX="${CC}" +CXX= ${CC} .endif # MySQL-Server part .if !defined(CLIENT_ONLY) -RUN_DEPENDS= mysql:${PORTSDIR}/databases/mysql323-client \ +RUN_DEPENDS= mysql:${PORTSDIR}/databases/mysql40-client \ ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Mysql.pm:${PORTSDIR}/databases/p5-Mysql -PLIST_SUB= MYSQL_VERSION=${PORTVERSION} +PLIST_SUB= MYSQL_VERSION=${PORTVERSION}-gamma -ONLY_FOR_ARCHS= i386 alpha sparc64 +ONLY_FOR_ARCHS= i386 alpha + +DOCS= manual.html manual.ps manual_toc.html manual.txt manual.texi \ + include.texi pre-fetch: @${ECHO} "" @${ECHO} "You may use the following build options:" @${ECHO} "" - @${ECHO} " WITH_CHARSET=charset define the primary built-in charset (latin1);" - @${ECHO} " WITH_XCHARSET=list define other built-in charsets (may be 'all');" + @${ECHO} " WITH_CHARSET=charset Define the primary built-in charset (latin1)." + @${ECHO} " WITH_XCHARSET=list Define other built-in charsets (may be 'all')." + @${ECHO} " WITH_OPENSSL=yes Enable secure connections." @${ECHO} " DB_DIR=directory Set alternate directory for database files" @${ECHO} " (default is /var/db/mysql)." - @${ECHO} " WITH_LINUXTHREADS=yes Use the linuxthreads pthread library." - @${ECHO} " This is _NOT_ recommended for production" - @${ECHO} " servers. Expect problems when enabled." - @${ECHO} " SKIP_INSTALL_DB=yes Skip mysql_install_db" - @${ECHO} " (i. e. leave ${DB_DIR} alone)." - @${ECHO} " This is useful for upgrades." - @${ECHO} " Be sure to know what you are doing!" - @${ECHO} " SKIP_DNS_CHECK=yes don't run resolveip to do an additional" + @${ECHO} " SKIP_INSTALL_DB=yes Skip database initialization" + @${ECHO} " (useful for upgrades)." + @${ECHO} " SKIP_DNS_CHECK=yes Don't run resolveip to do an additional" @${ECHO} " DNS check before inserting local hostname to" - @${ECHO} " mysql database." - @${ECHO} " Use if your machine has no offical DNS entry." + @${ECHO} " mysql database" + @${ECHO} " (use if your machine has no official DNS entry)." @${ECHO} " BUILD_STATIC=yes Build a static version of mysqld." - @${ECHO} " BUILD_OPTIMIZED=yes Add -mcpu=pentiumpro -O3 to CFLAGS." - @${ECHO} " This setting may produce broken code and thus" - @${ECHO} " is not recommended for production servers." + @${ECHO} " BUILD_OPTIMIZED=yes Add -mcpu=i686 to CFLAGS." @${ECHO} "" +.if defined(WITH_OPENSSL) && defined(BUILD_STATIC) +pre-configure: + @${ECHO} "You can't use the BUILD_STATIC option when using OpenSSL." + @${FALSE} +.endif + .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}." @@ -145,20 +151,18 @@ post-install: @${CHMOD} 750 ${PREFIX}/etc/rc.d/mysql-server.sh .if !defined(NOPORTDOCS) - ${MKDIR} ${PREFIX}/share/doc/mysql/Flags -.for doc in manual.html manual.ps manual_toc.html manual.txt manual.texi include.texi - ${INSTALL_DATA} ${WRKSRC}/Docs/${doc} ${PREFIX}/share/doc/mysql + ${MKDIR} ${DOCSDIR}/Flags +.for doc in ${DOCS} + ${INSTALL_DATA} ${WRKSRC}/Docs/${doc} ${DOCSDIR} .endfor - ${INSTALL_DATA} ${WRKSRC}/Docs/Flags/*.gif ${PREFIX}/share/doc/mysql/Flags - ${INSTALL_DATA} ${WRKSRC}/Docs/mysql.info ${PREFIX}/info - @install-info ${PREFIX}/info/mysql.info ${PREFIX}/info/dir + ${INSTALL_DATA} ${WRKSRC}/Docs/Flags/*.gif ${DOCSDIR}/Flags .endif # MySQL-Client part .else MAN1= isamchk.1 isamlog.1 mysql.1 mysql_zap.1 mysqlaccess.1 \ - mysqladmin.1 mysqld.1 mysqld_multi.1 mysqldump.1 mysqlshow.1 \ - perror.1 replace.1 safe_mysqld.1 + mysqladmin.1 mysqld.1 mysqld_multi.1 mysqld_safe.1 mysqldump.1 \ + mysqlshow.1 perror.1 replace.1 INSTALLS_SHLIB= yes LDCONFIG_DIRS= %%PREFIX%%/lib/mysql @@ -172,9 +176,4 @@ post-install: .endif -# This is for the maintainer only... -make-plist: - /usr/bin/find foo -type f -or -type l | /usr/bin/cut -d / -f 2- | /usr/bin/sort > ${.CURDIR}/pkg-plist.new - /usr/bin/perl -i -ne 'if (m#share/doc/#) { print "%%PORTDOCS%%", $$_; } else { print $$_; }' ${.CURDIR}/pkg-plist.new - .include <bsd.port.post.mk> diff --git a/databases/mysql55-server/distinfo b/databases/mysql55-server/distinfo index b56d22caad75..4c809e2ce104 100644 --- a/databases/mysql55-server/distinfo +++ b/databases/mysql55-server/distinfo @@ -1 +1 @@ -MD5 (mysql-3.23.55.tar.gz) = 259196ddc00c94051dceb9e86574d17e +MD5 (mysql-4.0.9-gamma.tar.gz) = 75d582f3e71e21cd6ffa7c84a6db26c3 diff --git a/databases/mysql55-server/files/mysql-server.sh b/databases/mysql55-server/files/mysql-server.sh index 6a5acb39a962..5180b9c0c1eb 100644 --- a/databases/mysql55-server/files/mysql-server.sh +++ b/databases/mysql55-server/files/mysql-server.sh @@ -5,9 +5,9 @@ PIDFILE=${DB_DIR}/`/bin/hostname -s`.pid case "$1" in start) - if [ -x %%PREFIX%%/bin/safe_mysqld ]; then + if [ -x %%PREFIX%%/bin/mysqld_safe ]; then /usr/bin/limits -U mysql \ - %%PREFIX%%/bin/safe_mysqld --user=mysql --datadir=${DB_DIR} --pid-file=${PIDFILE} > /dev/null & + %%PREFIX%%/bin/mysqld_safe --user=mysql --datadir=${DB_DIR} --pid-file=${PIDFILE} > /dev/null & echo -n ' mysqld' fi ;; diff --git a/databases/mysql55-server/files/patch-Makefile.in b/databases/mysql55-server/files/patch-Makefile.in index 987cf407da8f..c8bf28bc02bc 100644 --- a/databases/mysql55-server/files/patch-Makefile.in +++ b/databases/mysql55-server/files/patch-Makefile.in @@ -1,19 +1,20 @@ ---- Makefile.in.orig Thu Jan 23 16:13:43 2003 -+++ Makefile.in Wed Jan 29 17:11:29 2003 -@@ -195,11 +195,11 @@ +--- Makefile.in.orig Wed Nov 20 00:06:37 2002 ++++ Makefile.in Wed Nov 20 00:07:31 2002 +@@ -207,12 +207,11 @@ EXTRA_DIST = INSTALL-SOURCE README \ - COPYING COPYING.LIB MIRRORS + COPYING COPYING.LIB --SUBDIRS = . include @docs_dirs@ @readline_dir@ \ -- @thread_dirs@ @sql_client_dirs@ \ -- @sql_server_dirs@ scripts tests man \ -- @bench_dirs@ support-files os2 +-SUBDIRS = include @docs_dirs@ @readline_dir@ \ +- @thread_dirs@ pstack @sql_client_dirs@ \ +- @sql_server_dirs@ @libmysqld_dirs@ scripts man \ +- tests BUILD os2 \ +- @bench_dirs@ support-files @fs_dirs@ @tools_dirs@ - +.if defined(CLIENT_ONLY) -+SUBDIRS = include @readline_dir@ @sql_client_dirs@ tests man ++SUBDIRS = include @sql_client_dirs@ tests man +.else -+SUBDIRS = include @thread_dirs@ @docs_dirs@ @sql_server_dirs@ scripts support-files ++SUBDIRS = include @docs_dirs@ @sql_server_dirs@ scripts support-files +.endif # Relink after clean - CLEANFILES = linked_client_sources linked_server_sources linked_libmysql_sources linked_libmysql_r_sources linked_include_sources + linked_sources = linked_client_sources linked_server_sources \ diff --git a/databases/mysql55-server/files/patch-af b/databases/mysql55-server/files/patch-af deleted file mode 100644 index 8d2d1003f2e4..000000000000 --- a/databases/mysql55-server/files/patch-af +++ /dev/null @@ -1,79 +0,0 @@ ---- scripts/safe_mysqld.sh.orig Thu Oct 10 12:17:29 2002 -+++ scripts/safe_mysqld.sh Sun Nov 10 21:27:46 2002 -@@ -68,30 +68,9 @@ - done - } - --MY_PWD=`pwd` --# Check if we are starting this relative (for the binary release) --if test -d $MY_PWD/data/mysql -a -f ./share/mysql/english/errmsg.sys -a \ -- -x ./bin/mysqld --then -- MY_BASEDIR_VERSION=$MY_PWD # Where bin, share and data are -- ledir=$MY_BASEDIR_VERSION/bin # Where mysqld is -- DATADIR=$MY_BASEDIR_VERSION/data -- if test -z "$defaults" -- then -- defaults="--defaults-extra-file=$MY_BASEDIR_VERSION/data/my.cnf" -- fi --# Check if this is a 'moved install directory' --elif test -f ./var/mysql/db.frm -a -f ./share/mysql/english/errmsg.sys -a \ -- -x ./libexec/mysqld --then -- MY_BASEDIR_VERSION=$MY_PWD # Where libexec, share and var are -- ledir=$MY_BASEDIR_VERSION/libexec # Where mysqld is -- DATADIR=$MY_BASEDIR_VERSION/var --else -- MY_BASEDIR_VERSION=@prefix@ -- DATADIR=@localstatedir@ -- ledir=@libexecdir@ --fi -+MY_BASEDIR_VERSION=@prefix@ -+DATADIR=@localstatedir@ -+ledir=@libexecdir@ - - MYSQL_UNIX_PORT=${MYSQL_UNIX_PORT:-@MYSQL_UNIX_ADDR@} - MYSQL_TCP_PORT=${MYSQL_TCP_PORT:-@MYSQL_TCP_PORT@} -@@ -106,7 +85,6 @@ - fi - - # these rely on $DATADIR by default, so we'll set them later on --pid_file= - err_log= - SET_USER=0 - -@@ -239,34 +217,6 @@ - if test ! -f $pid_file # This is removed if normal shutdown - then - break -- fi -- -- if @IS_LINUX@ -- then -- # Test if one process was hanging. -- # This is only a fix for Linux (running as base 3 mysqld processes) -- # but should work for the rest of the servers. -- # The only thing is ps x => redhat 5 gives warnings when using ps -x. -- # kill -9 is used or the process won't react on the kill. -- numofproces=`ps xa | grep -v "grep" | grep -c $ledir/$MYSQLD` -- echo -e "\nNumber of processes running now: $numofproces" | tee -a $err_log -- I=1 -- while test "$I" -le "$numofproces" -- do -- PROC=`ps xa | grep $ledir/$MYSQLD | grep -v "grep" | sed -n '$p'` -- for T in $PROC -- do -- break -- done -- # echo "TEST $I - $T **" -- if kill -9 $T -- then -- echo "$MYSQLD process hanging, pid $T - killed" | tee -a $err_log -- else -- break -- fi -- I=`expr $I + 1` -- done - fi - - echo "`date +'%y%m%d %H:%M:%S'` mysqld restarted" | tee -a $err_log diff --git a/databases/mysql55-server/files/patch-configure b/databases/mysql55-server/files/patch-configure index 6c6e0ad044fa..5f5155735ee1 100644 --- a/databases/mysql55-server/files/patch-configure +++ b/databases/mysql55-server/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig Thu Dec 5 10:37:31 2002 -+++ configure Mon Dec 16 19:49:41 2002 -@@ -8059,6 +8059,7 @@ +--- configure.orig Mon Dec 16 10:12:16 2002 ++++ configure Fri Dec 20 18:11:14 2002 +@@ -8071,6 +8071,7 @@ # This can be used to rebuild libtool when needed LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" @@ -8,7 +8,7 @@ # Always use our own libtool. LIBTOOL='$(SHELL) $(top_builddir)/libtool' -@@ -8988,7 +8989,7 @@ +@@ -9000,7 +9001,7 @@ ;; esac fi @@ -17,142 +17,3 @@ if test -n "$HOSTNAME"; then echo "$as_me:$LINENO: result: $HOSTNAME" >&5 -@@ -9177,43 +9178,7 @@ - echo "${ECHO_T}no" >&6 - fi - --echo "$as_me:$LINENO: checking \"how to check if pid exists\"" >&5 --echo $ECHO_N "checking \"how to check if pid exists\"... $ECHO_C" >&6 --PS=$ac_cv_path_PS --# Linux style --if $PS p $$ 2> /dev/null | grep $0 > /dev/null --then -- FIND_PROC="$PS p \$\$PID | grep mysqld > /dev/null" --# Solaris --elif $PS -p $$ 2> /dev/null | grep $0 > /dev/null --then -- FIND_PROC="$PS -p \$\$PID | grep mysqld > /dev/null" --# BSD style --elif $PS -uaxww 2> /dev/null | grep $0 > /dev/null --then -- FIND_PROC="$PS -uaxww | grep mysqld | grep \" \$\$PID \" > /dev/null" --# SysV style --elif $PS -ef 2> /dev/null | grep $0 > /dev/null --then -- FIND_PROC="$PS -ef | grep mysqld | grep \" \$\$PID \" > /dev/null" --# Do anybody use this? --elif $PS $$ 2> /dev/null | grep $0 > /dev/null --then -- FIND_PROC="$PS \$\$PID | grep mysqld > /dev/null" --else -- case $SYSTEM_TYPE in -- *darwin*) -- FIND_PROC="$PS -uaxww | grep mysqld | grep \" \$\$PID \" > /dev/null" -- ;; -- *cygwin*) -- FIND_PROC="$PS -e | grep mysqld | grep \" \$\$PID \" > /dev/null" -- ;; -- *) -- { { echo "$as_me:$LINENO: error: Could not find the right ps switches. Which OS is this ?. See the Installation chapter in the Reference Manual." >&5 --echo "$as_me: error: Could not find the right ps switches. Which OS is this ?. See the Installation chapter in the Reference Manual." >&2;} -- { (exit 1); exit 1; }; } -- esac --fi -+FIND_PROC="$PS -uaxww | grep mysqld | grep \" \$\$PID \" > /dev/null" - - echo "$as_me:$LINENO: result: \"$FIND_PROC\"" >&5 - echo "${ECHO_T}\"$FIND_PROC\"" >&6 -@@ -13208,7 +13173,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 $LINENO "configure" - #include "confdefs.h" -@@ -13262,7 +13226,6 @@ - #define HAVE_LIBC_R 1 - _ACEOF - -- LIBS="-lc_r $LIBS" - - fi - -@@ -13706,29 +13669,6 @@ - fi - - --# Build optimized or debug version ? --# First check for gcc and g++ --if test "$ac_cv_c_compiler_gnu" = "yes" --then -- DEBUG_CFLAGS="-g" -- DEBUG_OPTIMIZE_CC="-O" -- OPTIMIZE_CFLAGS="$MAX_C_OPTIMIZE" --else -- DEBUG_CFLAGS="-g" -- DEBUG_OPTIMIZE_CC="" -- OPTIMIZE_CFLAGS="-O" --fi --if test "$ac_cv_prog_cxx_g" = "yes" --then -- DEBUG_CXXFLAGS="-g" -- DEBUG_OPTIMIZE_CXX="-O" -- OPTIMIZE_CXXFLAGS="-O3" --else -- DEBUG_CXXFLAGS="-g" -- DEBUG_OPTIMIZE_CXX="" -- OPTIMIZE_CXXFLAGS="-O" --fi -- - - # Check whether --with-debug or --without-debug was given. - if test "${with_debug+set}" = set; then -@@ -16081,10 +16021,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_cxx_compiler_gnu" = "yes" --then -- CXXFLAGS="$CXXFLAGS -Werror" --fi - mysql_cv_btype_last_arg_accept=none - cat >conftest.$ac_ext <<_ACEOF - #line $LINENO "configure" -@@ -19222,14 +19158,6 @@ - ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - - --# Do not treat warnings as errors if we are linking against 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 <<_ACEOF - #line $LINENO "configure" - #include "confdefs.h" -@@ -19313,10 +19241,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_cxx_compiler_gnu" = "yes" -a "$with_other_libc" = "no" --then -- CXXFLAGS="$CXXFLAGS -Werror" --fi - cat >conftest.$ac_ext <<_ACEOF - #line $LINENO "configure" - #include "confdefs.h" -@@ -19399,10 +19323,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_cxx_compiler_gnu" = "yes" -a "$with_other_libc" = "no" --then -- CXXFLAGS="$CXXFLAGS -Werror" --fi - cat >conftest.$ac_ext <<_ACEOF - #line $LINENO "configure" - #include "confdefs.h" diff --git a/databases/mysql55-server/files/patch-include::Makefile.in b/databases/mysql55-server/files/patch-include::Makefile.in index 3ff10ce708d5..34b404c0a255 100644 --- a/databases/mysql55-server/files/patch-include::Makefile.in +++ b/databases/mysql55-server/files/patch-include::Makefile.in @@ -1,6 +1,6 @@ ---- include/Makefile.in.orig Thu Dec 5 10:37:22 2002 -+++ include/Makefile.in Sat Dec 14 16:26:53 2002 -@@ -324,7 +324,11 @@ +--- include/Makefile.in.orig Tue Nov 19 17:13:35 2002 ++++ include/Makefile.in Tue Nov 19 17:14:10 2002 +@@ -335,7 +335,11 @@ installdirs: $(mkinstalldirs) $(DESTDIR)$(pkgincludedir) diff --git a/databases/mysql55-server/files/patch-sql_mysqld.cc b/databases/mysql55-server/files/patch-sql_mysqld.cc deleted file mode 100644 index 5155bd5f33cd..000000000000 --- a/databases/mysql55-server/files/patch-sql_mysqld.cc +++ /dev/null @@ -1,12 +0,0 @@ ---- sql/mysqld.cc.orig Thu Oct 10 12:17:28 2002 -+++ sql/mysqld.cc Tue Nov 12 23:23:27 2002 -@@ -92,7 +92,8 @@ - int allow_severity = LOG_INFO; - int deny_severity = LOG_WARNING; - --#ifdef __STDC__ -+#include <osreldate.h> -+#if defined(__STDC__) && __FreeBSD_version < 500000 - #define my_fromhost(A) fromhost(A) - #define my_hosts_access(A) hosts_access(A) - #define my_eval_client(A) eval_client(A) diff --git a/databases/mysql55-server/pkg-descr b/databases/mysql55-server/pkg-descr index 8f4acf36e853..cd19c135f9cc 100644 --- a/databases/mysql55-server/pkg-descr +++ b/databases/mysql55-server/pkg-descr @@ -2,3 +2,6 @@ MySQL is a very fast, multi-threaded, multi-user and robust SQL (Structured Query Language) database server. WWW: http://www.mysql.com/ + +- Alex Dupre +sysadmin@alexdupre.com diff --git a/databases/mysql55-server/pkg-plist b/databases/mysql55-server/pkg-plist index 7a482d60bc34..692b3053f8c6 100644 --- a/databases/mysql55-server/pkg-plist +++ b/databases/mysql55-server/pkg-plist @@ -8,14 +8,21 @@ bin/myisamlog bin/myisampack bin/mysql_config bin/mysql_convert_table_format +bin/mysql_explain_log bin/mysql_find_rows +bin/mysql_fix_extensions bin/mysql_fix_privilege_tables +bin/mysql_install bin/mysql_install_db +bin/mysql_secure_installation bin/mysql_setpermission +bin/mysql_tableinfo +bin/mysql_waitpid bin/mysql_zap bin/mysqlaccess bin/mysqlbug bin/mysqld_multi +bin/mysqld_safe bin/mysqldumpslow bin/mysqlhotcopy bin/pack_isam @@ -23,7 +30,6 @@ bin/perror bin/replace bin/resolve_stack_dump bin/resolveip -bin/safe_mysqld etc/rc.d/mysql-server.sh %%PORTDOCS%%@unexec install-info --delete %D/info/mysql.info %D/info/dir %%PORTDOCS%%info/mysql.info @@ -36,15 +42,19 @@ lib/mysql/libmyisammrg.a lib/mysql/libmystrings.a lib/mysql/libmysys.a lib/mysql/libnisam.a +lib/mysql/libvio.a libexec/mysqld %%PORTDOCS%%share/doc/mysql/Flags/argentina.gif +%%PORTDOCS%%share/doc/mysql/Flags/armenia.gif %%PORTDOCS%%share/doc/mysql/Flags/australia.gif %%PORTDOCS%%share/doc/mysql/Flags/austria.gif +%%PORTDOCS%%share/doc/mysql/Flags/belgium.gif %%PORTDOCS%%share/doc/mysql/Flags/brazil.gif %%PORTDOCS%%share/doc/mysql/Flags/bulgaria.gif %%PORTDOCS%%share/doc/mysql/Flags/canada.gif %%PORTDOCS%%share/doc/mysql/Flags/chile.gif %%PORTDOCS%%share/doc/mysql/Flags/china.gif +%%PORTDOCS%%share/doc/mysql/Flags/costa-rica.gif %%PORTDOCS%%share/doc/mysql/Flags/croatia.gif %%PORTDOCS%%share/doc/mysql/Flags/czech-republic.gif %%PORTDOCS%%share/doc/mysql/Flags/denmark.gif @@ -58,25 +68,28 @@ libexec/mysqld %%PORTDOCS%%share/doc/mysql/Flags/iceland.gif %%PORTDOCS%%share/doc/mysql/Flags/indonesia.gif %%PORTDOCS%%share/doc/mysql/Flags/ireland.gif -%%PORTDOCS%%share/doc/mysql/Flags/island.gif %%PORTDOCS%%share/doc/mysql/Flags/israel.gif %%PORTDOCS%%share/doc/mysql/Flags/italy.gif %%PORTDOCS%%share/doc/mysql/Flags/japan.gif -%%PORTDOCS%%share/doc/mysql/Flags/kroatia.gif %%PORTDOCS%%share/doc/mysql/Flags/latvia.gif +%%PORTDOCS%%share/doc/mysql/Flags/mexico.gif %%PORTDOCS%%share/doc/mysql/Flags/netherlands.gif +%%PORTDOCS%%share/doc/mysql/Flags/new-zealand.gif +%%PORTDOCS%%share/doc/mysql/Flags/norway.gif +%%PORTDOCS%%share/doc/mysql/Flags/philippines.gif %%PORTDOCS%%share/doc/mysql/Flags/poland.gif %%PORTDOCS%%share/doc/mysql/Flags/portugal.gif %%PORTDOCS%%share/doc/mysql/Flags/romania.gif %%PORTDOCS%%share/doc/mysql/Flags/russia.gif %%PORTDOCS%%share/doc/mysql/Flags/singapore.gif +%%PORTDOCS%%share/doc/mysql/Flags/slovenia.gif %%PORTDOCS%%share/doc/mysql/Flags/south-africa.gif -%%PORTDOCS%%share/doc/mysql/Flags/south-africa1.gif %%PORTDOCS%%share/doc/mysql/Flags/south-korea.gif %%PORTDOCS%%share/doc/mysql/Flags/spain.gif %%PORTDOCS%%share/doc/mysql/Flags/sweden.gif %%PORTDOCS%%share/doc/mysql/Flags/switzerland.gif %%PORTDOCS%%share/doc/mysql/Flags/taiwan.gif +%%PORTDOCS%%share/doc/mysql/Flags/turkey.gif %%PORTDOCS%%share/doc/mysql/Flags/ukraine.gif %%PORTDOCS%%share/doc/mysql/Flags/usa.gif %%PORTDOCS%%share/doc/mysql/Flags/yugoslavia.gif diff --git a/databases/mysql55-server/pkg-plist.client b/databases/mysql55-server/pkg-plist.client index 13d787a27fb7..e7ad0a65b8a1 100644 --- a/databases/mysql55-server/pkg-plist.client +++ b/databases/mysql55-server/pkg-plist.client @@ -4,6 +4,8 @@ bin/mysqlbinlog bin/mysqlcheck bin/mysqldump bin/mysqlimport +bin/mysqlmanager-pwgen +bin/mysqlmanagerc bin/mysqlshow bin/mysqltest etc/rc.d/000.mysql-client.sh @@ -11,24 +13,27 @@ include/mysql/dbug.h include/mysql/errmsg.h include/mysql/m_ctype.h include/mysql/m_string.h +include/mysql/my_alloc.h include/mysql/my_config.h +include/mysql/my_getopt.h include/mysql/my_global.h include/mysql/my_list.h include/mysql/my_net.h include/mysql/my_no_pthread.h include/mysql/my_pthread.h +include/mysql/my_semaphore.h include/mysql/my_sys.h include/mysql/mysql.h include/mysql/mysql_com.h +include/mysql/mysql_embed.h include/mysql/mysql_version.h include/mysql/mysqld_error.h include/mysql/raid.h include/mysql/sslopt-case.h include/mysql/sslopt-longopts.h -include/mysql/sslopt-usage.h include/mysql/sslopt-vars.h lib/mysql/libmysqlclient.a lib/mysql/libmysqlclient.so -lib/mysql/libmysqlclient.so.10 +lib/mysql/libmysqlclient.so.12 @dirrm include/mysql @dirrm lib/mysql diff --git a/databases/mysql60-client/Makefile b/databases/mysql60-client/Makefile index b5f3065ac95f..e9f4c3c3277e 100644 --- a/databases/mysql60-client/Makefile +++ b/databases/mysql60-client/Makefile @@ -1,14 +1,15 @@ -# ports collection makefile for: MySQL-client -# Date created: Sun Sep 24 21:21:20 CEST 2000 -# Whom: Dirk Froemberg <dirk@FreeBSD.org> +# New ports collection makefile for: MySQL-client +# Date created: Sun Mar 3 12:20:35 CET 2002 +# Whom: Alex Dupre <sysadmin@alexdupre.com> # # $FreeBSD$ # -PORTNAME= mysql-client +PORTNAME= mysql PORTREVISION= 0 +PKGNAMESUFFIX= -client -MASTERDIR= ${.CURDIR}/../mysql323-server +MASTERDIR= ${.CURDIR}/../mysql40-server COMMENT= ${PKGDIR}/pkg-comment.client PKGINSTALL= mustnotexist PLIST= ${PKGDIR}/pkg-plist.client diff --git a/databases/mysql60-server/Makefile b/databases/mysql60-server/Makefile index bb9329b3c669..b499fd55b10d 100644 --- a/databases/mysql60-server/Makefile +++ b/databases/mysql60-server/Makefile @@ -1,42 +1,51 @@ -# ports collection makefile for: MySQL-server -# Date created: Sun Sep 24 21:20:46 CEST 2000 -# Whom: Dirk Froemberg <dirk@FreeBSD.org> +# New ports collection makefile for: MySQL-server +# Date created: Sun Mar 3 12:20:35 CET 2002 +# Whom: Alex Dupre <sysadmin@alexdupre.com> # # $FreeBSD$ # -PORTNAME?= ${MASTERPORTNAME} -PORTVERSION= 3.23.55 +PORTNAME?= mysql +PORTVERSION= 4.0.9 PORTREVISION?= 0 CATEGORIES= databases -MASTER_SITES= http://www.kernelnotes.de/MySQL/Downloads/MySQL-3.23/ \ - http://mysql.he.net/Downloads/MySQL-3.23/ \ - ftp://ftp.sunet.se/pub/unix/databases/relational/mysql/Downloads/MySQL-3.23/ \ - ftp://mysql.secsup.org/pub/software/mysql/Downloads/MySQL-3.23/ \ - http://mysql.orst.edu/Downloads/MySQL-3.23/ \ - http://web.tryc.on.ca/mysql/Downloads/MySQL-3.23/ \ - ftp://ftp.gwdg.de/pub/misc/mysql/Downloads/MySQL-3.23/ -DISTFILES= mysql-${PORTVERSION}${EXTRACT_SUFX} - -MAINTAINER= dirk@FreeBSD.org - -WRKSRC= ${WRKDIR}/mysql-${PORTVERSION} -SLAVEDIRS= databases/mysql323-client -MASTERPORTNAME= mysql-server +MASTER_SITES= ftp://mysql.secsup.org/pub/software/mysql/Downloads/MySQL-4.0/ \ + http://mysql.tzone.it/Downloads/MySQL-4.0/ \ + ftp://planetmirror.com/pub/mysql/Downloads/MySQL-4.0/ \ + http://www.softagency.co.jp/MySQL/Downloads/MySQL-4.0/ \ + ftp://sunsite.dk/mirrors/mysql/Downloads/MySQL-4.0/ \ + http://mysql.mediatraffic.fi/Downloads/MySQL-4.0/ \ + ftp://filepile.tiscali.de/mirror/mysql/Downloads/MySQL-4.0/ \ + http://mirrors.tilian.co.uk/mysql.com/Downloads/MySQL-4.0/ \ + ftp://ftp.rtfm.no/pub/mysql/Downloads/MySQL-4.0/ \ + http://www.mysql.cz/Downloads/MySQL-4.0/ \ + ftp://ftp.u-paris10.fr/mysql.com/Downloads/MySQL-4.0/ \ + http://mysql.oms-net.nl/Downloads/MySQL-4.0/ \ + ftp://ftp.free.fr/pub/MySQL/Downloads/MySQL-4.0/ +PKGNAMESUFFIX?= -server +DISTNAME= ${PORTNAME}-${PORTVERSION}-gamma + +MAINTAINER= sysadmin@alexdupre.com + +SLAVEDIRS= databases/mysql40-client DB_DIR?= /var/db/mysql -USE_PERL5= yes +USE_PERL5_RUN= yes USE_LIBTOOL= yes + +GNU_CONFIGURE= yes CONFIGURE_ARGS= --localstatedir=${DB_DIR} \ - --without-perl \ --without-debug \ --without-readline \ --without-bench \ - --with-mit-threads=no \ + --without-extra-tools \ --with-libwrap \ + --with-raid \ + --with-mysqlfs \ + --with-vio \ --with-low-memory \ --with-comment='FreeBSD port: ${PKGNAME}' \ - --program-prefix='' \ - --with-innodb + --with-server-suffix='' \ + --program-prefix='' .if ${MACHINE_ARCH} == "i386" CONFIGURE_ARGS+=--enable-assembler --with-berkeley-db @@ -47,71 +56,68 @@ CONFIGURE_ARGS+=--with-charset=${WITH_CHARSET} .if defined(WITH_XCHARSET) && ${WITH_XCHARSET} != "" CONFIGURE_ARGS+=--with-extra-charsets=${WITH_XCHARSET} .endif +.if defined(WITH_OPENSSL) +USE_OPENSSL= yes +CONFIGURE_ARGS+=--with-openssl +.endif .if defined(BUILD_STATIC) -CONFIGURE_ARGS+=--with-mysqld-ldflags=--static +CONFIGURE_ARGS+=--with-mysqld-ldflags=-all-static .endif .if defined(BUILD_OPTIMIZED) -CFLAGS+= -mcpu=pentiumpro -O3 -.endif -.if defined(WITH_LINUXTHREADS) -CONFIGURE_ARGS+=--with-named-thread-libs='-DHAVE_GLIBC2_STYLE_GETHOSTBYNAME_R -D_THREAD_SAFE -I${LOCALBASE}/include/pthread/linuxthreads -L${LOCALBASE}/lib -llthread -llgcc_r' -CFLAGS+= -D__USE_UNIX98 -D_REENTRANT -D_THREAD_SAFE -I${LOCALBASE}/include/pthread/linuxthreads -LIB_DEPENDS+= lthread.2:${PORTSDIR}/devel/linuxthreads +CFLAGS+= -mcpu=i686 .endif .if defined(THREAD_SAFE_CLIENT) CONFIGURE_ARGS+=--enable-thread-safe-client .endif -CONFIGURE_ENV+= PERL=${PERL} \ - PERL5=${PERL} \ - INSTALL_SCRIPT="${INSTALL_SCRIPT}" \ - CFLAGS="${CFLAGS}" \ - CONFIGURE_ARGS="${CONFIGURE_ARGS}" -.include <bsd.port.pre.mk> -# without including these flags mysqld may crash under heavy load -# and multiple connections at the same time +CFLAGS+= -O3 -fno-omit-frame-pointer CXXFLAGS= ${CFLAGS} -felide-constructors -fno-rtti + +.include <bsd.port.pre.mk> .if ${OSVERSION} >= 400002 CXXFLAGS+= -fno-exceptions .endif .if ${OSVERSION} < 500000 -CONFIGURE_ENV+= CXX="${CC}" +CXX= ${CC} .endif # MySQL-Server part .if !defined(CLIENT_ONLY) -RUN_DEPENDS= mysql:${PORTSDIR}/databases/mysql323-client \ +RUN_DEPENDS= mysql:${PORTSDIR}/databases/mysql40-client \ ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Mysql.pm:${PORTSDIR}/databases/p5-Mysql -PLIST_SUB= MYSQL_VERSION=${PORTVERSION} +PLIST_SUB= MYSQL_VERSION=${PORTVERSION}-gamma -ONLY_FOR_ARCHS= i386 alpha sparc64 +ONLY_FOR_ARCHS= i386 alpha + +DOCS= manual.html manual.ps manual_toc.html manual.txt manual.texi \ + include.texi pre-fetch: @${ECHO} "" @${ECHO} "You may use the following build options:" @${ECHO} "" - @${ECHO} " WITH_CHARSET=charset define the primary built-in charset (latin1);" - @${ECHO} " WITH_XCHARSET=list define other built-in charsets (may be 'all');" + @${ECHO} " WITH_CHARSET=charset Define the primary built-in charset (latin1)." + @${ECHO} " WITH_XCHARSET=list Define other built-in charsets (may be 'all')." + @${ECHO} " WITH_OPENSSL=yes Enable secure connections." @${ECHO} " DB_DIR=directory Set alternate directory for database files" @${ECHO} " (default is /var/db/mysql)." - @${ECHO} " WITH_LINUXTHREADS=yes Use the linuxthreads pthread library." - @${ECHO} " This is _NOT_ recommended for production" - @${ECHO} " servers. Expect problems when enabled." - @${ECHO} " SKIP_INSTALL_DB=yes Skip mysql_install_db" - @${ECHO} " (i. e. leave ${DB_DIR} alone)." - @${ECHO} " This is useful for upgrades." - @${ECHO} " Be sure to know what you are doing!" - @${ECHO} " SKIP_DNS_CHECK=yes don't run resolveip to do an additional" + @${ECHO} " SKIP_INSTALL_DB=yes Skip database initialization" + @${ECHO} " (useful for upgrades)." + @${ECHO} " SKIP_DNS_CHECK=yes Don't run resolveip to do an additional" @${ECHO} " DNS check before inserting local hostname to" - @${ECHO} " mysql database." - @${ECHO} " Use if your machine has no offical DNS entry." + @${ECHO} " mysql database" + @${ECHO} " (use if your machine has no official DNS entry)." @${ECHO} " BUILD_STATIC=yes Build a static version of mysqld." - @${ECHO} " BUILD_OPTIMIZED=yes Add -mcpu=pentiumpro -O3 to CFLAGS." - @${ECHO} " This setting may produce broken code and thus" - @${ECHO} " is not recommended for production servers." + @${ECHO} " BUILD_OPTIMIZED=yes Add -mcpu=i686 to CFLAGS." @${ECHO} "" +.if defined(WITH_OPENSSL) && defined(BUILD_STATIC) +pre-configure: + @${ECHO} "You can't use the BUILD_STATIC option when using OpenSSL." + @${FALSE} +.endif + .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}." @@ -145,20 +151,18 @@ post-install: @${CHMOD} 750 ${PREFIX}/etc/rc.d/mysql-server.sh .if !defined(NOPORTDOCS) - ${MKDIR} ${PREFIX}/share/doc/mysql/Flags -.for doc in manual.html manual.ps manual_toc.html manual.txt manual.texi include.texi - ${INSTALL_DATA} ${WRKSRC}/Docs/${doc} ${PREFIX}/share/doc/mysql + ${MKDIR} ${DOCSDIR}/Flags +.for doc in ${DOCS} + ${INSTALL_DATA} ${WRKSRC}/Docs/${doc} ${DOCSDIR} .endfor - ${INSTALL_DATA} ${WRKSRC}/Docs/Flags/*.gif ${PREFIX}/share/doc/mysql/Flags - ${INSTALL_DATA} ${WRKSRC}/Docs/mysql.info ${PREFIX}/info - @install-info ${PREFIX}/info/mysql.info ${PREFIX}/info/dir + ${INSTALL_DATA} ${WRKSRC}/Docs/Flags/*.gif ${DOCSDIR}/Flags .endif # MySQL-Client part .else MAN1= isamchk.1 isamlog.1 mysql.1 mysql_zap.1 mysqlaccess.1 \ - mysqladmin.1 mysqld.1 mysqld_multi.1 mysqldump.1 mysqlshow.1 \ - perror.1 replace.1 safe_mysqld.1 + mysqladmin.1 mysqld.1 mysqld_multi.1 mysqld_safe.1 mysqldump.1 \ + mysqlshow.1 perror.1 replace.1 INSTALLS_SHLIB= yes LDCONFIG_DIRS= %%PREFIX%%/lib/mysql @@ -172,9 +176,4 @@ post-install: .endif -# This is for the maintainer only... -make-plist: - /usr/bin/find foo -type f -or -type l | /usr/bin/cut -d / -f 2- | /usr/bin/sort > ${.CURDIR}/pkg-plist.new - /usr/bin/perl -i -ne 'if (m#share/doc/#) { print "%%PORTDOCS%%", $$_; } else { print $$_; }' ${.CURDIR}/pkg-plist.new - .include <bsd.port.post.mk> diff --git a/databases/mysql60-server/distinfo b/databases/mysql60-server/distinfo index b56d22caad75..4c809e2ce104 100644 --- a/databases/mysql60-server/distinfo +++ b/databases/mysql60-server/distinfo @@ -1 +1 @@ -MD5 (mysql-3.23.55.tar.gz) = 259196ddc00c94051dceb9e86574d17e +MD5 (mysql-4.0.9-gamma.tar.gz) = 75d582f3e71e21cd6ffa7c84a6db26c3 diff --git a/databases/mysql60-server/files/mysql-server.sh b/databases/mysql60-server/files/mysql-server.sh index 6a5acb39a962..5180b9c0c1eb 100644 --- a/databases/mysql60-server/files/mysql-server.sh +++ b/databases/mysql60-server/files/mysql-server.sh @@ -5,9 +5,9 @@ PIDFILE=${DB_DIR}/`/bin/hostname -s`.pid case "$1" in start) - if [ -x %%PREFIX%%/bin/safe_mysqld ]; then + if [ -x %%PREFIX%%/bin/mysqld_safe ]; then /usr/bin/limits -U mysql \ - %%PREFIX%%/bin/safe_mysqld --user=mysql --datadir=${DB_DIR} --pid-file=${PIDFILE} > /dev/null & + %%PREFIX%%/bin/mysqld_safe --user=mysql --datadir=${DB_DIR} --pid-file=${PIDFILE} > /dev/null & echo -n ' mysqld' fi ;; diff --git a/databases/mysql60-server/files/patch-Makefile.in b/databases/mysql60-server/files/patch-Makefile.in index 987cf407da8f..c8bf28bc02bc 100644 --- a/databases/mysql60-server/files/patch-Makefile.in +++ b/databases/mysql60-server/files/patch-Makefile.in @@ -1,19 +1,20 @@ ---- Makefile.in.orig Thu Jan 23 16:13:43 2003 -+++ Makefile.in Wed Jan 29 17:11:29 2003 -@@ -195,11 +195,11 @@ +--- Makefile.in.orig Wed Nov 20 00:06:37 2002 ++++ Makefile.in Wed Nov 20 00:07:31 2002 +@@ -207,12 +207,11 @@ EXTRA_DIST = INSTALL-SOURCE README \ - COPYING COPYING.LIB MIRRORS + COPYING COPYING.LIB --SUBDIRS = . include @docs_dirs@ @readline_dir@ \ -- @thread_dirs@ @sql_client_dirs@ \ -- @sql_server_dirs@ scripts tests man \ -- @bench_dirs@ support-files os2 +-SUBDIRS = include @docs_dirs@ @readline_dir@ \ +- @thread_dirs@ pstack @sql_client_dirs@ \ +- @sql_server_dirs@ @libmysqld_dirs@ scripts man \ +- tests BUILD os2 \ +- @bench_dirs@ support-files @fs_dirs@ @tools_dirs@ - +.if defined(CLIENT_ONLY) -+SUBDIRS = include @readline_dir@ @sql_client_dirs@ tests man ++SUBDIRS = include @sql_client_dirs@ tests man +.else -+SUBDIRS = include @thread_dirs@ @docs_dirs@ @sql_server_dirs@ scripts support-files ++SUBDIRS = include @docs_dirs@ @sql_server_dirs@ scripts support-files +.endif # Relink after clean - CLEANFILES = linked_client_sources linked_server_sources linked_libmysql_sources linked_libmysql_r_sources linked_include_sources + linked_sources = linked_client_sources linked_server_sources \ diff --git a/databases/mysql60-server/files/patch-af b/databases/mysql60-server/files/patch-af deleted file mode 100644 index 8d2d1003f2e4..000000000000 --- a/databases/mysql60-server/files/patch-af +++ /dev/null @@ -1,79 +0,0 @@ ---- scripts/safe_mysqld.sh.orig Thu Oct 10 12:17:29 2002 -+++ scripts/safe_mysqld.sh Sun Nov 10 21:27:46 2002 -@@ -68,30 +68,9 @@ - done - } - --MY_PWD=`pwd` --# Check if we are starting this relative (for the binary release) --if test -d $MY_PWD/data/mysql -a -f ./share/mysql/english/errmsg.sys -a \ -- -x ./bin/mysqld --then -- MY_BASEDIR_VERSION=$MY_PWD # Where bin, share and data are -- ledir=$MY_BASEDIR_VERSION/bin # Where mysqld is -- DATADIR=$MY_BASEDIR_VERSION/data -- if test -z "$defaults" -- then -- defaults="--defaults-extra-file=$MY_BASEDIR_VERSION/data/my.cnf" -- fi --# Check if this is a 'moved install directory' --elif test -f ./var/mysql/db.frm -a -f ./share/mysql/english/errmsg.sys -a \ -- -x ./libexec/mysqld --then -- MY_BASEDIR_VERSION=$MY_PWD # Where libexec, share and var are -- ledir=$MY_BASEDIR_VERSION/libexec # Where mysqld is -- DATADIR=$MY_BASEDIR_VERSION/var --else -- MY_BASEDIR_VERSION=@prefix@ -- DATADIR=@localstatedir@ -- ledir=@libexecdir@ --fi -+MY_BASEDIR_VERSION=@prefix@ -+DATADIR=@localstatedir@ -+ledir=@libexecdir@ - - MYSQL_UNIX_PORT=${MYSQL_UNIX_PORT:-@MYSQL_UNIX_ADDR@} - MYSQL_TCP_PORT=${MYSQL_TCP_PORT:-@MYSQL_TCP_PORT@} -@@ -106,7 +85,6 @@ - fi - - # these rely on $DATADIR by default, so we'll set them later on --pid_file= - err_log= - SET_USER=0 - -@@ -239,34 +217,6 @@ - if test ! -f $pid_file # This is removed if normal shutdown - then - break -- fi -- -- if @IS_LINUX@ -- then -- # Test if one process was hanging. -- # This is only a fix for Linux (running as base 3 mysqld processes) -- # but should work for the rest of the servers. -- # The only thing is ps x => redhat 5 gives warnings when using ps -x. -- # kill -9 is used or the process won't react on the kill. -- numofproces=`ps xa | grep -v "grep" | grep -c $ledir/$MYSQLD` -- echo -e "\nNumber of processes running now: $numofproces" | tee -a $err_log -- I=1 -- while test "$I" -le "$numofproces" -- do -- PROC=`ps xa | grep $ledir/$MYSQLD | grep -v "grep" | sed -n '$p'` -- for T in $PROC -- do -- break -- done -- # echo "TEST $I - $T **" -- if kill -9 $T -- then -- echo "$MYSQLD process hanging, pid $T - killed" | tee -a $err_log -- else -- break -- fi -- I=`expr $I + 1` -- done - fi - - echo "`date +'%y%m%d %H:%M:%S'` mysqld restarted" | tee -a $err_log diff --git a/databases/mysql60-server/files/patch-configure b/databases/mysql60-server/files/patch-configure index 6c6e0ad044fa..5f5155735ee1 100644 --- a/databases/mysql60-server/files/patch-configure +++ b/databases/mysql60-server/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig Thu Dec 5 10:37:31 2002 -+++ configure Mon Dec 16 19:49:41 2002 -@@ -8059,6 +8059,7 @@ +--- configure.orig Mon Dec 16 10:12:16 2002 ++++ configure Fri Dec 20 18:11:14 2002 +@@ -8071,6 +8071,7 @@ # This can be used to rebuild libtool when needed LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" @@ -8,7 +8,7 @@ # Always use our own libtool. LIBTOOL='$(SHELL) $(top_builddir)/libtool' -@@ -8988,7 +8989,7 @@ +@@ -9000,7 +9001,7 @@ ;; esac fi @@ -17,142 +17,3 @@ if test -n "$HOSTNAME"; then echo "$as_me:$LINENO: result: $HOSTNAME" >&5 -@@ -9177,43 +9178,7 @@ - echo "${ECHO_T}no" >&6 - fi - --echo "$as_me:$LINENO: checking \"how to check if pid exists\"" >&5 --echo $ECHO_N "checking \"how to check if pid exists\"... $ECHO_C" >&6 --PS=$ac_cv_path_PS --# Linux style --if $PS p $$ 2> /dev/null | grep $0 > /dev/null --then -- FIND_PROC="$PS p \$\$PID | grep mysqld > /dev/null" --# Solaris --elif $PS -p $$ 2> /dev/null | grep $0 > /dev/null --then -- FIND_PROC="$PS -p \$\$PID | grep mysqld > /dev/null" --# BSD style --elif $PS -uaxww 2> /dev/null | grep $0 > /dev/null --then -- FIND_PROC="$PS -uaxww | grep mysqld | grep \" \$\$PID \" > /dev/null" --# SysV style --elif $PS -ef 2> /dev/null | grep $0 > /dev/null --then -- FIND_PROC="$PS -ef | grep mysqld | grep \" \$\$PID \" > /dev/null" --# Do anybody use this? --elif $PS $$ 2> /dev/null | grep $0 > /dev/null --then -- FIND_PROC="$PS \$\$PID | grep mysqld > /dev/null" --else -- case $SYSTEM_TYPE in -- *darwin*) -- FIND_PROC="$PS -uaxww | grep mysqld | grep \" \$\$PID \" > /dev/null" -- ;; -- *cygwin*) -- FIND_PROC="$PS -e | grep mysqld | grep \" \$\$PID \" > /dev/null" -- ;; -- *) -- { { echo "$as_me:$LINENO: error: Could not find the right ps switches. Which OS is this ?. See the Installation chapter in the Reference Manual." >&5 --echo "$as_me: error: Could not find the right ps switches. Which OS is this ?. See the Installation chapter in the Reference Manual." >&2;} -- { (exit 1); exit 1; }; } -- esac --fi -+FIND_PROC="$PS -uaxww | grep mysqld | grep \" \$\$PID \" > /dev/null" - - echo "$as_me:$LINENO: result: \"$FIND_PROC\"" >&5 - echo "${ECHO_T}\"$FIND_PROC\"" >&6 -@@ -13208,7 +13173,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 $LINENO "configure" - #include "confdefs.h" -@@ -13262,7 +13226,6 @@ - #define HAVE_LIBC_R 1 - _ACEOF - -- LIBS="-lc_r $LIBS" - - fi - -@@ -13706,29 +13669,6 @@ - fi - - --# Build optimized or debug version ? --# First check for gcc and g++ --if test "$ac_cv_c_compiler_gnu" = "yes" --then -- DEBUG_CFLAGS="-g" -- DEBUG_OPTIMIZE_CC="-O" -- OPTIMIZE_CFLAGS="$MAX_C_OPTIMIZE" --else -- DEBUG_CFLAGS="-g" -- DEBUG_OPTIMIZE_CC="" -- OPTIMIZE_CFLAGS="-O" --fi --if test "$ac_cv_prog_cxx_g" = "yes" --then -- DEBUG_CXXFLAGS="-g" -- DEBUG_OPTIMIZE_CXX="-O" -- OPTIMIZE_CXXFLAGS="-O3" --else -- DEBUG_CXXFLAGS="-g" -- DEBUG_OPTIMIZE_CXX="" -- OPTIMIZE_CXXFLAGS="-O" --fi -- - - # Check whether --with-debug or --without-debug was given. - if test "${with_debug+set}" = set; then -@@ -16081,10 +16021,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_cxx_compiler_gnu" = "yes" --then -- CXXFLAGS="$CXXFLAGS -Werror" --fi - mysql_cv_btype_last_arg_accept=none - cat >conftest.$ac_ext <<_ACEOF - #line $LINENO "configure" -@@ -19222,14 +19158,6 @@ - ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - - --# Do not treat warnings as errors if we are linking against 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 <<_ACEOF - #line $LINENO "configure" - #include "confdefs.h" -@@ -19313,10 +19241,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_cxx_compiler_gnu" = "yes" -a "$with_other_libc" = "no" --then -- CXXFLAGS="$CXXFLAGS -Werror" --fi - cat >conftest.$ac_ext <<_ACEOF - #line $LINENO "configure" - #include "confdefs.h" -@@ -19399,10 +19323,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_cxx_compiler_gnu" = "yes" -a "$with_other_libc" = "no" --then -- CXXFLAGS="$CXXFLAGS -Werror" --fi - cat >conftest.$ac_ext <<_ACEOF - #line $LINENO "configure" - #include "confdefs.h" diff --git a/databases/mysql60-server/files/patch-include::Makefile.in b/databases/mysql60-server/files/patch-include::Makefile.in index 3ff10ce708d5..34b404c0a255 100644 --- a/databases/mysql60-server/files/patch-include::Makefile.in +++ b/databases/mysql60-server/files/patch-include::Makefile.in @@ -1,6 +1,6 @@ ---- include/Makefile.in.orig Thu Dec 5 10:37:22 2002 -+++ include/Makefile.in Sat Dec 14 16:26:53 2002 -@@ -324,7 +324,11 @@ +--- include/Makefile.in.orig Tue Nov 19 17:13:35 2002 ++++ include/Makefile.in Tue Nov 19 17:14:10 2002 +@@ -335,7 +335,11 @@ installdirs: $(mkinstalldirs) $(DESTDIR)$(pkgincludedir) diff --git a/databases/mysql60-server/files/patch-sql_mysqld.cc b/databases/mysql60-server/files/patch-sql_mysqld.cc deleted file mode 100644 index 5155bd5f33cd..000000000000 --- a/databases/mysql60-server/files/patch-sql_mysqld.cc +++ /dev/null @@ -1,12 +0,0 @@ ---- sql/mysqld.cc.orig Thu Oct 10 12:17:28 2002 -+++ sql/mysqld.cc Tue Nov 12 23:23:27 2002 -@@ -92,7 +92,8 @@ - int allow_severity = LOG_INFO; - int deny_severity = LOG_WARNING; - --#ifdef __STDC__ -+#include <osreldate.h> -+#if defined(__STDC__) && __FreeBSD_version < 500000 - #define my_fromhost(A) fromhost(A) - #define my_hosts_access(A) hosts_access(A) - #define my_eval_client(A) eval_client(A) diff --git a/databases/mysql60-server/pkg-descr b/databases/mysql60-server/pkg-descr index 8f4acf36e853..cd19c135f9cc 100644 --- a/databases/mysql60-server/pkg-descr +++ b/databases/mysql60-server/pkg-descr @@ -2,3 +2,6 @@ MySQL is a very fast, multi-threaded, multi-user and robust SQL (Structured Query Language) database server. WWW: http://www.mysql.com/ + +- Alex Dupre +sysadmin@alexdupre.com diff --git a/databases/mysql60-server/pkg-plist b/databases/mysql60-server/pkg-plist index 7a482d60bc34..692b3053f8c6 100644 --- a/databases/mysql60-server/pkg-plist +++ b/databases/mysql60-server/pkg-plist @@ -8,14 +8,21 @@ bin/myisamlog bin/myisampack bin/mysql_config bin/mysql_convert_table_format +bin/mysql_explain_log bin/mysql_find_rows +bin/mysql_fix_extensions bin/mysql_fix_privilege_tables +bin/mysql_install bin/mysql_install_db +bin/mysql_secure_installation bin/mysql_setpermission +bin/mysql_tableinfo +bin/mysql_waitpid bin/mysql_zap bin/mysqlaccess bin/mysqlbug bin/mysqld_multi +bin/mysqld_safe bin/mysqldumpslow bin/mysqlhotcopy bin/pack_isam @@ -23,7 +30,6 @@ bin/perror bin/replace bin/resolve_stack_dump bin/resolveip -bin/safe_mysqld etc/rc.d/mysql-server.sh %%PORTDOCS%%@unexec install-info --delete %D/info/mysql.info %D/info/dir %%PORTDOCS%%info/mysql.info @@ -36,15 +42,19 @@ lib/mysql/libmyisammrg.a lib/mysql/libmystrings.a lib/mysql/libmysys.a lib/mysql/libnisam.a +lib/mysql/libvio.a libexec/mysqld %%PORTDOCS%%share/doc/mysql/Flags/argentina.gif +%%PORTDOCS%%share/doc/mysql/Flags/armenia.gif %%PORTDOCS%%share/doc/mysql/Flags/australia.gif %%PORTDOCS%%share/doc/mysql/Flags/austria.gif +%%PORTDOCS%%share/doc/mysql/Flags/belgium.gif %%PORTDOCS%%share/doc/mysql/Flags/brazil.gif %%PORTDOCS%%share/doc/mysql/Flags/bulgaria.gif %%PORTDOCS%%share/doc/mysql/Flags/canada.gif %%PORTDOCS%%share/doc/mysql/Flags/chile.gif %%PORTDOCS%%share/doc/mysql/Flags/china.gif +%%PORTDOCS%%share/doc/mysql/Flags/costa-rica.gif %%PORTDOCS%%share/doc/mysql/Flags/croatia.gif %%PORTDOCS%%share/doc/mysql/Flags/czech-republic.gif %%PORTDOCS%%share/doc/mysql/Flags/denmark.gif @@ -58,25 +68,28 @@ libexec/mysqld %%PORTDOCS%%share/doc/mysql/Flags/iceland.gif %%PORTDOCS%%share/doc/mysql/Flags/indonesia.gif %%PORTDOCS%%share/doc/mysql/Flags/ireland.gif -%%PORTDOCS%%share/doc/mysql/Flags/island.gif %%PORTDOCS%%share/doc/mysql/Flags/israel.gif %%PORTDOCS%%share/doc/mysql/Flags/italy.gif %%PORTDOCS%%share/doc/mysql/Flags/japan.gif -%%PORTDOCS%%share/doc/mysql/Flags/kroatia.gif %%PORTDOCS%%share/doc/mysql/Flags/latvia.gif +%%PORTDOCS%%share/doc/mysql/Flags/mexico.gif %%PORTDOCS%%share/doc/mysql/Flags/netherlands.gif +%%PORTDOCS%%share/doc/mysql/Flags/new-zealand.gif +%%PORTDOCS%%share/doc/mysql/Flags/norway.gif +%%PORTDOCS%%share/doc/mysql/Flags/philippines.gif %%PORTDOCS%%share/doc/mysql/Flags/poland.gif %%PORTDOCS%%share/doc/mysql/Flags/portugal.gif %%PORTDOCS%%share/doc/mysql/Flags/romania.gif %%PORTDOCS%%share/doc/mysql/Flags/russia.gif %%PORTDOCS%%share/doc/mysql/Flags/singapore.gif +%%PORTDOCS%%share/doc/mysql/Flags/slovenia.gif %%PORTDOCS%%share/doc/mysql/Flags/south-africa.gif -%%PORTDOCS%%share/doc/mysql/Flags/south-africa1.gif %%PORTDOCS%%share/doc/mysql/Flags/south-korea.gif %%PORTDOCS%%share/doc/mysql/Flags/spain.gif %%PORTDOCS%%share/doc/mysql/Flags/sweden.gif %%PORTDOCS%%share/doc/mysql/Flags/switzerland.gif %%PORTDOCS%%share/doc/mysql/Flags/taiwan.gif +%%PORTDOCS%%share/doc/mysql/Flags/turkey.gif %%PORTDOCS%%share/doc/mysql/Flags/ukraine.gif %%PORTDOCS%%share/doc/mysql/Flags/usa.gif %%PORTDOCS%%share/doc/mysql/Flags/yugoslavia.gif diff --git a/databases/mysql60-server/pkg-plist.client b/databases/mysql60-server/pkg-plist.client index 13d787a27fb7..e7ad0a65b8a1 100644 --- a/databases/mysql60-server/pkg-plist.client +++ b/databases/mysql60-server/pkg-plist.client @@ -4,6 +4,8 @@ bin/mysqlbinlog bin/mysqlcheck bin/mysqldump bin/mysqlimport +bin/mysqlmanager-pwgen +bin/mysqlmanagerc bin/mysqlshow bin/mysqltest etc/rc.d/000.mysql-client.sh @@ -11,24 +13,27 @@ include/mysql/dbug.h include/mysql/errmsg.h include/mysql/m_ctype.h include/mysql/m_string.h +include/mysql/my_alloc.h include/mysql/my_config.h +include/mysql/my_getopt.h include/mysql/my_global.h include/mysql/my_list.h include/mysql/my_net.h include/mysql/my_no_pthread.h include/mysql/my_pthread.h +include/mysql/my_semaphore.h include/mysql/my_sys.h include/mysql/mysql.h include/mysql/mysql_com.h +include/mysql/mysql_embed.h include/mysql/mysql_version.h include/mysql/mysqld_error.h include/mysql/raid.h include/mysql/sslopt-case.h include/mysql/sslopt-longopts.h -include/mysql/sslopt-usage.h include/mysql/sslopt-vars.h lib/mysql/libmysqlclient.a lib/mysql/libmysqlclient.so -lib/mysql/libmysqlclient.so.10 +lib/mysql/libmysqlclient.so.12 @dirrm include/mysql @dirrm lib/mysql diff --git a/databases/percona55-client/Makefile b/databases/percona55-client/Makefile index b5f3065ac95f..e9f4c3c3277e 100644 --- a/databases/percona55-client/Makefile +++ b/databases/percona55-client/Makefile @@ -1,14 +1,15 @@ -# ports collection makefile for: MySQL-client -# Date created: Sun Sep 24 21:21:20 CEST 2000 -# Whom: Dirk Froemberg <dirk@FreeBSD.org> +# New ports collection makefile for: MySQL-client +# Date created: Sun Mar 3 12:20:35 CET 2002 +# Whom: Alex Dupre <sysadmin@alexdupre.com> # # $FreeBSD$ # -PORTNAME= mysql-client +PORTNAME= mysql PORTREVISION= 0 +PKGNAMESUFFIX= -client -MASTERDIR= ${.CURDIR}/../mysql323-server +MASTERDIR= ${.CURDIR}/../mysql40-server COMMENT= ${PKGDIR}/pkg-comment.client PKGINSTALL= mustnotexist PLIST= ${PKGDIR}/pkg-plist.client diff --git a/databases/percona55-server/Makefile b/databases/percona55-server/Makefile index bb9329b3c669..b499fd55b10d 100644 --- a/databases/percona55-server/Makefile +++ b/databases/percona55-server/Makefile @@ -1,42 +1,51 @@ -# ports collection makefile for: MySQL-server -# Date created: Sun Sep 24 21:20:46 CEST 2000 -# Whom: Dirk Froemberg <dirk@FreeBSD.org> +# New ports collection makefile for: MySQL-server +# Date created: Sun Mar 3 12:20:35 CET 2002 +# Whom: Alex Dupre <sysadmin@alexdupre.com> # # $FreeBSD$ # -PORTNAME?= ${MASTERPORTNAME} -PORTVERSION= 3.23.55 +PORTNAME?= mysql +PORTVERSION= 4.0.9 PORTREVISION?= 0 CATEGORIES= databases -MASTER_SITES= http://www.kernelnotes.de/MySQL/Downloads/MySQL-3.23/ \ - http://mysql.he.net/Downloads/MySQL-3.23/ \ - ftp://ftp.sunet.se/pub/unix/databases/relational/mysql/Downloads/MySQL-3.23/ \ - ftp://mysql.secsup.org/pub/software/mysql/Downloads/MySQL-3.23/ \ - http://mysql.orst.edu/Downloads/MySQL-3.23/ \ - http://web.tryc.on.ca/mysql/Downloads/MySQL-3.23/ \ - ftp://ftp.gwdg.de/pub/misc/mysql/Downloads/MySQL-3.23/ -DISTFILES= mysql-${PORTVERSION}${EXTRACT_SUFX} - -MAINTAINER= dirk@FreeBSD.org - -WRKSRC= ${WRKDIR}/mysql-${PORTVERSION} -SLAVEDIRS= databases/mysql323-client -MASTERPORTNAME= mysql-server +MASTER_SITES= ftp://mysql.secsup.org/pub/software/mysql/Downloads/MySQL-4.0/ \ + http://mysql.tzone.it/Downloads/MySQL-4.0/ \ + ftp://planetmirror.com/pub/mysql/Downloads/MySQL-4.0/ \ + http://www.softagency.co.jp/MySQL/Downloads/MySQL-4.0/ \ + ftp://sunsite.dk/mirrors/mysql/Downloads/MySQL-4.0/ \ + http://mysql.mediatraffic.fi/Downloads/MySQL-4.0/ \ + ftp://filepile.tiscali.de/mirror/mysql/Downloads/MySQL-4.0/ \ + http://mirrors.tilian.co.uk/mysql.com/Downloads/MySQL-4.0/ \ + ftp://ftp.rtfm.no/pub/mysql/Downloads/MySQL-4.0/ \ + http://www.mysql.cz/Downloads/MySQL-4.0/ \ + ftp://ftp.u-paris10.fr/mysql.com/Downloads/MySQL-4.0/ \ + http://mysql.oms-net.nl/Downloads/MySQL-4.0/ \ + ftp://ftp.free.fr/pub/MySQL/Downloads/MySQL-4.0/ +PKGNAMESUFFIX?= -server +DISTNAME= ${PORTNAME}-${PORTVERSION}-gamma + +MAINTAINER= sysadmin@alexdupre.com + +SLAVEDIRS= databases/mysql40-client DB_DIR?= /var/db/mysql -USE_PERL5= yes +USE_PERL5_RUN= yes USE_LIBTOOL= yes + +GNU_CONFIGURE= yes CONFIGURE_ARGS= --localstatedir=${DB_DIR} \ - --without-perl \ --without-debug \ --without-readline \ --without-bench \ - --with-mit-threads=no \ + --without-extra-tools \ --with-libwrap \ + --with-raid \ + --with-mysqlfs \ + --with-vio \ --with-low-memory \ --with-comment='FreeBSD port: ${PKGNAME}' \ - --program-prefix='' \ - --with-innodb + --with-server-suffix='' \ + --program-prefix='' .if ${MACHINE_ARCH} == "i386" CONFIGURE_ARGS+=--enable-assembler --with-berkeley-db @@ -47,71 +56,68 @@ CONFIGURE_ARGS+=--with-charset=${WITH_CHARSET} .if defined(WITH_XCHARSET) && ${WITH_XCHARSET} != "" CONFIGURE_ARGS+=--with-extra-charsets=${WITH_XCHARSET} .endif +.if defined(WITH_OPENSSL) +USE_OPENSSL= yes +CONFIGURE_ARGS+=--with-openssl +.endif .if defined(BUILD_STATIC) -CONFIGURE_ARGS+=--with-mysqld-ldflags=--static +CONFIGURE_ARGS+=--with-mysqld-ldflags=-all-static .endif .if defined(BUILD_OPTIMIZED) -CFLAGS+= -mcpu=pentiumpro -O3 -.endif -.if defined(WITH_LINUXTHREADS) -CONFIGURE_ARGS+=--with-named-thread-libs='-DHAVE_GLIBC2_STYLE_GETHOSTBYNAME_R -D_THREAD_SAFE -I${LOCALBASE}/include/pthread/linuxthreads -L${LOCALBASE}/lib -llthread -llgcc_r' -CFLAGS+= -D__USE_UNIX98 -D_REENTRANT -D_THREAD_SAFE -I${LOCALBASE}/include/pthread/linuxthreads -LIB_DEPENDS+= lthread.2:${PORTSDIR}/devel/linuxthreads +CFLAGS+= -mcpu=i686 .endif .if defined(THREAD_SAFE_CLIENT) CONFIGURE_ARGS+=--enable-thread-safe-client .endif -CONFIGURE_ENV+= PERL=${PERL} \ - PERL5=${PERL} \ - INSTALL_SCRIPT="${INSTALL_SCRIPT}" \ - CFLAGS="${CFLAGS}" \ - CONFIGURE_ARGS="${CONFIGURE_ARGS}" -.include <bsd.port.pre.mk> -# without including these flags mysqld may crash under heavy load -# and multiple connections at the same time +CFLAGS+= -O3 -fno-omit-frame-pointer CXXFLAGS= ${CFLAGS} -felide-constructors -fno-rtti + +.include <bsd.port.pre.mk> .if ${OSVERSION} >= 400002 CXXFLAGS+= -fno-exceptions .endif .if ${OSVERSION} < 500000 -CONFIGURE_ENV+= CXX="${CC}" +CXX= ${CC} .endif # MySQL-Server part .if !defined(CLIENT_ONLY) -RUN_DEPENDS= mysql:${PORTSDIR}/databases/mysql323-client \ +RUN_DEPENDS= mysql:${PORTSDIR}/databases/mysql40-client \ ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Mysql.pm:${PORTSDIR}/databases/p5-Mysql -PLIST_SUB= MYSQL_VERSION=${PORTVERSION} +PLIST_SUB= MYSQL_VERSION=${PORTVERSION}-gamma -ONLY_FOR_ARCHS= i386 alpha sparc64 +ONLY_FOR_ARCHS= i386 alpha + +DOCS= manual.html manual.ps manual_toc.html manual.txt manual.texi \ + include.texi pre-fetch: @${ECHO} "" @${ECHO} "You may use the following build options:" @${ECHO} "" - @${ECHO} " WITH_CHARSET=charset define the primary built-in charset (latin1);" - @${ECHO} " WITH_XCHARSET=list define other built-in charsets (may be 'all');" + @${ECHO} " WITH_CHARSET=charset Define the primary built-in charset (latin1)." + @${ECHO} " WITH_XCHARSET=list Define other built-in charsets (may be 'all')." + @${ECHO} " WITH_OPENSSL=yes Enable secure connections." @${ECHO} " DB_DIR=directory Set alternate directory for database files" @${ECHO} " (default is /var/db/mysql)." - @${ECHO} " WITH_LINUXTHREADS=yes Use the linuxthreads pthread library." - @${ECHO} " This is _NOT_ recommended for production" - @${ECHO} " servers. Expect problems when enabled." - @${ECHO} " SKIP_INSTALL_DB=yes Skip mysql_install_db" - @${ECHO} " (i. e. leave ${DB_DIR} alone)." - @${ECHO} " This is useful for upgrades." - @${ECHO} " Be sure to know what you are doing!" - @${ECHO} " SKIP_DNS_CHECK=yes don't run resolveip to do an additional" + @${ECHO} " SKIP_INSTALL_DB=yes Skip database initialization" + @${ECHO} " (useful for upgrades)." + @${ECHO} " SKIP_DNS_CHECK=yes Don't run resolveip to do an additional" @${ECHO} " DNS check before inserting local hostname to" - @${ECHO} " mysql database." - @${ECHO} " Use if your machine has no offical DNS entry." + @${ECHO} " mysql database" + @${ECHO} " (use if your machine has no official DNS entry)." @${ECHO} " BUILD_STATIC=yes Build a static version of mysqld." - @${ECHO} " BUILD_OPTIMIZED=yes Add -mcpu=pentiumpro -O3 to CFLAGS." - @${ECHO} " This setting may produce broken code and thus" - @${ECHO} " is not recommended for production servers." + @${ECHO} " BUILD_OPTIMIZED=yes Add -mcpu=i686 to CFLAGS." @${ECHO} "" +.if defined(WITH_OPENSSL) && defined(BUILD_STATIC) +pre-configure: + @${ECHO} "You can't use the BUILD_STATIC option when using OpenSSL." + @${FALSE} +.endif + .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}." @@ -145,20 +151,18 @@ post-install: @${CHMOD} 750 ${PREFIX}/etc/rc.d/mysql-server.sh .if !defined(NOPORTDOCS) - ${MKDIR} ${PREFIX}/share/doc/mysql/Flags -.for doc in manual.html manual.ps manual_toc.html manual.txt manual.texi include.texi - ${INSTALL_DATA} ${WRKSRC}/Docs/${doc} ${PREFIX}/share/doc/mysql + ${MKDIR} ${DOCSDIR}/Flags +.for doc in ${DOCS} + ${INSTALL_DATA} ${WRKSRC}/Docs/${doc} ${DOCSDIR} .endfor - ${INSTALL_DATA} ${WRKSRC}/Docs/Flags/*.gif ${PREFIX}/share/doc/mysql/Flags - ${INSTALL_DATA} ${WRKSRC}/Docs/mysql.info ${PREFIX}/info - @install-info ${PREFIX}/info/mysql.info ${PREFIX}/info/dir + ${INSTALL_DATA} ${WRKSRC}/Docs/Flags/*.gif ${DOCSDIR}/Flags .endif # MySQL-Client part .else MAN1= isamchk.1 isamlog.1 mysql.1 mysql_zap.1 mysqlaccess.1 \ - mysqladmin.1 mysqld.1 mysqld_multi.1 mysqldump.1 mysqlshow.1 \ - perror.1 replace.1 safe_mysqld.1 + mysqladmin.1 mysqld.1 mysqld_multi.1 mysqld_safe.1 mysqldump.1 \ + mysqlshow.1 perror.1 replace.1 INSTALLS_SHLIB= yes LDCONFIG_DIRS= %%PREFIX%%/lib/mysql @@ -172,9 +176,4 @@ post-install: .endif -# This is for the maintainer only... -make-plist: - /usr/bin/find foo -type f -or -type l | /usr/bin/cut -d / -f 2- | /usr/bin/sort > ${.CURDIR}/pkg-plist.new - /usr/bin/perl -i -ne 'if (m#share/doc/#) { print "%%PORTDOCS%%", $$_; } else { print $$_; }' ${.CURDIR}/pkg-plist.new - .include <bsd.port.post.mk> diff --git a/databases/percona55-server/distinfo b/databases/percona55-server/distinfo index b56d22caad75..4c809e2ce104 100644 --- a/databases/percona55-server/distinfo +++ b/databases/percona55-server/distinfo @@ -1 +1 @@ -MD5 (mysql-3.23.55.tar.gz) = 259196ddc00c94051dceb9e86574d17e +MD5 (mysql-4.0.9-gamma.tar.gz) = 75d582f3e71e21cd6ffa7c84a6db26c3 diff --git a/databases/percona55-server/files/mysql-server.sh b/databases/percona55-server/files/mysql-server.sh index 6a5acb39a962..5180b9c0c1eb 100644 --- a/databases/percona55-server/files/mysql-server.sh +++ b/databases/percona55-server/files/mysql-server.sh @@ -5,9 +5,9 @@ PIDFILE=${DB_DIR}/`/bin/hostname -s`.pid case "$1" in start) - if [ -x %%PREFIX%%/bin/safe_mysqld ]; then + if [ -x %%PREFIX%%/bin/mysqld_safe ]; then /usr/bin/limits -U mysql \ - %%PREFIX%%/bin/safe_mysqld --user=mysql --datadir=${DB_DIR} --pid-file=${PIDFILE} > /dev/null & + %%PREFIX%%/bin/mysqld_safe --user=mysql --datadir=${DB_DIR} --pid-file=${PIDFILE} > /dev/null & echo -n ' mysqld' fi ;; diff --git a/databases/percona55-server/files/patch-Makefile.in b/databases/percona55-server/files/patch-Makefile.in index 987cf407da8f..c8bf28bc02bc 100644 --- a/databases/percona55-server/files/patch-Makefile.in +++ b/databases/percona55-server/files/patch-Makefile.in @@ -1,19 +1,20 @@ ---- Makefile.in.orig Thu Jan 23 16:13:43 2003 -+++ Makefile.in Wed Jan 29 17:11:29 2003 -@@ -195,11 +195,11 @@ +--- Makefile.in.orig Wed Nov 20 00:06:37 2002 ++++ Makefile.in Wed Nov 20 00:07:31 2002 +@@ -207,12 +207,11 @@ EXTRA_DIST = INSTALL-SOURCE README \ - COPYING COPYING.LIB MIRRORS + COPYING COPYING.LIB --SUBDIRS = . include @docs_dirs@ @readline_dir@ \ -- @thread_dirs@ @sql_client_dirs@ \ -- @sql_server_dirs@ scripts tests man \ -- @bench_dirs@ support-files os2 +-SUBDIRS = include @docs_dirs@ @readline_dir@ \ +- @thread_dirs@ pstack @sql_client_dirs@ \ +- @sql_server_dirs@ @libmysqld_dirs@ scripts man \ +- tests BUILD os2 \ +- @bench_dirs@ support-files @fs_dirs@ @tools_dirs@ - +.if defined(CLIENT_ONLY) -+SUBDIRS = include @readline_dir@ @sql_client_dirs@ tests man ++SUBDIRS = include @sql_client_dirs@ tests man +.else -+SUBDIRS = include @thread_dirs@ @docs_dirs@ @sql_server_dirs@ scripts support-files ++SUBDIRS = include @docs_dirs@ @sql_server_dirs@ scripts support-files +.endif # Relink after clean - CLEANFILES = linked_client_sources linked_server_sources linked_libmysql_sources linked_libmysql_r_sources linked_include_sources + linked_sources = linked_client_sources linked_server_sources \ diff --git a/databases/percona55-server/files/patch-af b/databases/percona55-server/files/patch-af deleted file mode 100644 index 8d2d1003f2e4..000000000000 --- a/databases/percona55-server/files/patch-af +++ /dev/null @@ -1,79 +0,0 @@ ---- scripts/safe_mysqld.sh.orig Thu Oct 10 12:17:29 2002 -+++ scripts/safe_mysqld.sh Sun Nov 10 21:27:46 2002 -@@ -68,30 +68,9 @@ - done - } - --MY_PWD=`pwd` --# Check if we are starting this relative (for the binary release) --if test -d $MY_PWD/data/mysql -a -f ./share/mysql/english/errmsg.sys -a \ -- -x ./bin/mysqld --then -- MY_BASEDIR_VERSION=$MY_PWD # Where bin, share and data are -- ledir=$MY_BASEDIR_VERSION/bin # Where mysqld is -- DATADIR=$MY_BASEDIR_VERSION/data -- if test -z "$defaults" -- then -- defaults="--defaults-extra-file=$MY_BASEDIR_VERSION/data/my.cnf" -- fi --# Check if this is a 'moved install directory' --elif test -f ./var/mysql/db.frm -a -f ./share/mysql/english/errmsg.sys -a \ -- -x ./libexec/mysqld --then -- MY_BASEDIR_VERSION=$MY_PWD # Where libexec, share and var are -- ledir=$MY_BASEDIR_VERSION/libexec # Where mysqld is -- DATADIR=$MY_BASEDIR_VERSION/var --else -- MY_BASEDIR_VERSION=@prefix@ -- DATADIR=@localstatedir@ -- ledir=@libexecdir@ --fi -+MY_BASEDIR_VERSION=@prefix@ -+DATADIR=@localstatedir@ -+ledir=@libexecdir@ - - MYSQL_UNIX_PORT=${MYSQL_UNIX_PORT:-@MYSQL_UNIX_ADDR@} - MYSQL_TCP_PORT=${MYSQL_TCP_PORT:-@MYSQL_TCP_PORT@} -@@ -106,7 +85,6 @@ - fi - - # these rely on $DATADIR by default, so we'll set them later on --pid_file= - err_log= - SET_USER=0 - -@@ -239,34 +217,6 @@ - if test ! -f $pid_file # This is removed if normal shutdown - then - break -- fi -- -- if @IS_LINUX@ -- then -- # Test if one process was hanging. -- # This is only a fix for Linux (running as base 3 mysqld processes) -- # but should work for the rest of the servers. -- # The only thing is ps x => redhat 5 gives warnings when using ps -x. -- # kill -9 is used or the process won't react on the kill. -- numofproces=`ps xa | grep -v "grep" | grep -c $ledir/$MYSQLD` -- echo -e "\nNumber of processes running now: $numofproces" | tee -a $err_log -- I=1 -- while test "$I" -le "$numofproces" -- do -- PROC=`ps xa | grep $ledir/$MYSQLD | grep -v "grep" | sed -n '$p'` -- for T in $PROC -- do -- break -- done -- # echo "TEST $I - $T **" -- if kill -9 $T -- then -- echo "$MYSQLD process hanging, pid $T - killed" | tee -a $err_log -- else -- break -- fi -- I=`expr $I + 1` -- done - fi - - echo "`date +'%y%m%d %H:%M:%S'` mysqld restarted" | tee -a $err_log diff --git a/databases/percona55-server/files/patch-configure b/databases/percona55-server/files/patch-configure index 6c6e0ad044fa..5f5155735ee1 100644 --- a/databases/percona55-server/files/patch-configure +++ b/databases/percona55-server/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig Thu Dec 5 10:37:31 2002 -+++ configure Mon Dec 16 19:49:41 2002 -@@ -8059,6 +8059,7 @@ +--- configure.orig Mon Dec 16 10:12:16 2002 ++++ configure Fri Dec 20 18:11:14 2002 +@@ -8071,6 +8071,7 @@ # This can be used to rebuild libtool when needed LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" @@ -8,7 +8,7 @@ # Always use our own libtool. LIBTOOL='$(SHELL) $(top_builddir)/libtool' -@@ -8988,7 +8989,7 @@ +@@ -9000,7 +9001,7 @@ ;; esac fi @@ -17,142 +17,3 @@ if test -n "$HOSTNAME"; then echo "$as_me:$LINENO: result: $HOSTNAME" >&5 -@@ -9177,43 +9178,7 @@ - echo "${ECHO_T}no" >&6 - fi - --echo "$as_me:$LINENO: checking \"how to check if pid exists\"" >&5 --echo $ECHO_N "checking \"how to check if pid exists\"... $ECHO_C" >&6 --PS=$ac_cv_path_PS --# Linux style --if $PS p $$ 2> /dev/null | grep $0 > /dev/null --then -- FIND_PROC="$PS p \$\$PID | grep mysqld > /dev/null" --# Solaris --elif $PS -p $$ 2> /dev/null | grep $0 > /dev/null --then -- FIND_PROC="$PS -p \$\$PID | grep mysqld > /dev/null" --# BSD style --elif $PS -uaxww 2> /dev/null | grep $0 > /dev/null --then -- FIND_PROC="$PS -uaxww | grep mysqld | grep \" \$\$PID \" > /dev/null" --# SysV style --elif $PS -ef 2> /dev/null | grep $0 > /dev/null --then -- FIND_PROC="$PS -ef | grep mysqld | grep \" \$\$PID \" > /dev/null" --# Do anybody use this? --elif $PS $$ 2> /dev/null | grep $0 > /dev/null --then -- FIND_PROC="$PS \$\$PID | grep mysqld > /dev/null" --else -- case $SYSTEM_TYPE in -- *darwin*) -- FIND_PROC="$PS -uaxww | grep mysqld | grep \" \$\$PID \" > /dev/null" -- ;; -- *cygwin*) -- FIND_PROC="$PS -e | grep mysqld | grep \" \$\$PID \" > /dev/null" -- ;; -- *) -- { { echo "$as_me:$LINENO: error: Could not find the right ps switches. Which OS is this ?. See the Installation chapter in the Reference Manual." >&5 --echo "$as_me: error: Could not find the right ps switches. Which OS is this ?. See the Installation chapter in the Reference Manual." >&2;} -- { (exit 1); exit 1; }; } -- esac --fi -+FIND_PROC="$PS -uaxww | grep mysqld | grep \" \$\$PID \" > /dev/null" - - echo "$as_me:$LINENO: result: \"$FIND_PROC\"" >&5 - echo "${ECHO_T}\"$FIND_PROC\"" >&6 -@@ -13208,7 +13173,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 $LINENO "configure" - #include "confdefs.h" -@@ -13262,7 +13226,6 @@ - #define HAVE_LIBC_R 1 - _ACEOF - -- LIBS="-lc_r $LIBS" - - fi - -@@ -13706,29 +13669,6 @@ - fi - - --# Build optimized or debug version ? --# First check for gcc and g++ --if test "$ac_cv_c_compiler_gnu" = "yes" --then -- DEBUG_CFLAGS="-g" -- DEBUG_OPTIMIZE_CC="-O" -- OPTIMIZE_CFLAGS="$MAX_C_OPTIMIZE" --else -- DEBUG_CFLAGS="-g" -- DEBUG_OPTIMIZE_CC="" -- OPTIMIZE_CFLAGS="-O" --fi --if test "$ac_cv_prog_cxx_g" = "yes" --then -- DEBUG_CXXFLAGS="-g" -- DEBUG_OPTIMIZE_CXX="-O" -- OPTIMIZE_CXXFLAGS="-O3" --else -- DEBUG_CXXFLAGS="-g" -- DEBUG_OPTIMIZE_CXX="" -- OPTIMIZE_CXXFLAGS="-O" --fi -- - - # Check whether --with-debug or --without-debug was given. - if test "${with_debug+set}" = set; then -@@ -16081,10 +16021,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_cxx_compiler_gnu" = "yes" --then -- CXXFLAGS="$CXXFLAGS -Werror" --fi - mysql_cv_btype_last_arg_accept=none - cat >conftest.$ac_ext <<_ACEOF - #line $LINENO "configure" -@@ -19222,14 +19158,6 @@ - ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - - --# Do not treat warnings as errors if we are linking against 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 <<_ACEOF - #line $LINENO "configure" - #include "confdefs.h" -@@ -19313,10 +19241,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_cxx_compiler_gnu" = "yes" -a "$with_other_libc" = "no" --then -- CXXFLAGS="$CXXFLAGS -Werror" --fi - cat >conftest.$ac_ext <<_ACEOF - #line $LINENO "configure" - #include "confdefs.h" -@@ -19399,10 +19323,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_cxx_compiler_gnu" = "yes" -a "$with_other_libc" = "no" --then -- CXXFLAGS="$CXXFLAGS -Werror" --fi - cat >conftest.$ac_ext <<_ACEOF - #line $LINENO "configure" - #include "confdefs.h" diff --git a/databases/percona55-server/files/patch-include::Makefile.in b/databases/percona55-server/files/patch-include::Makefile.in index 3ff10ce708d5..34b404c0a255 100644 --- a/databases/percona55-server/files/patch-include::Makefile.in +++ b/databases/percona55-server/files/patch-include::Makefile.in @@ -1,6 +1,6 @@ ---- include/Makefile.in.orig Thu Dec 5 10:37:22 2002 -+++ include/Makefile.in Sat Dec 14 16:26:53 2002 -@@ -324,7 +324,11 @@ +--- include/Makefile.in.orig Tue Nov 19 17:13:35 2002 ++++ include/Makefile.in Tue Nov 19 17:14:10 2002 +@@ -335,7 +335,11 @@ installdirs: $(mkinstalldirs) $(DESTDIR)$(pkgincludedir) diff --git a/databases/percona55-server/files/patch-sql_mysqld.cc b/databases/percona55-server/files/patch-sql_mysqld.cc deleted file mode 100644 index 5155bd5f33cd..000000000000 --- a/databases/percona55-server/files/patch-sql_mysqld.cc +++ /dev/null @@ -1,12 +0,0 @@ ---- sql/mysqld.cc.orig Thu Oct 10 12:17:28 2002 -+++ sql/mysqld.cc Tue Nov 12 23:23:27 2002 -@@ -92,7 +92,8 @@ - int allow_severity = LOG_INFO; - int deny_severity = LOG_WARNING; - --#ifdef __STDC__ -+#include <osreldate.h> -+#if defined(__STDC__) && __FreeBSD_version < 500000 - #define my_fromhost(A) fromhost(A) - #define my_hosts_access(A) hosts_access(A) - #define my_eval_client(A) eval_client(A) diff --git a/databases/percona55-server/pkg-descr b/databases/percona55-server/pkg-descr index 8f4acf36e853..cd19c135f9cc 100644 --- a/databases/percona55-server/pkg-descr +++ b/databases/percona55-server/pkg-descr @@ -2,3 +2,6 @@ MySQL is a very fast, multi-threaded, multi-user and robust SQL (Structured Query Language) database server. WWW: http://www.mysql.com/ + +- Alex Dupre +sysadmin@alexdupre.com diff --git a/databases/percona55-server/pkg-plist b/databases/percona55-server/pkg-plist index 7a482d60bc34..692b3053f8c6 100644 --- a/databases/percona55-server/pkg-plist +++ b/databases/percona55-server/pkg-plist @@ -8,14 +8,21 @@ bin/myisamlog bin/myisampack bin/mysql_config bin/mysql_convert_table_format +bin/mysql_explain_log bin/mysql_find_rows +bin/mysql_fix_extensions bin/mysql_fix_privilege_tables +bin/mysql_install bin/mysql_install_db +bin/mysql_secure_installation bin/mysql_setpermission +bin/mysql_tableinfo +bin/mysql_waitpid bin/mysql_zap bin/mysqlaccess bin/mysqlbug bin/mysqld_multi +bin/mysqld_safe bin/mysqldumpslow bin/mysqlhotcopy bin/pack_isam @@ -23,7 +30,6 @@ bin/perror bin/replace bin/resolve_stack_dump bin/resolveip -bin/safe_mysqld etc/rc.d/mysql-server.sh %%PORTDOCS%%@unexec install-info --delete %D/info/mysql.info %D/info/dir %%PORTDOCS%%info/mysql.info @@ -36,15 +42,19 @@ lib/mysql/libmyisammrg.a lib/mysql/libmystrings.a lib/mysql/libmysys.a lib/mysql/libnisam.a +lib/mysql/libvio.a libexec/mysqld %%PORTDOCS%%share/doc/mysql/Flags/argentina.gif +%%PORTDOCS%%share/doc/mysql/Flags/armenia.gif %%PORTDOCS%%share/doc/mysql/Flags/australia.gif %%PORTDOCS%%share/doc/mysql/Flags/austria.gif +%%PORTDOCS%%share/doc/mysql/Flags/belgium.gif %%PORTDOCS%%share/doc/mysql/Flags/brazil.gif %%PORTDOCS%%share/doc/mysql/Flags/bulgaria.gif %%PORTDOCS%%share/doc/mysql/Flags/canada.gif %%PORTDOCS%%share/doc/mysql/Flags/chile.gif %%PORTDOCS%%share/doc/mysql/Flags/china.gif +%%PORTDOCS%%share/doc/mysql/Flags/costa-rica.gif %%PORTDOCS%%share/doc/mysql/Flags/croatia.gif %%PORTDOCS%%share/doc/mysql/Flags/czech-republic.gif %%PORTDOCS%%share/doc/mysql/Flags/denmark.gif @@ -58,25 +68,28 @@ libexec/mysqld %%PORTDOCS%%share/doc/mysql/Flags/iceland.gif %%PORTDOCS%%share/doc/mysql/Flags/indonesia.gif %%PORTDOCS%%share/doc/mysql/Flags/ireland.gif -%%PORTDOCS%%share/doc/mysql/Flags/island.gif %%PORTDOCS%%share/doc/mysql/Flags/israel.gif %%PORTDOCS%%share/doc/mysql/Flags/italy.gif %%PORTDOCS%%share/doc/mysql/Flags/japan.gif -%%PORTDOCS%%share/doc/mysql/Flags/kroatia.gif %%PORTDOCS%%share/doc/mysql/Flags/latvia.gif +%%PORTDOCS%%share/doc/mysql/Flags/mexico.gif %%PORTDOCS%%share/doc/mysql/Flags/netherlands.gif +%%PORTDOCS%%share/doc/mysql/Flags/new-zealand.gif +%%PORTDOCS%%share/doc/mysql/Flags/norway.gif +%%PORTDOCS%%share/doc/mysql/Flags/philippines.gif %%PORTDOCS%%share/doc/mysql/Flags/poland.gif %%PORTDOCS%%share/doc/mysql/Flags/portugal.gif %%PORTDOCS%%share/doc/mysql/Flags/romania.gif %%PORTDOCS%%share/doc/mysql/Flags/russia.gif %%PORTDOCS%%share/doc/mysql/Flags/singapore.gif +%%PORTDOCS%%share/doc/mysql/Flags/slovenia.gif %%PORTDOCS%%share/doc/mysql/Flags/south-africa.gif -%%PORTDOCS%%share/doc/mysql/Flags/south-africa1.gif %%PORTDOCS%%share/doc/mysql/Flags/south-korea.gif %%PORTDOCS%%share/doc/mysql/Flags/spain.gif %%PORTDOCS%%share/doc/mysql/Flags/sweden.gif %%PORTDOCS%%share/doc/mysql/Flags/switzerland.gif %%PORTDOCS%%share/doc/mysql/Flags/taiwan.gif +%%PORTDOCS%%share/doc/mysql/Flags/turkey.gif %%PORTDOCS%%share/doc/mysql/Flags/ukraine.gif %%PORTDOCS%%share/doc/mysql/Flags/usa.gif %%PORTDOCS%%share/doc/mysql/Flags/yugoslavia.gif diff --git a/databases/percona55-server/pkg-plist.client b/databases/percona55-server/pkg-plist.client index 13d787a27fb7..e7ad0a65b8a1 100644 --- a/databases/percona55-server/pkg-plist.client +++ b/databases/percona55-server/pkg-plist.client @@ -4,6 +4,8 @@ bin/mysqlbinlog bin/mysqlcheck bin/mysqldump bin/mysqlimport +bin/mysqlmanager-pwgen +bin/mysqlmanagerc bin/mysqlshow bin/mysqltest etc/rc.d/000.mysql-client.sh @@ -11,24 +13,27 @@ include/mysql/dbug.h include/mysql/errmsg.h include/mysql/m_ctype.h include/mysql/m_string.h +include/mysql/my_alloc.h include/mysql/my_config.h +include/mysql/my_getopt.h include/mysql/my_global.h include/mysql/my_list.h include/mysql/my_net.h include/mysql/my_no_pthread.h include/mysql/my_pthread.h +include/mysql/my_semaphore.h include/mysql/my_sys.h include/mysql/mysql.h include/mysql/mysql_com.h +include/mysql/mysql_embed.h include/mysql/mysql_version.h include/mysql/mysqld_error.h include/mysql/raid.h include/mysql/sslopt-case.h include/mysql/sslopt-longopts.h -include/mysql/sslopt-usage.h include/mysql/sslopt-vars.h lib/mysql/libmysqlclient.a lib/mysql/libmysqlclient.so -lib/mysql/libmysqlclient.so.10 +lib/mysql/libmysqlclient.so.12 @dirrm include/mysql @dirrm lib/mysql |