ports/71348: [maintainer] Unbreak databases/mysqlcppapi after mysql41-* update

[Jie Gao]

>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 at 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: