diff options
| author | Pav Lucistnik <pav@FreeBSD.org> | 2006-03-26 19:32:28 +0000 |
|---|---|---|
| committer | Pav Lucistnik <pav@FreeBSD.org> | 2006-03-26 19:32:28 +0000 |
| commit | 3903809d519c5c3df16833a3e086b88e6cfece06 (patch) | |
| tree | e4df4fbb1a12de28ff2839c27372d2040cf5ea1b /databases/p5-Mysql | |
| parent | da3b875d282bc4b9504ff0785f435d630d02c998 (diff) | |
| download | ports-3903809d519c5c3df16833a3e086b88e6cfece06.tar.gz ports-3903809d519c5c3df16833a3e086b88e6cfece06.zip | |
Notes
Diffstat (limited to 'databases/p5-Mysql')
| -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) |