Attachment #156826 for bug #200097




# $FreeBSD$

PORTNAME?=	mariadb
PORTVERSION=	10.0.19
CATEGORIES=	databases ipv6
MASTER_SITES=	http://ftp.osuosl.org/pub/${SITESDIR}/ \
		http://mirrors.supportex.net/${SITESDIR}/ \

NO_OPTIONS_SORT=	yes

BUNDLED_SSL_DESC=	SSL/TLS support via (bundled) CyaSSL
FASTMTX_DESC=		Replace mutexes with spinlocks
WITHOUT_SSL_DESC=	No SSL/TLS support

CMAKE_ARGS+=	-DINSTALL_DOCDIR="share/doc/mysql" \
		-DINSTALL_DOCREADMEDIR="share/doc/mysql" \

OPTIONS_DEFAULT+=	MAXKEY
OPTIONS_SUB=		yes

INNODB_DESC=		Build InnoDB engine next to XtraDB
MAXKEY_DESC=		Change max key length from 1000 to 4000
MROONGA_DESC=		Mroonga Full Text Search engine (gcc)
OQGRAPH_DESC=		Open Query Graph Computation engine (gcc)
.endif

BUNDLED_SSL_CMAKE_ON=	-DWITH_SSL=bundled
FASTMTX_CMAKE_ON=	-DWITH_FAST_MUTEXES=1
OPENSSL_CMAKE_ON=	-DWITH_SSL=yes
OPENSSL_USE=	OPENSSL=yes

		-DWITHOUT_EXAMPLE_STORAGE_ENGINE=1

INNODB_CMAKE_OFF=	-DWITHOUT_INNOBASE=1
MAXKEY_EXTRA_PATCHES+=	${FILESDIR}/extra-patch-include_my_compare.h
MROONGA_CMAKE_OFF=	-DWITHOUT_MROONGA=1
MROONGA_USE=	GCC?=yes
OQGRAPH_CMAKE_OFF=	-DWITHOUT_OQGRAPH=1
OQGRAPH_LIB_DEPENDS=	libboost_system.so:${PORTSDIR}/devel/boost-libs \
			libJudy.so:${PORTSDIR}/devel/judy

CXXFLAGS+=		-I${LOCALBASE}/include
LDFLAGS+=		-L${LOCALBASE}/lib

post-install:
	# Remove programs to avoid conflict with mariadb100-client
	# These are "client" components, so there should be a switch that

.include <bsd.port.pre.mk>

.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000012
CMAKE_ARGS+=	-DWITH_JEMALLOC="system"
.else
CMAKE_ARGS+=	-DWITH_JEMALLOC="no"
.endif

# Server segfaults on i386 when built with clang >= 3.4
.if ${ARCH} == 'i386' && ${OSVERSION} >= 1001000
USE_GCC=	yes
.endif

.if ${PORT_OPTIONS:MOQGRAPH}
IGNORE=	MariaDB server fails to build with OQGraph currently
.endif

post-patch:
	@${REINPLACE_CMD} 's/*.1/${MAN1}/' ${WRKSRC}/man/CMakeLists.txt
	@${REINPLACE_CMD} 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/mysys/my_default.c

Lines 1-2 Link Here

(-)databases/mariadb100-server/distinfo (-2 / +2 lines)
1	SHA256 (mariadb-10.0.16.tar.gz) = 44134a5f3e174e3e8443c1d07916af57f3ffadd4c8846338d41850fedfefcde4	1	SHA256 (mariadb-10.0.19.tar.gz) = 2fbf5e5d7d8094691601ece8ae60b941478d73c98a58a960aeebfa021091a132
2	SIZE (mariadb-10.0.16.tar.gz) = 55656968	2	SIZE (mariadb-10.0.19.tar.gz) = 56224123




--- CMakeLists.txt.orig	2015-05-08 14:37:45 UTC
+++ CMakeLists.txt
@@ -438,7 +438,6 @@ IF(WIN32)
   ADD_SUBDIRECTORY(win/upgrade_wizard)
   ADD_SUBDIRECTORY(win/packaging)
 ENDIF()

-ADD_SUBDIRECTORY(packaging/solaris)
 
 IF(NOT CMAKE_CROSSCOMPILING)
   SET(EXPORTED comp_err comp_sql factorial)
@@ -482,6 +481,7 @@ ADD_CUSTOM_TARGET(INFO_BIN ALL
   WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
 )
 

+IF(FALSE)
 INSTALL_DOCUMENTATION(README CREDITS COPYING COPYING.LESSER EXCEPTIONS-CLIENT
                       COMPONENT Readme)
 
@@ -492,6 +492,7 @@ INSTALL_DOCUMENTATION(README CREDITS COP
 IF(UNIX)
   INSTALL_DOCUMENTATION(Docs/INSTALL-BINARY COMPONENT Readme)
 ENDIF()




--- client/CMakeLists.txt.orig	2015-05-08 14:37:45 UTC
+++ client/CMakeLists.txt
@@ -30,6 +30,7 @@ INCLUDE_DIRECTORIES(
 COPY_OPENSSL_DLLS(copy_openssl_client)
 
 ADD_DEFINITIONS(${SSL_DEFINES})

 MYSQL_ADD_EXECUTABLE(mysql completion_hash.cc mysql.cc readline.cc
                            ${CMAKE_SOURCE_DIR}/sql/sql_string.cc)
 TARGET_LINK_LIBRARIES(mysql mysqlclient)
@@ -37,6 +38,7 @@ IF(UNIX)
   TARGET_LINK_LIBRARIES(mysql ${MY_READLINE_LIBRARY})
   SET_TARGET_PROPERTIES(mysql PROPERTIES ENABLE_EXPORTS TRUE)
 ENDIF(UNIX)

 
 MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test)
 SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS")
@@ -44,6 +46,7 @@ TARGET_LINK_LIBRARIES(mysqltest mysqlcli
 SET_TARGET_PROPERTIES(mysqltest PROPERTIES ENABLE_EXPORTS TRUE)
 
 

 MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c)
 TARGET_LINK_LIBRARIES(mysqlcheck mysqlclient)
 
@@ -52,17 +55,21 @@ TARGET_LINK_LIBRARIES(mysqldump mysqlcli
 
 MYSQL_ADD_EXECUTABLE(mysqlimport mysqlimport.c)
 TARGET_LINK_LIBRARIES(mysqlimport mysqlclient)

 MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc)
 TARGET_LINK_LIBRARIES(mysqlbinlog mysqlclient)
 
@@ -72,17 +79,20 @@ TARGET_LINK_LIBRARIES(mysqladmin mysqlcl
 MYSQL_ADD_EXECUTABLE(mysqlslap mysqlslap.c)
 SET_SOURCE_FILES_PROPERTIES(mysqlslap.c PROPERTIES COMPILE_FLAGS "-DTHREADS")
 TARGET_LINK_LIBRARIES(mysqlslap mysqlclient)

Lines 1-6 Link Here

(-)databases/mariadb100-server/files/patch-cmake__jemalloc.cmake (-3 / +3 lines)
1	--- cmake/jemalloc.cmake.orig 2014-09-25 00:29:47.000000000 +0200	1	--- cmake/jemalloc.cmake.orig 2015-05-08 14:37:45 UTC
2	+++ cmake/jemalloc.cmake 2014-09-27 10:05:48.000000000 +0200	2	+++ cmake/jemalloc.cmake
3	@@ -24,12 +24,12 @@	3	@@ -24,12 +24,12 @@ MACRO (CHECK_JEMALLOC)
4	SET(what system)	4	SET(what system)
5	ENDIF()	5	ENDIF()
6		6

Lines 1-6 Link Here

(-)databases/mariadb100-server/files/patch-extra_CMakeLists.txt (-3 / +6 lines)
1	--- extra/CMakeLists.txt.orig 2014-08-09 00:13:40.000000000 +0200	1	--- extra/CMakeLists.txt.orig 2015-05-08 14:37:45 UTC
2	+++ extra/CMakeLists.txt 2014-09-05 18:32:20.555373233 +0200	2	+++ extra/CMakeLists.txt
3	@@ -80,6 +80,8 @@	3	@@ -78,9 +78,11 @@ IF(UNIX)
4	MYSQL_ADD_EXECUTABLE(resolve_stack_dump resolve_stack_dump.c)	4	MYSQL_ADD_EXECUTABLE(resolve_stack_dump resolve_stack_dump.c)
5	TARGET_LINK_LIBRARIES(resolve_stack_dump mysys)	5	TARGET_LINK_LIBRARIES(resolve_stack_dump mysys)
6		6
Lines 9-11 Link Here
9	TARGET_LINK_LIBRARIES(mysql_waitpid mysys)	9	TARGET_LINK_LIBRARIES(mysql_waitpid mysys)
10	ENDIF()	10	ENDIF()
11	+ENDIF()	11	+ENDIF()
		12
		13
		14	# Add path to the InnoDB headers

Lines 1-6 Link Here

(-)databases/mariadb100-server/files/patch-extra_yassl_taocrypt_src_integer.cpp (-3 / +3 lines)
1	--- extra/yassl/taocrypt/src/integer.cpp.orig 2014-04-15 14:02:39.000000000 +0300	1	--- extra/yassl/taocrypt/src/integer.cpp.orig 2015-05-08 14:37:45 UTC
2	+++ extra/yassl/taocrypt/src/integer.cpp 2014-05-16 17:00:15.000000000 +0300	2	+++ extra/yassl/taocrypt/src/integer.cpp
3	@@ -75,7 +75,7 @@	3	@@ -74,7 +74,7 @@ template <class T>
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	{

Lines 1-6 Link Here

(-)databases/mariadb100-server/files/patch-include_CMakeLists.txt (-3 / +3 lines)
1	--- include/CMakeLists.txt.orig 2014-08-09 00:13:38.000000000 +0200	1	--- include/CMakeLists.txt.orig 2015-05-08 14:37:45 UTC
2	+++ include/CMakeLists.txt 2014-09-05 18:38:18.461346954 +0200	2	+++ include/CMakeLists.txt
3	@@ -62,17 +62,21 @@	3	@@ -62,17 +62,21 @@ SET(HEADERS
4	handler_ername.h	4	handler_ername.h
5	)	5	)
6		6




--- libmysql/CMakeLists.txt.orig	2015-05-08 14:37:45 UTC
+++ libmysql/CMakeLists.txt
@@ -410,7 +410,7 @@ SET(LIBS clientlib dbug strings vio mysy
 
 # 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
 IF(MSVC)
@@ -418,6 +418,7 @@ IF(MSVC)
  INSTALL_DEBUG_TARGET(clientlib DESTINATION ${INSTALL_LIBDIR}/debug)
 ENDIF()
 

 IF(UNIX)
   MACRO(GET_VERSIONED_LIBNAME LIBNAME EXTENSION VERSION OUTNAME)
     SET(DOT_VERSION ".${VERSION}")
@@ -432,11 +433,13 @@ IF(UNIX)
   ENDMACRO()
   INSTALL_SYMLINK(${CMAKE_STATIC_LIBRARY_PREFIX}mysqlclient_r.a mysqlclient ${INSTALL_LIBDIR} Development)
 ENDIF()

   IF(UNIX)
     # libtool compatability
     IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE)
@@ -484,3 +487,4 @@ IF(NOT DISABLE_SHARED)
     ENDFOREACH()
   ENDIF()
 ENDIF()

Lines 1-6 Link Here

(-)databases/mariadb100-server/files/patch-libservices_CMakeLists.txt (-3 / +3 lines)
1	--- libservices/CMakeLists.txt.orig 2014-08-09 00:13:47.000000000 +0200	1	--- libservices/CMakeLists.txt.orig 2015-05-08 14:37:45 UTC
2	+++ libservices/CMakeLists.txt 2014-09-05 18:48:40.074297131 +0200	2	+++ libservices/CMakeLists.txt
3	@@ -29,4 +29,6 @@	3	@@ -29,4 +29,6 @@ SET(MYSQLSERVICES_SOURCES
4	logger_service.c)	4	logger_service.c)
5		5
6	ADD_CONVENIENCE_LIBRARY(mysqlservices ${MYSQLSERVICES_SOURCES})	6	ADD_CONVENIENCE_LIBRARY(mysqlservices ${MYSQLSERVICES_SOURCES})

Lines 1-6 Link Here

(-)databases/mariadb100-server/files/patch-man_CMakeLists.txt (-3 / +3 lines)
1	--- man/CMakeLists.txt.orig 2014-06-13 13:58:21.397251542 +0300	1	--- man/CMakeLists.txt.orig 2015-05-08 14:37:45 UTC
2	+++ man/CMakeLists.txt 2014-06-13 14:00:24.132245109 +0300	2	+++ man/CMakeLists.txt
3	@@ -33,7 +33,8 @@	3	@@ -34,7 +34,8 @@ SET(MAN1_TEST mysql-stress-test.pl.1 mys
4		4
5	INSTALL(FILES ${MAN1_SERVER} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesServer)	5	INSTALL(FILES ${MAN1_SERVER} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesServer)
6	INSTALL(FILES ${MAN8_SERVER} DESTINATION ${INSTALL_MANDIR}/man8 COMPONENT ManPagesServer)	6	INSTALL(FILES ${MAN8_SERVER} DESTINATION ${INSTALL_MANDIR}/man8 COMPONENT ManPagesServer)

Lines 1-6 Link Here

(-)databases/mariadb100-server/files/patch-pcre_CMakeLists.txt (-3 / +3 lines)
1	--- pcre/CMakeLists.txt.orig 2014-08-09 00:13:36.000000000 +0200	1	--- pcre/CMakeLists.txt.orig 2015-05-08 14:37:46 UTC
2	+++ pcre/CMakeLists.txt 2014-09-05 20:08:49.090972949 +0200	2	+++ pcre/CMakeLists.txt
3	@@ -513,6 +513,8 @@	3	@@ -513,6 +513,8 @@ IF(PCRE_SHOW_REPORT)
4	MESSAGE(STATUS "")	4	MESSAGE(STATUS "")
5	ENDIF(PCRE_SHOW_REPORT)	5	ENDIF(PCRE_SHOW_REPORT)
6		6

Lines 1-6 Link Here

(-)databases/mariadb100-server/files/patch-scripts_CMakeLists.txt (-3 / +3 lines)
1	--- scripts/CMakeLists.txt.orig 2014-08-09 00:13:37.000000000 +0200	1	--- scripts/CMakeLists.txt.orig 2015-05-08 14:37:46 UTC
2	+++ scripts/CMakeLists.txt 2014-09-05 19:06:46.206250221 +0200	2	+++ scripts/CMakeLists.txt
3	@@ -281,6 +281,8 @@	3	@@ -275,6 +275,8 @@ MACRO(EXTRACT_LINK_LIBRARIES target var)
4	STRING(REGEX REPLACE "^lib" "" lib "${lib}")	4	STRING(REGEX REPLACE "^lib" "" lib "${lib}")
5	SET(${var} "${${var}}-l${lib} " )	5	SET(${var} "${${var}}-l${lib} " )
6	ENDIF()	6	ENDIF()




--- sql/CMakeLists.txt.orig	2015-05-08 14:37:46 UTC
+++ sql/CMakeLists.txt
@@ -312,6 +312,7 @@ ADD_CUSTOM_TARGET(distclean
   VERBATIM
   )
 

 IF(INSTALL_LAYOUT STREQUAL "STANDALONE")
 
 # Copy db.opt into data/test/
@@ -355,6 +356,7 @@ ELSE()
   INSTALL(FILES ${DUMMY_FILE} DESTINATION data/mysql COMPONENT DataFiles)
 ENDIF(WIN32 AND MYSQLD_EXECUTABLE)
 ENDIF(INSTALL_LAYOUT STREQUAL "STANDALONE")

 
 IF(WIN32)
   SET(my_bootstrap_sql ${CMAKE_CURRENT_BINARY_DIR}/my_bootstrap.sql)
@@ -397,8 +399,10 @@ IF(WIN32)
   TARGET_LINK_LIBRARIES(mysql_upgrade_service mysys winservice)
 ENDIF(WIN32)
 

Lines 1-4 Link Here

(-)databases/mariadb100-server/files/patch-storage_tokudb_ft-index_cmake__modules_TokuFeatureDetection.cmake (-1 / +1 lines)
1	--- storage/tokudb/ft-index/cmake_modules/TokuFeatureDetection.cmake.orig 2014-09-24 22:29:47 UTC	1	--- storage/tokudb/ft-index/cmake_modules/TokuFeatureDetection.cmake.orig 2015-05-08 14:37:46 UTC
2	+++ storage/tokudb/ft-index/cmake_modules/TokuFeatureDetection.cmake	2	+++ storage/tokudb/ft-index/cmake_modules/TokuFeatureDetection.cmake
3	@@ -87,13 +87,7 @@ if (NOT HAVE_DLSYM_WITHOUT_DL)	3	@@ -87,13 +87,7 @@ if (NOT HAVE_DLSYM_WITHOUT_DL)
4	endif ()	4	endif ()

Lines 1-4 Link Here

(-)databases/mariadb100-server/files/patch-storage_tokudb_ft-index_portability_memory.cc (-1 / +1 lines)
1	--- storage/tokudb/ft-index/portability/memory.cc.orig 2014-09-24 22:29:47 UTC	1	--- storage/tokudb/ft-index/portability/memory.cc.orig 2015-05-08 14:37:47 UTC
2	+++ storage/tokudb/ft-index/portability/memory.cc	2	+++ storage/tokudb/ft-index/portability/memory.cc
3	@@ -94,11 +94,6 @@ PATENT RIGHTS GRANT:	3	@@ -94,11 +94,6 @@ PATENT RIGHTS GRANT:
4	#include <string.h>	4	#include <string.h>

Lines 1-6 Link Here

(-)databases/mariadb100-server/files/patch-support-files_CMakeLists.txt (-3 / +3 lines)
1	--- support-files/CMakeLists.txt.orig 2012-11-28 17:49:47.000000000 +0200	1	--- support-files/CMakeLists.txt.orig 2015-05-08 14:37:48 UTC
2	+++ support-files/CMakeLists.txt 2012-12-23 05:40:39.000000000 +0200	2	+++ support-files/CMakeLists.txt
3	@@ -66,10 +66,11 @@	3	@@ -67,10 +67,11 @@ IF(UNIX)
4	ENDFOREACH()	4	ENDFOREACH()
5	IF(INSTALL_SUPPORTFILESDIR)	5	IF(INSTALL_SUPPORTFILESDIR)
6	INSTALL(FILES magic DESTINATION ${inst_location} COMPONENT SupportFiles)	6	INSTALL(FILES magic DESTINATION ${inst_location} COMPONENT SupportFiles)

Return to bug 200097

Lines 1-7 Link Here

(-)databases/mariadb100-server/Makefile (-13 / +19 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME?= mariadb	3	PORTNAME?= mariadb
4	PORTVERSION= 10.0.16	4	PORTVERSION= 10.0.19
5	CATEGORIES= databases ipv6	5	CATEGORIES= databases ipv6
6	MASTER_SITES= http://ftp.osuosl.org/pub/${SITESDIR}/ \	6	MASTER_SITES= http://ftp.osuosl.org/pub/${SITESDIR}/ \
7	http://mirrors.supportex.net/${SITESDIR}/ \	7	http://mirrors.supportex.net/${SITESDIR}/ \
Lines 35-42 Link Here
35	NO_OPTIONS_SORT= yes	35	NO_OPTIONS_SORT= yes
36		36
37	BUNDLED_SSL_DESC= SSL/TLS support via (bundled) CyaSSL	37	BUNDLED_SSL_DESC= SSL/TLS support via (bundled) CyaSSL
38	FASTMTX_DESC= Replace mutexes with spinlocks	38	FASTMTX_DESC= Replace mutexes with spinlocks
39	WITHOUT_SSL_DESC= No SSL/TLS support	39	WITHOUT_SSL_DESC= No SSL/TLS support
40		40
41	CMAKE_ARGS+= -DINSTALL_DOCDIR="share/doc/mysql" \	41	CMAKE_ARGS+= -DINSTALL_DOCDIR="share/doc/mysql" \
42	-DINSTALL_DOCREADMEDIR="share/doc/mysql" \	42	-DINSTALL_DOCREADMEDIR="share/doc/mysql" \
Lines 72-84 Link Here
72	OPTIONS_DEFAULT+= MAXKEY	72	OPTIONS_DEFAULT+= MAXKEY
73	OPTIONS_SUB= yes	73	OPTIONS_SUB= yes
74		74
75	INNODB_DESC= Build InnoDB engine next to XtraDB	75	INNODB_DESC= Build InnoDB engine next to XtraDB
76	MAXKEY_DESC= Change max key length from 1000 to 4000	76	MAXKEY_DESC= Change max key length from 1000 to 4000
77	MROONGA_DESC= Mroonga Full Text Search engine (gcc)	77	MROONGA_DESC= Mroonga Full Text Search engine (gcc)
78	OQGRAPH_DESC= Open Query Graph Computation engine (gcc)	78	OQGRAPH_DESC= Open Query Graph Computation engine (gcc)
79	.endif	79	.endif
80		80
81	BUNDLED_SSL_CMAKE_ON= -DWITH_SSL=bundled	81	BUNDLED_SSL_CMAKE_ON= -DWITH_SSL=bundled
82	FASTMTX_CMAKE_ON= -DWITH_FAST_MUTEXES=1	82	FASTMTX_CMAKE_ON= -DWITH_FAST_MUTEXES=1
83	OPENSSL_CMAKE_ON= -DWITH_SSL=yes	83	OPENSSL_CMAKE_ON= -DWITH_SSL=yes
84	OPENSSL_USE= OPENSSL=yes	84	OPENSSL_USE= OPENSSL=yes
Lines 104-116 Link Here
104	-DWITHOUT_EXAMPLE_STORAGE_ENGINE=1	104	-DWITHOUT_EXAMPLE_STORAGE_ENGINE=1
105		105
106	INNODB_CMAKE_OFF= -DWITHOUT_INNOBASE=1	106	INNODB_CMAKE_OFF= -DWITHOUT_INNOBASE=1
107	MAXKEY_EXTRA_PATCHES+= ${FILESDIR}/extra-patch-include_my_compare.h	107	MAXKEY_EXTRA_PATCHES+= ${FILESDIR}/extra-patch-include_my_compare.h
108	MROONGA_CMAKE_OFF= -DWITHOUT_MROONGA=1	108	MROONGA_CMAKE_OFF= -DWITHOUT_MROONGA=1
109	MROONGA_USE= GCC?=yes
110	OQGRAPH_CMAKE_OFF= -DWITHOUT_OQGRAPH=1	109	OQGRAPH_CMAKE_OFF= -DWITHOUT_OQGRAPH=1
111	OQGRAPH_USE= GCC?=yes	110	OQGRAPH_LIB_DEPENDS= libboost_system.so:${PORTSDIR}/devel/boost-libs \
112	OQGRAPH_LIB_DEPENDS= libboost_system.so:${PORTSDIR}/devel/boost-libs	111	libJudy.so:${PORTSDIR}/devel/judy
113		112
		113	CXXFLAGS+= -I${LOCALBASE}/include
		114	LDFLAGS+= -L${LOCALBASE}/lib
		115
114	post-install:	116	post-install:
115	# Remove programs to avoid conflict with mariadb100-client	117	# Remove programs to avoid conflict with mariadb100-client
116	# These are "client" components, so there should be a switch that	118	# These are "client" components, so there should be a switch that
Lines 124-139 Link Here
124	.include <bsd.port.pre.mk>	126	.include <bsd.port.pre.mk>
125		127
126	.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000012	128	.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000012
127	CMAKE_ARGS+= -DWITH_JEMALLOC="system"	129	CMAKE_ARGS+= -DWITH_JEMALLOC="system"
128	.else	130	.else
129	CMAKE_ARGS+= -DWITH_JEMALLOC="no"	131	CMAKE_ARGS+= -DWITH_JEMALLOC="no"
130	.endif	132	.endif
131		133
132	# Server segfaults on i386 when built with clang >= 3.4	134	# Server segfaults on i386 when built with clang >= 3.4
133	.if ${ARCH} == 'i386' && ${OSVERSION} >= 1001000	135	.if ${ARCH} == 'i386' && ${OSVERSION} >= 1001000
134	USE_GCC= yes	136	USE_GCC= yes
135	.endif	137	.endif
136		138
		139	.if ${PORT_OPTIONS:MOQGRAPH}
		140	IGNORE= MariaDB server fails to build with OQGraph currently
		141	.endif
		142
137	post-patch:	143	post-patch:
138	@${REINPLACE_CMD} 's/*.1/${MAN1}/' ${WRKSRC}/man/CMakeLists.txt	144	@${REINPLACE_CMD} 's/*.1/${MAN1}/' ${WRKSRC}/man/CMakeLists.txt
139	@${REINPLACE_CMD} 's\|%%PREFIX%%\|${PREFIX}\|g' ${WRKSRC}/mysys/my_default.c	145	@${REINPLACE_CMD} 's\|%%PREFIX%%\|${PREFIX}\|g' ${WRKSRC}/mysys/my_default.c

Lines 1-6 Link Here

(-)databases/mariadb100-server/files/patch-CMakeLists.txt (-7 / +7 lines)
1	--- CMakeLists.txt.orig 2014-08-09 00:13:37.000000000 +0200	1	--- CMakeLists.txt.orig 2015-05-08 14:37:45 UTC
2	+++ CMakeLists.txt 2014-09-05 18:22:34.646409575 +0200	2	+++ CMakeLists.txt
3	@@ -463,7 +463,6 @@	3	@@ -438,7 +438,6 @@ IF(WIN32)
4	ADD_SUBDIRECTORY(win/upgrade_wizard)	4	ADD_SUBDIRECTORY(win/upgrade_wizard)
5	ADD_SUBDIRECTORY(win/packaging)	5	ADD_SUBDIRECTORY(win/packaging)
6	ENDIF()	6	ENDIF()
Lines 7-14 Link Here
7	-ADD_SUBDIRECTORY(packaging/solaris)	7	-ADD_SUBDIRECTORY(packaging/solaris)
8		8
9	IF(NOT CMAKE_CROSSCOMPILING)	9	IF(NOT CMAKE_CROSSCOMPILING)
10	SET(EXPORTED comp_err comp_sql factorial gen_lex_hash)	10	SET(EXPORTED comp_err comp_sql factorial)
11	@@ -503,6 +502,7 @@	11	@@ -482,6 +481,7 @@ ADD_CUSTOM_TARGET(INFO_BIN ALL
12	WORKING_DIRECTORY ${CMAKE_BINARY_DIR}	12	WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
13	)	13	)
14		14
Lines 15-22 Link Here
15	+IF(FALSE)	15	+IF(FALSE)
16	INSTALL_DOCUMENTATION(README CREDITS COPYING COPYING.LESSER EXCEPTIONS-CLIENT	16	INSTALL_DOCUMENTATION(README CREDITS COPYING COPYING.LESSER EXCEPTIONS-CLIENT
17	COMPONENT Readme)	17	COMPONENT Readme)
18	INSTALL_DOCUMENTATION(${CMAKE_BINARY_DIR}/Docs/INFO_SRC	18
19	@@ -511,6 +511,7 @@	19	@@ -492,6 +492,7 @@ INSTALL_DOCUMENTATION(README CREDITS COP
20	IF(UNIX)	20	IF(UNIX)
21	INSTALL_DOCUMENTATION(Docs/INSTALL-BINARY COMPONENT Readme)	21	INSTALL_DOCUMENTATION(Docs/INSTALL-BINARY COMPONENT Readme)
22	ENDIF()	22	ENDIF()

Lines 1-6 Link Here

(-)databases/mariadb100-server/files/patch-client_CMakeLists.txt (-7 / +7 lines)
1	--- client/CMakeLists.txt.orig 2014-08-09 00:13:48.000000000 +0200	1	--- client/CMakeLists.txt.orig 2015-05-08 14:37:45 UTC
2	+++ client/CMakeLists.txt 2014-09-07 21:19:33.000000000 +0200	2	+++ client/CMakeLists.txt
3	@@ -30,6 +30,7 @@	3	@@ -30,6 +30,7 @@ INCLUDE_DIRECTORIES(
4	COPY_OPENSSL_DLLS(copy_openssl_client)	4	COPY_OPENSSL_DLLS(copy_openssl_client)
5		5
6	ADD_DEFINITIONS(${SSL_DEFINES})	6	ADD_DEFINITIONS(${SSL_DEFINES})
Lines 8-14 Link Here
8	MYSQL_ADD_EXECUTABLE(mysql completion_hash.cc mysql.cc readline.cc	8	MYSQL_ADD_EXECUTABLE(mysql completion_hash.cc mysql.cc readline.cc
9	${CMAKE_SOURCE_DIR}/sql/sql_string.cc)	9	${CMAKE_SOURCE_DIR}/sql/sql_string.cc)
10	TARGET_LINK_LIBRARIES(mysql mysqlclient)	10	TARGET_LINK_LIBRARIES(mysql mysqlclient)
11	@@ -37,6 +38,7 @@	11	@@ -37,6 +38,7 @@ IF(UNIX)
12	TARGET_LINK_LIBRARIES(mysql ${MY_READLINE_LIBRARY})	12	TARGET_LINK_LIBRARIES(mysql ${MY_READLINE_LIBRARY})
13	SET_TARGET_PROPERTIES(mysql PROPERTIES ENABLE_EXPORTS TRUE)	13	SET_TARGET_PROPERTIES(mysql PROPERTIES ENABLE_EXPORTS TRUE)
14	ENDIF(UNIX)	14	ENDIF(UNIX)
Lines 16-22 Link Here
16		16
17	MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test)	17	MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test)
18	SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS")	18	SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS")
19	@@ -44,6 +46,7 @@	19	@@ -44,6 +46,7 @@ TARGET_LINK_LIBRARIES(mysqltest mysqlcli
20	SET_TARGET_PROPERTIES(mysqltest PROPERTIES ENABLE_EXPORTS TRUE)	20	SET_TARGET_PROPERTIES(mysqltest PROPERTIES ENABLE_EXPORTS TRUE)
21		21
22		22
Lines 24-30 Link Here
24	MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c)	24	MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c)
25	TARGET_LINK_LIBRARIES(mysqlcheck mysqlclient)	25	TARGET_LINK_LIBRARIES(mysqlcheck mysqlclient)
26		26
27	@@ -52,17 +55,21 @@	27	@@ -52,17 +55,21 @@ TARGET_LINK_LIBRARIES(mysqldump mysqlcli
28		28
29	MYSQL_ADD_EXECUTABLE(mysqlimport mysqlimport.c)	29	MYSQL_ADD_EXECUTABLE(mysqlimport mysqlimport.c)
30	TARGET_LINK_LIBRARIES(mysqlimport mysqlclient)	30	TARGET_LINK_LIBRARIES(mysqlimport mysqlclient)
Lines 46-52 Link Here
46	MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc)	46	MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc)
47	TARGET_LINK_LIBRARIES(mysqlbinlog mysqlclient)	47	TARGET_LINK_LIBRARIES(mysqlbinlog mysqlclient)
48		48
49	@@ -72,17 +79,20 @@	49	@@ -72,17 +79,20 @@ TARGET_LINK_LIBRARIES(mysqladmin mysqlcl
50	MYSQL_ADD_EXECUTABLE(mysqlslap mysqlslap.c)	50	MYSQL_ADD_EXECUTABLE(mysqlslap mysqlslap.c)
51	SET_SOURCE_FILES_PROPERTIES(mysqlslap.c PROPERTIES COMPILE_FLAGS "-DTHREADS")	51	SET_SOURCE_FILES_PROPERTIES(mysqlslap.c PROPERTIES COMPILE_FLAGS "-DTHREADS")
52	TARGET_LINK_LIBRARIES(mysqlslap mysqlclient)	52	TARGET_LINK_LIBRARIES(mysqlslap mysqlclient)

Lines 1-6 Link Here

(-)databases/mariadb100-server/files/patch-libmysql_CMakeLists.txt (-6 / +6 lines)
1	--- libmysql/CMakeLists.txt.orig 2014-08-09 00:13:37.000000000 +0200	1	--- libmysql/CMakeLists.txt.orig 2015-05-08 14:37:45 UTC
2	+++ libmysql/CMakeLists.txt 2014-09-05 18:46:34.420323119 +0200	2	+++ libmysql/CMakeLists.txt
3	@@ -403,7 +403,7 @@	3	@@ -410,7 +410,7 @@ SET(LIBS clientlib dbug strings vio mysy
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	IF(MSVC)	11	IF(MSVC)
12	@@ -411,6 +411,7 @@	12	@@ -418,6 +418,7 @@ IF(MSVC)
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-23 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	@@ -425,11 +426,13 @@	20	@@ -432,11 +433,13 @@ IF(UNIX)
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()
Lines 32-38 Link Here
32	IF(UNIX)	32	IF(UNIX)
33	# libtool compatability	33	# libtool compatability
34	IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE)	34	IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE)
35	@@ -477,3 +480,4 @@	35	@@ -484,3 +487,4 @@ IF(NOT DISABLE_SHARED)
36	ENDFOREACH()	36	ENDFOREACH()
37	ENDIF()	37	ENDIF()
38	ENDIF()	38	ENDIF()

Lines 1-6 Link Here

(-)databases/mariadb100-server/files/patch-sql_CMakeLists.txt (-5 / +5 lines)
1	--- sql/CMakeLists.txt.orig 2013-05-22 01:09:51.000000000 +0300	1	--- sql/CMakeLists.txt.orig 2015-05-08 14:37:46 UTC
2	+++ sql/CMakeLists.txt 2013-06-08 14:13:06.000000000 +0300	2	+++ sql/CMakeLists.txt
3	@@ -278,6 +278,7 @@	3	@@ -312,6 +312,7 @@ ADD_CUSTOM_TARGET(distclean
4	VERBATIM	4	VERBATIM
5	)	5	)
6		6
Lines 8-14 Link Here
8	IF(INSTALL_LAYOUT STREQUAL "STANDALONE")	8	IF(INSTALL_LAYOUT STREQUAL "STANDALONE")
9		9
10	# Copy db.opt into data/test/	10	# Copy db.opt into data/test/
11	@@ -321,6 +322,7 @@	11	@@ -355,6 +356,7 @@ ELSE()
12	INSTALL(FILES ${DUMMY_FILE} DESTINATION data/mysql COMPONENT DataFiles)	12	INSTALL(FILES ${DUMMY_FILE} DESTINATION data/mysql COMPONENT DataFiles)
13	ENDIF(WIN32 AND MYSQLD_EXECUTABLE)	13	ENDIF(WIN32 AND MYSQLD_EXECUTABLE)
14	ENDIF(INSTALL_LAYOUT STREQUAL "STANDALONE")	14	ENDIF(INSTALL_LAYOUT STREQUAL "STANDALONE")
Lines 16-22 Link Here
16		16
17	IF(WIN32)	17	IF(WIN32)
18	SET(my_bootstrap_sql ${CMAKE_CURRENT_BINARY_DIR}/my_bootstrap.sql)	18	SET(my_bootstrap_sql ${CMAKE_CURRENT_BINARY_DIR}/my_bootstrap.sql)
19	@@ -363,8 +365,10 @@	19	@@ -397,8 +399,10 @@ IF(WIN32)
20	TARGET_LINK_LIBRARIES(mysql_upgrade_service mysys winservice)	20	TARGET_LINK_LIBRARIES(mysql_upgrade_service mysys winservice)
21	ENDIF(WIN32)	21	ENDIF(WIN32)
22		22