Index: head/databases/mysql323-server/Makefile =================================================================== --- head/databases/mysql323-server/Makefile (revision 87989) +++ head/databases/mysql323-server/Makefile (revision 87990) @@ -1,187 +1,187 @@ # ports collection makefile for: MySQL-server # Date created: Sun Sep 24 21:20:46 CEST 2000 # Whom: Dirk Froemberg # # $FreeBSD$ # PORTNAME?= ${MASTERPORTNAME} PORTVERSION= 3.23.57 #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= dirk@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT?= Multithreaded SQL database (server) WRKSRC= ${WRKDIR}/mysql-${PORTVERSION} SLAVEDIRS= databases/mysql323-client MASTERPORTNAME= mysql-server DB_DIR?= /var/db/mysql USE_PERL5= yes USE_LIBTOOL= yes 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 .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 .if defined(WITH_XCHARSET) && ${WITH_XCHARSET} != "" CONFIGURE_ARGS+=--with-extra-charsets=${WITH_XCHARSET} .endif .if defined(BUILD_STATIC) CONFIGURE_ARGS+=--with-mysqld-ldflags=--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 CONFIGURE_ARGS+=-D_THREAD_SAFE -I${LOCALBASE}/include/pthread/linuxthreads CFLAGS+= -D__USE_UNIX98 -D_REENTRANT -D_THREAD_SAFE -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 .else CONFIGURE_ARGS+=-L${LOCALBASE}/lib -llthread -llgcc_r' LIB_DEPENDS+= lthread.2:${PORTSDIR}/devel/linuxthreads .endif .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} >= 400002 CXXFLAGS+= -fno-exceptions .endif .if ${OSVERSION} < 500000 CONFIGURE_ENV+= CXX="${CC}" .endif # MySQL-Server part .if !defined(CLIENT_ONLY) RUN_DEPENDS= mysql:${PORTSDIR}/databases/mysql323-client \ ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Mysql.pm:${PORTSDIR}/databases/p5-Mysql PLIST_SUB= MYSQL_VERSION=${PORTVERSION} ONLY_FOR_ARCHS= i386 alpha sparc64 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} " 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} " 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} " DNS check before inserting local hostname to" @${ECHO} " mysql database." @${ECHO} " Use if your machine has no offical 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} "" .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}." @${ECHO} "" @${ECHO} "In order to preserve your existing data, you should:" @${ECHO} " - dump all your databases" @${ECHO} " - kill mysql if it is running" @${ECHO} " - delete the ${DB_DIR} directory" @${ECHO} " - run 'make install'" @${ECHO} " - start up mysql" @${ECHO} " - re-create all of your database" @${ECHO} " - re-load your data" @${ECHO} "" @${ECHO} "If you understand the consequences of this upgrade, please re-build this" @${ECHO} "port with the environment variable OVERWRITE_DB defined." @${FALSE} .endif post-install: .if !defined(PACKAGE_BUILDING) .if !defined(SKIP_INSTALL_DB) .if defined(SKIP_DNS_CHECK) ${PREFIX}/bin/mysql_install_db --force .else ${PREFIX}/bin/mysql_install_db .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 .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 .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 INSTALLS_SHLIB= yes LDCONFIG_DIRS= %%PREFIX%%/lib/mysql CONFIGURE_ARGS+=--without-server MAKE_ENV= CLIENT_ONLY="${CLIENT_ONLY}" 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: /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 Property changes on: head/databases/mysql323-server/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.160 \ No newline at end of property +1.161 \ No newline at end of property Index: head/databases/mysql323-server/files/patch-ag =================================================================== --- head/databases/mysql323-server/files/patch-ag (revision 87989) +++ head/databases/mysql323-server/files/patch-ag (revision 87990) @@ -1,177 +1,186 @@ ---- configure.orig Thu Mar 13 19:32:30 2003 -+++ configure Fri May 23 00:00:20 2003 -@@ -8059,6 +8059,7 @@ +--- configure.orig Fri Jun 6 10:39:41 2003 ++++ configure Fri Aug 29 13:26:35 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' -@@ -8988,7 +8989,7 @@ +@@ -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 -@@ -9177,43 +9178,7 @@ +@@ -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 -@@ -12498,8 +12463,16 @@ +@@ -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" -@@ -13208,7 +13181,6 @@ +@@ -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" -@@ -13262,7 +13234,6 @@ +@@ -13269,7 +13241,6 @@ #define HAVE_LIBC_R 1 _ACEOF - LIBS="-lc_r $LIBS" fi -@@ -13706,29 +13677,6 @@ +@@ -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 -@@ -16081,10 +16029,6 @@ +@@ -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" -@@ -19222,14 +19166,6 @@ +@@ -16942,7 +16886,7 @@ + FILE *file=fopen("conftestval", "w"); + f = (float) ll; + fprintf(file,"%g\n",f); +- close(file); ++ fclose(file); + exit (0); + } + _ACEOF +@@ -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" -@@ -19313,10 +19249,6 @@ +@@ -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" -@@ -19399,10 +19331,6 @@ +@@ -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" Property changes on: head/databases/mysql323-server/files/patch-ag ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.22 \ No newline at end of property +1.23 \ No newline at end of property