--- Makefile.orig 2014-08-09 10:05:39.000000000 +0400 +++ Makefile 2014-08-09 10:08:15.000000000 +0400 @@ -2,10 +2,12 @@ # $FreeBSD: head/databases/mysql-connector-odbc/Makefile 353029 2014-05-05 16:24:00Z bapt $ PORTNAME= mysql-connector-odbc -PORTVERSION= 5.1.9 +PORTVERSION= 5.2.7 CATEGORIES= databases MASTER_SITES= ${MASTER_SITE_MYSQL} -MASTER_SITE_SUBDIR= Connector-ODBC/5.1 +MASTER_SITE_SUBDIR= Connector-ODBC/5.2 +DISTNAME= ${PORTNAME}-${PORTVERSION}-src +DISTFILES= ${DISTNAME}.tar.gz PKGNAMESUFFIX= -${DRIVER_MANAGER}-mysql${MYSQL_VER} MAINTAINER= sergey@network-asp.biz @@ -13,7 +15,6 @@ USE_LDCONFIG= yes USE_MYSQL= yes -DEFAULT_MYSQL_VER= 51 USES= cmake PLIST_SUB= VER=${PORTVERSION} @@ -21,6 +22,7 @@ PORTDOCS= ChangeLog INSTALL \ README README.debug COPYING Licenses_for_Third-Party_Components.txt +LDFLAGS+= -L${LOCALBASE}/lib LIB_DEPENDS+= libodbc.so:${PORTSDIR}/databases/unixODBC BUILD_DEPENDS= unixODBC>=2.2.14_1:${PORTSDIR}/databases/unixODBC CMAKE_ARGS += -DWITH_UNIXODBC=1 --- distinfo.orig 2014-08-07 14:07:19.000000000 +0400 +++ distinfo 2014-08-07 14:08:08.000000000 +0400 @@ -1,2 +1,2 @@ -SHA256 (mysql-connector-odbc-5.1.9.tar.gz) = d14a0d5ca0f0bc4fc4bbd8609c4e7fde56c70d8b3ae56eb2c3687ce794990ee9 -SIZE (mysql-connector-odbc-5.1.9.tar.gz) = 542281 +SHA256 (mysql-connector-odbc-5.2.7-src.tar.gz) = 0ad8fcccb4c41c7100fe02ec0aa87938d33329d23f7b68d1b9031c87750392c9 +SIZE (mysql-connector-odbc-5.2.7-src.tar.gz) = 606472 --- pkg-plist.orig 2014-08-07 14:07:19.000000000 +0400 +++ pkg-plist 2014-08-07 14:08:14.000000000 +0400 @@ -1,2 +1,3 @@ bin/myodbc-installer -lib/libmyodbc5.so +lib/libmyodbc5a.so +lib/libmyodbc5w.so --- files/patch-driver__execute.c.orig 2014-08-07 14:07:19.000000000 +0400 +++ files/patch-driver__execute.c 2014-08-07 14:08:24.000000000 +0400 @@ -1,22 +1,22 @@ ---- driver/execute.c.orig 2011-10-04 23:19:00.000000000 +0300 -+++ driver/execute.c 2011-10-15 12:07:45.000000000 +0300 -@@ -424,11 +424,19 @@ - data= buff; - break; - case SQL_C_SBIGINT: +--- driver/execute.c.orig 2014-08-07 13:59:09.000000000 +0400 ++++ driver/execute.c 2014-08-07 14:01:45.000000000 +0400 +@@ -540,11 +540,19 @@ + *res= buff; + break; + case SQL_C_SBIGINT: +#ifdef MARIADB_BASE_VERSION -+ length= longlong2str(*((longlong*) data),buff, -10, 1) - buff; ++ *length= longlong2str(*((longlong*) *res),buff, -10, 1) - buff; +#else - length= longlong2str(*((longlong*) data),buff, -10) - buff; + *length= longlong2str(*((longlong*) *res), buff, -10) - buff; +#endif - data= buff; - break; - case SQL_C_UBIGINT: -+#ifdef MARIADB_BASE_VERSION -+ length= longlong2str(*((ulonglong*) data),buff, 10, 1) - buff; + *res= buff; + break; + case SQL_C_UBIGINT: ++#ifdef MARIADB_BASE_VERSIONA ++ *length= longlong2str(*((ulonglong*) *res), buff, 10, 1) - buff; +#else - length= longlong2str(*((ulonglong*) data),buff, 10) - buff; + *length= longlong2str(*((ulonglong*) *res), buff, 10) - buff; +#endif - data= buff; - break; - case SQL_C_FLOAT: + *res= buff; + break; + case SQL_C_FLOAT: