diff options
| -rw-r--r-- | databases/myodbc/Makefile | 9 | ||||
| -rw-r--r-- | databases/myodbc/PLIST | 13 | ||||
| -rw-r--r-- | databases/myodbc/distinfo | 13 | ||||
| -rw-r--r-- | databases/myodbc/patches/patch-CMakeLists.txt | 12 | ||||
| -rw-r--r-- | databases/myodbc/patches/patch-driver_myutil.h | 13 | ||||
| -rw-r--r-- | databases/myodbc/patches/patch-test_CMakeLists.txt | 30 |
6 files changed, 45 insertions, 45 deletions
diff --git a/databases/myodbc/Makefile b/databases/myodbc/Makefile index f7676499fbf..9ffcf90f629 100644 --- a/databases/myodbc/Makefile +++ b/databases/myodbc/Makefile @@ -1,10 +1,9 @@ -# $NetBSD: Makefile,v 1.37 2013/10/10 00:04:15 joerg Exp $ +# $NetBSD: Makefile,v 1.38 2014/07/02 03:41:51 jnemeth Exp $ -DISTNAME= mysql-connector-odbc-5.2.2-src +DISTNAME= mysql-connector-odbc-5.3.2-src PKGNAME= ${DISTNAME:S/mysql-connector-odbc/myodbc/:S/-src$//} -PKGREVISION= 7 CATEGORIES= databases -MASTER_SITES= ${MASTER_SITE_MYSQL:=Connector-ODBC/5.2/} +MASTER_SITES= ${MASTER_SITE_MYSQL:=Connector-ODBC/5.3/} MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.mysql.com/ @@ -22,7 +21,7 @@ INSTALLATION_DIRS+= share/mysql-connector-odbc/test .include "options.mk" -MYSQL_VERSIONS_ACCEPTED= 55 51 +MYSQL_VERSIONS_ACCEPTED= 56 55 51 .include "../../devel/libltdl/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" diff --git a/databases/myodbc/PLIST b/databases/myodbc/PLIST index fda004f58e0..d4fce860d53 100644 --- a/databases/myodbc/PLIST +++ b/databases/myodbc/PLIST @@ -1,6 +1,7 @@ -@comment $NetBSD: PLIST,v 1.9 2012/11/22 10:01:10 jnemeth Exp $ +@comment $NetBSD: PLIST,v 1.10 2014/07/02 03:41:51 jnemeth Exp $ bin/myodbc-installer ${PLIST.gui}lib/libmyodbc5S.so +lib/libmyodbc5a.so lib/libmyodbc5w.so share/doc/mysql-connector-odbc/COPYING share/doc/mysql-connector-odbc/ChangeLog @@ -13,7 +14,9 @@ share/mysql-connector-odbc/test/my_basics share/mysql-connector-odbc/test/my_blob share/mysql-connector-odbc/test/my_bug13766 share/mysql-connector-odbc/test/my_bulk -share/mysql-connector-odbc/test/my_catalog +share/mysql-connector-odbc/test/my_catalog1 +share/mysql-connector-odbc/test/my_catalog2 +share/mysql-connector-odbc/test/my_crash share/mysql-connector-odbc/test/my_curext share/mysql-connector-odbc/test/my_cursor share/mysql-connector-odbc/test/my_datetime @@ -22,11 +25,15 @@ share/mysql-connector-odbc/test/my_dyn_cursor share/mysql-connector-odbc/test/my_error share/mysql-connector-odbc/test/my_info share/mysql-connector-odbc/test/my_keys +share/mysql-connector-odbc/test/my_nodma share/mysql-connector-odbc/test/my_param +share/mysql-connector-odbc/test/my_pooling share/mysql-connector-odbc/test/my_prepare share/mysql-connector-odbc/test/my_relative -share/mysql-connector-odbc/test/my_result +share/mysql-connector-odbc/test/my_result1 +share/mysql-connector-odbc/test/my_result2 share/mysql-connector-odbc/test/my_scroll +share/mysql-connector-odbc/test/my_setup share/mysql-connector-odbc/test/my_tran share/mysql-connector-odbc/test/my_types share/mysql-connector-odbc/test/my_unicode diff --git a/databases/myodbc/distinfo b/databases/myodbc/distinfo index ebea82cdd65..af74095df9c 100644 --- a/databases/myodbc/distinfo +++ b/databases/myodbc/distinfo @@ -1,8 +1,7 @@ -$NetBSD: distinfo,v 1.10 2013/03/24 17:03:14 joerg Exp $ +$NetBSD: distinfo,v 1.11 2014/07/02 03:41:51 jnemeth Exp $ -SHA1 (mysql-connector-odbc-5.2.2-src.tar.gz) = f289c1127a67e15d6b179eea3b202a00044624b9 -RMD160 (mysql-connector-odbc-5.2.2-src.tar.gz) = f4485a76be39e4534dcdfceb6b5c92a8a812d171 -Size (mysql-connector-odbc-5.2.2-src.tar.gz) = 573157 bytes -SHA1 (patch-CMakeLists.txt) = 584d003286c190e03e16a69ebf546587795e55eb -SHA1 (patch-driver_myutil.h) = af9eda7430c9eea44695e568c93fdbff539080db -SHA1 (patch-test_CMakeLists.txt) = 8d02fccbac6e09d97618ea188320fe2d35dbf00b +SHA1 (mysql-connector-odbc-5.3.2-src.tar.gz) = 5507903fb14aadf6b7c14f7142eef2c9fff1250c +RMD160 (mysql-connector-odbc-5.3.2-src.tar.gz) = 0fb1343c1a1754e6c88f2ee8af480a839c7c769b +Size (mysql-connector-odbc-5.3.2-src.tar.gz) = 655634 bytes +SHA1 (patch-CMakeLists.txt) = 95c05823ef706fe9344eae4606306d3abc9ab519 +SHA1 (patch-test_CMakeLists.txt) = 7d004271310243f8ccca1bfe8f7b1e8333f6ffdc diff --git a/databases/myodbc/patches/patch-CMakeLists.txt b/databases/myodbc/patches/patch-CMakeLists.txt index 78c8c08f38f..90c11d6448b 100644 --- a/databases/myodbc/patches/patch-CMakeLists.txt +++ b/databases/myodbc/patches/patch-CMakeLists.txt @@ -1,17 +1,17 @@ -$NetBSD: patch-CMakeLists.txt,v 1.1 2012/11/22 10:01:10 jnemeth Exp $ +$NetBSD: patch-CMakeLists.txt,v 1.2 2014/07/02 03:41:51 jnemeth Exp $ ---- CMakeLists.txt.orig 2012-09-18 10:56:28.000000000 +0000 +--- CMakeLists.txt.orig 2014-03-26 21:20:55.000000000 +0000 +++ CMakeLists.txt -@@ -232,6 +232,8 @@ IF(RPM_BUILD AND CMAKE_SYSTEM_PROCESSOR - SET(LIB_SUBDIR "lib64") - ENDIF() +@@ -257,6 +257,8 @@ ENDIF() + + MESSAGE(STATUS "Installation library subdir: ${LIB_SUBDIR}") +SET(DOC_SUBDIR "share/doc/mysql-connector-odbc") + INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}) ADD_SUBDIRECTORY(util) -@@ -329,18 +331,18 @@ IF(WIN32) +@@ -382,18 +384,18 @@ IF(WIN32) ELSE(WIN32) diff --git a/databases/myodbc/patches/patch-driver_myutil.h b/databases/myodbc/patches/patch-driver_myutil.h deleted file mode 100644 index 7a8f23bdd14..00000000000 --- a/databases/myodbc/patches/patch-driver_myutil.h +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-driver_myutil.h,v 1.1 2013/03/24 17:03:15 joerg Exp $ - ---- driver/myutil.h.orig 2013-03-23 16:08:29.000000000 +0000 -+++ driver/myutil.h -@@ -338,7 +338,7 @@ char * add_to_buffer(NET *net,char *to,c - MY_LIMIT_CLAUSE find_position4limit(CHARSET_INFO* cs, char *query, - char * query_end); - BOOL myodbc_isspace(CHARSET_INFO* cs, const char * begin, const char *end); --BOOL got_out_parameters(stmt); -+BOOL got_out_parameters(STMT *stmt); - - /* handle.c*/ - BOOL allocate_param_bind(DYNAMIC_ARRAY **param_bind, uint elements); diff --git a/databases/myodbc/patches/patch-test_CMakeLists.txt b/databases/myodbc/patches/patch-test_CMakeLists.txt index d2afde2c4e7..913497e0b51 100644 --- a/databases/myodbc/patches/patch-test_CMakeLists.txt +++ b/databases/myodbc/patches/patch-test_CMakeLists.txt @@ -1,21 +1,29 @@ -$NetBSD: patch-test_CMakeLists.txt,v 1.1 2012/11/22 10:01:10 jnemeth Exp $ +$NetBSD: patch-test_CMakeLists.txt,v 1.2 2014/07/02 03:41:51 jnemeth Exp $ ---- test/CMakeLists.txt.orig 2012-09-18 10:56:28.000000000 +0000 +--- test/CMakeLists.txt.orig 2014-03-26 21:20:55.000000000 +0000 +++ test/CMakeLists.txt -@@ -44,7 +44,7 @@ FOREACH(T my_basics my_blob my_bulk my_c - my_types my_unicode my_unixodbc my_use_result my_bug13766) - ADD_EXECUTABLE(${T} ${T}.c) +@@ -55,7 +55,7 @@ FOREACH(T my_basics my_blob my_bulk my_c + COMPILE_FLAGS "${MYSQLODBCCONN_COMPILE_FLAGS_ENV} ${MYSQL_CXXFLAGS}") + ENDIF(MYSQL_CXX_LINKAGE) -- INSTALL(TARGETS ${T} DESTINATION test COMPONENT tests) -+ INSTALL(TARGETS ${T} DESTINATION share/mysql-connector-odbc/test COMPONENT tests) +- INSTALL(TARGETS ${T} DESTINATION test COMPONENT tests) ++ INSTALL(TARGETS ${T} DESTINATION share/mysql-connector-odbc/test COMPONENT tests) + SET_TARGET_PROPERTIES(${T} PROPERTIES + LINK_FLAGS "${MYSQLODBCCONN_LINK_FLAGS_ENV} ${MYSQL_LINK_FLAGS}") - IF(WIN32) - TARGET_LINK_LIBRARIES(${T} ${ODBCLIB} ${ODBCINSTLIB}) -@@ -59,6 +59,6 @@ INSTALL(FILES +@@ -102,7 +102,7 @@ IF(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Dar + COMPILE_FLAGS "${MYSQLODBCCONN_COMPILE_FLAGS_ENV} ${MYSQL_CXXFLAGS}") + ENDIF(MYSQL_CXX_LINKAGE) + +- INSTALL(TARGETS ${T} DESTINATION test COMPONENT tests) ++ INSTALL(TARGETS ${T} DESTINATION share/mysql-connector-odbc/test COMPONENT tests) + SET_TARGET_PROPERTIES(${T} PROPERTIES + LINK_FLAGS "${MYSQLODBCCONN_LINK_FLAGS_ENV} ${MYSQL_LINK_FLAGS}") + +@@ -130,5 +130,5 @@ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/CTestTestfile.cmake ${CMAKE_CURRENT_BINARY_DIR}/odbc.ini ${CMAKE_CURRENT_BINARY_DIR}/odbcinst.ini - DESTINATION test COMPONENT tests) + DESTINATION share/mysql-connector-odbc/test COMPONENT tests) - |