Attachment #142801 for bug #189887




--- CMakeLists.txt.orig	2014-04-15 14:02:39.000000000 +0300
+++ CMakeLists.txt	2014-05-16 18:56:55.000000000 +0300
@@ -395,29 +395,8 @@
 ADD_SUBDIRECTORY(extra)
 ADD_SUBDIRECTORY(libservices)
 ADD_SUBDIRECTORY(scripts)

-    ADD_SUBDIRECTORY(internal)
-  ENDIF()
-  ADD_SUBDIRECTORY(packaging/rpm-uln)
-  ADD_SUBDIRECTORY(packaging/rpm-oel)
-ENDIF()
-
 IF(UNIX)
   ADD_SUBDIRECTORY(man)
 ENDIF()
@@ -429,7 +408,6 @@
   ADD_SUBDIRECTORY(win/upgrade_wizard)
   ADD_SUBDIRECTORY(win/packaging)
 ENDIF()

 
 CONFIGURE_FILE(config.h.cmake   ${CMAKE_BINARY_DIR}/include/my_config.h)
 CONFIGURE_FILE(config.h.cmake   ${CMAKE_BINARY_DIR}/include/config.h)
@@ -462,6 +440,7 @@
   WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
 )
 

 INSTALL_DOCUMENTATION(README COPYING COPYING.LESSER
                       COMPONENT Readme)
 INSTALL_DOCUMENTATION(${CMAKE_BINARY_DIR}/Docs/INFO_SRC
@@ -469,6 +448,7 @@
 IF(UNIX)
   INSTALL_DOCUMENTATION(Docs/INSTALL-BINARY COMPONENT Readme)
 ENDIF()

Lines 1-10 Link Here

(-)b/databases/mariadb55-client/files/patch-extra_yassl_taocrypt_src_integer.cpp (-4 / +4 lines)
1	--- extra/yassl/taocrypt/src/integer.cpp.orig 2012-12-17 03:41:47.000000000 +0200	1	--- extra/yassl/taocrypt/src/integer.cpp.orig 2014-04-15 14:02:39.000000000 +0300
2	+++ extra/yassl/taocrypt/src/integer.cpp 2012-12-17 03:42:47.000000000 +0200	2	+++ extra/yassl/taocrypt/src/integer.cpp 2014-05-16 17:00:15.000000000 +0300
3	@@ -73,7 +73,7 @@	3	@@ -75,7 +75,7 @@
4	CPP_TYPENAME AlignedAllocator<T>::pointer AlignedAllocator<T>::allocate(	4	CPP_TYPENAME AlignedAllocator<T>::pointer AlignedAllocator<T>::allocate(
5	size_type n, const void *)	5	size_type n, const void *)
6	{	6	{
7	- if (n > max_size())	7	- if (n > this->max_size())
8	+ if (n > AlignedAllocator<T>::max_size())	8	+ if (n > AlignedAllocator<T>::max_size())
9	return 0;	9	return 0;
10	if (n == 0)	10	if (n == 0)




--- scripts/CMakeLists.txt.orig	2014-04-15 14:02:28.000000000 +0300
+++ scripts/CMakeLists.txt	2014-05-16 19:02:48.000000000 +0300
@@ -72,6 +72,7 @@
 )
 ENDIF()
 

 INSTALL(FILES 
   ${CMAKE_CURRENT_SOURCE_DIR}/mysql_system_tables.sql 
   ${CMAKE_CURRENT_SOURCE_DIR}/mysql_system_tables_data.sql
@@ -81,6 +82,7 @@
   ${FIX_PRIVILEGES_SQL}
   DESTINATION ${INSTALL_MYSQLSHAREDIR} COMPONENT Server
 )

 
 # TCMalloc hacks
 IF(MALLOC_LIB)
@@ -140,6 +142,7 @@
 SET(HOSTNAME "hostname")
 SET(MYSQLD_USER "mysql")
 

 # Required for mysqlbug until autotools are deprecated, once done remove these
 # and expand default cmake variables
 SET(CC ${CMAKE_C_COMPILER})
@@ -180,6 +183,7 @@
   DESTINATION ${INSTALL_BINDIR}
   COMPONENT Server
   )

 
 ENDIF(UNIX)
 
@@ -204,6 +208,7 @@
   SET(localstatedir ${MYSQL_DATADIR})
 ENDIF()
 

 IF(UNIX)
 CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mysql_install_db.sh
   ${CMAKE_CURRENT_BINARY_DIR}/mysql_install_db ESCAPE_QUOTES @ONLY)
@@ -219,6 +224,7 @@
   COMPONENT Server
   )
 ENDIF()
+ENDIF()
 
 
 SET(prefix "${CMAKE_INSTALL_PREFIX}")
 SET(sysconfdir ${prefix})
@@ -276,6 +282,8 @@
             STRING(REGEX REPLACE "^lib" "" lib "${lib}")
             SET(${var} "${${var}}-l${lib} " ) 
           ENDIF()
+        ELSEIF(lib STREQUAL "-pthread")
+          SET(${var} "${${var}}-pthread " )
         ELSE()
           SET(${var} "${${var}}-l${lib} " ) 
         ENDIF()
@@ -334,18 +342,8 @@
   SET(BIN_SCRIPTS
     msql2mysql
     mysql_config




--- scripts/mysql_config.sh.orig	2014-04-15 14:02:39.000000000 +0300
+++ scripts/mysql_config.sh	2014-05-16 19:08:41.000000000 +0300
@@ -108,8 +108,11 @@
 # We intentionally add a space to the beginning and end of lib strings, simplifies replace later
 libs=" $ldflags -L$pkglibdir @RPATH_OPTION@ -lmysqlclient @ZLIB_DEPS@ @NON_THREADED_LIBS@"
 libs="$libs @openssl_libs@ @STATIC_NSS_FLAGS@ "
+libs="$libs -L%%LOCALBASE%%/lib "
 libs_r=" $ldflags -L$pkglibdir  @RPATH_OPTION@ -lmysqlclient_r @ZLIB_DEPS@ @CLIENT_LIBS@ @openssl_libs@ "
+libs_r="$libs_r -L%%LOCALBASE%%/lib "
 embedded_libs=" $ldflags -L$pkglibdir @RPATH_OPTION@ -lmysqld @LIBDL@ @ZLIB_DEPS@ @LIBS@ @WRAPLIBS@ @openssl_libs@ "
+embedded_libs="$embedded_libs -L%%LOCALBASE%%/lib "
 
 if [ -r "$pkglibdir/libmygcc.a" ]; then




# $FreeBSD: head/databases/mariadb55-server/Makefile 346927 2014-03-03 16:23:58Z feld $

PORTNAME?=	mariadb
PORTVERSION=	5.5.37
PORTREVISION?=	0
CATEGORIES=	databases ipv6
MASTER_SITES=	http://ftp.osuosl.org/pub/mariadb/${PORTNAME}-${PORTVERSION}/source/ \
		http://mirrors.supportex.net/mariadb/${PORTNAME}-${PORTVERSION}/source/ \
		http://mirror.aarnet.edu.au/pub/MariaDB/${PORTNAME}-${PORTVERSION}/source/ \
		http://mirror2.hs-esslingen.de/pub/Mirrors/mariadb/${PORTNAME}-${PORTVERSION}/source/ \
		http://gd.tuwien.ac.at/db/mariadb/${PORTNAME}-${PORTVERSION}/source/ \
		http://mirrors.fe.up.pt/pub/mariadb/${PORTNAME}-${PORTVERSION}/source/ \
		http://mirror.de.gsnw.de:56431/mariadb/${PORTNAME}-${PORTVERSION}/source/ \
		http://mirror.layerjet.com/mariadb/${PORTNAME}-${PORTVERSION}/source/ \
		http://mirror.switch.ch/mirror/mariadb/${PORTNAME}-${PORTVERSION}/source/
PKGNAMESUFFIX?=	55-server

MAINTAINER=	never@nevermind.kiev.ua

Lines 1-2 Link Here

(-)b/databases/mariadb55-server/distinfo (-2 / +2 lines)
1	SHA256 (mariadb-5.5.35.tar.gz) = b47391e5da8ea1a09585411b2a892e2070d097bec6102b0f13640176a1746a4e	1	SHA256 (mariadb-5.5.37.tar.gz) = a0faf492b3595d938684ed701812a4bd5aaab395b8402efe3322338a80fb3c9c
2	SIZE (mariadb-5.5.35.tar.gz) = 45723697	2	SIZE (mariadb-5.5.37.tar.gz) = 46078042

Lines 1-10 Link Here

(-)b/databases/mariadb55-server/files/patch-extra_yassl_taocrypt_src_integer.cpp (-4 / +4 lines)
1	--- extra/yassl/taocrypt/src/integer.cpp.orig 2012-04-02 09:37:09.000000000 +0200	1	--- extra/yassl/taocrypt/src/integer.cpp.orig 2014-04-15 14:02:39.000000000 +0300
2	+++ extra/yassl/taocrypt/src/integer.cpp 2012-04-02 09:37:41.000000000 +0200	2	+++ extra/yassl/taocrypt/src/integer.cpp 2014-05-16 17:00:15.000000000 +0300
3	@@ -73,7 +73,7 @@	3	@@ -75,7 +75,7 @@
4	CPP_TYPENAME AlignedAllocator<T>::pointer AlignedAllocator<T>::allocate(	4	CPP_TYPENAME AlignedAllocator<T>::pointer AlignedAllocator<T>::allocate(
5	size_type n, const void *)	5	size_type n, const void *)
6	{	6	{
7	- if (n > max_size())	7	- if (n > this->max_size())
8	+ if (n > AlignedAllocator<T>::max_size())	8	+ if (n > AlignedAllocator<T>::max_size())
9	return 0;	9	return 0;
10	if (n == 0)	10	if (n == 0)




--- libmysql/CMakeLists.txt.orig	2014-04-15 14:02:39.000000000 +0300
+++ libmysql/CMakeLists.txt	2014-05-16 19:33:07.000000000 +0300
@@ -377,7 +377,7 @@
 
 # Merge several convenience libraries into one big mysqlclient
 # and link them together into shared library.

 
 # Visual Studio users need debug  static library for debug projects
 INSTALL_DEBUG_SYMBOLS(clientlib)
@@ -386,6 +386,7 @@
  INSTALL_DEBUG_TARGET(clientlib DESTINATION ${INSTALL_LIBDIR}/debug)
 ENDIF()
 

 IF(UNIX)
   MACRO(GET_VERSIONED_LIBNAME LIBNAME EXTENSION VERSION OUTNAME)
     SET(DOT_VERSION ".${VERSION}")
@@ -400,11 +401,13 @@
   ENDMACRO()
   INSTALL_SYMLINK(${CMAKE_STATIC_LIBRARY_PREFIX}mysqlclient_r.a mysqlclient ${INSTALL_LIBDIR} Development)
 ENDIF()
+ENDIF()
 
 IF(NOT DISABLE_SHARED)
   MERGE_LIBRARIES(libmysql SHARED ${LIBS}
     EXPORTS ${CLIENT_API_FUNCTIONS} ${CLIENT_API_5_1_EXTRA} ${CLIENT_API_5_5_EXTRA}
-    COMPONENT SharedLibraries)
+	COMPONENT SharedLibraries NOINSTALL)
+IF(FALSE)
   IF(UNIX)
     # libtool compatability
     IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE)
@@ -448,3 +451,4 @@
     ENDFOREACH()
   ENDIF()
 ENDIF()




--- scripts/CMakeLists.txt.orig	2014-04-15 14:02:28.000000000 +0300
+++ scripts/CMakeLists.txt	2014-05-16 19:36:34.000000000 +0300
@@ -276,6 +276,8 @@
             STRING(REGEX REPLACE "^lib" "" lib "${lib}")
             SET(${var} "${${var}}-l${lib} " ) 
           ENDIF()
+        ELSEIF(lib STREQUAL "-pthread")
+          SET(${var} "${${var}}-pthread " )
         ELSE()
           SET(${var} "${${var}}-l${lib} " ) 
         ENDIF()
@@ -332,16 +334,11 @@
     ${CMAKE_CURRENT_BINARY_DIR}/mysql_config.pl ESCAPE_QUOTES @ONLY)
   # On Unix, most of the files end up in the bin directory
   SET(BIN_SCRIPTS
-    msql2mysql




--- scripts/mysql_config.sh.orig	2014-04-15 14:02:39.000000000 +0300
+++ scripts/mysql_config.sh	2014-05-16 19:08:41.000000000 +0300
@@ -108,8 +108,11 @@
 # We intentionally add a space to the beginning and end of lib strings, simplifies replace later
 libs=" $ldflags -L$pkglibdir @RPATH_OPTION@ -lmysqlclient @ZLIB_DEPS@ @NON_THREADED_LIBS@"
 libs="$libs @openssl_libs@ @STATIC_NSS_FLAGS@ "
+libs="$libs -L%%LOCALBASE%%/lib "
 libs_r=" $ldflags -L$pkglibdir  @RPATH_OPTION@ -lmysqlclient_r @ZLIB_DEPS@ @CLIENT_LIBS@ @openssl_libs@ "
+libs_r="$libs_r -L%%LOCALBASE%%/lib "
 embedded_libs=" $ldflags -L$pkglibdir @RPATH_OPTION@ -lmysqld @LIBDL@ @ZLIB_DEPS@ @LIBS@ @WRAPLIBS@ @openssl_libs@ "
+embedded_libs="$embedded_libs -L%%LOCALBASE%%/lib "
 
 if [ -r "$pkglibdir/libmygcc.a" ]; then

Lines 58-63 lib/mysql/plugin/qa_auth_server.so Link Here

(-)b/databases/mariadb55-server/pkg-plist (+1 lines)
58	lib/mysql/plugin/query_cache_info.so	58	lib/mysql/plugin/query_cache_info.so
59	lib/mysql/plugin/semisync_master.so	59	lib/mysql/plugin/semisync_master.so
60	lib/mysql/plugin/semisync_slave.so	60	lib/mysql/plugin/semisync_slave.so
		61	lib/mysql/plugin/server_audit.so
61	lib/mysql/plugin/sphinx.so	62	lib/mysql/plugin/sphinx.so
62	lib/mysql/plugin/sql_errlog.so	63	lib/mysql/plugin/sql_errlog.so
63	libexec/mysqld	64	libexec/mysqld

Return to bug 189887

Lines 1-6 Link Here

(-)b/databases/mariadb55-client/files/patch-CMakeLists.txt (-6 / +7 lines)
1	--- CMakeLists.txt.orig 2013-09-20 01:34:26.000000000 +0300	1	--- CMakeLists.txt.orig 2014-04-15 14:02:39.000000000 +0300
2	+++ CMakeLists.txt 2013-09-27 01:30:14.000000000 +0300	2	+++ CMakeLists.txt 2014-05-16 18:56:55.000000000 +0300
3	@@ -306,28 +306,8 @@	3	@@ -395,29 +395,8 @@
4	ADD_SUBDIRECTORY(extra)	4	ADD_SUBDIRECTORY(extra)
5	ADD_SUBDIRECTORY(libservices)	5	ADD_SUBDIRECTORY(libservices)
6	ADD_SUBDIRECTORY(scripts)	6	ADD_SUBDIRECTORY(scripts)
Lines 24-35 Link Here
24	- ADD_SUBDIRECTORY(internal)	24	- ADD_SUBDIRECTORY(internal)
25	- ENDIF()	25	- ENDIF()
26	- ADD_SUBDIRECTORY(packaging/rpm-uln)	26	- ADD_SUBDIRECTORY(packaging/rpm-uln)
		27	- ADD_SUBDIRECTORY(packaging/rpm-oel)
27	-ENDIF()	28	-ENDIF()
28	-	29	-
29	IF(UNIX)	30	IF(UNIX)
30	ADD_SUBDIRECTORY(man)	31	ADD_SUBDIRECTORY(man)
31	ENDIF()	32	ENDIF()
32	@@ -339,7 +319,6 @@	33	@@ -429,7 +408,6 @@
33	ADD_SUBDIRECTORY(win/upgrade_wizard)	34	ADD_SUBDIRECTORY(win/upgrade_wizard)
34	ADD_SUBDIRECTORY(win/packaging)	35	ADD_SUBDIRECTORY(win/packaging)
35	ENDIF()	36	ENDIF()
Lines 37-43 Link Here
37		38
38	CONFIGURE_FILE(config.h.cmake ${CMAKE_BINARY_DIR}/include/my_config.h)	39	CONFIGURE_FILE(config.h.cmake ${CMAKE_BINARY_DIR}/include/my_config.h)
39	CONFIGURE_FILE(config.h.cmake ${CMAKE_BINARY_DIR}/include/config.h)	40	CONFIGURE_FILE(config.h.cmake ${CMAKE_BINARY_DIR}/include/config.h)
40	@@ -366,6 +345,7 @@	41	@@ -462,6 +440,7 @@
41	WORKING_DIRECTORY ${CMAKE_BINARY_DIR}	42	WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
42	)	43	)
43		44
Lines 45-51 Link Here
45	INSTALL_DOCUMENTATION(README COPYING COPYING.LESSER	46	INSTALL_DOCUMENTATION(README COPYING COPYING.LESSER
46	COMPONENT Readme)	47	COMPONENT Readme)
47	INSTALL_DOCUMENTATION(${CMAKE_BINARY_DIR}/Docs/INFO_SRC	48	INSTALL_DOCUMENTATION(${CMAKE_BINARY_DIR}/Docs/INFO_SRC
48	@@ -373,6 +353,7 @@	49	@@ -469,6 +448,7 @@
49	IF(UNIX)	50	IF(UNIX)
50	INSTALL_DOCUMENTATION(Docs/INSTALL-BINARY COMPONENT Readme)	51	INSTALL_DOCUMENTATION(Docs/INSTALL-BINARY COMPONENT Readme)
51	ENDIF()	52	ENDIF()

Lines 1-6 Link Here

(-)b/databases/mariadb55-client/files/patch-scripts_CMakeLists.txt (-14 / +14 lines)
1	--- scripts/CMakeLists.txt.orig 2012-11-28 17:49:47.000000000 +0200	1	--- scripts/CMakeLists.txt.orig 2014-04-15 14:02:28.000000000 +0300
2	+++ scripts/CMakeLists.txt 2012-12-22 23:26:51.000000000 +0200	2	+++ scripts/CMakeLists.txt 2014-05-16 19:02:48.000000000 +0300
3	@@ -71,6 +71,7 @@	3	@@ -72,6 +72,7 @@
4	)	4	)
5	ENDIF()	5	ENDIF()
6		6
Lines 8-14 Link Here
8	INSTALL(FILES	8	INSTALL(FILES
9	${CMAKE_CURRENT_SOURCE_DIR}/mysql_system_tables.sql	9	${CMAKE_CURRENT_SOURCE_DIR}/mysql_system_tables.sql
10	${CMAKE_CURRENT_SOURCE_DIR}/mysql_system_tables_data.sql	10	${CMAKE_CURRENT_SOURCE_DIR}/mysql_system_tables_data.sql
11	@@ -79,6 +80,7 @@	11	@@ -81,6 +82,7 @@
12	${FIX_PRIVILEGES_SQL}	12	${FIX_PRIVILEGES_SQL}
13	DESTINATION ${INSTALL_MYSQLSHAREDIR} COMPONENT Server	13	DESTINATION ${INSTALL_MYSQLSHAREDIR} COMPONENT Server
14	)	14	)
Lines 16-22 Link Here
16		16
17	# TCMalloc hacks	17	# TCMalloc hacks
18	IF(MALLOC_LIB)	18	IF(MALLOC_LIB)
19	@@ -138,6 +140,7 @@	19	@@ -140,6 +142,7 @@
20	SET(HOSTNAME "hostname")	20	SET(HOSTNAME "hostname")
21	SET(MYSQLD_USER "mysql")	21	SET(MYSQLD_USER "mysql")
22		22
Lines 24-30 Link Here
24	# Required for mysqlbug until autotools are deprecated, once done remove these	24	# Required for mysqlbug until autotools are deprecated, once done remove these
25	# and expand default cmake variables	25	# and expand default cmake variables
26	SET(CC ${CMAKE_C_COMPILER})	26	SET(CC ${CMAKE_C_COMPILER})
27	@@ -174,6 +177,7 @@	27	@@ -180,6 +183,7 @@
28	DESTINATION ${INSTALL_BINDIR}	28	DESTINATION ${INSTALL_BINDIR}
29	COMPONENT Server	29	COMPONENT Server
30	)	30	)
Lines 32-38 Link Here
32		32
33	ENDIF(UNIX)	33	ENDIF(UNIX)
34		34
35	@@ -198,6 +202,7 @@	35	@@ -204,6 +208,7 @@
36	SET(localstatedir ${MYSQL_DATADIR})	36	SET(localstatedir ${MYSQL_DATADIR})
37	ENDIF()	37	ENDIF()
38		38
Lines 40-63 Link Here
40	IF(UNIX)	40	IF(UNIX)
41	CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mysql_install_db.sh	41	CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mysql_install_db.sh
42	${CMAKE_CURRENT_BINARY_DIR}/mysql_install_db ESCAPE_QUOTES @ONLY)	42	${CMAKE_CURRENT_BINARY_DIR}/mysql_install_db ESCAPE_QUOTES @ONLY)
43	@@ -209,6 +214,7 @@	43	@@ -219,6 +224,7 @@
44	COMPONENT Server	44	COMPONENT Server
45	)	45	)
46	ENDIF()	46	ENDIF()
47	+ENDIF()	47	+ENDIF()
48		48
49
50	SET(prefix "${CMAKE_INSTALL_PREFIX}")	49	SET(prefix "${CMAKE_INSTALL_PREFIX}")
51	@@ -260,6 +266,8 @@	50	SET(sysconfdir ${prefix})
52	GET_FILENAME_COMPONENT(lib "${lib}" NAME_WE)	51	@@ -276,6 +282,8 @@
53	STRING(REGEX REPLACE "^lib" "" lib "${lib}")	52	STRING(REGEX REPLACE "^lib" "" lib "${lib}")
54	SET(${var} "${${var}}-l${lib} " )	53	SET(${var} "${${var}}-l${lib} " )
		54	ENDIF()
55	+ ELSEIF(lib STREQUAL "-pthread")	55	+ ELSEIF(lib STREQUAL "-pthread")
56	+ SET(${var} "${${var}}-pthread " )	56	+ SET(${var} "${${var}}-pthread " )
57	ELSE()	57	ELSE()
58	SET(${var} "${${var}}-l${lib} " )	58	SET(${var} "${${var}}-l${lib} " )
59	ENDIF()	59	ENDIF()
60	@@ -315,18 +323,8 @@	60	@@ -334,18 +342,8 @@
61	SET(BIN_SCRIPTS	61	SET(BIN_SCRIPTS
62	msql2mysql	62	msql2mysql
63	mysql_config	63	mysql_config

Lines 1-13 Link Here

(-)b/databases/mariadb55-client/files/patch-scripts_mysql_config.sh (-5 / +5 lines)
1	--- scripts/mysql_config.sh.orig 2013-09-20 01:34:23.000000000 +0300	1	--- scripts/mysql_config.sh.orig 2014-04-15 14:02:39.000000000 +0300
2	+++ scripts/mysql_config.sh 2013-10-15 21:23:34.000000000 +0300	2	+++ scripts/mysql_config.sh 2014-05-16 19:08:41.000000000 +0300
3	@@ -108,8 +108,11 @@	3	@@ -108,8 +108,11 @@
4	# We intentionally add a space to the beginning and end of lib strings, simplifies replace later	4	# We intentionally add a space to the beginning and end of lib strings, simplifies replace later
5	libs=" $ldflags -L$pkglibdir -lmysqlclient @ZLIB_DEPS@ @NON_THREADED_LIBS@"	5	libs=" $ldflags -L$pkglibdir @RPATH_OPTION@ -lmysqlclient @ZLIB_DEPS@ @NON_THREADED_LIBS@"
6	libs="$libs @openssl_libs@ @STATIC_NSS_FLAGS@ "	6	libs="$libs @openssl_libs@ @STATIC_NSS_FLAGS@ "
7	+libs="$libs -L%%LOCALBASE%%/lib "	7	+libs="$libs -L%%LOCALBASE%%/lib "
8	libs_r=" $ldflags -L$pkglibdir -lmysqlclient_r @ZLIB_DEPS@ @CLIENT_LIBS@ @openssl_libs@ "	8	libs_r=" $ldflags -L$pkglibdir @RPATH_OPTION@ -lmysqlclient_r @ZLIB_DEPS@ @CLIENT_LIBS@ @openssl_libs@ "
9	+libs_r="$libs_r -L%%LOCALBASE%%/lib "	9	+libs_r="$libs_r -L%%LOCALBASE%%/lib "
10	embedded_libs=" $ldflags -L$pkglibdir -lmysqld @LIBDL@ @ZLIB_DEPS@ @LIBS@ @WRAPLIBS@ @openssl_libs@ "	10	embedded_libs=" $ldflags -L$pkglibdir @RPATH_OPTION@ -lmysqld @LIBDL@ @ZLIB_DEPS@ @LIBS@ @WRAPLIBS@ @openssl_libs@ "
11	+embedded_libs="$embedded_libs -L%%LOCALBASE%%/lib "	11	+embedded_libs="$embedded_libs -L%%LOCALBASE%%/lib "
12		12
13	if [ -r "$pkglibdir/libmygcc.a" ]; then	13	if [ -r "$pkglibdir/libmygcc.a" ]; then

Lines 1-18 Link Here

(-)b/databases/mariadb55-server/Makefile (-10 / +10 lines)
1	# $FreeBSD: head/databases/mariadb55-server/Makefile 346927 2014-03-03 16:23:58Z feld $	1	# $FreeBSD: head/databases/mariadb55-server/Makefile 346927 2014-03-03 16:23:58Z feld $
2		2
3	PORTNAME?= mariadb	3	PORTNAME?= mariadb
4	PORTVERSION= 5.5.35	4	PORTVERSION= 5.5.37
5	PORTREVISION?= 0	5	PORTREVISION?= 0
6	CATEGORIES= databases ipv6	6	CATEGORIES= databases ipv6
7	MASTER_SITES= http://ftp.osuosl.org/pub/mariadb/${PORTNAME}-${PORTVERSION}/kvm-tarbake-jaunty-x86/ \	7	MASTER_SITES= http://ftp.osuosl.org/pub/mariadb/${PORTNAME}-${PORTVERSION}/source/ \
8	http://mirrors.supportex.net/mariadb/${PORTNAME}-${PORTVERSION}/kvm-tarbake-jaunty-x86/ \	8	http://mirrors.supportex.net/mariadb/${PORTNAME}-${PORTVERSION}/source/ \
9	http://mirror.aarnet.edu.au/pub/MariaDB/${PORTNAME}-${PORTVERSION}/kvm-tarbake-jaunty-x86/ \	9	http://mirror.aarnet.edu.au/pub/MariaDB/${PORTNAME}-${PORTVERSION}/source/ \
10	http://mirror2.hs-esslingen.de/pub/Mirrors/mariadb/${PORTNAME}-${PORTVERSION}/kvm-tarbake-jaunty-x86/ \	10	http://mirror2.hs-esslingen.de/pub/Mirrors/mariadb/${PORTNAME}-${PORTVERSION}/source/ \
11	http://gd.tuwien.ac.at/db/mariadb/${PORTNAME}-${PORTVERSION}/kvm-tarbake-jaunty-x86/ \	11	http://gd.tuwien.ac.at/db/mariadb/${PORTNAME}-${PORTVERSION}/source/ \
12	http://mirrors.fe.up.pt/pub/mariadb/${PORTNAME}-${PORTVERSION}/kvm-tarbake-jaunty-x86/ \	12	http://mirrors.fe.up.pt/pub/mariadb/${PORTNAME}-${PORTVERSION}/source/ \
13	http://mirror.de.gsnw.de:56431/mariadb/${PORTNAME}-${PORTVERSION}/kvm-tarbake-jaunty-x86/ \	13	http://mirror.de.gsnw.de:56431/mariadb/${PORTNAME}-${PORTVERSION}/source/ \
14	http://mirror.layerjet.com/mariadb/${PORTNAME}-${PORTVERSION}/kvm-tarbake-jaunty-x86/ \	14	http://mirror.layerjet.com/mariadb/${PORTNAME}-${PORTVERSION}/source/ \
15	http://mirror.switch.ch/mirror/mariadb/${PORTNAME}-${PORTVERSION}/kvm-tarbake-jaunty-x86/	15	http://mirror.switch.ch/mirror/mariadb/${PORTNAME}-${PORTVERSION}/source/
16	PKGNAMESUFFIX?= 55-server	16	PKGNAMESUFFIX?= 55-server
17		17
18	MAINTAINER= never@nevermind.kiev.ua	18	MAINTAINER= never@nevermind.kiev.ua

Lines 1-6 Link Here

(-)b/databases/mariadb55-server/files/patch-libmysql_CMakeLists.txt (-8 / +10 lines)
1	--- libmysql/CMakeLists.txt.orig 2014-02-11 20:20:18.571491184 -0600	1	--- libmysql/CMakeLists.txt.orig 2014-04-15 14:02:39.000000000 +0300
2	+++ libmysql/CMakeLists.txt 2014-02-11 20:23:27.474449535 -0600	2	+++ libmysql/CMakeLists.txt 2014-05-16 19:33:07.000000000 +0300
3	@@ -329,7 +329,7 @@	3	@@ -377,7 +377,7 @@
4		4
5	# Merge several convenience libraries into one big mysqlclient	5	# Merge several convenience libraries into one big mysqlclient
6	# and link them together into shared library.	6	# and link them together into shared library.
Lines 9-15 Link Here
9		9
10	# Visual Studio users need debug static library for debug projects	10	# Visual Studio users need debug static library for debug projects
11	INSTALL_DEBUG_SYMBOLS(clientlib)	11	INSTALL_DEBUG_SYMBOLS(clientlib)
12	@@ -338,6 +338,7 @@	12	@@ -386,6 +386,7 @@
13	INSTALL_DEBUG_TARGET(clientlib DESTINATION ${INSTALL_LIBDIR}/debug)	13	INSTALL_DEBUG_TARGET(clientlib DESTINATION ${INSTALL_LIBDIR}/debug)
14	ENDIF()	14	ENDIF()
15		15
Lines 17-36 Link Here
17	IF(UNIX)	17	IF(UNIX)
18	MACRO(GET_VERSIONED_LIBNAME LIBNAME EXTENSION VERSION OUTNAME)	18	MACRO(GET_VERSIONED_LIBNAME LIBNAME EXTENSION VERSION OUTNAME)
19	SET(DOT_VERSION ".${VERSION}")	19	SET(DOT_VERSION ".${VERSION}")
20	@@ -352,9 +353,11 @@	20	@@ -400,11 +401,13 @@
21	ENDMACRO()	21	ENDMACRO()
22	INSTALL_SYMLINK(${CMAKE_STATIC_LIBRARY_PREFIX}mysqlclient_r.a mysqlclient ${INSTALL_LIBDIR} Development)	22	INSTALL_SYMLINK(${CMAKE_STATIC_LIBRARY_PREFIX}mysqlclient_r.a mysqlclient ${INSTALL_LIBDIR} Development)
23	ENDIF()	23	ENDIF()
24	+ENDIF()	24	+ENDIF()
25		25
26	IF(NOT DISABLE_SHARED)	26	IF(NOT DISABLE_SHARED)
27	- MERGE_LIBRARIES(libmysql SHARED ${LIBS} EXPORTS ${CLIENT_API_FUNCTIONS} ${CLIENT_API_EXTRA} COMPONENT SharedLibraries)	27	MERGE_LIBRARIES(libmysql SHARED ${LIBS}
28	+ MERGE_LIBRARIES(libmysql SHARED ${LIBS} EXPORTS ${CLIENT_API_FUNCTIONS} ${CLIENT_API_EXTRA} COMPONENT SharedLibraries NOINSTALL)	28	EXPORTS ${CLIENT_API_FUNCTIONS} ${CLIENT_API_5_1_EXTRA} ${CLIENT_API_5_5_EXTRA}
		29	- COMPONENT SharedLibraries)
		30	+ COMPONENT SharedLibraries NOINSTALL)
29	+IF(FALSE)	31	+IF(FALSE)
30	IF(UNIX)	32	IF(UNIX)
31	# libtool compatability	33	# libtool compatability
32	IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE)	34	IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE)
33	@@ -401,3 +404,4 @@	35	@@ -448,3 +451,4 @@
34	ENDFOREACH()	36	ENDFOREACH()
35	ENDIF()	37	ENDIF()
36	ENDIF()	38	ENDIF()