Date: Mon, 30 Nov 1998 23:54:11 +0100 From: Dirk Froemberg <ibex@physik.TU-Berlin.DE> To: Satoshi Asami <asami@FreeBSD.ORG> Cc: ports@FreeBSD.ORG Subject: Re: mysql and ps Message-ID: <19981130235411.A27827@physik.TU-Berlin.DE> In-Reply-To: <199811302000.MAA02086@vader.cs.berkeley.edu>; from Satoshi Asami on Mon, Nov 30, 1998 at 12:00:47PM -0800 References: <19981130175544.A13831@physik.TU-Berlin.DE> <199811302000.MAA02086@vader.cs.berkeley.edu>
next in thread | previous in thread | raw e-mail | index | archive | help
--9jxsPFA5p3P2qPhR Content-Type: text/plain; charset=us-ascii Hi Satoshi! On Mon, Nov 30, 1998 at 12:00:47PM -0800, Satoshi Asami wrote: > * Ok, I changed the ports Makefile and the mysql configure script (patch-ag). > * Hopefully ps isn't called during a PACKAGE_BUILDING any more. > > This is great, I just verified it. Can you send a patch to mysql322 > too so I can commit them together? :) I don't think this is really necessary for mysql322 now since it sets MANUAL_PACKAGE_BUILD. But some day we'll have mysql322 as the default so we don't have to care about this point then... 8) So here are the new files for mysql322. TIA for committing! Best regards Dirk -- e-mail: ibex@physik.tu-berlin.de --9jxsPFA5p3P2qPhR Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename=Makefile # ports collection makefile for: MySQL # Version required: v3.22.6-alpha # Date created: 26 Jan 1998 # Whom: Josh Tiefenbach <josh@ican.net> # # $Id: Makefile,v 1.32 1998/11/21 20:13:46 steve Exp $ # DISTNAME= mysql-3.22.10-beta PKGNAME= mysql-3.22.10b CATEGORIES= databases MASTER_SITES= http://mysql.polaris.ca/Downloads/MySQL-3.22/ \ http://www.fh-wolfenbuettel.de/ftp/pub/database/mysql/Downloads/MySQL-3.22/ \ http://www.tcx.se/Downloads/MySQL-3.22/ MAINTAINER= ibex@physik.TU-Berlin.DE MANUAL_PACKAGE_BUILD= incompatible with mysql321 NO_LATEST_LINK= yes MAN1= mysql.1 USE_PERL5= YES GNU_CONFIGURE= YES CONFIGURE_ARGS= --localstatedir=/var/db/mysql \ --without-perl \ --without-debug \ --without-readline \ --without-bench CONFIGURE_ENV+= PERL=${PERL5} \ PERL5=${PERL5} \ INSTALL_SCRIPT="${INSTALL_SCRIPT}" .include <bsd.port.pre.mk> .if defined(NATIVE_THREADS) && ${OSVERSION} >= 300000 CONFIGURE_ARGS+= --with-named-thread-libs=-lc_r .else CONFIGURE_ARGS+= --with-mit-threads .endif .if !defined(NATIVE_THREADS) && ${OSVERSION} >= 300000 pre-fetch: @${ECHO} @${ECHO} "You may set NATIVE_THREADS (make NATIVE_THREADS=yes)" @${ECHO} "to compile mysql with the native FreeBSD threads (libc_r)." @${ECHO} "Warning: There are still some bugs in libc_r which prevent" @${ECHO} " 'mysqladmin shutdown' from working properly." @${ECHO} .elif defined(NATIVE_THREADS) && ${OSVERSION} >= 300000 pre-fetch: @${ECHO} @${ECHO} "Using native FreeBSD threads (libc_r)." @${ECHO} .elif defined(NATIVE_THREADS) && ${OSVERSION} < 300000 pre-fetch: @${ECHO} @${ECHO} "Sorry, native FreeBSD threads (libc_r) in 2.2-branch" @${ECHO} "are still to buggy to use with mysql." @${ECHO} "Using mit-pthreads." @${ECHO} .endif pre-install: .if !defined(PACKAGE_BUILDING) @ ${SETENV} ${MAKE_ENV} ${PERL5} ${SCRIPTDIR}/check_old_version .endif post-install: ${MKDIR} ${PREFIX}/share/mysql/mysql .if !defined(PACKAGE_BUILDING) ${PREFIX}/bin/mysql_install_db .endif @ ${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/mysql.sh @ ${ECHO} "#" >> ${PREFIX}/etc/rc.d/mysql.sh @ ${ECHO} "" >> ${PREFIX}/etc/rc.d/mysql.sh @ ${ECHO} "/sbin/ldconfig -m ${PREFIX}/lib/mysql" >> ${PREFIX}/etc/rc.d/mysql.sh @ ${ECHO} "" >> ${PREFIX}/etc/rc.d/mysql.sh @ ${ECHO} "if [ -x ${PREFIX}/bin/safe_mysqld ]" >> ${PREFIX}/etc/rc.d/mysql.sh @ ${ECHO} "then" >> ${PREFIX}/etc/rc.d/mysql.sh @ ${ECHO} " ${PREFIX}/bin/safe_mysqld > /dev/null & && ${ECHO} -n ' mysql'" >> ${PREFIX}/etc/rc.d/mysql.sh @ ${ECHO} "fi" >> ${PREFIX}/etc/rc.d/mysql.sh @ /bin/chmod 750 ${PREFIX}/etc/rc.d/mysql.sh .if !defined(NOPORTDOCS) ${MKDIR} ${PREFIX}/share/doc/mysql .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 @if [ ! -f ${PREFIX}/info/dir -a -f /usr/share/info/dir ]; then \ ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \ fi ${INSTALL_DATA} ${WRKSRC}/Docs/mysql.info ${PREFIX}/info @install-info ${PREFIX}/info/mysql.info ${PREFIX}/info/dir .endif ${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib/mysql .include <bsd.port.post.mk> --9jxsPFA5p3P2qPhR Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename=patch-ag --- configure.orig Wed Nov 4 23:00:15 1998 +++ configure Mon Nov 30 23:35:59 1998 @@ -2197,30 +2197,7 @@ echo $ac_n "checking "how to check if pid exists"""... $ac_c" 1>&6 echo "configure:2199: checking "how to check if pid exists"" >&5 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 - { echo "configure: error: Could not find the right ps switches. Which OS is this ?. See the Installation chapter in the Reference Manual." 1>&2; exit 1; } -fi - +FIND_PROC="$PS -uaxww | grep mysqld | grep \" \$\$PID \" > /dev/null" echo "$ac_t"""$FIND_PROC"" 1>&6 # Check if a pid is valid @@ -3484,7 +3461,7 @@ echo "configure:3485: checking "named thread libs:"" >&5 if test "$with_named_thread" != "no" then - LIBS="$LIBS $with_named_thread" + LIBS="-pthread $LIBS" with_posix_threads="yes" with_mit_threads="no" echo "$ac_t"""$with_named_thread"" 1>&6 --9jxsPFA5p3P2qPhR-- To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?19981130235411.A27827>