From owner-freebsd-ports-bugs Tue Feb 4 5:50:20 2003 Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 98E6937B405 for ; Tue, 4 Feb 2003 05:50:14 -0800 (PST) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 330D043F9B for ; Tue, 4 Feb 2003 05:50:13 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id h14DoDNS098833 for ; Tue, 4 Feb 2003 05:50:13 -0800 (PST) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id h14DoDHu098832; Tue, 4 Feb 2003 05:50:13 -0800 (PST) Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id F246237B401 for ; Tue, 4 Feb 2003 05:49:35 -0800 (PST) Received: from vaio.alexdupre.com (212-41-211-209.adsl.galactica.it [212.41.211.209]) by mx1.FreeBSD.org (Postfix) with ESMTP id DFA4843E4A for ; Tue, 4 Feb 2003 05:49:28 -0800 (PST) (envelope-from alex@vaio.alexdupre.com) Received: from vaio.alexdupre.com (localhost [127.0.0.1]) by vaio.alexdupre.com (8.12.2/8.12.2) with ESMTP id h14DvafY044804 for ; Tue, 4 Feb 2003 14:57:36 +0100 (CET) (envelope-from alex@vaio.alexdupre.com) Received: (from alex@localhost) by vaio.alexdupre.com (8.12.2/8.12.2/Submit) id h14DvZUs044803; Tue, 4 Feb 2003 14:57:35 +0100 (CET) Message-Id: <200302041357.h14DvZUs044803@vaio.alexdupre.com> Date: Tue, 4 Feb 2003 14:57:35 +0100 (CET) From: Alex Dupre Reply-To: Alex Dupre To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/47902: [Maintainer Update] Port: MySQL 4.0.10 Sender: owner-freebsd-ports-bugs@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org >Number: 47902 >Category: ports >Synopsis: [Maintainer Update] Port: MySQL 4.0.10 >Confidential: no >Severity: serious >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Tue Feb 04 05:50:12 PST 2003 >Closed-Date: >Last-Modified: >Originator: Alex Dupre >Release: FreeBSD 4.5-ALEXDUPRE i386 >Organization: >Environment: System: FreeBSD vaio.alexdupre.com 4.5-ALEXDUPRE FreeBSD 4.5-ALEXDUPRE #0: Fri Apr 12 14:12:57 CEST 2002 alex@vaio.alexdupre.com:/usr/obj/usr/src/sys/VAIO i386 >Description: Update to 4.0.10 Fix configure on -current >How-To-Repeat: >Fix: --- mysql40-server.diff begins here --- diff -ruN mysql40-server.orig/Makefile mysql40-server/Makefile --- mysql40-server.orig/Makefile Sun Feb 2 11:50:32 2003 +++ mysql40-server/Makefile Tue Feb 4 14:02:28 2003 @@ -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 @@ 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 -ruN mysql40-server.orig/distinfo mysql40-server/distinfo --- mysql40-server.orig/distinfo Sun Feb 2 11:50:32 2003 +++ mysql40-server/distinfo Tue Feb 4 13:49:35 2003 @@ -1 +1 @@ -MD5 (mysql-4.0.9-gamma.tar.gz) = 75d582f3e71e21cd6ffa7c84a6db26c3 +MD5 (mysql-4.0.10-gamma.tar.gz) = fd66e12e7de57a6836283365107af427 diff -ruN mysql40-server.orig/files/patch-Makefile.in mysql40-server/files/patch-Makefile.in --- mysql40-server.orig/files/patch-Makefile.in Sun Feb 2 11:50:32 2003 +++ mysql40-server/files/patch-Makefile.in Tue Feb 4 13:58:49 2003 @@ -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 -ruN mysql40-server.orig/files/patch-configure mysql40-server/files/patch-configure --- mysql40-server.orig/files/patch-configure Sun Feb 2 11:50:32 2003 +++ mysql40-server/files/patch-configure Tue Feb 4 14:09:35 2003 @@ -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 --- mysql40-server.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports-bugs" in the body of the message