From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Sep 3 17:40:18 2004 Return-Path: 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 32C1F16A4CE for ; Fri, 3 Sep 2004 17:40:18 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0C33B43D55 for ; Fri, 3 Sep 2004 17:40:18 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) i83HeGxB055964 for ; Fri, 3 Sep 2004 17:40:16 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.11/8.12.11/Submit) id i83HeGJG055963; Fri, 3 Sep 2004 17:40:16 GMT (envelope-from gnats) Resent-Date: Fri, 3 Sep 2004 17:40:16 GMT Resent-Message-Id: <200409031740.i83HeGJG055963@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Jie Gao Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A8DD016A4CE for ; Fri, 3 Sep 2004 17:38:38 +0000 (GMT) Received: from ensa.cpsc.ucalgary.ca (ensa.cpsc.ucalgary.ca [136.159.2.1]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6B05643D54 for ; Fri, 3 Sep 2004 17:38:38 +0000 (GMT) (envelope-from gaoj@cpsc.ucalgary.ca) Received: from imgw1.cpsc.ucalgary.ca (imgw1 [136.159.5.9]) i83HZIpE015077 for ; Fri, 3 Sep 2004 11:35:18 -0600 Received: from _HOSTNAME_ (sana-sa [136.159.7.231])i83HZDXb019088 for ; Fri, 3 Sep 2004 11:35:13 -0600 Received: by _HOSTNAME_ (sSMTP sendmail emulation); Fri, 3 Sep 2004 11:35:12 -0600 Message-Id: <200409031735.i83HZDXb019088@imgw1.cpsc.ucalgary.ca> Date: Fri, 3 Sep 2004 11:35:12 -0600 From: "Jie Gao" To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/71348: [maintainer] Unbreak databases/mysqlcppapi after mysql41-* update X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Jie Gao List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Sep 2004 17:40:18 -0000 >Number: 71348 >Category: ports >Synopsis: [maintainer] Unbreak databases/mysqlcppapi after mysql41-* update >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Fri Sep 03 17:40:16 GMT 2004 >Closed-Date: >Last-Modified: >Originator: Jie Gao >Release: FreeBSD 5.3-BETA2 i386 >Organization: >Environment: System: FreeBSD aibsd-current.cpsc.ucalgary.ca 5.3-BETA2 FreeBSD 5.3-BETA2 #0: Mon Aug 30 20:16:55 MDT 2004 gaoj@aibsd-current.cpsc.ucalgary.ca:/usr/obj/usr/src/sys/AIBSD i386 >Description: databases/mysqlcppapi is unable to detect mysql-4.1.4 and use new mysql_shutdown() api. Thus it is broken with mysql41-* after mysql41-* were updated to 4.1.4. I hope this fix can make it way to ports before the freeze. >How-To-Repeat: build databases/mysqlcppapi port when mysql41-client is installed. >Fix: Apply the following patch to ports tree. --- patch-databases-mysqlcppapi begins here --- Index: databases/mysqlcppapi/files/patch-mysqlcppapi-Connection.cc =================================================================== RCS file: /home/grads/gaoj/repository/ports/databases/mysqlcppapi/files/patch-mysqlcppapi-Connection.cc,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- databases/mysqlcppapi/files/patch-mysqlcppapi-Connection.cc 6 Aug 2004 00:24:35 -0000 1.1 +++ databases/mysqlcppapi/files/patch-mysqlcppapi-Connection.cc 3 Sep 2004 17:28:13 -0000 1.2 @@ -5,7 +5,7 @@ { check_connection_is_open(); - -+#if ( MYSQL_VERSION_ID == 40103 ) || ( MYSQL_VERSION_ID == 50001 ) ++#if ( MYSQL_VERSION_ID >= 50001 ) || (( MYSQL_VERSION_ID < 50000 ) && ( MYSQL_VERSION_ID >= 40103 )) + bool suc = !(mysql_shutdown(m_sharedptr_connection.obj(),SHUTDOWN_DEFAULT)); +#else bool suc = !(mysql_shutdown(m_sharedptr_connection.obj())); --- patch-databases-mysqlcppapi ends here --- >Release-Note: >Audit-Trail: >Unformatted: