From cc4970f84534a446724aa3884423c7d170f1f4a0 Mon Sep 17 00:00:00 2001 From: Norikatsu Shigemura Date: Tue, 4 Feb 2003 14:13:34 +0000 Subject: Update to 4.0.10. Fix configure on -current. PR: ports/47902 Submitted by: Alex Dupre (maintainer) --- databases/mysql54-server/Makefile | 4 +- databases/mysql54-server/distinfo | 2 +- databases/mysql54-server/files/patch-Makefile.in | 15 +++---- databases/mysql54-server/files/patch-configure | 52 ++++++++++++++++++++++-- 4 files changed, 59 insertions(+), 14 deletions(-) (limited to 'databases/mysql54-server') diff --git a/databases/mysql54-server/Makefile b/databases/mysql54-server/Makefile index b499fd55b10d..783868f9fbdf 100644 --- a/databases/mysql54-server/Makefile +++ b/databases/mysql54-server/Makefile @@ -6,7 +6,7 @@ # PORTNAME?= mysql -PORTVERSION= 4.0.9 +PORTVERSION= 4.0.10 PORTREVISION?= 0 CATEGORIES= databases MASTER_SITES= ftp://mysql.secsup.org/pub/software/mysql/Downloads/MySQL-4.0/ \ @@ -88,7 +88,7 @@ RUN_DEPENDS= mysql:${PORTSDIR}/databases/mysql40-client \ PLIST_SUB= MYSQL_VERSION=${PORTVERSION}-gamma -ONLY_FOR_ARCHS= i386 alpha +ONLY_FOR_ARCHS= i386 alpha sparc64 DOCS= manual.html manual.ps manual_toc.html manual.txt manual.texi \ include.texi diff --git a/databases/mysql54-server/distinfo b/databases/mysql54-server/distinfo index 4c809e2ce104..f7751a770d6c 100644 --- a/databases/mysql54-server/distinfo +++ b/databases/mysql54-server/distinfo @@ -1 +1 @@ -MD5 (mysql-4.0.9-gamma.tar.gz) = 75d582f3e71e21cd6ffa7c84a6db26c3 +MD5 (mysql-4.0.10-gamma.tar.gz) = fd66e12e7de57a6836283365107af427 diff --git a/databases/mysql54-server/files/patch-Makefile.in b/databases/mysql54-server/files/patch-Makefile.in index c8bf28bc02bc..3e8211497edc 100644 --- a/databases/mysql54-server/files/patch-Makefile.in +++ b/databases/mysql54-server/files/patch-Makefile.in @@ -1,14 +1,15 @@ ---- Makefile.in.orig Wed Nov 20 00:06:37 2002 -+++ Makefile.in Wed Nov 20 00:07:31 2002 -@@ -207,12 +207,11 @@ +--- Makefile.in.orig Tue Feb 4 13:55:10 2003 ++++ Makefile.in Tue Feb 4 13:58:31 2003 +@@ -210,13 +210,11 @@ EXTRA_DIST = INSTALL-SOURCE README \ COPYING COPYING.LIB --SUBDIRS = include @docs_dirs@ @readline_dir@ \ +-SUBDIRS = . include @docs_dirs@ @readline_dir@ \ - @thread_dirs@ pstack @sql_client_dirs@ \ -- @sql_server_dirs@ @libmysqld_dirs@ scripts man \ -- tests BUILD os2 \ -- @bench_dirs@ support-files @fs_dirs@ @tools_dirs@ +- @sql_server_dirs@ scripts man tests \ +- BUILD netware os2 @libmysqld_dirs@ \ +- @bench_dirs@ support-files @fs_dirs@ @tools_dirs@ \ +- @platform_dir@ - +.if defined(CLIENT_ONLY) +SUBDIRS = include @sql_client_dirs@ tests man diff --git a/databases/mysql54-server/files/patch-configure b/databases/mysql54-server/files/patch-configure index 5f5155735ee1..7add28292e45 100644 --- a/databases/mysql54-server/files/patch-configure +++ b/databases/mysql54-server/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig Mon Dec 16 10:12:16 2002 -+++ configure Fri Dec 20 18:11:14 2002 -@@ -8071,6 +8071,7 @@ +--- configure.orig Wed Jan 29 12:29:38 2003 ++++ configure Tue Feb 4 14:07:39 2003 +@@ -8104,6 +8104,7 @@ # This can be used to rebuild libtool when needed LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" @@ -8,7 +8,7 @@ # Always use our own libtool. LIBTOOL='$(SHELL) $(top_builddir)/libtool' -@@ -9000,7 +9001,7 @@ +@@ -9046,7 +9047,7 @@ ;; esac fi @@ -17,3 +17,47 @@ if test -n "$HOSTNAME"; then echo "$as_me:$LINENO: result: $HOSTNAME" >&5 +@@ -9238,43 +9239,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" +- ;; +- *netware* | *modesto*) +- FIND_PROC= +- ;; +- *) +- { { 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 -- cgit v1.2.3