View | Details | Raw Unified | Return to bug 238365 | Differences between
and this patch

Collapse All | Expand All

(-)Mk/Uses/mysql.mk (-1 / +2 lines)
Lines 7-13 Link Here
7
#
7
#
8
# version	If no version is given (by the maintainer via the port), try to
8
# version	If no version is given (by the maintainer via the port), try to
9
#		find the currently installed version.  Fall back to default if
9
#		find the currently installed version.  Fall back to default if
10
#		necessary (MySQL-5.6 = 56).
10
#		necessary (MySQL-5.7 = 57, look at bsd.default-versions.mk for
11
#		possible values).
11
# client	Depends on the libmysqlclient library (default)
12
# client	Depends on the libmysqlclient library (default)
12
# server/embedded
13
# server/embedded
13
#		Depend on the server at run/build time. If none of these is
14
#		Depend on the server at run/build time. If none of these is
(-)Mk/bsd.default-versions.mk (-1 / +1 lines)
Lines 63-69 Link Here
63
# Possible values: 5.1, 5.2, 5.3
63
# Possible values: 5.1, 5.2, 5.3
64
LUA_DEFAULT?=		5.2
64
LUA_DEFAULT?=		5.2
65
# Possible values: 5.5, 5.6, 5.7, 8.0, 5.5m, 10.0m, 10.1m, 10.2m, 10.3m, 5.5p, 5.6p, 5.7p, 5.6w
65
# Possible values: 5.5, 5.6, 5.7, 8.0, 5.5m, 10.0m, 10.1m, 10.2m, 10.3m, 5.5p, 5.6p, 5.7p, 5.6w
66
MYSQL_DEFAULT?=		5.6
66
MYSQL_DEFAULT?=		5.7
67
# Possible values: 5.26, 5.28, 5.30, devel
67
# Possible values: 5.26, 5.28, 5.30, devel
68
.if !exists(${LOCALBASE}/bin/perl) || (!defined(_PORTS_ENV_CHECK) && \
68
.if !exists(${LOCALBASE}/bin/perl) || (!defined(_PORTS_ENV_CHECK) && \
69
    defined(PACKAGE_BUILDING))
69
    defined(PACKAGE_BUILDING))
(-)audio/amarok/Makefile (-1 / +2 lines)
Lines 19-25 Link Here
19
		libqjson-qt5.so:devel/qjson \
19
		libqjson-qt5.so:devel/qjson \
20
		libqca-qt5.so:devel/qca \
20
		libqca-qt5.so:devel/qca \
21
		libtag.so:audio/taglib \
21
		libtag.so:audio/taglib \
22
		libtag-extras.so:audio/taglib-extras
22
		libtag-extras.so:audio/taglib-extras \
23
		liblz4.so:archivers/liblz4
23
24
24
USES=		cmake compiler:c++11-lang desktop-file-utils \
25
USES=		cmake compiler:c++11-lang desktop-file-utils \
25
		kde:5 mysql:client,embedded pkgconfig qt:5 shebangfix ssl
26
		kde:5 mysql:client,embedded pkgconfig qt:5 shebangfix ssl
(-)audio/amarok/files/patch-cmake_modules_FindMySQL.cmake (+25 lines)
Line 0 Link Here
1
--- cmake/modules/FindMySQL.cmake.orig	2019-06-14 07:24:31 UTC
2
+++ cmake/modules/FindMySQL.cmake
3
@@ -31,21 +31,7 @@ if(MYSQLCONFIG_EXECUTABLE)
4
         OUTPUT_STRIP_TRAILING_WHITESPACE
5
     )
6
 
7
-    execute_process(
8
-        COMMAND ${MYSQLCONFIG_EXECUTABLE} --libmysqld-libs
9
-        RESULT_VARIABLE MC_return_embedded
10
-        OUTPUT_VARIABLE MC_MYSQL_EMBEDDED_LIBRARIES
11
-        OUTPUT_STRIP_TRAILING_WHITESPACE
12
-    )
13
-
14
-    if(NOT MC_MYSQL_EMBEDDED_LIBRARIES)
15
-        # At least on OpenSUSE --libmysql-libs doesn't exist, so we just use
16
-        # MYSQL_LIBRARIES for that. We'll see if that's enough when testing
17
-        # below.
18
-        set(MYSQL_EMBEDDED_LIBRARIES ${MYSQL_LIBRARIES})
19
-    else()
20
-        set(MYSQL_EMBEDDED_LIBRARIES ${MC_MYSQL_EMBEDDED_LIBRARIES})
21
-    endif()
22
+    set(MYSQL_EMBEDDED_LIBRARIES "-L/usr/local/lib/mysql" -lmysqld -llz4)
23
 endif()
24
 
25
 # Try searching manually via find_path/find_library,  possibly with hints
(-)databases/apq-mysql/Makefile (-2 / +3 lines)
Lines 18-25 Link Here
18
		${LOCALBASE}/lib/gnat/apq.gpr:databases/apq
18
		${LOCALBASE}/lib/gnat/apq.gpr:databases/apq
19
RUN_DEPENDS=	${LOCALBASE}/lib/gnat/apq.gpr:databases/apq
19
RUN_DEPENDS=	${LOCALBASE}/lib/gnat/apq.gpr:databases/apq
20
20
21
USES=		ada tar:bzip2
21
USES=		ada tar:bzip2 mysql
22
USE_MYSQL=	yes
22
23
IGNORE_WITH_MYSQL=	57 80 101m 102m 103m 57p 57w
23
HAS_CONFIGURE=	yes
24
HAS_CONFIGURE=	yes
24
WRKPATH=	${WRKDIR}/build
25
WRKPATH=	${WRKDIR}/build
25
CONFIGURE_ARGS= --prefix=${PREFIX} \
26
CONFIGURE_ARGS= --prefix=${PREFIX} \
(-)databases/ateam_mysql_ldap_auth/Makefile (+2 lines)
Lines 17-22 Link Here
17
USE_OPENLDAP=	yes
17
USE_OPENLDAP=	yes
18
USES=		gmake mysql:client,server
18
USES=		gmake mysql:client,server
19
19
20
IGNORE_WITH_MYSQL=	57 80 101m 102m 103m 57p 57w
21
20
USE_GITHUB=	yes
22
USE_GITHUB=	yes
21
GH_ACCOUNT=	ateamsystems
23
GH_ACCOUNT=	ateamsystems
22
GH_TAGNAME=	f6a1a5d
24
GH_TAGNAME=	f6a1a5d
(-)databases/mroonga/Makefile (+1 lines)
Lines 16-21 Link Here
16
16
17
USES=		libtool mysql pkgconfig
17
USES=		libtool mysql pkgconfig
18
18
19
IGNORE_WITH_MYSQL=	57 80 101m 102m 103m 57p 57w
19
GNU_CONFIGURE=	yes
20
GNU_CONFIGURE=	yes
20
CONFIGURE_ARGS=	--with-mysql-source="$$(cd ${PORTSDIR}/${_MYSQL_SERVER}; ${MAKE} -V WRKSRC)" \
21
CONFIGURE_ARGS=	--with-mysql-source="$$(cd ${PORTSDIR}/${_MYSQL_SERVER}; ${MAKE} -V WRKSRC)" \
21
		--with-mysql-build="$$(cd ${PORTSDIR}/${_MYSQL_SERVER}; ${MAKE} -V BUILD_WRKSRC)" \
22
		--with-mysql-build="$$(cd ${PORTSDIR}/${_MYSQL_SERVER}; ${MAKE} -V BUILD_WRKSRC)" \
(-)databases/mysac/Makefile (-1 / +4 lines)
Lines 12-19 Link Here
12
12
13
LICENSE=	LGPL3
13
LICENSE=	LGPL3
14
14
15
USES=		mysql
16
17
IGNORE_WITH_MYSQL=	57 80 101m 102m 103m 57p 57w
18
15
USE_LDCONFIG=	yes
19
USE_LDCONFIG=	yes
16
USE_MYSQL=	yes
17
20
18
CFLAGS+=	-I${LOCALBASE}/include
21
CFLAGS+=	-I${LOCALBASE}/include
19
LDFLAGS+=	-I${LOCALBASE}/lib
22
LDFLAGS+=	-I${LOCALBASE}/lib
(-)databases/mysql-connector-odbc/Makefile (-9 / +5 lines)
Lines 2-9 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	mysql-connector-odbc
4
PORTNAME=	mysql-connector-odbc
5
PORTVERSION=	5.3.4
5
PORTVERSION=	5.3.13
6
PORTREVISION=	1
7
CATEGORIES=	databases
6
CATEGORIES=	databases
8
MASTER_SITES=	MYSQL/Connector-ODBC/5.3
7
MASTER_SITES=	MYSQL/Connector-ODBC/5.3
9
PKGNAMESUFFIX=	-${DRIVER_MANAGER}-mysql${MYSQL_VER}
8
PKGNAMESUFFIX=	-${DRIVER_MANAGER}-mysql${MYSQL_VER}
Lines 13-37 Link Here
13
COMMENT=	ODBC driver for MySQL${MYSQL_VER} / ${DRIVER_MANAGER}
12
COMMENT=	ODBC driver for MySQL${MYSQL_VER} / ${DRIVER_MANAGER}
14
13
15
LICENSE=	GPLv2
14
LICENSE=	GPLv2
16
LICENSE_FILE=	${WRKSRC}/COPYING
15
LICENSE_FILE=	${WRKSRC}/LICENSE.txt
17
16
18
BUILD_DEPENDS=	unixODBC>=2.2.14_1:databases/unixODBC
19
LIB_DEPENDS=	libodbc.so:databases/unixODBC
17
LIB_DEPENDS=	libodbc.so:databases/unixODBC
20
18
21
USES=		cmake mysql
19
USES=		cmake mysql
22
CMAKE_ARGS=	-DWITH_UNIXODBC=1
20
21
CMAKE_ARGS=	-DWITH_UNIXODBC=1 -DDISABLE_GUI=1
23
USE_LDCONFIG=	yes
22
USE_LDCONFIG=	yes
24
23
25
MAKE_JOBS_UNSAFE=yes
24
MAKE_JOBS_UNSAFE=yes
26
25
27
IGNORE_WITH_MYSQL=	55 55m 55p 51 51m 51p
28
29
LDFLAGS+=	-L${LOCALBASE}/lib
26
LDFLAGS+=	-L${LOCALBASE}/lib
30
27
31
DRIVER_MANAGER=	unixodbc
28
DRIVER_MANAGER=	unixodbc
32
29
33
PORTDOCS=	ChangeLog INSTALL \
30
PORTDOCS=	*
34
		README README.debug Licenses_for_Third-Party_Components.txt
35
31
36
PLIST_FILES=	bin/myodbc-installer \
32
PLIST_FILES=	bin/myodbc-installer \
37
		lib/libmyodbc5a.so \
33
		lib/libmyodbc5a.so \
(-)databases/mysql-connector-odbc/distinfo (-2 / +3 lines)
Lines 1-2 Link Here
1
SHA256 (mysql-connector-odbc-5.3.4-src.tar.gz) = a5f7a490f2958f2768d18b8a57f71909f9699a8619c82776b3ad1c02b8abce0d
1
TIMESTAMP = 1560498109
2
SIZE (mysql-connector-odbc-5.3.4-src.tar.gz) = 667340
2
SHA256 (mysql-connector-odbc-5.3.13-src.tar.gz) = 6127639a503e80cff71e211d7534801a074e781624974807a279c7f6e6f0353a
3
SIZE (mysql-connector-odbc-5.3.13-src.tar.gz) = 3009032
(-)databases/mysql-connector-odbc/files/patch-CMakeLists.txt (-23 / +17 lines)
Lines 1-36 Link Here
1
--- CMakeLists.txt.orig	2014-06-18 22:50:16 UTC
1
--- CMakeLists.txt.orig	2019-04-15 16:56:34 UTC
2
+++ CMakeLists.txt
2
+++ CMakeLists.txt
3
@@ -269,7 +269,7 @@ ENDIF(NOT DISABLE_GUI)
3
@@ -431,7 +431,6 @@ ENDIF(NOT DISABLE_GUI)
4
 
4
 ADD_SUBDIRECTORY(dltest)
5
 ADD_SUBDIRECTORY(dltest)
5
 ADD_SUBDIRECTORY(installer)
6
 ADD_SUBDIRECTORY(installer)
6
 
7
-ADD_SUBDIRECTORY(test)
7
-ADD_SUBDIRECTORY(test)
8
+# ADD_SUBDIRECTORY(test)
9
 
8
 
10
 ##############################################################################
9
 # For dynamic linking use the built-in sys and strings
11
 #
10
 IF(NOT MYSQLCLIENT_STATIC_LINKING)
12
@@ -382,18 +382,17 @@ IF(WIN32)
11
@@ -501,8 +500,8 @@ cmake/sql.*\\\\.c$
12
 #------------ Installation ---------------------------
13
 
13
 
14
 
15
-INSTALL(FILES LICENSE.txt   DESTINATION .)
16
-INSTALL(FILES README.txt    DESTINATION .)
17
+INSTALL(FILES LICENSE.txt   DESTINATION ./share/doc/mysql-connector-odbc/)
18
+INSTALL(FILES README.txt    DESTINATION ./share/doc/mysql-connector-odbc/)
19
 
20
 IF(WIN32)
21
 
22
@@ -542,7 +541,7 @@ IF(WIN32)
23
 
14
 ELSE(WIN32)
24
 ELSE(WIN32)
15
 
25
 
16
-  INSTALL(FILES ChangeLog    DESTINATION .)
26
-  INSTALL(FILES ChangeLog    DESTINATION .)
17
-  INSTALL(FILES README       DESTINATION .)
18
-  INSTALL(FILES README.debug DESTINATION .)
19
-  INSTALL(FILES INSTALL      DESTINATION .)
20
+  INSTALL(FILES ChangeLog    DESTINATION ./share/doc/mysql-connector-odbc/)
27
+  INSTALL(FILES ChangeLog    DESTINATION ./share/doc/mysql-connector-odbc/)
21
+  INSTALL(FILES README       DESTINATION ./share/doc/mysql-connector-odbc/)
22
+  INSTALL(FILES README.debug DESTINATION ./share/doc/mysql-connector-odbc/)
23
+  INSTALL(FILES INSTALL      DESTINATION ./share/doc/mysql-connector-odbc/)
24
   IF(EXISTS "${CMAKE_SOURCE_DIR}/COPYING")
25
-    INSTALL(FILES COPYING       DESTINATION .)
26
   ELSE()
27
-    INSTALL(FILES LICENSE.mysql DESTINATION .)
28
+    INSTALL(FILES LICENSE.mysql DESTINATION ./share/doc/mysql-connector-odbc/)
29
   ENDIF()
30
 
28
 
31
 ENDIF(WIN32)
29
 ENDIF(WIN32)
32
 
30
 
33
-INSTALL(FILES Licenses_for_Third-Party_Components.txt DESTINATION .)
34
+INSTALL(FILES Licenses_for_Third-Party_Components.txt DESTINATION ./share/doc/mysql-connector-odbc/)
35
 
36
 INCLUDE(CPack)
(-)databases/mysql-connector-odbc/files/patch-driver_catalog_no_i_s.c (-14 lines)
Lines 1-14 Link Here
1
--- driver/catalog_no_i_s.c.orig	2014-06-19 02:50:16.000000000 +0400
2
+++ driver/catalog_no_i_s.c	2015-03-26 12:31:13.356945009 +0300
3
@@ -1093,7 +1093,11 @@
4
   unsigned long *lengths;
5
   SQLRETURN rc= SQL_SUCCESS;
6
 
7
+#ifdef MARIADB_BASE_VERSION
8
+  my_init_dynamic_array(&records, sizeof(MY_FOREIGN_KEY_FIELD), 0, 0, 0);
9
+#else
10
   my_init_dynamic_array(&records, sizeof(MY_FOREIGN_KEY_FIELD), 0, 0);
11
+#endif
12
 
13
   /* Get the list of tables that match szCatalog and szTable */
14
   pthread_mutex_lock(&stmt->dbc->lock);
(-)databases/mysql-connector-odbc/files/patch-driver_desc.c (-37 lines)
Lines 1-37 Link Here
1
--- driver/desc.c.orig	2014-06-19 02:50:16.000000000 +0400
2
+++ driver/desc.c	2015-03-26 12:34:50.610931661 +0300
3
@@ -63,13 +63,21 @@
4
      but in desc_get_rec we manually get a pointer to it. This avoids
5
      having to call set_dynamic after modifying the DESCREC.
6
   */
7
+#ifdef MARIADB_BASE_VERSION
8
+  if (my_init_dynamic_array(&desc->records, sizeof(DESCREC), 0, 0, 0))
9
+#else
10
   if (my_init_dynamic_array(&desc->records, sizeof(DESCREC), 0, 0))
11
+#endif
12
   {
13
     x_free((char *)desc);
14
     return NULL;
15
   }
16
 
17
+#ifdef MARIADB_BASE_VERSION
18
+  if (my_init_dynamic_array(&desc->bookmark, sizeof(DESCREC), 0, 0, 0))
19
+#else
20
   if (my_init_dynamic_array(&desc->bookmark, sizeof(DESCREC), 0, 0))
21
+#endif
22
   {
23
     delete_dynamic(&desc->records);
24
     x_free((char *)desc);
25
@@ -997,7 +1005,12 @@
26
   delete_dynamic(&dest->records);
27
   if (my_init_dynamic_array(&dest->records, sizeof(DESCREC),
28
                             src->records.max_element,
29
+#ifdef MARIADB_BASE_VERSION
30
+                            src->records.alloc_increment,
31
+                            0))
32
+#else
33
                             src->records.alloc_increment))
34
+#endif
35
   {
36
     return set_desc_error(dest, "HY001",
37
               "Memory allocation error",
(-)databases/mysql-connector-odbc/files/patch-driver_handle.c (-14 lines)
Lines 1-14 Link Here
1
--- driver/handle.c.orig	2014-06-19 02:50:16.000000000 +0400
2
+++ driver/handle.c	2015-03-26 12:36:14.548929818 +0300
3
@@ -403,7 +403,11 @@
4
     }
5
   }
6
 
7
+#ifdef MARIADB_BASE_VERSION
8
+  my_init_dynamic_array(*param_bind, sizeof(MYSQL_BIND), elements, 10, 0);
9
+#else
10
   my_init_dynamic_array(*param_bind, sizeof(MYSQL_BIND), elements, 10);
11
+#endif
12
   memset((*param_bind)->buffer, 0, sizeof(MYSQL_BIND) *
13
 											(*param_bind)->max_element);
14
 
(-)databases/mysql-connector-odbc/files/patch-driver_parse.c (-16 lines)
Lines 1-16 Link Here
1
--- driver/parse.c.orig	2014-06-19 02:50:16.000000000 +0400
2
+++ driver/parse.c	2015-03-26 12:37:12.112907082 +0300
3
@@ -129,8 +129,13 @@
4
 
5
     /* TODO: Store offsets rather than ptrs. In this case we will be fine
6
        if work with copy of the originally parsed string */
7
+#ifdef MARIADB_BASE_VERSION
8
+    my_init_dynamic_array(&pq->token,     sizeof(uint), 20, 10, 0);
9
+    my_init_dynamic_array(&pq->param_pos, sizeof(uint), 10, 10, 0);
10
+#else
11
     my_init_dynamic_array(&pq->token,     sizeof(uint), 20, 10);
12
     my_init_dynamic_array(&pq->param_pos, sizeof(uint), 10, 10);
13
+#endif
14
   }
15
 
16
   return pq;
(-)databases/mysql-connector-odbc/files/patch-util_odbcinstw.c (-12 lines)
Lines 1-12 Link Here
1
--- util/odbcinstw.c.orig	2015-03-26 15:10:03.189270855 +0300
2
+++ util/odbcinstw.c	2015-03-26 15:10:43.503271192 +0300
3
@@ -105,7 +105,8 @@
4
   x_free(section);
5
   x_free(entry);
6
   x_free(def);
7
-  x_free(ret);
8
+  if (ret)
9
+    free(ret);
10
   x_free(filename);
11
 
12
   return rc;
(-)databases/mysql-q4m/Makefile (-2 / +3 lines)
Lines 14-21 Link Here
14
FETCH_DEPENDS+=	${NONEXISTENT}:${_MYSQL_SERVER}:fetch
14
FETCH_DEPENDS+=	${NONEXISTENT}:${_MYSQL_SERVER}:fetch
15
BUILD_DEPENDS+=	${NONEXISTENT}:${_MYSQL_SERVER}:build
15
BUILD_DEPENDS+=	${NONEXISTENT}:${_MYSQL_SERVER}:build
16
16
17
USES=		gmake perl5 libtool
17
USES=		gmake perl5 libtool mysql:server
18
USE_MYSQL=	server
18
19
IGNORE_WITH_MYSQL=	57 80 101m 102m 103m 57p 57w
19
USE_GCC=	any
20
USE_GCC=	any
20
USE_PERL5=	run
21
USE_PERL5=	run
21
22
(-)databases/mysqlbigram/Makefile (-2 / +3 lines)
Lines 13-21 Link Here
13
13
14
LICENSE=	LGPL21
14
LICENSE=	LGPL21
15
15
16
USES=		libtool mysql
17
16
GNU_CONFIGURE=	yes
18
GNU_CONFIGURE=	yes
17
USES=		libtool
19
IGNORE_WITH_MYSQL=	57 80 101m 102m 103m 57p 57w
18
USE_MYSQL=	yes
19
INSTALL_TARGET=	install-strip
20
INSTALL_TARGET=	install-strip
20
WRKSRC=		${WRKDIR}/bi_gram
21
WRKSRC=		${WRKDIR}/bi_gram
21
22

Return to bug 238365