ports/174660: [NEW PORT] databases/mariadb55-{client|server}
Alexandr Kovalenko
never at nevermind.kiev.ua
Sun Dec 23 17:00:01 UTC 2012
>Number: 174660
>Category: ports
>Synopsis: [NEW PORT] databases/mariadb55-{client|server}
>Confidential: no
>Severity: serious
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Sun Dec 23 17:00:00 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator: Alexandr Kovalenko
>Release: FreeBSD 9.1-PRERELEASE amd64
>Organization:
Nevermind Ltd.
>Environment:
System: FreeBSD 9.1-PRERELEASE FreeBSD 9.1-PRERELEASE #0 r243957
>Description:
New port for MariaDB 5.5.28a.
Requires repocopy from databases/mysql55-client and databases/mysql55-server ports (as of 5.5.28) and then applying patch.
Also requires minor patch to Mk/bsd.database.mk
>How-To-Repeat:
N/A
>Fix:
# This is a shell archive. Save it in a file, remove anything before
# this line, and then unpack it by entering "sh file". Note, it may
# create directories; files and directories will be owned by you and
# have default permissions.
#
# This archive contains:
#
# patch-Mk_bsd.database.mk
# patch-databases_mariadb55-client
# patch-databases_mariadb55-server
#
echo x - patch-Mk_bsd.database.mk
sed 's/^X//' >patch-Mk_bsd.database.mk << 'c0a58df4898b6b36e5f88d0a5e23915b'
XIndex: bsd.database.mk
X===================================================================
X--- Mk/bsd.database.mk (revision 308973)
X+++ Mk/bsd.database.mk (working copy)
X@@ -140,6 +140,9 @@
X .if (${MYSQL_VER} == "53")
X _MYSQL_CLIENT= databases/mariadb-client
X _MYSQL_SERVER= databases/mariadb-server
X+.elif (${MYSQL_VER} == "55" && defined(WITH_MARIADB))
X+_MYSQL_CLIENT= databases/mariadb${MYSQL_VER}-client
X+_MYSQL_SERVER= databases/mariadb${MYSQL_VER}-server
X .else
X _MYSQL_CLIENT= databases/mysql${MYSQL_VER}-client
X _MYSQL_SERVER= databases/mysql${MYSQL_VER}-server
c0a58df4898b6b36e5f88d0a5e23915b
echo x - patch-databases_mariadb55-client
sed 's/^X//' >patch-databases_mariadb55-client << 'afc8293af2a20a7512115e84e87bd1ce'
Xdiff -ruN databases/mysql55-client/Makefile databases/mariadb55-client/Makefile
X--- databases/mysql55-client/Makefile 2012-12-16 03:14:33.000000000 +0200
X+++ databases/mariadb55-client/Makefile 2012-12-23 18:40:05.000000000 +0200
X@@ -1,30 +1,26 @@
X-# New ports collection makefile for: MySQL-client
X-# Date created: 28 Jan 2006
X-# Whom: Alex Dupre <ale at FreeBSD.org>
X-#
X-# $FreeBSD: head/databases/mysql55-client/Makefile 300896 2012-07-14 13:54:48Z beat $
X-#
X+# Created by: Alex Dupre <ale at FreeBSD.org>
X+# $FreeBSD$
X
X-PORTNAME= mysql
X+PORTNAME= mariadb
X PKGNAMESUFFIX= -client
X
X COMMENT= Multithreaded SQL database (client)
X
X-MASTERDIR= ${.CURDIR}/../mysql55-server
X+MASTERDIR= ${.CURDIR}/../mariadb55-server
X
X PKGMESSAGE= mustnotexist
X PATCHDIR= ${.CURDIR}/files
X PLIST= ${.CURDIR}/pkg-plist
X
X-LATEST_LINK= mysql55-client
X+LATEST_LINK= mariadb55-client
X
X-CONFLICTS_INSTALL= mysql-client-[34].* mysql-client-5.[0-46-9].*
X+CONFLICTS_INSTALL= mysql-client-[34].* mysql-client-5.[0-46-9].* mariadb-client-5.3.*
X
X CMAKE_ARGS+= -DWITHOUT_SERVER=1
X
X USE_LDCONFIG= ${PREFIX}/lib/mysql
X
X-MAN1= comp_err.1 msql2mysql.1 mysql.1 mysql_config.1 mysql_find_rows.1 \
X+MAN1= msql2mysql.1 mysql.1 mysql_config.1 mysql_find_rows.1 \
X mysql_waitpid.1 mysqlaccess.1 mysqladmin.1 mysqlbinlog.1 \
X mysqlcheck.1 mysqldump.1 mysqlimport.1 mysqlshow.1 mysqlslap.1
X
Xdiff -ruN databases/mysql55-client/files/patch-CMakeLists.txt databases/mariadb55-client/files/patch-CMakeLists.txt
X--- databases/mysql55-client/files/patch-CMakeLists.txt 2012-12-16 03:14:33.000000000 +0200
X+++ databases/mariadb55-client/files/patch-CMakeLists.txt 2012-12-23 01:48:03.000000000 +0200
X@@ -1,15 +1,21 @@
X---- CMakeLists.txt.orig 2012-08-29 10:50:46.000000000 +0200
X-+++ CMakeLists.txt 2012-10-12 15:29:18.000000000 +0200
X-@@ -304,30 +304,11 @@
X- ENDIF()
X-
X+--- CMakeLists.txt.orig 2012-11-28 17:49:36.000000000 +0200
X++++ CMakeLists.txt 2012-12-23 01:47:47.000000000 +0200
X+@@ -298,34 +298,13 @@
X+ ADD_SUBDIRECTORY(regex)
X+ ADD_SUBDIRECTORY(mysys)
X+ ADD_SUBDIRECTORY(libmysql)
X+-ADD_SUBDIRECTORY(client)
X ADD_SUBDIRECTORY(extra)
X++
X++ADD_SUBDIRECTORY(client)
X+ ADD_SUBDIRECTORY(libservices)
X+-ADD_SUBDIRECTORY(scripts)
X+-ADD_SUBDIRECTORY(sql/share)
X+ ADD_SUBDIRECTORY(support-files)
X+-
X -IF(NOT WITHOUT_SERVER)
X - ADD_SUBDIRECTORY(tests)
X-- ADD_SUBDIRECTORY(client)
X - ADD_SUBDIRECTORY(sql)
X-- ADD_SUBDIRECTORY(sql/share)
X-- ADD_SUBDIRECTORY(libservices)
X - OPTION (WITH_EMBEDDED_SERVER "Compile MySQL with embedded server" OFF)
X - IF(WITH_EMBEDDED_SERVER)
X - ADD_SUBDIRECTORY(libmysqld)
X@@ -18,39 +24,34 @@
X -
X - ADD_SUBDIRECTORY(mysql-test)
X - ADD_SUBDIRECTORY(mysql-test/lib/My/SafeProcess)
X-- ADD_SUBDIRECTORY(support-files)
X-- ADD_SUBDIRECTORY(scripts)
X - ADD_SUBDIRECTORY(sql-bench)
X-- IF(UNIX)
X-- ADD_SUBDIRECTORY(man)
X-- ENDIF()
X+-
X - IF(EXISTS ${CMAKE_SOURCE_DIR}/internal/CMakeLists.txt)
X - ADD_SUBDIRECTORY(internal)
X - ENDIF()
X -ENDIF()
X-+ADD_SUBDIRECTORY(client)
X-+ADD_SUBDIRECTORY(libservices)
X-+ADD_SUBDIRECTORY(support-files)
X+-
X+-IF(UNIX)
X+- ADD_SUBDIRECTORY(man)
X+-ENDIF()
X +ADD_SUBDIRECTORY(scripts)
X +ADD_SUBDIRECTORY(man)
X
X INCLUDE(cmake/abi_check.cmake)
X INCLUDE(cmake/tags.cmake)
X-@@ -371,11 +352,11 @@
X+@@ -360,6 +339,7 @@
X+ WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
X+ )
X
X- INCLUDE(CPack)
X- IF(UNIX)
X-- INSTALL(FILES Docs/mysql.info DESTINATION ${INSTALL_INFODIR} OPTIONAL COMPONENT Info)
X- ENDIF()
X- #
X- # RPM installs documentation directly from the source tree
X- #
X +IF(FALSE)
X- IF(NOT INSTALL_LAYOUT MATCHES "RPM")
X- INSTALL(FILES COPYING LICENSE.mysql
X- DESTINATION ${INSTALL_DOCREADMEDIR}
X-@@ -401,3 +382,4 @@
X- PATTERN "sp-imp-spec.txt" EXCLUDE
X- )
X+ INSTALL(FILES COPYING COPYING.LESSER LICENSE.mysql
X+ DESTINATION ${INSTALL_DOCREADMEDIR}
X+ COMPONENT Readme
X+@@ -370,6 +350,7 @@
X+ IF(UNIX)
X+ INSTALL(FILES Docs/INSTALL-BINARY DESTINATION ${INSTALL_DOCREADMEDIR} COMPONENT Readme)
X ENDIF()
X +ENDIF()
X+
X+ INCLUDE(CPack)
X+
Xdiff -ruN databases/mysql55-client/files/patch-client_CMakeLists.txt databases/mariadb55-client/files/patch-client_CMakeLists.txt
X--- databases/mysql55-client/files/patch-client_CMakeLists.txt 2012-12-16 03:14:33.000000000 +0200
X+++ databases/mariadb55-client/files/patch-client_CMakeLists.txt 2012-12-17 03:37:25.000000000 +0200
X@@ -1,23 +1,25 @@
X---- client/CMakeLists.txt.orig 2011-09-09 17:56:40.000000000 +0200
X-+++ client/CMakeLists.txt 2011-10-07 11:08:18.000000000 +0200
X-@@ -33,9 +33,11 @@
X- TARGET_LINK_LIBRARIES(mysql ${READLINE_LIBRARY})
X+--- client/CMakeLists.txt.orig 2012-12-17 03:34:23.000000000 +0200
X++++ client/CMakeLists.txt 2012-12-17 03:36:43.000000000 +0200
X+@@ -34,11 +34,12 @@
X+ SET_TARGET_PROPERTIES(mysql PROPERTIES ENABLE_EXPORTS TRUE)
X ENDIF(UNIX)
X
X +IF(FALSE)
X MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test)
X SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS")
X TARGET_LINK_LIBRARIES(mysqltest mysqlclient regex)
X+ SET_TARGET_PROPERTIES(mysqltest PROPERTIES ENABLE_EXPORTS TRUE)
X+-
X +ENDIF()
X
X-
X MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c)
X-@@ -47,15 +49,19 @@
X+ TARGET_LINK_LIBRARIES(mysqlcheck mysqlclient)
X+@@ -49,15 +50,19 @@
X MYSQL_ADD_EXECUTABLE(mysqlimport mysqlimport.c)
X TARGET_LINK_LIBRARIES(mysqlimport mysqlclient)
X
X +IF(FALSE)
X- MYSQL_ADD_EXECUTABLE(mysql_upgrade mysql_upgrade.c)
X+ MYSQL_ADD_EXECUTABLE(mysql_upgrade mysql_upgrade.c COMPONENT Server)
X TARGET_LINK_LIBRARIES(mysql_upgrade mysqlclient)
X ADD_DEPENDENCIES(mysql_upgrade GenFixPrivs)
X +ENDIF()
X@@ -32,12 +34,12 @@
X
X MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc)
X TARGET_LINK_LIBRARIES(mysqlbinlog mysqlclient)
X-@@ -72,7 +78,7 @@
X- MYSQL_ADD_EXECUTABLE(echo echo.c)
X- ENDIF(WIN32)
X+@@ -78,7 +83,7 @@
X+ ADD_EXECUTABLE(async_example async_example.c)
X+ TARGET_LINK_LIBRARIES(async_example mysqlclient)
X
X -SET_TARGET_PROPERTIES (mysqlcheck mysqldump mysqlimport mysql_upgrade mysqlshow mysqlslap mysql_plugin
X-+SET_TARGET_PROPERTIES (mysqlcheck mysqldump mysqlimport mysqlshow mysqlslap
X++SET_TARGET_PROPERTIES (mysqlcheck mysqldump mysqlimport mysqlshow mysqlslap
X PROPERTIES HAS_CXX TRUE)
X
X ADD_DEFINITIONS(-DHAVE_DLOPEN)
Xdiff -ruN databases/mysql55-client/files/patch-extra_CMakeLists.txt databases/mariadb55-client/files/patch-extra_CMakeLists.txt
X--- databases/mysql55-client/files/patch-extra_CMakeLists.txt 2012-12-16 03:14:33.000000000 +0200
X+++ databases/mariadb55-client/files/patch-extra_CMakeLists.txt 2012-12-17 03:40:36.000000000 +0200
X@@ -1,16 +1,16 @@
X---- extra/CMakeLists.txt.orig 2010-12-03 18:58:24.000000000 +0100
X-+++ extra/CMakeLists.txt 2010-12-23 14:45:36.000000000 +0100
X-@@ -50,6 +50,7 @@
X- ${PROJECT_BINARY_DIR}/sql/share/english/errmsg.sys
X- ${PROJECT_SOURCE_DIR}/sql/share/errmsg-utf8.txt)
X+--- extra/CMakeLists.txt.orig 2012-12-17 03:38:29.000000000 +0200
X++++ extra/CMakeLists.txt 2012-12-17 03:40:12.000000000 +0200
X+@@ -54,6 +54,7 @@
X+ DEPENDS
X+ ${CMAKE_BINARY_DIR}/include/mysqld_error.h.tmp)
X
X +IF(FALSE)
X MYSQL_ADD_EXECUTABLE(my_print_defaults my_print_defaults.c)
X TARGET_LINK_LIBRARIES(my_print_defaults mysys)
X
X-@@ -69,11 +70,14 @@
X+@@ -74,11 +75,14 @@
X
X- MYSQL_ADD_EXECUTABLE(replace replace.c)
X+ MYSQL_ADD_EXECUTABLE(replace replace.c COMPONENT Server)
X TARGET_LINK_LIBRARIES(replace mysys)
X +ENDIF()
X IF(UNIX)
X@@ -21,5 +21,5 @@
X TARGET_LINK_LIBRARIES(resolve_stack_dump mysys)
X +ENDIF()
X
X- MYSQL_ADD_EXECUTABLE(mysql_waitpid mysql_waitpid.c)
X+ MYSQL_ADD_EXECUTABLE(mysql_waitpid mysql_waitpid.c COMPONENT Client)
X TARGET_LINK_LIBRARIES(mysql_waitpid mysys)
Xdiff -ruN databases/mysql55-client/files/patch-extra_yassl_taocrypt_src_integer.cpp databases/mariadb55-client/files/patch-extra_yassl_taocrypt_src_integer.cpp
X--- databases/mysql55-client/files/patch-extra_yassl_taocrypt_src_integer.cpp 2012-12-16 03:14:33.000000000 +0200
X+++ databases/mariadb55-client/files/patch-extra_yassl_taocrypt_src_integer.cpp 2012-12-17 03:43:26.000000000 +0200
X@@ -1,5 +1,5 @@
X---- extra/yassl/taocrypt/src/integer.cpp.orig 2012-04-02 09:37:09.000000000 +0200
X-+++ extra/yassl/taocrypt/src/integer.cpp 2012-04-02 09:37:41.000000000 +0200
X+--- extra/yassl/taocrypt/src/integer.cpp.orig 2012-12-17 03:41:47.000000000 +0200
X++++ extra/yassl/taocrypt/src/integer.cpp 2012-12-17 03:42:47.000000000 +0200
X @@ -73,7 +73,7 @@
X CPP_TYPENAME AlignedAllocator<T>::pointer AlignedAllocator<T>::allocate(
X size_type n, const void *)
Xdiff -ruN databases/mysql55-client/files/patch-include_CMakeLists.txt databases/mariadb55-client/files/patch-include_CMakeLists.txt
X--- databases/mysql55-client/files/patch-include_CMakeLists.txt 2012-12-16 03:14:33.000000000 +0200
X+++ databases/mariadb55-client/files/patch-include_CMakeLists.txt 2012-12-23 00:50:24.000000000 +0200
X@@ -1,12 +1,22 @@
X---- include/CMakeLists.txt.orig 2011-01-19 23:37:08.000000000 +0100
X-+++ include/CMakeLists.txt 2011-02-07 22:42:05.129894470 +0100
X-@@ -27,9 +27,6 @@
X- my_list.h
X- my_alloc.h
X- typelib.h
X-- mysql/plugin.h
X-- mysql/plugin_audit.h
X-- mysql/plugin_ftparser.h
X- )
X+--- include/CMakeLists.txt.orig 2012-11-28 17:49:47.000000000 +0200
X++++ include/CMakeLists.txt 2012-12-23 00:48:29.000000000 +0200
X+@@ -58,13 +58,18 @@
X+ FOREACH(f ${HEADERS_GEN_CONFIGURE})
X+ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${f} DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development PERMISSIONS OWNER_READ GROUP_READ WORLD_READ)
X+ ENDFOREACH(f)
X+-INSTALL(DIRECTORY mysql/ DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development FILES_MATCHING PATTERN "*.h")
X++INSTALL(DIRECTORY mysql/ DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development
X++ FILES_MATCHING PATTERN "*.h"
X++ PATTERN "psi_abi*" EXCLUDE
X++)
X
X- SET(HEADERS
X+ STRING(REPLACE "." "\\." EXCL_RE "${HEADERS};${HEADERS_GEN_CONFIGURE}")
X+ STRING(REPLACE ";" "|" EXCL_RE "${EXCL_RE}")
X+
X++IF(FALSE)
X+ INSTALL(DIRECTORY . DESTINATION ${INSTALL_INCLUDEDIR}/private COMPONENT Development
X+ FILES_MATCHING PATTERN "*.h"
X+ PATTERN CMakeFiles EXCLUDE
X+ PATTERN mysql EXCLUDE
X+ REGEX "\\./(${EXCL_RE}$)" EXCLUDE)
X++ENDIF()
Xdiff -ruN databases/mysql55-client/files/patch-include_my_compare.h databases/mariadb55-client/files/patch-include_my_compare.h
X--- databases/mysql55-client/files/patch-include_my_compare.h 2012-12-16 03:14:33.000000000 +0200
X+++ databases/mariadb55-client/files/patch-include_my_compare.h 2012-12-17 03:54:14.000000000 +0200
X@@ -1,11 +1,11 @@
X---- include/my_compare.h.orig 2011-05-10 09:46:46.000000000 +0200
X-+++ include/my_compare.h 2011-05-10 09:47:01.000000000 +0200
X-@@ -39,7 +39,7 @@
X+--- include/my_compare.h.orig 2012-12-17 03:52:37.000000000 +0200
X++++ include/my_compare.h 2012-12-17 03:53:40.000000000 +0200
X+@@ -40,7 +40,7 @@
X But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and HA_MAX_KEY_LENGTH.
X */
X
X -#define HA_MAX_KEY_LENGTH 1000 /* Max length in bytes */
X +#define HA_MAX_KEY_LENGTH 4000 /* Max length in bytes */
X- #define HA_MAX_KEY_SEG 16 /* Max segments for key */
X+ #define HA_MAX_KEY_SEG 32 /* Max segments for key */
X
X #define HA_MAX_POSSIBLE_KEY_BUFF (HA_MAX_KEY_LENGTH + 24+ 6+6)
Xdiff -ruN databases/mysql55-client/files/patch-include_myisam.h databases/mariadb55-client/files/patch-include_myisam.h
X--- databases/mysql55-client/files/patch-include_myisam.h 2012-12-16 03:14:33.000000000 +0200
X+++ databases/mariadb55-client/files/patch-include_myisam.h 1970-01-01 03:00:00.000000000 +0300
X@@ -1,11 +0,0 @@
X---- include/myisam.h.orig 2009-02-16 23:04:54.000000000 +0100
X-+++ include/myisam.h 2009-02-16 23:10:08.000000000 +0100
X-@@ -48,7 +48,7 @@
X- The following defines can be increased if necessary.
X- But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and MI_MAX_KEY_LENGTH.
X- */
X--#define MI_MAX_KEY_LENGTH 1000 /* Max length in bytes */
X-+#define MI_MAX_KEY_LENGTH 4000 /* Max length in bytes */
X- #define MI_MAX_KEY_SEG 16 /* Max segments for key */
X-
X- #define MI_MAX_KEY_BUFF (MI_MAX_KEY_LENGTH+MI_MAX_KEY_SEG*6+8+8)
Xdiff -ruN databases/mysql55-client/files/patch-libservices_CMakeLists.txt databases/mariadb55-client/files/patch-libservices_CMakeLists.txt
X--- databases/mysql55-client/files/patch-libservices_CMakeLists.txt 1970-01-01 03:00:00.000000000 +0300
X+++ databases/mariadb55-client/files/patch-libservices_CMakeLists.txt 2012-12-23 17:41:20.000000000 +0200
X@@ -0,0 +1,9 @@
X+--- libservices/CMakeLists.txt.orig 2012-11-28 17:49:47.000000000 +0200
X++++ libservices/CMakeLists.txt 2012-12-23 17:32:35.000000000 +0200
X+@@ -24,4 +24,6 @@
X+ debug_sync_service.c)
X+
X+ ADD_CONVENIENCE_LIBRARY(mysqlservices ${MYSQLSERVICES_SOURCES})
X++IF(FALSE)
X+ INSTALL(TARGETS mysqlservices DESTINATION ${INSTALL_LIBDIR} COMPONENT Development)
X++ENDIF()
Xdiff -ruN databases/mysql55-client/files/patch-man_CMakeLists.txt databases/mariadb55-client/files/patch-man_CMakeLists.txt
X--- databases/mysql55-client/files/patch-man_CMakeLists.txt 2012-12-16 03:14:33.000000000 +0200
X+++ databases/mariadb55-client/files/patch-man_CMakeLists.txt 2012-12-22 21:31:14.000000000 +0200
X@@ -1,13 +1,16 @@
X---- man/CMakeLists.txt.orig 2011-10-22 14:08:32.000000000 +0200
X-+++ man/CMakeLists.txt 2011-10-22 14:22:42.000000000 +0200
X-@@ -15,10 +15,6 @@
X+--- man/CMakeLists.txt.orig 2012-12-22 21:30:12.000000000 +0200
X++++ man/CMakeLists.txt 2012-12-22 21:30:54.000000000 +0200
X+@@ -30,9 +30,13 @@
X+ SET(MAN1_TEST mysql-stress-test.pl.1 mysql-test-run.pl.1 mysql_client_test.1
X+ mysqltest_embedded.1 mysql_client_test_embedded.1)
X+
X++IF(FALSE)
X+ INSTALL(FILES ${MAN1_SERVER} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesServer)
X+ INSTALL(FILES ${MAN8_SERVER} DESTINATION ${INSTALL_MANDIR}/man8 COMPONENT ManPagesServer)
X++ENDIF()
X+ INSTALL(FILES ${MAN1_CLIENT} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesClient)
X+ INSTALL(FILES ${MAN1_DEVEL} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesDevelopment)
X++IF(FALSE)
X+ INSTALL(FILES ${MAN1_TEST} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesTest)
X++ENDIF()
X
X- # Copy man pages
X- FILE(GLOB MAN1_FILES *.1)
X--FILE(GLOB MAN1_EXCLUDE make_win_bin_dist.1)
X--FILE(GLOB MAN1_NDB ndb*.1)
X--FILE(GLOB MAN8_FILES *.8)
X--FILE(GLOB MAN8_NDB ndb*.8)
X- IF(MAN1_FILES)
X- IF(MAN1_EXCLUDE)
X- LIST(REMOVE_ITEM MAN1_FILES ${MAN1_EXCLUDE})
Xdiff -ruN databases/mysql55-client/files/patch-mysys_default.c databases/mariadb55-client/files/patch-mysys_default.c
X--- databases/mysql55-client/files/patch-mysys_default.c 2012-12-16 03:14:33.000000000 +0200
X+++ databases/mariadb55-client/files/patch-mysys_default.c 2012-12-17 04:01:03.000000000 +0200
X@@ -1,6 +1,6 @@
X---- mysys/default.c.orig 2010-11-02 23:01:13.000000000 +0100
X-+++ mysys/default.c 2010-11-10 16:39:51.000000000 +0100
X-@@ -70,7 +70,7 @@
X+--- mysys/default.c.orig 2012-12-17 03:57:40.000000000 +0200
X++++ mysys/default.c 2012-12-17 04:00:28.000000000 +0200
X+@@ -89,7 +89,7 @@
X
X /* Which directories are searched for options (and in which order) */
X
X@@ -9,7 +9,7 @@
X #define DEFAULT_DIRS_SIZE (MAX_DEFAULT_DIRS + 1) /* Terminate with NULL */
X static const char **default_directories = NULL;
X
X-@@ -711,7 +711,7 @@
X+@@ -785,7 +785,7 @@
X {
X MY_STAT stat_info;
X if (!my_stat(name,&stat_info,MYF(0)))
X@@ -18,14 +18,11 @@
X /*
X Ignore world-writable regular files.
X This is mainly done to protect us to not read a file created by
X-@@ -1153,7 +1153,10 @@
X-
X+@@ -1229,6 +1229,7 @@
X #if defined(DEFAULT_SYSCONFDIR)
X if (DEFAULT_SYSCONFDIR[0])
X-+ {
X errors += add_directory(alloc, DEFAULT_SYSCONFDIR, dirs);
X + errors += add_directory(alloc, DEFAULT_SYSCONFDIR "/mysql", dirs);
X-+ }
X #endif /* DEFAULT_SYSCONFDIR */
X
X #endif
Xdiff -ruN databases/mysql55-client/files/patch-regex_CMakeLists.txt databases/mariadb55-client/files/patch-regex_CMakeLists.txt
X--- databases/mysql55-client/files/patch-regex_CMakeLists.txt 1970-01-01 03:00:00.000000000 +0300
X+++ databases/mariadb55-client/files/patch-regex_CMakeLists.txt 2012-12-23 00:43:13.000000000 +0200
X@@ -0,0 +1,9 @@
X+--- regex/CMakeLists.txt.orig 2012-12-23 00:42:41.000000000 +0200
X++++ regex/CMakeLists.txt 2012-12-23 00:42:54.000000000 +0200
X+@@ -18,4 +18,6 @@
X+ SET(REGEX_SOURCES regcomp.c regerror.c regexec.c regfree.c reginit.c)
X+ ADD_CONVENIENCE_LIBRARY(regex ${REGEX_SOURCES})
X+
X++IF(FALSE)
X+ INSTALL(FILES "my_regex.h" DESTINATION ${INSTALL_INCLUDEDIR}/private COMPONENT Development)
X++ENDIF()
Xdiff -ruN databases/mysql55-client/files/patch-scripts_CMakeLists.txt databases/mariadb55-client/files/patch-scripts_CMakeLists.txt
X--- databases/mysql55-client/files/patch-scripts_CMakeLists.txt 2012-12-16 03:14:33.000000000 +0200
X+++ databases/mariadb55-client/files/patch-scripts_CMakeLists.txt 2012-12-22 23:27:08.000000000 +0200
X@@ -1,5 +1,5 @@
X---- scripts/CMakeLists.txt.orig 2010-12-03 18:58:26.000000000 +0100
X-+++ scripts/CMakeLists.txt 2011-01-11 20:18:07.000000000 +0100
X+--- scripts/CMakeLists.txt.orig 2012-11-28 17:49:47.000000000 +0200
X++++ scripts/CMakeLists.txt 2012-12-22 23:26:51.000000000 +0200
X @@ -71,6 +71,7 @@
X )
X ENDIF()
X@@ -40,24 +40,24 @@
X IF(UNIX)
X CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mysql_install_db.sh
X ${CMAKE_CURRENT_BINARY_DIR}/mysql_install_db ESCAPE_QUOTES @ONLY)
X-@@ -215,6 +220,7 @@
X- DESTINATION ${DEST}
X+@@ -209,6 +214,7 @@
X COMPONENT Server
X )
X+ ENDIF()
X +ENDIF()
X
X
X SET(prefix "${CMAKE_INSTALL_PREFIX}")
X-@@ -266,6 +272,8 @@
X+@@ -260,6 +266,8 @@
X GET_FILENAME_COMPONENT(lib "${lib}" NAME_WE)
X STRING(REGEX REPLACE "^lib" "" lib "${lib}")
X SET(${var} "${${var}}-l${lib} " )
X + ELSEIF(lib STREQUAL "-pthread")
X-+ SET(${var} "${${var}}-pthread " )
X++ SET(${var} "${${var}}-pthread " )
X ELSE()
X SET(${var} "${${var}}-l${lib} " )
X ENDIF()
X-@@ -318,18 +326,9 @@
X+@@ -315,18 +323,8 @@
X SET(BIN_SCRIPTS
X msql2mysql
X mysql_config
X@@ -66,9 +66,9 @@
X - mysql_secure_installation
X - mysql_zap
X mysqlaccess
X- mysqlaccess.conf
X - mysql_convert_table_format
X mysql_find_rows
X+- mytop
X - mysqlhotcopy
X - mysqldumpslow
X - mysqld_multi
XFiles databases/mysql55-client/mysql-client-5.5.28.tbz and databases/mariadb55-client/mysql-client-5.5.28.tbz differ
Xdiff -ruN databases/mysql55-client/pkg-plist databases/mariadb55-client/pkg-plist
X--- databases/mysql55-client/pkg-plist 2012-12-16 03:14:33.000000000 +0200
X+++ databases/mariadb55-client/pkg-plist 2012-12-23 17:41:40.000000000 +0200
X@@ -4,7 +4,6 @@
X bin/mysql_find_rows
X bin/mysql_waitpid
X bin/mysqlaccess
X-bin/mysqlaccess.conf
X bin/mysqladmin
X bin/mysqlbinlog
X bin/mysqlcheck
X@@ -12,16 +11,21 @@
X bin/mysqlimport
X bin/mysqlshow
X bin/mysqlslap
X+include/mysql/auth_dialog_client.h
X+include/mysql/client_plugin.h
X include/mysql/decimal.h
X include/mysql/errmsg.h
X+include/mysql/handler_state.h
X include/mysql/keycache.h
X include/mysql/m_ctype.h
X include/mysql/m_string.h
X+include/mysql/ma_dyncol.h
X include/mysql/my_alloc.h
X include/mysql/my_attribute.h
X include/mysql/my_compiler.h
X include/mysql/my_config.h
X include/mysql/my_dbug.h
X+include/mysql/my_decimal_limits.h
X include/mysql/my_dir.h
X include/mysql/my_getopt.h
X include/mysql/my_global.h
X@@ -29,25 +33,8 @@
X include/mysql/my_net.h
X include/mysql/my_pthread.h
X include/mysql/my_sys.h
X+include/mysql/my_valgrind.h
X include/mysql/my_xml.h
X-include/mysql/mysql/client_plugin.h
X-include/mysql/mysql/innodb_priv.h
X-include/mysql/mysql/plugin.h
X-include/mysql/mysql/plugin_audit.h
X-include/mysql/mysql/plugin_auth.h
X-include/mysql/mysql/plugin_auth_common.h
X-include/mysql/mysql/plugin_ftparser.h
X-include/mysql/mysql/psi/mysql_file.h
X-include/mysql/mysql/psi/mysql_thread.h
X-include/mysql/mysql/psi/psi.h
X-include/mysql/mysql/psi/psi_abi_v1.h
X-include/mysql/mysql/psi/psi_abi_v2.h
X-include/mysql/mysql/service_my_snprintf.h
X-include/mysql/mysql/service_thd_alloc.h
X-include/mysql/mysql/service_thd_wait.h
X-include/mysql/mysql/service_thread_scheduler.h
X-include/mysql/mysql/services.h
X-include/mysql/mysql/thread_pool_priv.h
X include/mysql/mysql.h
X include/mysql/mysql_com.h
X include/mysql/mysql_embed.h
X@@ -55,6 +42,21 @@
X include/mysql/mysql_version.h
X include/mysql/mysqld_ername.h
X include/mysql/mysqld_error.h
X+include/mysql/plugin.h
X+include/mysql/plugin_audit.h
X+include/mysql/plugin_auth.h
X+include/mysql/plugin_auth_common.h
X+include/mysql/plugin_ftparser.h
X+include/mysql/psi/mysql_file.h
X+include/mysql/psi/mysql_thread.h
X+include/mysql/psi/psi.h
X+include/mysql/service_debug_sync.h
X+include/mysql/service_my_snprintf.h
X+include/mysql/service_progress_report.h
X+include/mysql/service_thd_alloc.h
X+include/mysql/service_thd_wait.h
X+include/mysql/service_thread_scheduler.h
X+include/mysql/services.h
X include/mysql/sql_common.h
X include/mysql/sql_state.h
X include/mysql/sslopt-case.h
X@@ -67,9 +69,7 @@
X lib/mysql/libmysqlclient_r.a
X lib/mysql/libmysqlclient_r.so
X lib/mysql/libmysqlclient_r.so.18
X-lib/mysql/libmysqlservices.a
X share/aclocal/mysql.m4
X- at dirrm include/mysql/mysql/psi
X- at dirrm include/mysql/mysql
X+ at dirrm include/mysql/psi
X @dirrm include/mysql
X @dirrmtry lib/mysql
afc8293af2a20a7512115e84e87bd1ce
echo x - patch-databases_mariadb55-server
sed 's/^X//' >patch-databases_mariadb55-server << 'f44aaf6bd91d856faffe998de4f862dc'
Xdiff -ruN databases/mysql55-server/Makefile databases/mariadb55-server/Makefile
X--- databases/mysql55-server/Makefile 2012-12-16 03:14:37.000000000 +0200
X+++ databases/mariadb55-server/Makefile 2012-12-23 18:40:23.000000000 +0200
X@@ -1,18 +1,25 @@
X # Created by: Alex Dupre <ale at FreeBSD.org>
X-# $FreeBSD: head/databases/mysql55-server/Makefile 305778 2012-10-12 13:44:59Z ale $
X+# $FreeBSD$
X
X-PORTNAME?= mysql
X-PORTVERSION= 5.5.28
X+PORTNAME?= mariadb
X+PORTVERSION= 5.5.28a
X PORTREVISION?= 0
X CATEGORIES= databases ipv6
X-MASTER_SITES= ${MASTER_SITE_MYSQL}
X-MASTER_SITE_SUBDIR= MySQL-5.5
X+MASTER_SITES= http://ftp.osuosl.org/pub/mariadb/${PORTNAME}-${PORTVERSION}/kvm-tarbake-jaunty-x86/ \
X+ http://mirrors.supportex.net/mariadb/${PORTNAME}-${PORTVERSION}/kvm-tarbake-jaunty-x86/ \
X+ http://mirror.aarnet.edu.au/pub/MariaDB/${PORTNAME}-${PORTVERSION}/kvm-tarbake-jaunty-x86/ \
X+ http://mirror2.hs-esslingen.de/pub/Mirrors/mariadb/${PORTNAME}-${PORTVERSION}/kvm-tarbake-jaunty-x86/ \
X+ http://gd.tuwien.ac.at/db/mariadb/${PORTNAME}-${PORTVERSION}/kvm-tarbake-jaunty-x86/ \
X+ http://mirrors.fe.up.pt/pub/mariadb/${PORTNAME}-${PORTVERSION}/kvm-tarbake-jaunty-x86/ \
X+ http://mirror.de.gsnw.de:56431/mariadb/${PORTNAME}-${PORTVERSION}/kvm-tarbake-jaunty-x86/ \
X+ http://mirror.layerjet.com/mariadb/${PORTNAME}-${PORTVERSION}/kvm-tarbake-jaunty-x86/ \
X+ http://mirror.switch.ch/mirror/mariadb/${PORTNAME}-${PORTVERSION}/kvm-tarbake-jaunty-x86/
X PKGNAMESUFFIX?= -server
X
X MAINTAINER= ale at FreeBSD.org
X COMMENT?= Multithreaded SQL database (server)
X
X-SLAVEDIRS= databases/mysql55-client
X+SLAVEDIRS= databases/mariadb55-client
X USE_CMAKE= yes
X MAKE_JOBS_SAFE= yes
X NO_OPTIONS_SORT=yes
X@@ -44,6 +51,10 @@
X .error You have `USE_MYSQL' variable defined either in environment or in make(1) arguments. Please undefine and try again.
X .endif
X
X+WITH_MARIADB=yes
X+DATADIR= ${PREFIX}/share/mysql
X+USE_LDCONFIG= ${PREFIX}/lib/mysql
X+
X .include <bsd.port.options.mk>
X
X .if ${PORT_OPTIONS:MSSL}
X@@ -58,23 +69,22 @@
X USE_MYSQL= yes
X WANT_MYSQL_VER= 55
X
X-LATEST_LINK= mysql55-server
X+LATEST_LINK= mariadb55-server
X
X-CONFLICTS_INSTALL= mysql-server-[34].* mysql-server-5.[0-46-9].*
X+CONFLICTS_INSTALL= mysql-server-[34].* mysql-server-5.[0-46-9].* mariadb-server-5.3.*
X
X USE_RC_SUBR= mysql-server
X
X USERS= mysql
X GROUPS= mysql
X
X-INFO= mysql
X-
X MAN1= my_print_defaults.1 myisam_ftdump.1 myisamchk.1 myisamlog.1 myisampack.1 \
X mysql.server.1 mysql_convert_table_format.1 mysql_fix_extensions.1 \
X- mysql_install_db.1 mysql_plugin.1 mysql_secure_installation.1 mysql_setpermission.1 \
X+ mysql_install_db.1 mysql_secure_installation.1 mysql_setpermission.1 \
X mysql_tzinfo_to_sql.1 mysql_upgrade.1 mysql_zap.1 mysqlbug.1 \
X mysqld_multi.1 mysqld_safe.1 mysqldumpslow.1 mysqlhotcopy.1 mysqlman.1 \
X- mysqltest.1 perror.1 replace.1 resolve_stack_dump.1 resolveip.1
X+ mysqltest.1 perror.1 replace.1 resolve_stack_dump.1 resolveip.1 \
X+ innochecksum.1
X
X MAN8= mysqld.8
X
Xdiff -ruN databases/mysql55-server/distinfo databases/mariadb55-server/distinfo
X--- databases/mysql55-server/distinfo 2012-12-16 03:14:37.000000000 +0200
X+++ databases/mariadb55-server/distinfo 2012-12-16 04:25:42.000000000 +0200
X@@ -1,2 +1,2 @@
X-SHA256 (mysql-5.5.28.tar.gz) = f9b2491f1ddd99842a8e75c21958368bebe59c47e84bec778baa915e255cc78f
X-SIZE (mysql-5.5.28.tar.gz) = 24739429
X+SHA256 (mariadb-5.5.28a.tar.gz) = 66c908592763c641f2a1e9fd83f080458a0d3375cda9aaf7700a37877b1e9968
X+SIZE (mariadb-5.5.28a.tar.gz) = 27844298
Xdiff -ruN databases/mysql55-server/files/patch-CMakeLists.txt databases/mariadb55-server/files/patch-CMakeLists.txt
X--- databases/mysql55-server/files/patch-CMakeLists.txt 2012-12-16 03:14:37.000000000 +0200
X+++ databases/mariadb55-server/files/patch-CMakeLists.txt 2012-12-23 17:40:14.000000000 +0200
X@@ -1,14 +1,11 @@
X---- CMakeLists.txt.orig 2010-12-03 18:58:24.000000000 +0100
X-+++ CMakeLists.txt 2010-12-23 18:02:02.000000000 +0100
X-@@ -293,7 +293,6 @@
X+--- CMakeLists.txt.orig 2012-11-28 17:49:36.000000000 +0200
X++++ CMakeLists.txt 2012-12-23 02:25:55.000000000 +0200
X+@@ -306,17 +306,12 @@
X+ ADD_SUBDIRECTORY(support-files)
X
X- ADD_SUBDIRECTORY(extra)
X IF(NOT WITHOUT_SERVER)
X - ADD_SUBDIRECTORY(tests)
X- ADD_SUBDIRECTORY(client)
X ADD_SUBDIRECTORY(sql)
X- ADD_SUBDIRECTORY(sql/share)
X-@@ -301,14 +300,10 @@
X OPTION (WITH_EMBEDDED_SERVER "Compile MySQL with embedded server" OFF)
X IF(WITH_EMBEDDED_SERVER)
X ADD_SUBDIRECTORY(libmysqld)
X@@ -17,22 +14,23 @@
X
X - ADD_SUBDIRECTORY(mysql-test)
X - ADD_SUBDIRECTORY(mysql-test/lib/My/SafeProcess)
X- ADD_SUBDIRECTORY(support-files)
X- ADD_SUBDIRECTORY(scripts)
X - ADD_SUBDIRECTORY(sql-bench)
X- IF(UNIX)
X- ADD_SUBDIRECTORY(man)
X- ENDIF()
X-@@ -343,6 +338,7 @@
X- #
X- # RPM installs documentation directly from the source tree
X- #
X+
X+ IF(EXISTS ${CMAKE_SOURCE_DIR}/internal/CMakeLists.txt)
X+ ADD_SUBDIRECTORY(internal)
X+@@ -360,6 +355,7 @@
X+ WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
X+ )
X+
X +IF(FALSE)
X- IF(NOT INSTALL_LAYOUT MATCHES "RPM")
X- INSTALL(FILES COPYING LICENSE.mysql
X- DESTINATION ${INSTALL_DOCREADMEDIR}
X-@@ -367,3 +363,4 @@
X- PATTERN "sp-imp-spec.txt" EXCLUDE
X- )
X+ INSTALL(FILES COPYING COPYING.LESSER LICENSE.mysql
X+ DESTINATION ${INSTALL_DOCREADMEDIR}
X+ COMPONENT Readme
X+@@ -370,6 +366,7 @@
X+ IF(UNIX)
X+ INSTALL(FILES Docs/INSTALL-BINARY DESTINATION ${INSTALL_DOCREADMEDIR} COMPONENT Readme)
X ENDIF()
X +ENDIF()
X+
X+ INCLUDE(CPack)
X+
Xdiff -ruN databases/mysql55-server/files/patch-client_CMakeLists.txt databases/mariadb55-server/files/patch-client_CMakeLists.txt
X--- databases/mysql55-server/files/patch-client_CMakeLists.txt 2012-12-16 03:14:37.000000000 +0200
X+++ databases/mariadb55-server/files/patch-client_CMakeLists.txt 2012-12-23 02:37:34.000000000 +0200
X@@ -1,33 +1,36 @@
X---- client/CMakeLists.txt.orig 2011-09-09 17:56:40.000000000 +0200
X-+++ client/CMakeLists.txt 2011-10-07 11:06:21.000000000 +0200
X-@@ -27,17 +27,20 @@
X+--- client/CMakeLists.txt.orig 2012-11-28 17:49:47.000000000 +0200
X++++ client/CMakeLists.txt 2012-12-23 02:37:04.000000000 +0200
X+@@ -26,6 +26,7 @@
X+ )
X
X- ADD_DEFINITIONS(${READLINE_DEFINES})
X ADD_DEFINITIONS(${SSL_DEFINES})
X +IF(FALSE)
X- MYSQL_ADD_EXECUTABLE(mysql completion_hash.cc mysql.cc readline.cc sql_string.cc)
X+ MYSQL_ADD_EXECUTABLE(mysql completion_hash.cc mysql.cc readline.cc
X+ ${CMAKE_SOURCE_DIR}/sql/sql_string.cc)
X TARGET_LINK_LIBRARIES(mysql mysqlclient)
X- IF(UNIX)
X- TARGET_LINK_LIBRARIES(mysql ${READLINE_LIBRARY})
X+@@ -33,6 +34,7 @@
X+ TARGET_LINK_LIBRARIES(mysql ${MY_READLINE_LIBRARY})
X+ SET_TARGET_PROPERTIES(mysql PROPERTIES ENABLE_EXPORTS TRUE)
X ENDIF(UNIX)
X +ENDIF()
X
X MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test)
X SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS")
X- TARGET_LINK_LIBRARIES(mysqltest mysqlclient regex)
X+@@ -40,6 +42,7 @@
X+ SET_TARGET_PROPERTIES(mysqltest PROPERTIES ENABLE_EXPORTS TRUE)
X
X
X +IF(FALSE)
X MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c)
X TARGET_LINK_LIBRARIES(mysqlcheck mysqlclient)
X
X-@@ -46,17 +49,21 @@
X+@@ -48,17 +51,21 @@
X
X MYSQL_ADD_EXECUTABLE(mysqlimport mysqlimport.c)
X TARGET_LINK_LIBRARIES(mysqlimport mysqlclient)
X +ENDIF()
X
X- MYSQL_ADD_EXECUTABLE(mysql_upgrade mysql_upgrade.c)
X+ MYSQL_ADD_EXECUTABLE(mysql_upgrade mysql_upgrade.c COMPONENT Server)
X TARGET_LINK_LIBRARIES(mysql_upgrade mysqlclient)
X ADD_DEPENDENCIES(mysql_upgrade GenFixPrivs)
X
X@@ -43,7 +46,7 @@
X MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc)
X TARGET_LINK_LIBRARIES(mysqlbinlog mysqlclient)
X
X-@@ -66,13 +73,14 @@
X+@@ -68,17 +75,20 @@
X MYSQL_ADD_EXECUTABLE(mysqlslap mysqlslap.c)
X SET_SOURCE_FILES_PROPERTIES(mysqlslap.c PROPERTIES COMPILE_FLAGS "-DTHREADS")
X TARGET_LINK_LIBRARIES(mysqlslap mysqlclient)
X@@ -51,11 +54,17 @@
X
X # "WIN32" also covers 64 bit. "echo" is used in some files below "mysql-test/".
X IF(WIN32)
X- MYSQL_ADD_EXECUTABLE(echo echo.c)
X+ MYSQL_ADD_EXECUTABLE(echo echo.c COMPONENT Junk)
X ENDIF(WIN32)
X
X++IF(FALSE)
X+ # async_example is just a code example, do not install it.
X+ ADD_EXECUTABLE(async_example async_example.c)
X+ TARGET_LINK_LIBRARIES(async_example mysqlclient)
X++ENDIF()
X+
X -SET_TARGET_PROPERTIES (mysqlcheck mysqldump mysqlimport mysql_upgrade mysqlshow mysqlslap mysql_plugin
X-+SET_TARGET_PROPERTIES (mysql_upgrade mysql_plugin
X++SET_TARGET_PROPERTIES (mysql_upgrade mysql_plugin
X PROPERTIES HAS_CXX TRUE)
X
X ADD_DEFINITIONS(-DHAVE_DLOPEN)
Xdiff -ruN databases/mysql55-server/files/patch-cmake_plugin.cmake databases/mariadb55-server/files/patch-cmake_plugin.cmake
X--- databases/mysql55-server/files/patch-cmake_plugin.cmake 2012-12-16 03:14:37.000000000 +0200
X+++ databases/mariadb55-server/files/patch-cmake_plugin.cmake 1970-01-01 03:00:00.000000000 +0300
X@@ -1,10 +0,0 @@
X---- cmake/plugin.cmake.orig 2011-09-09 17:56:39.000000000 +0200
X-+++ cmake/plugin.cmake 2011-10-07 10:56:37.000000000 +0200
X-@@ -195,7 +195,6 @@
X- OUTPUT_NAME "${ARG_MODULE_OUTPUT_NAME}")
X- # Install dynamic library
X- MYSQL_INSTALL_TARGETS(${target} DESTINATION ${INSTALL_PLUGINDIR} COMPONENT Server)
X-- INSTALL_DEBUG_TARGET(${target} DESTINATION ${INSTALL_PLUGINDIR}/debug)
X- # Add installed files to list for RPMs
X- FILE(APPEND ${CMAKE_BINARY_DIR}/support-files/plugins.files
X- "%attr(755, root, root) %{_prefix}/${INSTALL_PLUGINDIR}/${ARG_MODULE_OUTPUT_NAME}.so\n"
Xdiff -ruN databases/mysql55-server/files/patch-extra_CMakeLists.txt databases/mariadb55-server/files/patch-extra_CMakeLists.txt
X--- databases/mysql55-server/files/patch-extra_CMakeLists.txt 2012-12-16 03:14:37.000000000 +0200
X+++ databases/mariadb55-server/files/patch-extra_CMakeLists.txt 2012-12-23 02:42:13.000000000 +0200
X@@ -1,12 +1,11 @@
X---- extra/CMakeLists.txt.orig 2010-12-23 17:38:06.000000000 +0100
X-+++ extra/CMakeLists.txt 2010-12-23 17:38:51.000000000 +0100
X-@@ -75,7 +75,9 @@
X+--- extra/CMakeLists.txt.orig 2012-11-28 17:49:47.000000000 +0200
X++++ extra/CMakeLists.txt 2012-12-23 02:41:57.000000000 +0200
X+@@ -80,6 +80,8 @@
X MYSQL_ADD_EXECUTABLE(resolve_stack_dump resolve_stack_dump.c)
X TARGET_LINK_LIBRARIES(resolve_stack_dump mysys)
X
X +IF(FALSE)
X- MYSQL_ADD_EXECUTABLE(mysql_waitpid mysql_waitpid.c)
X+ MYSQL_ADD_EXECUTABLE(mysql_waitpid mysql_waitpid.c COMPONENT Client)
X TARGET_LINK_LIBRARIES(mysql_waitpid mysys)
X ENDIF()
X +ENDIF()
X-
Xdiff -ruN databases/mysql55-server/files/patch-include_CMakeLists.txt databases/mariadb55-server/files/patch-include_CMakeLists.txt
X--- databases/mysql55-server/files/patch-include_CMakeLists.txt 2012-12-16 03:14:37.000000000 +0200
X+++ databases/mariadb55-server/files/patch-include_CMakeLists.txt 2012-12-23 05:50:13.000000000 +0200
X@@ -1,10 +1,24 @@
X---- include/CMakeLists.txt.orig 2011-01-19 23:37:08.000000000 +0100
X-+++ include/CMakeLists.txt 2011-02-07 22:40:32.698758463 +0100
X-@@ -57,5 +57,7 @@
X- ${HEADERS_GEN_CONFIGURE}
X+--- include/CMakeLists.txt.orig 2012-11-28 17:49:47.000000000 +0200
X++++ include/CMakeLists.txt 2012-12-23 05:49:42.000000000 +0200
X+@@ -54,17 +54,21 @@
X+ handler_state.h
X )
X
X +IF(FALSE)
X INSTALL(FILES ${HEADERS} DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development)
X- INSTALL(DIRECTORY mysql/ DESTINATION ${INSTALL_INCLUDEDIR}/mysql COMPONENT Development FILES_MATCHING PATTERN "*.h")
X+ FOREACH(f ${HEADERS_GEN_CONFIGURE})
X+ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${f} DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development PERMISSIONS OWNER_READ GROUP_READ WORLD_READ)
X+ ENDFOREACH(f)
X+ INSTALL(DIRECTORY mysql/ DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development FILES_MATCHING PATTERN "*.h")
X++ENDIF()
X+
X+ STRING(REPLACE "." "\\." EXCL_RE "${HEADERS};${HEADERS_GEN_CONFIGURE}")
X+ STRING(REPLACE ";" "|" EXCL_RE "${EXCL_RE}")
X+
X++IF(FALSE)
X+ INSTALL(DIRECTORY . DESTINATION ${INSTALL_INCLUDEDIR}/private COMPONENT Development
X+ FILES_MATCHING PATTERN "*.h"
X+ PATTERN CMakeFiles EXCLUDE
X+ PATTERN mysql EXCLUDE
X+ REGEX "\\./(${EXCL_RE}$)" EXCLUDE)
X +ENDIF()
Xdiff -ruN databases/mysql55-server/files/patch-include_my_compare.h databases/mariadb55-server/files/patch-include_my_compare.h
X--- databases/mysql55-server/files/patch-include_my_compare.h 2012-12-16 03:14:37.000000000 +0200
X+++ databases/mariadb55-server/files/patch-include_my_compare.h 2012-12-23 02:46:17.000000000 +0200
X@@ -1,11 +1,11 @@
X---- include/my_compare.h.orig 2011-05-10 09:46:46.000000000 +0200
X-+++ include/my_compare.h 2011-05-10 09:47:01.000000000 +0200
X-@@ -39,7 +39,7 @@
X+--- include/my_compare.h.orig 2012-11-28 17:49:43.000000000 +0200
X++++ include/my_compare.h 2012-12-23 02:45:51.000000000 +0200
X+@@ -40,7 +40,7 @@
X But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and HA_MAX_KEY_LENGTH.
X */
X
X -#define HA_MAX_KEY_LENGTH 1000 /* Max length in bytes */
X +#define HA_MAX_KEY_LENGTH 4000 /* Max length in bytes */
X- #define HA_MAX_KEY_SEG 16 /* Max segments for key */
X+ #define HA_MAX_KEY_SEG 32 /* Max segments for key */
X
X #define HA_MAX_POSSIBLE_KEY_BUFF (HA_MAX_KEY_LENGTH + 24+ 6+6)
Xdiff -ruN databases/mysql55-server/files/patch-include_myisam.h databases/mariadb55-server/files/patch-include_myisam.h
X--- databases/mysql55-server/files/patch-include_myisam.h 2012-12-16 03:14:37.000000000 +0200
X+++ databases/mariadb55-server/files/patch-include_myisam.h 1970-01-01 03:00:00.000000000 +0300
X@@ -1,11 +0,0 @@
X---- include/myisam.h.orig 2009-02-16 23:04:54.000000000 +0100
X-+++ include/myisam.h 2009-02-16 23:10:08.000000000 +0100
X-@@ -48,7 +48,7 @@
X- The following defines can be increased if necessary.
X- But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and MI_MAX_KEY_LENGTH.
X- */
X--#define MI_MAX_KEY_LENGTH 1000 /* Max length in bytes */
X-+#define MI_MAX_KEY_LENGTH 4000 /* Max length in bytes */
X- #define MI_MAX_KEY_SEG 16 /* Max segments for key */
X-
X- #define MI_MAX_KEY_BUFF (MI_MAX_KEY_LENGTH+MI_MAX_KEY_SEG*6+8+8)
Xdiff -ruN databases/mysql55-server/files/patch-libservices_CMakeLists.txt databases/mariadb55-server/files/patch-libservices_CMakeLists.txt
X--- databases/mysql55-server/files/patch-libservices_CMakeLists.txt 2012-12-16 03:14:37.000000000 +0200
X+++ databases/mariadb55-server/files/patch-libservices_CMakeLists.txt 2012-12-23 17:32:56.000000000 +0200
X@@ -1,9 +1,9 @@
X---- libservices/CMakeLists.txt.orig 2010-12-23 17:13:03.000000000 +0100
X-+++ libservices/CMakeLists.txt 2010-12-23 17:13:17.000000000 +0100
X-@@ -22,4 +22,6 @@
X- my_thread_scheduler_service.c)
X+--- libservices/CMakeLists.txt.orig 2012-11-28 17:49:47.000000000 +0200
X++++ libservices/CMakeLists.txt 2012-12-23 17:32:35.000000000 +0200
X+@@ -24,4 +24,6 @@
X+ debug_sync_service.c)
X
X- ADD_LIBRARY(mysqlservices ${MYSQLSERVICES_SOURCES})
X+ ADD_CONVENIENCE_LIBRARY(mysqlservices ${MYSQLSERVICES_SOURCES})
X +IF(FALSE)
X INSTALL(TARGETS mysqlservices DESTINATION ${INSTALL_LIBDIR} COMPONENT Development)
X +ENDIF()
Xdiff -ruN databases/mysql55-server/files/patch-man_CMakeLists.txt databases/mariadb55-server/files/patch-man_CMakeLists.txt
X--- databases/mysql55-server/files/patch-man_CMakeLists.txt 2012-12-16 03:14:37.000000000 +0200
X+++ databases/mariadb55-server/files/patch-man_CMakeLists.txt 2012-12-23 05:38:43.000000000 +0200
X@@ -1,11 +1,28 @@
X---- man/CMakeLists.txt.orig 2011-10-22 14:36:06.000000000 +0200
X-+++ man/CMakeLists.txt 2011-10-22 14:36:23.000000000 +0200
X-@@ -15,8 +15,6 @@
X+--- man/CMakeLists.txt.orig 2012-11-28 17:49:47.000000000 +0200
X++++ man/CMakeLists.txt 2012-12-23 05:38:24.000000000 +0200
X+@@ -16,13 +16,13 @@
X+ SET(MAN1_SERVER innochecksum.1 my_print_defaults.1 myisam_ftdump.1 myisamchk.1
X+ myisamlog.1 myisampack.1 mysql.server.1
X+ mysql_convert_table_format.1 mysql_fix_extensions.1
X+- mysql_fix_privilege_tables.1 mysql_install_db.1
X++ mysql_install_db.1
X+ mysql_secure_installation.1 mysql_setpermission.1
X+ mysql_tzinfo_to_sql.1 mysql_upgrade.1 mysql_zap.1
X+ mysqld_multi.1 mysqld_safe.1 mysqldumpslow.1 mysqlhotcopy.1
X+ mysqlman.1 mysqltest.1 perror.1 replace.1 resolve_stack_dump.1
X+ resolveip.1 mysqlbug.1)
X+-SET(MAN8_SERVER mysqld.8 mysqlmanager.8)
X++SET(MAN8_SERVER mysqld.8)
X+ SET(MAN1_CLIENT msql2mysql.1 mysql.1 mysql_find_rows.1 mysql_waitpid.1
X+ mysqlaccess.1 mysqladmin.1 mysqlbinlog.1 mysqlcheck.1
X+ mysqldump.1 mysqlimport.1 mysqlshow.1 mysqlslap.1)
X+@@ -32,7 +32,9 @@
X+
X+ INSTALL(FILES ${MAN1_SERVER} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesServer)
X+ INSTALL(FILES ${MAN8_SERVER} DESTINATION ${INSTALL_MANDIR}/man8 COMPONENT ManPagesServer)
X++IF(FALSE)
X+ INSTALL(FILES ${MAN1_CLIENT} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesClient)
X+ INSTALL(FILES ${MAN1_DEVEL} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesDevelopment)
X+ INSTALL(FILES ${MAN1_TEST} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesTest)
X++ENDIF()
X
X- # Copy man pages
X- FILE(GLOB MAN1_FILES *.1)
X--FILE(GLOB MAN1_EXCLUDE make_win_bin_dist.1)
X--FILE(GLOB MAN1_NDB ndb*.1)
X- FILE(GLOB MAN8_FILES *.8)
X- FILE(GLOB MAN8_NDB ndb*.8)
X- IF(MAN1_FILES)
Xdiff -ruN databases/mysql55-server/files/patch-regex_CMakeLists.txt databases/mariadb55-server/files/patch-regex_CMakeLists.txt
X--- databases/mysql55-server/files/patch-regex_CMakeLists.txt 1970-01-01 03:00:00.000000000 +0300
X+++ databases/mariadb55-server/files/patch-regex_CMakeLists.txt 2012-12-23 06:03:22.000000000 +0200
X@@ -0,0 +1,9 @@
X+--- regex/CMakeLists.txt.orig 2012-12-23 06:02:57.000000000 +0200
X++++ regex/CMakeLists.txt 2012-12-23 06:03:01.000000000 +0200
X+@@ -18,4 +18,6 @@
X+ SET(REGEX_SOURCES regcomp.c regerror.c regexec.c regfree.c reginit.c)
X+ ADD_CONVENIENCE_LIBRARY(regex ${REGEX_SOURCES})
X+
X++IF(FALSE)
X+ INSTALL(FILES "my_regex.h" DESTINATION ${INSTALL_INCLUDEDIR}/private COMPONENT Development)
X++ENDIF()
Xdiff -ruN databases/mysql55-server/files/patch-scripts_CMakeLists.txt databases/mariadb55-server/files/patch-scripts_CMakeLists.txt
X--- databases/mysql55-server/files/patch-scripts_CMakeLists.txt 2012-12-16 03:14:37.000000000 +0200
X+++ databases/mariadb55-server/files/patch-scripts_CMakeLists.txt 2012-12-23 02:54:37.000000000 +0200
X@@ -1,17 +1,17 @@
X---- scripts/CMakeLists.txt.orig 2011-07-13 21:09:03.000000000 +0200
X-+++ scripts/CMakeLists.txt 2011-09-01 09:48:22.000000000 +0200
X-@@ -266,6 +266,8 @@
X+--- scripts/CMakeLists.txt.orig 2012-11-28 17:49:47.000000000 +0200
X++++ scripts/CMakeLists.txt 2012-12-23 02:54:04.000000000 +0200
X+@@ -260,6 +260,8 @@
X GET_FILENAME_COMPONENT(lib "${lib}" NAME_WE)
X STRING(REGEX REPLACE "^lib" "" lib "${lib}")
X SET(${var} "${${var}}-l${lib} " )
X + ELSEIF(lib STREQUAL "-pthread")
X-+ SET(${var} "${${var}}-pthread " )
X++ SET(${var} "${${var}}-pthread " )
X ELSE()
X SET(${var} "${${var}}-l${lib} " )
X ENDIF()
X-@@ -316,16 +318,11 @@
X+@@ -313,16 +315,11 @@
X+ ELSE()
X # On Unix, most of the files end up in the bin directory
X- SET(mysql_config_COMPONENT COMPONENT Development)
X SET(BIN_SCRIPTS
X - msql2mysql
X - mysql_config
X@@ -20,18 +20,9 @@
X mysql_secure_installation
X mysql_zap
X - mysqlaccess
X-- mysqlaccess.conf
X mysql_convert_table_format
X - mysql_find_rows
X+- mytop
X mysqlhotcopy
X mysqldumpslow
X mysqld_multi
X-@@ -334,7 +331,7 @@
X- FOREACH(file ${BIN_SCRIPTS})
X- IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh)
X- CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh
X-- ${CMAKE_CURRENT_BINARY_DIR}/${file} ESCAPE_QUOTES @ONLY)
X-+ ${CMAKE_CURRENT_BINARY_DIR}/${file} @ONLY)
X- ELSEIF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file})
X- CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${file}
X- ${CMAKE_CURRENT_BINARY_DIR}/${file} COPYONLY)
Xdiff -ruN databases/mysql55-server/files/patch-sql_CMakeLists.txt databases/mariadb55-server/files/patch-sql_CMakeLists.txt
X--- databases/mysql55-server/files/patch-sql_CMakeLists.txt 2012-12-16 03:14:37.000000000 +0200
X+++ databases/mariadb55-server/files/patch-sql_CMakeLists.txt 2012-12-23 05:57:22.000000000 +0200
X@@ -1,6 +1,6 @@
X---- sql/CMakeLists.txt.orig 2010-12-23 17:31:28.000000000 +0100
X-+++ sql/CMakeLists.txt 2010-12-23 17:33:36.000000000 +0100
X-@@ -245,6 +245,7 @@
X+--- sql/CMakeLists.txt.orig 2012-11-28 17:49:47.000000000 +0200
X++++ sql/CMakeLists.txt 2012-12-23 05:56:58.000000000 +0200
X+@@ -268,6 +268,7 @@
X
X IF(INSTALL_LAYOUT STREQUAL "STANDALONE")
X
X@@ -8,11 +8,22 @@
X # We need to create empty directories (data/test) the installation.
X # This does not work with current CPack due to http://www.cmake.org/Bug/view.php?id=8767
X # Avoid completely empty directories and install dummy file instead.
X-@@ -286,6 +287,7 @@
X+@@ -313,6 +314,7 @@
X INSTALL(FILES ${DUMMY_FILE} DESTINATION data/mysql COMPONENT DataFiles)
X- ENDIF()
X- ENDIF()
X+ ENDIF(WIN32 AND MYSQLD_EXECUTABLE)
X+ ENDIF(INSTALL_LAYOUT STREQUAL "STANDALONE")
X +ENDIF()
X
X- ADD_CUSTOM_TARGET(show-dist-name
X- COMMAND ${CMAKE_COMMAND} -E echo "${CPACK_PACKAGE_FILE_NAME}"
X+ IF(WIN32)
X+ SET(my_bootstrap_sql ${CMAKE_CURRENT_BINARY_DIR}/my_bootstrap.sql)
X+@@ -354,8 +356,10 @@
X+ TARGET_LINK_LIBRARIES(mysql_upgrade_service mysys winservice)
X+ ENDIF(WIN32)
X+
X++IF(FALSE)
X+ INSTALL(DIRECTORY . DESTINATION ${INSTALL_INCLUDEDIR}/private COMPONENT Development
X+ FILES_MATCHING PATTERN "*.h"
X+ PATTERN examples EXCLUDE
X+ PATTERN share EXCLUDE
X+ PATTERN CMakeFiles EXCLUDE)
X++ENDIF()
Xdiff -ruN databases/mysql55-server/files/patch-support-files_CMakeLists.txt databases/mariadb55-server/files/patch-support-files_CMakeLists.txt
X--- databases/mysql55-server/files/patch-support-files_CMakeLists.txt 2012-12-16 03:14:37.000000000 +0200
X+++ databases/mariadb55-server/files/patch-support-files_CMakeLists.txt 2012-12-23 05:41:09.000000000 +0200
X@@ -1,7 +1,10 @@
X---- support-files/CMakeLists.txt.orig 2010-12-23 17:38:19.000000000 +0100
X-+++ support-files/CMakeLists.txt 2010-12-23 17:41:11.000000000 +0100
X-@@ -74,7 +74,9 @@
X+--- support-files/CMakeLists.txt.orig 2012-11-28 17:49:47.000000000 +0200
X++++ support-files/CMakeLists.txt 2012-12-23 05:40:39.000000000 +0200
X+@@ -66,10 +66,11 @@
X+ ENDFOREACH()
X+ IF(INSTALL_SUPPORTFILESDIR)
X INSTALL(FILES magic DESTINATION ${inst_location} COMPONENT SupportFiles)
X+- INSTALL(DIRECTORY RHEL4-SElinux/ DESTINATION ${inst_location}/SELinux/RHEL4 COMPONENT SupportFiles)
X ENDIF()
X
X +IF(FALSE)
X@@ -9,4 +12,4 @@
X +ENDIF()
X CONFIGURE_FILE(MySQL-shared-compat.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/MySQL-shared-compat.spec @ONLY)
X CONFIGURE_FILE(mysql.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/mysql.spec @ONLY)
X- CONFIGURE_FILE(mysql.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/mysql.${VERSION}.spec @ONLY)
X+
XFiles databases/mysql55-server/mysql-server-5.5.28.tbz and databases/mariadb55-server/mysql-server-5.5.28.tbz differ
Xdiff -ruN databases/mysql55-server/pkg-plist databases/mariadb55-server/pkg-plist
X--- databases/mysql55-server/pkg-plist 2012-12-16 03:14:37.000000000 +0200
X+++ databases/mariadb55-server/pkg-plist 2012-12-23 17:33:08.000000000 +0200
X@@ -1,4 +1,9 @@
X @stopdaemon mysql-server
X+bin/aria_chk
X+bin/aria_dump_log
X+bin/aria_ftdump
X+bin/aria_pack
X+bin/aria_read_log
X bin/innochecksum
X bin/my_print_defaults
X bin/myisam_ftdump
X@@ -25,21 +30,32 @@
X bin/resolve_stack_dump
X bin/resolveip
X lib/mysql/libmysqld.a
X+lib/mysql/libmysqld.so
X+lib/mysql/libmysqld.so.18
X lib/mysql/plugin/adt_null.so
X-lib/mysql/plugin/auth.so
X+lib/mysql/plugin/auth_pam.so
X lib/mysql/plugin/auth_test_plugin.so
X lib/mysql/plugin/daemon_example.ini
X+lib/mysql/plugin/dialog.so
X+lib/mysql/plugin/dialog_examples.so
X+lib/mysql/plugin/feedback.so
X lib/mysql/plugin/ha_archive.so
X lib/mysql/plugin/ha_blackhole.so
X lib/mysql/plugin/ha_example.so
X lib/mysql/plugin/ha_federated.so
X+lib/mysql/plugin/ha_federatedx.so
X+lib/mysql/plugin/ha_innodb.so
X+lib/mysql/plugin/ha_sphinx.so
X+lib/mysql/plugin/handlersocket.so
X lib/mysql/plugin/libdaemon_example.so
X lib/mysql/plugin/mypluglib.so
X+lib/mysql/plugin/mysql_clear_password.so
X lib/mysql/plugin/qa_auth_client.so
X lib/mysql/plugin/qa_auth_interface.so
X lib/mysql/plugin/qa_auth_server.so
X lib/mysql/plugin/semisync_master.so
X lib/mysql/plugin/semisync_slave.so
X+lib/mysql/plugin/sql_errlog.so
X libexec/mysqld
X %%DATADIR%%/binary-configure
X %%DATADIR%%/charsets/Index.xml
f44aaf6bd91d856faffe998de4f862dc
exit
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list