diff options
| author | Satoshi Asami <asami@FreeBSD.org> | 1998-12-01 02:56:08 +0000 |
|---|---|---|
| committer | Satoshi Asami <asami@FreeBSD.org> | 1998-12-01 02:56:08 +0000 |
| commit | e3f53a8e898741db0dd534aa227c677c3fd559a1 (patch) | |
| tree | 80c31cbc5cdc2188df4823251e22b9243c0570a4 /databases/mysql54-server | |
| parent | 31742ce7029295b6b07dea8ef865818c28070510 (diff) | |
| download | ports-e3f53a8e898741db0dd534aa227c677c3fd559a1.tar.gz ports-e3f53a8e898741db0dd534aa227c677c3fd559a1.zip | |
Don't try to be too fancy about using ps to find its flags, it breaks
chrooted builds. Don't start mysql automatically if PACKAGE_BUILDING
is defined.
Submitted by: maintainer
Notes
Notes:
svn path=/head/; revision=14972
Diffstat (limited to 'databases/mysql54-server')
| -rw-r--r-- | databases/mysql54-server/Makefile | 9 | ||||
| -rw-r--r-- | databases/mysql54-server/files/patch-configure | 40 |
2 files changed, 41 insertions, 8 deletions
diff --git a/databases/mysql54-server/Makefile b/databases/mysql54-server/Makefile index 5ed911d49de9..e3108ed7486b 100644 --- a/databases/mysql54-server/Makefile +++ b/databases/mysql54-server/Makefile @@ -3,7 +3,7 @@ # Date created: 26 Jan 1998 # Whom: Josh Tiefenbach <josh@ican.net> # -# $Id: Makefile,v 1.31 1998/11/11 05:37:08 asami Exp $ +# $Id: Makefile,v 1.32 1998/11/21 20:13:46 steve Exp $ # DISTNAME= mysql-3.22.10-beta @@ -61,14 +61,15 @@ pre-fetch: .endif pre-install: -.if defined(PACKAGE_BUILDING) - @ ${RM} -rf /var/db/mysql -.endif +.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 diff --git a/databases/mysql54-server/files/patch-configure b/databases/mysql54-server/files/patch-configure index f25048611287..1d3aac9b1479 100644 --- a/databases/mysql54-server/files/patch-configure +++ b/databases/mysql54-server/files/patch-configure @@ -1,7 +1,39 @@ ---- configure.orig Mon Aug 31 13:09:12 1998 -+++ configure Wed Sep 9 16:33:22 1998 -@@ -3475,7 +3475,7 @@ - echo "configure:3476: checking "named thread libs:"" >&5 +--- 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" |