diff options
| author | ale <ale@FreeBSD.org> | 2004-09-29 16:18:25 +0000 |
|---|---|---|
| committer | ale <ale@FreeBSD.org> | 2004-09-29 16:18:25 +0000 |
| commit | f3775fe66c19f8f444e6bbc8c59807cdf9973d70 (patch) | |
| tree | 091985faf4130946bbac4d7af44f2a552e4d005e /databases | |
| parent | 386e7a9b72acc92907511120d20db9b0021f3646 (diff) | |
| download | FreeBSD-ports-f3775fe66c19f8f444e6bbc8c59807cdf9973d70.zip FreeBSD-ports-f3775fe66c19f8f444e6bbc8c59807cdf9973d70.tar.gz | |
Unbreak (restore forced 'ps' command).
Approved by: portmgr (kris)
Diffstat (limited to 'databases')
| -rw-r--r-- | databases/mysql323-server/files/patch-configure | 51 |
1 files changed, 46 insertions, 5 deletions
diff --git a/databases/mysql323-server/files/patch-configure b/databases/mysql323-server/files/patch-configure index aa467e7..6596fa0 100644 --- a/databases/mysql323-server/files/patch-configure +++ b/databases/mysql323-server/files/patch-configure @@ -1,15 +1,56 @@ ---- configure.orig Fri Sep 24 16:53:37 2004 -+++ configure Fri Sep 24 16:53:53 2004 +--- configure.orig Thu Sep 11 13:49:33 2003 ++++ configure Wed Sep 29 12:17:28 2004 @@ -8071,8 +8071,6 @@ # This can be used to rebuild libtool when needed - LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"; $ac_aux_dir/ltconfig $LIBTOOL_DEPS; + LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" -# Always use our own libtool. -LIBTOOL='$(SHELL) $(top_builddir)/libtool' # Prevent multiple expansion -@@ -12509,8 +12507,16 @@ +@@ -9191,40 +9189,8 @@ + 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 +12475,16 @@ ;; *freebsd*) echo "Adding fix for interrupted reads" @@ -28,7 +69,7 @@ ;; *netbsd*) echo "Adding flag -Dunix" -@@ -13710,30 +13716,6 @@ +@@ -13710,30 +13684,6 @@ #define HAVE_RESTARTABLE_SYSCALLS 1 _ACEOF |
