diff options
| author | Edwin Groothuis <edwin@FreeBSD.org> | 2004-10-13 02:53:10 +0000 |
|---|---|---|
| committer | Edwin Groothuis <edwin@FreeBSD.org> | 2004-10-13 02:53:10 +0000 |
| commit | 3e8d8ca41e2edd91917fb3b63d33a9137021c532 (patch) | |
| tree | 3ee9000e5d8442667977c2b9681538ef217c62f6 /databases/mysqlcppapi | |
| parent | update to 1.7.5. (diff) | |
[maintainer] Unbreak databases/mysqlcppapi after mysql41-* update
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.
PR: ports/71348
Submitted by: Jie Gao <gaoj@cpsc.ucalgary.ca>
Notes
Notes:
svn path=/head/; revision=119143
Diffstat (limited to 'databases/mysqlcppapi')
| -rw-r--r-- | databases/mysqlcppapi/Makefile | 1 | ||||
| -rw-r--r-- | databases/mysqlcppapi/files/patch-configure | 13 | ||||
| -rw-r--r-- | databases/mysqlcppapi/files/patch-mysqlcppapi-Connection.cc | 2 |
3 files changed, 14 insertions, 2 deletions
diff --git a/databases/mysqlcppapi/Makefile b/databases/mysqlcppapi/Makefile index 0ea473fefe13..4a65bfc09cc0 100644 --- a/databases/mysqlcppapi/Makefile +++ b/databases/mysqlcppapi/Makefile @@ -7,6 +7,7 @@ PORTNAME= mysqlcppapi PORTVERSION= 1.9.3 +PORTREVISION= 1 CATEGORIES= databases devel MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR=mysqlcppapi diff --git a/databases/mysqlcppapi/files/patch-configure b/databases/mysqlcppapi/files/patch-configure index e81daa02854a..23710b3c6c71 100644 --- a/databases/mysqlcppapi/files/patch-configure +++ b/databases/mysqlcppapi/files/patch-configure @@ -1,4 +1,4 @@ ---- configure~ Wed Aug 4 23:58:41 2004 +--- configure.orig Wed Aug 4 23:58:41 2004 +++ configure Thu Aug 5 00:12:29 2004 @@ -18465,8 +18465,8 @@ fi; @@ -11,3 +11,14 @@ +--- configure.orig Fri Aug 29 03:24:14 2003 ++++ configure Fri Sep 3 20:09:58 2004 +@@ -18660,7 +18660,7 @@ + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-lmysqlclient $LIBS" ++LIBS="-L$MYSQL_PREFIX/lib/mysql -lmysqlclient $LIBS" + cat >conftest.$ac_ext <<_ACEOF + #line $LINENO "configure" + /* confdefs.h. */ diff --git a/databases/mysqlcppapi/files/patch-mysqlcppapi-Connection.cc b/databases/mysqlcppapi/files/patch-mysqlcppapi-Connection.cc index aa3f2567e801..ffbeb0be9d22 100644 --- a/databases/mysqlcppapi/files/patch-mysqlcppapi-Connection.cc +++ b/databases/mysqlcppapi/files/patch-mysqlcppapi-Connection.cc @@ -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())); |