diff options
| author | pav <pav@FreeBSD.org> | 2006-03-27 03:32:28 +0800 |
|---|---|---|
| committer | pav <pav@FreeBSD.org> | 2006-03-27 03:32:28 +0800 |
| commit | 0f82b2255c0b72d38223a1c7727c8b389a3be1e8 (patch) | |
| tree | 4e5e28ac52ac653ffb60ec54b47d04e8f1043970 /databases | |
| parent | 42821a05e4c20e955a6076f4d0e6d3451dcf554d (diff) | |
| download | freebsd-ports-gnome-0f82b2255c0b72d38223a1c7727c8b389a3be1e8.tar.gz freebsd-ports-gnome-0f82b2255c0b72d38223a1c7727c8b389a3be1e8.tar.zst freebsd-ports-gnome-0f82b2255c0b72d38223a1c7727c8b389a3be1e8.zip | |
- Allow build against mysql-client 4.X
PR: ports/83373
Submitted by: Sven Berkvens-Matthijsse <sven@ilse.net>
Diffstat (limited to 'databases')
| -rw-r--r-- | databases/p5-Mysql/Makefile | 2 | ||||
| -rw-r--r-- | databases/p5-Mysql/files/patch-dbd-myMsql.h | 14 |
2 files changed, 15 insertions, 1 deletions
diff --git a/databases/p5-Mysql/Makefile b/databases/p5-Mysql/Makefile index 1d3aa3e7a40e..fd54a37ab238 100644 --- a/databases/p5-Mysql/Makefile +++ b/databases/p5-Mysql/Makefile @@ -19,7 +19,7 @@ COMMENT= Perl5 modules for accessing MySQL databases BUILD_DEPENDS= ${SITE_PERL}/Data/ShowTable.pm:${PORTSDIR}/devel/p5-Data-ShowTable RUN_DEPENDS= ${BUILD_DEPENDS} -CONFLICTS= p5-DBD-mysql-* p5-DBD-mysql4[0-9]-* p5-DBD-mysql5[0-9]-* +CONFLICTS= p5-DBD-mysql-* p5-DBD-mysql4[0-9]-* p5-DBD-mysql5[0-9]-* USE_MYSQL= yes DEFAULT_MYSQL_VER= 323 diff --git a/databases/p5-Mysql/files/patch-dbd-myMsql.h b/databases/p5-Mysql/files/patch-dbd-myMsql.h new file mode 100644 index 000000000000..b2cd424bc6d7 --- /dev/null +++ b/databases/p5-Mysql/files/patch-dbd-myMsql.h @@ -0,0 +1,14 @@ +--- dbd/myMsql.h.orig Wed Nov 30 09:28:39 2005 ++++ dbd/myMsql.h Wed Nov 30 09:29:09 2005 +@@ -117,7 +117,11 @@ + #define MyGetHostInfo(s) mysql_get_host_info(s) + #define MyGetServerInfo(s) mysql_get_server_info(s) + #define MyGetProtoInfo(s) mysql_get_proto_info(s) ++#if MYSQL_VERSION_ID < 40000 + #define MyShutdown(s) mysql_shutdown(s) ++#else ++#define MyShutdown(s) mysql_shutdown(s, SHUTDOWN_DEFAULT) ++#endif + #ifdef REFRESH_GRANT + #define MyReload(s) mysql_refresh(s, \ + REFRESH_GRANT|REFRESH_LOG|REFRESH_TABLES) |