From c9989eb4c43f689eb27a4cbb5cdf1cb4e09fdb70 Mon Sep 17 00:00:00 2001 From: Alex Dupre Date: Sat, 17 Jan 2004 12:47:02 +0000 Subject: - Completely restructure the port to follow other mysql* ports (too many improvements to be listed here) - Correctly support PTHREAD_LIBS/CFLAGS - Use USE_GNOME=lthack - Propagate DB_DIR in package [1] - Use my @FreeBSD.org email address - Bump PORTREVISION PR: ports/24749 [1] Submitted by: Tom Pavel [1] Approved by: nork (mentor/implicitly) --- databases/mysql323-server/Makefile | 201 ++++++++++------------ databases/mysql323-server/files/patch-Makefile.in | 14 ++ databases/mysql323-server/files/patch-af | 79 --------- databases/mysql323-server/files/patch-ag | 177 ------------------- databases/mysql323-server/files/patch-an | 19 -- databases/mysql323-server/files/patch-ar | 14 -- databases/mysql323-server/files/patch-configure | 105 +++++++++++ databases/mysql323-server/pkg-descr | 3 + databases/mysql323-server/pkg-install | 4 +- databases/mysql323-server/pkg-plist | 101 ++++++----- databases/mysql323-server/pkg-plist.client | 3 + 11 files changed, 270 insertions(+), 450 deletions(-) create mode 100644 databases/mysql323-server/files/patch-Makefile.in delete mode 100644 databases/mysql323-server/files/patch-af delete mode 100644 databases/mysql323-server/files/patch-ag delete mode 100644 databases/mysql323-server/files/patch-an delete mode 100644 databases/mysql323-server/files/patch-ar create mode 100644 databases/mysql323-server/files/patch-configure (limited to 'databases/mysql323-server') diff --git a/databases/mysql323-server/Makefile b/databases/mysql323-server/Makefile index d2a73a0fa614..2bcc3a64b0eb 100644 --- a/databases/mysql323-server/Makefile +++ b/databases/mysql323-server/Makefile @@ -5,49 +5,48 @@ # $FreeBSD$ # -PORTNAME?= ${MASTERPORTNAME} +PORTNAME?= mysql PORTVERSION= 3.23.58 -#PORTREVISION?= 1 +PORTREVISION?= 1 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= sysadmin@alexdupre.com +MASTER_SITES= ftp://planetmirror.com/pub/mysql/Downloads/MySQL-3.23/ \ + http://www.softagency.co.jp/MySQL/Downloads/MySQL-3.23/ \ + ftp://sunsite.dk/mirrors/mysql/Downloads/MySQL-3.23/ \ + http://mysql.mediatraffic.fi/Downloads/MySQL-3.23/ \ + ftp://filepile.tiscali.de/mirror/mysql/Downloads/MySQL-3.23/ \ + http://mirrors.tilian.co.uk/mysql.com/Downloads/MySQL-3.23/ \ + ftp://ftp.rtfm.no/pub/mysql/Downloads/MySQL-3.23/ \ + http://www.mysql.cz/Downloads/MySQL-3.23/ \ + ftp://ftp.u-paris10.fr/mysql.com/Downloads/MySQL-3.23/ \ + http://mysql.oms-net.nl/Downloads/MySQL-3.23/ \ + ftp://ftp.free.fr/pub/MySQL/Downloads/MySQL-3.23/ +PKGNAMESUFFIX?= -server + +MAINTAINER= ale@FreeBSD.org COMMENT?= Multithreaded SQL database (server) -WRKSRC= ${WRKDIR}/mysql-${PORTVERSION} SLAVEDIRS= databases/mysql323-client -MASTERPORTNAME= mysql-server +PKGINSTALL?= ${WRKDIR}/pkg-install DB_DIR?= /var/db/mysql -USE_PERL5= yes +USE_GNOME= lthack USE_LIBTOOL= yes +USE_REINPLACE= yes + +CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --localstatedir=${DB_DIR} \ - --without-perl \ --without-debug \ --without-readline \ --without-bench \ - --with-mit-threads=no \ --with-libwrap \ --with-low-memory \ --with-comment='FreeBSD port: ${PKGNAME}' \ - --program-prefix='' \ - --with-innodb + --with-innodb \ + --enable-thread-safe-client .ifdef USE_MYSQL .error You have `USE_MYSQL' variable defined either in environment or in make(1) arguments. Please undefine and try again. .endif -.include - -.if ${MACHINE_ARCH} == "i386" -CONFIGURE_ARGS+=--enable-assembler --with-berkeley-db -.endif .if defined(WITH_CHARSET) && ${WITH_CHARSET} != "" CONFIGURE_ARGS+=--with-charset=${WITH_CHARSET} .endif @@ -55,120 +54,115 @@ CONFIGURE_ARGS+=--with-charset=${WITH_CHARSET} CONFIGURE_ARGS+=--with-extra-charsets=${WITH_XCHARSET} .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 + +.include + +.if ${MACHINE_ARCH} == "i386" +CONFIGURE_ARGS+=--enable-assembler --with-berkeley-db .endif .if defined(WITH_LINUXTHREADS) CONFIGURE_ARGS+=--with-named-thread-libs='-DHAVE_GLIBC2_STYLE_GETHOSTBYNAME_R CONFIGURE_ARGS+=-D_THREAD_SAFE -I${LOCALBASE}/include/pthread/linuxthreads -CFLAGS+= -D__USE_UNIX98 -D_REENTRANT -D_THREAD_SAFE -I${LOCALBASE}/include/pthread/linuxthreads +CFLAGS+= -D__USE_UNIX98 -D_REENTRANT -D_THREAD_SAFE +CFLAGS+= -I${LOCALBASE}/include/pthread/linuxthreads .if ${OSVERSION} > 500000 -CONFIGURE_ARGS+=-L${LOCALBASE}/lib -llthread -llgcc_r -llstdc++ -llsupc++' LIB_DEPENDS+= lthread.3:${PORTSDIR}/devel/linuxthreads +CONFIGURE_ARGS+=-L${LOCALBASE}/lib -llthread -llgcc_r -llstdc++ -llsupc++' .else -CONFIGURE_ARGS+=-L${LOCALBASE}/lib -llthread -llgcc_r' LIB_DEPENDS+= lthread.2:${PORTSDIR}/devel/linuxthreads +CONFIGURE_ARGS+=-L${LOCALBASE}/lib -llthread -llgcc_r' .endif +.else +CONFIGURE_ARGS+=--with-named-thread-libs=${PTHREAD_LIBS} +CFLAGS+= ${PTHREAD_CFLAGS} .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}" -# without including these flags mysqld may crash under heavy load -# and multiple connections at the same time -CXXFLAGS= ${CFLAGS} -felide-constructors -fno-rtti +.if ${OSVERSION} < 500000 +CXX= ${CC} +.endif +.if defined(BUILD_OPTIMIZED) +CFLAGS+= -O3 -fno-omit-frame-pointer +.if ${OSVERSION} > 500000 || (defined(USE_GCC) && (${USE_GCC} == 3.0 || ${USE_GCC} == 3.1 || ${USE_GCC} == 3.2 || ${USE_GCC} == 3.3)) +CFLAGS+= -fno-gcse +.endif +.endif +CXXFLAGS+= ${CFLAGS} -felide-constructors -fno-rtti .if ${OSVERSION} >= 400002 CXXFLAGS+= -fno-exceptions .endif -.if ${OSVERSION} < 500000 -CONFIGURE_ENV+= CXX="${CC}" -.endif # MySQL-Server part .if !defined(CLIENT_ONLY) -.if !defined(NOPORTDOCS) -INFO= mysql -.endif +USE_PERL5_RUN= yes RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Mysql.pm:${PORTSDIR}/databases/p5-Mysql CONFLICTS= mysql-server-4.* mysql-server-5.* -PLIST_SUB= MYSQL_VERSION=${PORTVERSION} +PLIST_SUB= DB_DIR=${DB_DIR} \ + MYSQL_VERSION=${PORTVERSION} ONLY_FOR_ARCHS= i386 alpha sparc64 -pre-everything:: - @${ECHO_MSG} "" - @${ECHO_MSG} "You may use the following build options:" - @${ECHO_MSG} "" - @${ECHO_MSG} " WITH_CHARSET=charset define the primary built-in charset (latin1);" - @${ECHO_MSG} " WITH_XCHARSET=list define other built-in charsets (may be 'all');" - @${ECHO_MSG} " DB_DIR=directory Set alternate directory for database files" - @${ECHO_MSG} " (default is /var/db/mysql)." - @${ECHO_MSG} " WITH_LINUXTHREADS=yes Use the linuxthreads pthread library." - @${ECHO_MSG} " SKIP_INSTALL_DB=yes Skip mysql_install_db" - @${ECHO_MSG} " (i. e. leave ${DB_DIR} alone)." - @${ECHO_MSG} " This is useful for upgrades." - @${ECHO_MSG} " Be sure to know what you are doing!" - @${ECHO_MSG} " SKIP_DNS_CHECK=yes don't run resolveip to do an additional" - @${ECHO_MSG} " DNS check before inserting local hostname to" - @${ECHO_MSG} " mysql database." - @${ECHO_MSG} " Use if your machine has no offical DNS entry." - @${ECHO_MSG} " BUILD_STATIC=yes Build a static version of mysqld." - @${ECHO_MSG} " BUILD_OPTIMIZED=yes Add -mcpu=pentiumpro -O3 to CFLAGS." - @${ECHO_MSG} " This setting may produce broken code and thus" - @${ECHO_MSG} " is not recommended for production servers." - @${ECHO_MSG} "" - -.if exists(${DB_DIR}) && !defined(PACKAGE_BUILDING) && !defined(OVERWRITE_DB) && !defined(SKIP_INSTALL_DB) -pre-install: - @${ECHO_MSG} "You appear to already have a mysql database directory in ${DB_DIR}." - @${ECHO_MSG} "" - @${ECHO_MSG} "In order to preserve your existing data, you should:" - @${ECHO_MSG} " - dump all your databases" - @${ECHO_MSG} " - kill mysql if it is running" - @${ECHO_MSG} " - delete the ${DB_DIR} directory" - @${ECHO_MSG} " - run 'make install'" - @${ECHO_MSG} " - start up mysql" - @${ECHO_MSG} " - re-create all of your database" - @${ECHO_MSG} " - re-load your data" - @${ECHO_MSG} "" - @${ECHO_MSG} "If you understand the consequences of this upgrade, please re-build this" - @${ECHO_MSG} "port with the environment variable OVERWRITE_DB defined." - @${FALSE} -.endif +DOCS= manual.html manual.txt manual_toc.html + +INFO= mysql + +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_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} " OVERWRITE_DB=yes Re-initialize default databases." + @${ECHO} " SKIP_DNS_CHECK=yes Don't run resolveip to do an additional DNS" + @${ECHO} " reverse lookup before inserting local" + @${ECHO} " hostname into mysql database" + @${ECHO} " (use it if your machine has no official DNS entry)." + @${ECHO} " BUILD_OPTIMIZED=yes Enable compiler optimizations" + @${ECHO} " (use it if you need speed)." + @${ECHO} " BUILD_STATIC=yes Build a static version of mysqld." + @${ECHO} " (use it if you need even more speed)." + @${ECHO} "" + +post-patch: + @${REINPLACE_CMD} -e "s|SUBDIRS =|SUBDIRS = include @sql_server_dirs@ scripts support-files|g" ${WRKSRC}/Makefile.in + @${REINPLACE_CMD} -e "s|install: install-am|install:|g" ${WRKSRC}/include/Makefile.in + +post-build: + @${SED} "s|%%DB_DIR%%|${DB_DIR}|g" ${PKGDIR}/pkg-install > ${WRKDIR}/pkg-install post-install: .if !defined(PACKAGE_BUILDING) -.if !defined(SKIP_INSTALL_DB) +.if exists(${DB_DIR}) && defined(OVERWRITE_DB) && ${OVERWRITE_DB:L} != "no" + @${RM} -r ${DB_DIR}/mysql ${DB_DIR}/test 2>/dev/null || true +.endif +.if !exists(${DB_DIR}) || (defined(OVERWRITE_DB) && ${OVERWRITE_DB:L} != "no") .if defined(SKIP_DNS_CHECK) - ${PREFIX}/bin/mysql_install_db --force + ${PREFIX}/bin/mysql_install_db --force --ldata=${DB_DIR} .else - ${PREFIX}/bin/mysql_install_db + ${PREFIX}/bin/mysql_install_db --ldata=${DB_DIR} .endif .endif @${SETENV} DB_DIR=${DB_DIR} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .endif @${SED} "s|%%PREFIX%%|${PREFIX}|g; s|%%DB_DIR%%|${DB_DIR}|g" < ${FILESDIR}/mysql-server.sh > ${PREFIX}/etc/rc.d/mysql-server.sh @${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 + @${INSTALL_DATA} ${WRKSRC}/Docs/mysql.info ${PREFIX}/info + @install-info ${PREFIX}/info/mysql.info ${PREFIX}/info/dir # MySQL-Client part .else @@ -182,18 +176,13 @@ INSTALLS_SHLIB= yes LDCONFIG_DIRS= %%PREFIX%%/lib/mysql CONFIGURE_ARGS+=--without-server -MAKE_ENV= CLIENT_ONLY="${CLIENT_ONLY}" + +post-patch: + @${REINPLACE_CMD} -e "s|SUBDIRS =|SUBDIRS = include @sql_client_dirs@ tests man|g" ${WRKSRC}/Makefile.in post-install: @${SED} "s|%%PREFIX%%|${PREFIX}|g" < ${FILESDIR}/mysql-client.sh > ${PREFIX}/etc/rc.d/000.mysql-client.sh @${CHMOD} 750 ${PREFIX}/etc/rc.d/000.mysql-client.sh - .endif -# This is for the maintainer only... -make-plist: - ${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 diff --git a/databases/mysql323-server/files/patch-Makefile.in b/databases/mysql323-server/files/patch-Makefile.in new file mode 100644 index 000000000000..228501c8599e --- /dev/null +++ b/databases/mysql323-server/files/patch-Makefile.in @@ -0,0 +1,14 @@ +--- Makefile.in.orig Sat Jan 17 00:29:13 2004 ++++ Makefile.in Sat Jan 17 00:29:28 2004 +@@ -195,10 +195,7 @@ + EXTRA_DIST = INSTALL-SOURCE README \ + 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 = + + + # Relink after clean diff --git a/databases/mysql323-server/files/patch-af b/databases/mysql323-server/files/patch-af deleted file mode 100644 index 8d2d1003f2e4..000000000000 --- a/databases/mysql323-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/mysql323-server/files/patch-ag b/databases/mysql323-server/files/patch-ag deleted file mode 100644 index a54c0a835c6a..000000000000 --- a/databases/mysql323-server/files/patch-ag +++ /dev/null @@ -1,177 +0,0 @@ ---- configure.orig Thu Sep 11 13:49:33 2003 -+++ configure Fri Sep 19 16:37:59 2003 -@@ -8070,6 +8070,7 @@ - - # This can be used to rebuild libtool when needed - LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" -+$ac_aux_dir/ltconfig $LIBTOOL_DEPS - - # Always use our own libtool. - LIBTOOL='$(SHELL) $(top_builddir)/libtool' -@@ -8999,7 +9000,7 @@ - ;; - esac - fi --HOSTNAME=$ac_cv_path_HOSTNAME -+HOSTNAME="$ac_cv_path_HOSTNAME -s" - - if test -n "$HOSTNAME"; then - echo "$as_me:$LINENO: result: $HOSTNAME" >&5 -@@ -9188,43 +9189,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 -@@ -12509,8 +12474,16 @@ - ;; - *freebsd*) - echo "Adding fix for interrupted reads" -- CFLAGS="$CFLAGS -DHAVE_BROKEN_REALPATH" -- CXXFLAGS="$CXXFLAGS -DMYSQLD_NET_RETRY_COUNT=1000000 -DHAVE_BROKEN_REALPATH" -+ OSVERSION=`/sbin/sysctl -a | /usr/bin/grep osreldate | /usr/bin/awk '{ print $2 }'` -+ if test "$OSVERSION" -gt "480100" && \ -+ test "$OSVERSION" -lt "500000" || \ -+ test "$OSVERSION" -gt "500109" -+ then -+ CXXFLAGS="$CXXFLAGS -DMYSQLD_NET_RETRY_COUNT=1000000" -+ else -+ CFLAGS="$CFLAGS -DHAVE_BROKEN_REALPATH" -+ CXXFLAGS="$CXXFLAGS -DMYSQLD_NET_RETRY_COUNT=1000000 -DHAVE_BROKEN_REALPATH" -+ fi - ;; - *netbsd*) - echo "Adding flag -Dunix" -@@ -13215,7 +13188,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" -@@ -13269,7 +13241,6 @@ - #define HAVE_LIBC_R 1 - _ACEOF - -- LIBS="-lc_r $LIBS" - - fi - -@@ -13713,29 +13684,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 -@@ -16088,10 +16036,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" -@@ -19229,14 +19173,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" -@@ -19320,10 +19256,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" -@@ -19406,10 +19338,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/mysql323-server/files/patch-an b/databases/mysql323-server/files/patch-an deleted file mode 100644 index 987cf407da8f..000000000000 --- a/databases/mysql323-server/files/patch-an +++ /dev/null @@ -1,19 +0,0 @@ ---- Makefile.in.orig Thu Jan 23 16:13:43 2003 -+++ Makefile.in Wed Jan 29 17:11:29 2003 -@@ -195,11 +195,11 @@ - EXTRA_DIST = INSTALL-SOURCE README \ - COPYING COPYING.LIB MIRRORS - --SUBDIRS = . include @docs_dirs@ @readline_dir@ \ -- @thread_dirs@ @sql_client_dirs@ \ -- @sql_server_dirs@ scripts tests man \ -- @bench_dirs@ support-files os2 -- -+.if defined(CLIENT_ONLY) -+SUBDIRS = include @readline_dir@ @sql_client_dirs@ tests man -+.else -+SUBDIRS = include @thread_dirs@ @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 diff --git a/databases/mysql323-server/files/patch-ar b/databases/mysql323-server/files/patch-ar deleted file mode 100644 index 3ff10ce708d5..000000000000 --- a/databases/mysql323-server/files/patch-ar +++ /dev/null @@ -1,14 +0,0 @@ ---- 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 @@ - installdirs: - $(mkinstalldirs) $(DESTDIR)$(pkgincludedir) - -+.if defined(CLIENT_ONLY) - install: install-am -+.else -+install: -+.endif - install-exec: install-exec-am - install-data: install-data-am - uninstall: uninstall-am diff --git a/databases/mysql323-server/files/patch-configure b/databases/mysql323-server/files/patch-configure new file mode 100644 index 000000000000..f62b2b50eef7 --- /dev/null +++ b/databases/mysql323-server/files/patch-configure @@ -0,0 +1,105 @@ +--- configure.orig Thu Sep 11 13:49:33 2003 ++++ configure Sat Jan 17 00:49:23 2004 +@@ -8999,7 +8999,7 @@ + ;; + esac + fi +-HOSTNAME=$ac_cv_path_HOSTNAME ++HOSTNAME="$ac_cv_path_HOSTNAME -s" + + if test -n "$HOSTNAME"; then + echo "$as_me:$LINENO: result: $HOSTNAME" >&5 +@@ -9188,43 +9188,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 + + echo "$as_me:$LINENO: result: \"$FIND_PROC\"" >&5 + echo "${ECHO_T}\"$FIND_PROC\"" >&6 +@@ -12509,8 +12473,16 @@ + ;; + *freebsd*) + echo "Adding fix for interrupted reads" +- CFLAGS="$CFLAGS -DHAVE_BROKEN_REALPATH" +- CXXFLAGS="$CXXFLAGS -DMYSQLD_NET_RETRY_COUNT=1000000 -DHAVE_BROKEN_REALPATH" ++ OSVERSION=`/sbin/sysctl -a | /usr/bin/grep osreldate | /usr/bin/awk '{ print $2 }'` ++ if test "$OSVERSION" -gt "480100" && \ ++ test "$OSVERSION" -lt "500000" || \ ++ test "$OSVERSION" -gt "500109" ++ then ++ CXXFLAGS="$CXXFLAGS -DMYSQLD_NET_RETRY_COUNT=1000000" ++ else ++ CFLAGS="$CFLAGS -DHAVE_BROKEN_REALPATH" ++ CXXFLAGS="$CXXFLAGS -DMYSQLD_NET_RETRY_COUNT=1000000 -DHAVE_BROKEN_REALPATH" ++ fi + ;; + *netbsd*) + echo "Adding flag -Dunix" +@@ -13710,30 +13682,6 @@ + #define HAVE_RESTARTABLE_SYSCALLS 1 + _ACEOF + +-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 + + diff --git a/databases/mysql323-server/pkg-descr b/databases/mysql323-server/pkg-descr index 8f4acf36e853..4ddefbb70546 100644 --- a/databases/mysql323-server/pkg-descr +++ b/databases/mysql323-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 +ale@FreeBSD.org diff --git a/databases/mysql323-server/pkg-install b/databases/mysql323-server/pkg-install index 27732bf35c89..88a0b1c66915 100644 --- a/databases/mysql323-server/pkg-install +++ b/databases/mysql323-server/pkg-install @@ -1,9 +1,6 @@ #!/bin/sh PATH=/bin:/usr/sbin -if [ -z "${DB_DIR}" ]; then - DB_DIR=/var/db/mysql -fi case $2 in POST-INSTALL) @@ -11,6 +8,7 @@ POST-INSTALL) GROUP=${USER} UID=88 GID=${UID} + DB_DIR=%%DB_DIR%% if pw group show "${GROUP}" 2>/dev/null; then echo "You already have a group \"${GROUP}\", so I will use it." diff --git a/databases/mysql323-server/pkg-plist b/databases/mysql323-server/pkg-plist index 1587b704756f..2401ea803f3a 100644 --- a/databases/mysql323-server/pkg-plist +++ b/databases/mysql323-server/pkg-plist @@ -34,55 +34,52 @@ lib/mysql/libmystrings.a lib/mysql/libmysys.a lib/mysql/libnisam.a libexec/mysqld -%%PORTDOCS%%share/doc/mysql/Flags/argentina.gif -%%PORTDOCS%%share/doc/mysql/Flags/australia.gif -%%PORTDOCS%%share/doc/mysql/Flags/austria.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/croatia.gif -%%PORTDOCS%%share/doc/mysql/Flags/czech-republic.gif -%%PORTDOCS%%share/doc/mysql/Flags/denmark.gif -%%PORTDOCS%%share/doc/mysql/Flags/estonia.gif -%%PORTDOCS%%share/doc/mysql/Flags/finland.gif -%%PORTDOCS%%share/doc/mysql/Flags/france.gif -%%PORTDOCS%%share/doc/mysql/Flags/germany.gif -%%PORTDOCS%%share/doc/mysql/Flags/great-britain.gif -%%PORTDOCS%%share/doc/mysql/Flags/greece.gif -%%PORTDOCS%%share/doc/mysql/Flags/hungary.gif -%%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/netherlands.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/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/ukraine.gif -%%PORTDOCS%%share/doc/mysql/Flags/usa.gif -%%PORTDOCS%%share/doc/mysql/Flags/yugoslavia.gif -%%PORTDOCS%%share/doc/mysql/include.texi -%%PORTDOCS%%share/doc/mysql/manual.html -%%PORTDOCS%%share/doc/mysql/manual.ps -%%PORTDOCS%%share/doc/mysql/manual.texi -%%PORTDOCS%%share/doc/mysql/manual.txt -%%PORTDOCS%%share/doc/mysql/manual_toc.html +%%PORTDOCS%%%%DOCSDIR%%/Flags/argentina.gif +%%PORTDOCS%%%%DOCSDIR%%/Flags/australia.gif +%%PORTDOCS%%%%DOCSDIR%%/Flags/austria.gif +%%PORTDOCS%%%%DOCSDIR%%/Flags/brazil.gif +%%PORTDOCS%%%%DOCSDIR%%/Flags/bulgaria.gif +%%PORTDOCS%%%%DOCSDIR%%/Flags/canada.gif +%%PORTDOCS%%%%DOCSDIR%%/Flags/chile.gif +%%PORTDOCS%%%%DOCSDIR%%/Flags/china.gif +%%PORTDOCS%%%%DOCSDIR%%/Flags/croatia.gif +%%PORTDOCS%%%%DOCSDIR%%/Flags/czech-republic.gif +%%PORTDOCS%%%%DOCSDIR%%/Flags/denmark.gif +%%PORTDOCS%%%%DOCSDIR%%/Flags/estonia.gif +%%PORTDOCS%%%%DOCSDIR%%/Flags/finland.gif +%%PORTDOCS%%%%DOCSDIR%%/Flags/france.gif +%%PORTDOCS%%%%DOCSDIR%%/Flags/germany.gif +%%PORTDOCS%%%%DOCSDIR%%/Flags/great-britain.gif +%%PORTDOCS%%%%DOCSDIR%%/Flags/greece.gif +%%PORTDOCS%%%%DOCSDIR%%/Flags/hungary.gif +%%PORTDOCS%%%%DOCSDIR%%/Flags/iceland.gif +%%PORTDOCS%%%%DOCSDIR%%/Flags/indonesia.gif +%%PORTDOCS%%%%DOCSDIR%%/Flags/ireland.gif +%%PORTDOCS%%%%DOCSDIR%%/Flags/island.gif +%%PORTDOCS%%%%DOCSDIR%%/Flags/israel.gif +%%PORTDOCS%%%%DOCSDIR%%/Flags/italy.gif +%%PORTDOCS%%%%DOCSDIR%%/Flags/japan.gif +%%PORTDOCS%%%%DOCSDIR%%/Flags/kroatia.gif +%%PORTDOCS%%%%DOCSDIR%%/Flags/latvia.gif +%%PORTDOCS%%%%DOCSDIR%%/Flags/netherlands.gif +%%PORTDOCS%%%%DOCSDIR%%/Flags/poland.gif +%%PORTDOCS%%%%DOCSDIR%%/Flags/portugal.gif +%%PORTDOCS%%%%DOCSDIR%%/Flags/romania.gif +%%PORTDOCS%%%%DOCSDIR%%/Flags/russia.gif +%%PORTDOCS%%%%DOCSDIR%%/Flags/singapore.gif +%%PORTDOCS%%%%DOCSDIR%%/Flags/south-africa.gif +%%PORTDOCS%%%%DOCSDIR%%/Flags/south-africa1.gif +%%PORTDOCS%%%%DOCSDIR%%/Flags/south-korea.gif +%%PORTDOCS%%%%DOCSDIR%%/Flags/spain.gif +%%PORTDOCS%%%%DOCSDIR%%/Flags/sweden.gif +%%PORTDOCS%%%%DOCSDIR%%/Flags/switzerland.gif +%%PORTDOCS%%%%DOCSDIR%%/Flags/taiwan.gif +%%PORTDOCS%%%%DOCSDIR%%/Flags/ukraine.gif +%%PORTDOCS%%%%DOCSDIR%%/Flags/usa.gif +%%PORTDOCS%%%%DOCSDIR%%/Flags/yugoslavia.gif +%%PORTDOCS%%%%DOCSDIR%%/manual.html +%%PORTDOCS%%%%DOCSDIR%%/manual.txt +%%PORTDOCS%%%%DOCSDIR%%/manual_toc.html share/mysql/binary-configure share/mysql/charsets/Index share/mysql/charsets/README @@ -162,8 +159,8 @@ share/mysql/swedish/errmsg.sys share/mysql/swedish/errmsg.txt share/mysql/ukrainian/errmsg.sys share/mysql/ukrainian/errmsg.txt -%%PORTDOCS%%@dirrm share/doc/mysql/Flags -%%PORTDOCS%%@dirrm share/doc/mysql +%%PORTDOCS%%@dirrm %%DOCSDIR%%/Flags +%%PORTDOCS%%@dirrm %%DOCSDIR%% @dirrm share/mysql/charsets @dirrm share/mysql/czech @dirrm share/mysql/danish @@ -188,5 +185,5 @@ share/mysql/ukrainian/errmsg.txt @dirrm share/mysql/swedish @dirrm share/mysql/ukrainian @dirrm share/mysql -@exec %D/bin/mysql_install_db +@exec [ -d %%DB_DIR%% ] || %D/bin/mysql_install_db --ldata=%%DB_DIR%% @unexec /usr/bin/killall mysqld > /dev/null 2>&1 || true diff --git a/databases/mysql323-server/pkg-plist.client b/databases/mysql323-server/pkg-plist.client index 13d787a27fb7..a7f3c1e20480 100644 --- a/databases/mysql323-server/pkg-plist.client +++ b/databases/mysql323-server/pkg-plist.client @@ -30,5 +30,8 @@ include/mysql/sslopt-vars.h lib/mysql/libmysqlclient.a lib/mysql/libmysqlclient.so lib/mysql/libmysqlclient.so.10 +lib/mysql/libmysqlclient_r.a +lib/mysql/libmysqlclient_r.so +lib/mysql/libmysqlclient_r.so.10 @dirrm include/mysql @dirrm lib/mysql -- cgit v1.2.3