Attachment #179060 for bug #216244




# $FreeBSD$

PORTNAME=	mysql
PORTREVISION?=	0
PKGNAMESUFFIX=	56-client

COMMENT=	Multithreaded SQL database (client)

LICENSE+=	LGPL21

BROKEN_powerpc64=	Does not build
BROKEN_sparc64=	Does not build: reports unsupported compiler

MASTERDIR=	${.CURDIR}/../mysql56-server

PKGMESSAGE=	${.CURDIR}/pkg-message

PLIST=		${.CURDIR}/pkg-plist

CONFLICTS_INSTALL=	mysql5[0-57-9]-client-* \
			mysql[0-46-9][0-9]-client-* \
			mariadb[0-9][0-9]-client-* \
			percona[0-9][0-9]-client-*

CMAKE_ARGS+=	-DWITHOUT_SERVER=1

USE_LDCONFIG+=	${PREFIX}/lib/mysql

MMAN1=		comp_err.1 msql2mysql.1 mysql.1 mysql_config.1 mysql_config_editor.1 mysql_find_rows.1 \
		mysql_waitpid.1 mysqlaccess.1 mysqladmin.1 mysqlbinlog.1 \




--- CMakeLists.txt.orig	2016-11-28 13:36:22 UTC
+++ CMakeLists.txt
@@ -481,8 +481,8 @@ ENDIF()
 
 ADD_SUBDIRECTORY(extra)
 ADD_SUBDIRECTORY(client)

 
 IF(UNIX)
   ADD_SUBDIRECTORY(man)
@@ -552,18 +552,17 @@ ELSE()
   SET(CPACK_GENERATOR "TGZ")
 ENDIF() 
 ADD_SUBDIRECTORY(packaging/WiX)

 IF(NOT INSTALL_LAYOUT MATCHES "RPM")
   INSTALL(FILES COPYING LICENSE.mysql 
   DESTINATION ${INSTALL_DOCREADMEDIR} 
@@ -585,6 +584,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM")
     PATTERN "sp-imp-spec.txt" EXCLUDE
   )
 ENDIF()




--- extra/CMakeLists.txt.orig	2016-11-28 13:36:22 UTC
+++ extra/CMakeLists.txt
@@ -35,6 +35,7 @@ ENDIF()
 
 ADD_CUSTOM_COMMAND(OUTPUT ${PROJECT_BINARY_DIR}/include/mysqld_error.h 
                    ${PROJECT_BINARY_DIR}/sql/share/english/errmsg.sys
+                   COMMAND mkdir -p ${PROJECT_BINARY_DIR}/sql/share/
                    COMMAND comp_err
                     --charset=${PROJECT_SOURCE_DIR}/sql/share/charsets 
                     --out-dir=${PROJECT_BINARY_DIR}/sql/share/
@@ -60,6 +61,7 @@ IF (WIN32 AND WITH_SSL_PATH AND HAVE_CRY
 ENDIF()
 
 

 MYSQL_ADD_EXECUTABLE(my_print_defaults my_print_defaults.c)
 TARGET_LINK_LIBRARIES(my_print_defaults  mysys mysys_ssl)
 SET_TARGET_PROPERTIES(my_print_defaults PROPERTIES LINKER_LANGUAGE CXX)
@@ -96,10 +98,13 @@ IF(WITH_INNOBASE_STORAGE_ENGINE)
   MYSQL_ADD_EXECUTABLE(innochecksum innochecksum.cc ${INNOBASE_SOURCES})
   TARGET_LINK_LIBRARIES(innochecksum mysys mysys_ssl)
 ENDIF()




--- man/CMakeLists.txt.orig	2016-11-28 13:36:22 UTC
+++ man/CMakeLists.txt
@@ -14,11 +14,7 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
 # Copy man pages
-FILE(GLOB MAN1_FILES *.1)
-FILE(GLOB MAN1_EXCLUDE make_win_bin_dist.1)
-FILE(GLOB MAN1_NDB ndb*.1)
-FILE(GLOB MAN8_FILES *.8)
-FILE(GLOB MAN8_NDB ndb*.8)
+FILE(GLOB MAN1_FILES comp_err.1 msql2mysql.1 mysql.1 mysql_config.1 mysql_config_editor.1 mysql_find_rows.1  mysql_waitpid.1 mysqlaccess.1 mysqladmin.1 mysqlbinlog.1  mysqlcheck.1 mysqldump.1 mysqlimport.1 mysqlshow.1 mysqlslap.1)
 IF(MAN1_FILES)
   IF(MAN1_EXCLUDE)
     LIST(REMOVE_ITEM MAN1_FILES ${MAN1_EXCLUDE})

Lines 1-6 Link Here

(-)databases/mysql56-client/files/patch-mysys_ssl_my_default.cc (-10 / +40 lines)
1	--- mysys_ssl/my_default.cc.orig 2013-01-22 17:54:49.000000000 +0100	1	--- mysys_ssl/my_default.cc.orig 2016-11-28 13:36:22 UTC
2	+++ mysys_ssl/my_default.cc 2013-02-13 11:08:15.000000000 +0100	2	+++ mysys_ssl/my_default.cc
3	@@ -119,7 +119,7 @@	3	@@ -110,7 +110,7 @@ static my_bool defaults_already_read= FA
4		4
5	/* Which directories are searched for options (and in which order) */	5	/* Which directories are searched for options (and in which order) */
6		6
Lines 9-26 Link Here
9	#define DEFAULT_DIRS_SIZE (MAX_DEFAULT_DIRS + 1) /* Terminate with NULL */	9	#define DEFAULT_DIRS_SIZE (MAX_DEFAULT_DIRS + 1) /* Terminate with NULL */
10	static const char **default_directories = NULL;	10	static const char **default_directories = NULL;
11		11
12	@@ -1395,7 +1395,10 @@	12	@@ -903,6 +903,14 @@ static int search_default_file_with_ext(
		13	return 1; /* Ignore wrong files */
		14	}
13		15
14	#if defined(DEFAULT_SYSCONFDIR)	16	+ if (strstr(name, "/etc") == name)
15	if (DEFAULT_SYSCONFDIR[0])
16	+ {	17	+ {
17	errors += add_directory(alloc, DEFAULT_SYSCONFDIR, dirs);	18	+ fprintf(stderr,
18	+ errors += add_directory(alloc, DEFAULT_SYSCONFDIR "/mysql", dirs);	19	+ "error: Config file %s in invalid location, please move to or merge with /usr/local%s\n",
		20	+ name,name);
		21	+ goto err;
19	+ }	22	+ }
20	#endif /* DEFAULT_SYSCONFDIR */	23	+
		24	while (mysql_file_getline(buff, sizeof(buff) - 1, fp, is_login_file))
		25	{
		26	line++;
		27	@@ -1241,7 +1249,8 @@ void my_print_default_files(const char *
		28	end[(strlen(end)-1)] = ' ';
		29	else
		30	strxmov(end, conf_file, *ext , " ", NullS);
		31	- fputs(name, stdout);
		32	+ if (strstr(name, "/etc") != name)
		33	+ fputs(name, stdout);
		34	}
		35	}
		36	}
		37	@@ -1400,13 +1409,8 @@ static const char **init_default_directo
21		38
		39	#else
		40
		41	- errors += add_directory(alloc, "/etc/", dirs);
		42	- errors += add_directory(alloc, "/etc/mysql/", dirs);
		43	-
		44	-#if defined(DEFAULT_SYSCONFDIR)
		45	- if (DEFAULT_SYSCONFDIR[0])
		46	- errors += add_directory(alloc, DEFAULT_SYSCONFDIR, dirs);
		47	-#endif /* DEFAULT_SYSCONFDIR */
		48	+ errors += add_directory(alloc, "/usr/local/etc/", dirs);
		49	+ errors += add_directory(alloc, "/usr/local/etc/mysql/", dirs);
		50
22	#endif	51	#endif
23	@@ -1466,7 +1469,7 @@	52
		53	@@ -1477,7 +1481,7 @@ int check_file_permissions(const char *f
24	MY_STAT stat_info;	54	MY_STAT stat_info;
25		55
26	if (!my_stat(file_name,&stat_info,MYF(0)))	56	if (!my_stat(file_name,&stat_info,MYF(0)))




--- scripts/CMakeLists.txt.orig	2016-11-28 13:36:22 UTC
+++ scripts/CMakeLists.txt
@@ -71,6 +71,7 @@ IF(UNIX)
 )
 ENDIF()
 

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

 
 # TCMalloc hacks
 IF(MALLOC_LIB)
@@ -168,6 +170,7 @@ ENDIF()
 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})
@@ -204,6 +207,7 @@ INSTALL_SCRIPT(${CMAKE_CURRENT_BINARY_DI
   DESTINATION ${INSTALL_BINDIR}
   COMPONENT Server
   )

 
 ENDIF(UNIX)
 
@@ -228,6 +232,7 @@ ELSE()
   SET(localstatedir ${MYSQL_DATADIR})
 ENDIF()
 

 IF(UNIX)
   SET(EXT)
 ELSE()
@@ -242,6 +247,7 @@ INSTALL_SCRIPT(
   DESTINATION ${DEST}
   COMPONENT Server
   )
+ENDIF()
 
 
 SET(prefix "${CMAKE_INSTALL_PREFIX}")
 SET(sysconfdir ${prefix})
@@ -298,6 +304,8 @@ MACRO(EXTRACT_LINK_LIBRARIES target var)
           GET_FILENAME_COMPONENT(lib "${lib}" NAME_WE)
           STRING(REGEX REPLACE "^lib" "" lib "${lib}")
           SET(${var} "${${var}}-l${lib} " ) 

         ELSE()
           SET(${var} "${${var}}-l${lib} " ) 
         ENDIF()
@@ -353,17 +361,9 @@ ELSE()
   SET(BIN_SCRIPTS
     msql2mysql
     mysql_config

   )
   FOREACH(file ${BIN_SCRIPTS})
     IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh)
@@ -387,6 +387,7 @@ ELSE()
      )
   ENDFOREACH()
 

   # Input files with pl.in extension - drop the extension completely
   SET(PLIN_FILES mysql_secure_installation)
   FOREACH(file ${PLIN_FILES})
@@ -399,6 +400,7 @@ ELSE()
     INSTALL_SCRIPT(${CMAKE_CURRENT_BINARY_DIR}/${file} COMPONENT ${${file}_COMPONENT})
   ENDFOREACH()
 ENDIF()




--- support-files/CMakeLists.txt.orig	2016-11-28 13:36:22 UTC
+++ support-files/CMakeLists.txt
@@ -44,14 +44,17 @@ ELSE()
   SET(inst_location ${INSTALL_SUPPORTFILESDIR})
 ENDIF()
 

   FOREACH(script  mysqld_multi.server mysql-log-rotate binary-configure)
     CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${script}.sh 
                    ${CMAKE_CURRENT_BINARY_DIR}/${script} @ONLY )
@@ -68,8 +71,10 @@ IF(UNIX)
   IF(INSTALL_SUPPORTFILESDIR)
     INSTALL(FILES magic DESTINATION ${inst_location} COMPONENT SupportFiles)
   ENDIF()

   CONFIGURE_FILE(MySQL-shared-compat.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/MySQL-shared-compat.spec @ONLY)
   CONFIGURE_FILE(mysql.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/mysql.spec @ONLY)
   
@@ -94,3 +99,4 @@ IF(UNIX)
     PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ 
     GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
 ENDIF()




# $FreeBSD$

PORTNAME?=	mysql
PORTVERSION=	5.6.35
PORTREVISION?=	0
CATEGORIES=	databases ipv6
MASTER_SITES=	MYSQL/MySQL-5.6

MAINTAINER=	ale@FreeBSD.org
COMMENT?=	Multithreaded SQL database (server)

LICENSE=	GPLv2

SLAVEDIRS=	databases/mysql56-client
USES=		bison:build cmake:outsource compiler:c11 compiler:c++11-lib \
		cpe libedit localbase perl5 shebangfix ssl

USE_PERL5=	run

MY_DBDIR=	/var/db/mysql
MY_SECDIR=	/var/db/mysql_secure
MY_TMPDIR=	/var/db/mysql_tmpdir

LIB_DEPENDS+=	libevent.so:devel/libevent2 \
		liblz4.so:archivers/liblz4

CMAKE_BUILD_TYPE=	Release

CMAKE_ARGS+=	-DINSTALL_LAYOUT=FREEBSD \
		-DINSTALL_LDCONFIGDIR="${LOCALBASE}/libdata/ldconfig" \
		-DINSTALL_PKGCONFIGDIR="${LOCALBASE}/libdata/pkgconfig" \
		-DINSTALL_DOCDIR="share/doc/mysql" \
		-DINSTALL_DOCREADMEDIR="share/doc/mysql" \
		-DINSTALL_INCLUDEDIR="include/mysql" \
		-DINSTALL_INFODIR="info" \
		-DINSTALL_LIBDIR="lib/mysql" \
		-DINSTALL_MANDIR="man" \
		-DINSTALL_MYSQLDATADIR="${MY_DBDIR}" \
		-DINSTALL_MYSQLKEYRINGDIR="etc/mysql/keyring" \
		-DINSTALL_MYSQLSHAREDIR="share/mysql" \
		-DINSTALL_MYSQLTESTDIR="share/mysql/tests" \
		-DINSTALL_PLUGINDIR="lib/mysql/plugin" \
		-DINSTALL_SBINDIR="libexec" \
		-DINSTALL_SCRIPTDIR="bin" \
		-DINSTALL_SECURE_FILE_PRIVDIR="${MY_SECDIR}" \
		-DINSTALL_SHAREDIR="share" \
		-DINSTALL_SQLBENCHDIR="share/mysql" \
		-DINSTALL_SUPPORTFILESDIR="share/mysql" \
		-DMYSQL_KEYRINGDIR="${ETCDIR}/keyring" \
		-DWITH_BOOST="${WRKSRC}/boost" \
		-DWITH_EDITLINE=system \
		-DWITH_LIBEVENT=system \
		-DWITH_LZ4=system \
		-DWITH_ZLIB=system \
		-DINSTALL_MYSQLTESTDIR=0

SHEBANG_FILES=	scripts/*.pl* scripts/*.sh


.error You have `USE_MYSQL' variable defined either in environment or in make(1) arguments. Please undefine and try again.
.endif

SUB_LIST=	MY_DBDIR=${MY_DBDIR} \
		MY_SECDIR=${MY_SECDIR} \
		MY_TMPDIR=${MY_TMPDIR}

PLIST_SUB=	MY_DBDIR=${MY_DBDIR} \
		MY_SECDIR=${MY_SECDIR} \
		MY_TMPDIR=${MY_TMPDIR}

# MySQL-Server part
.if !defined(CLIENT_ONLY)
USES+=		mysql:56
WANT_MYSQL_VER=	56

USES+=		perl5
USE_PERL5=	run

CONFLICTS_INSTALL=	mysql5[0-57-9]-server-* \
			mysql[0-46-9][0-9]-server-* \
			mariadb[0-9][0-9]-server-* \
			percona[0-9][0-9]-server-*

USE_RC_SUBR=	mysql-server

SUB_FILES=	my.cnf.sample

USERS=		mysql
GROUPS=		mysql

USE_LDCONFIG+=	${PREFIX}/lib/mysql/plugin

MMAN1=		my_print_defaults.1 myisam_ftdump.1 myisamchk.1 myisamlog.1 myisampack.1 \
		mysql.server.1 mysql_convert_table_format.1 mysql_fix_extensions.1 \
		mysql_install_db.1 mysql_plugin.1 mysql_secure_installation.1 mysql_setpermission.1 \

		mysqltest.1 perror.1 replace.1 resolve_stack_dump.1 resolveip.1

CMAKE_ARGS+=	-DWITH_EMBEDDED_SERVER="ON"

OPTIONS_GROUP=		STORAGE
OPTIONS_GROUP_STORAGE=	ARCHIVE BLACKHOLE EXAMPLE FEDERATED INNOBASE PARTITION PERFSCHEMA
OPTIONS_SUB=		YES
STORAGE_DESC=		Permissible "Storage Engines" (to compile statically into the server)
ARCHIVE_DESC=		Compile "Archive Storage" statically in server
BLACKHOLE_DESC=		Compile "Blackhole Storage" statically in server
EXAMPLE_DESC=		Compile "Example Storage" statically in server
FEDERATED_DESC=		Compile "Federated Storage" statically in server
INNOBASE_DESC=		Compile "InnoDB Storage" statically in server
PARTITION_DESC=		Compile "Partitioning support Storage" statically in server
PERFSCHEMA_DESC=	Compile "Performance Schema Storage" statically in server

ARCHIVE_CMAKE_ON=	-DWITH_ARCHIVE_STORAGE_ENGINE=1
BLACKHOLE_CMAKE_ON=	-DWITH_BLACKHOLE_STORAGE_ENGINE=1
EXAMPLE_CMAKE_ON=	-DWITH_EXAMPLE_STORAGE_ENGINE=1
FEDERATED_CMAKE_ON=	-DWITH_FEDERATED_STORAGE_ENGINE=1
INNOBASE_CMAKE_ON=	-DWITH_INNOBASE_STORAGE_ENGINE=1
PARTITION_CMAKE_ON=	-DWITH_PARTITION_STORAGE_ENGINE=1
PERFSCHEMA_CMAKE_ON=	-DWITH_PERFSCHEMA_STORAGE_ENGINE=1

OPTIONS_GROUP+=		FEATURES
OPTIONS_GROUP_FEATURES=	PERFSCHM
FEATURES_DESC=		Default features knobs
PERFSCHM_DESC=		Enable "Performance Schema" by default (High RAM usage)
OPTIONS_DEFAULT+=	PERFSCHM

PERFSCHM_SUB_LIST+=	PERFSCHEMRC=""
PERFSCHM_SUB_LIST_OFF+=	PERFSCHEMRC="--skip-performance-schema"
.endif

.include <bsd.port.pre.mk>

.if ${SSL_DEFAULT} == base
CMAKE_ARGS+=		-DWITH_SSL=system
.else
CMAKE_ARGS+=		-DWITH_SSL=${OPENSSLBASE}
.endif

post-patch:
	@${REINPLACE_CMD} 's/*.1/${MMAN1}/' ${WRKSRC}/man/CMakeLists.txt

.if !defined(CLIENT_ONLY)
post-install:
	${MKDIR} ${STAGEDIR}${ETCDIR}
	${INSTALL_DATA} ${WRKDIR}/my.cnf.sample ${STAGEDIR}${ETCDIR}/my.cnf.sample

	${MKDIR} ${STAGEDIR}${ETCDIR}/keyring
	${MKDIR} ${STAGEDIR}${MY_SECDIR}
	${MKDIR} ${STAGEDIR}${MY_TMPDIR}
.endif

.if ${ARCH} == "armv6"
EXTRA_PATCHES+=		${FILESDIR}/extra-patch-config.h.cmake
.endif

Lines 1-3 Link Here

(-)databases/mysql56-server/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1477038469	1	TIMESTAMP = 1484753208
2	SHA256 (mysql-5.6.34.tar.gz) = ee90bafec6af3abe2715ccb0b3cc9345ed8d1cce025d41e6ec2b2b7a7d820823	2	SHA256 (mysql-5.6.35.tar.gz) = dddcba169b98844d7c65346cbd791c853edf942d78440381685087b84aa35020
3	SIZE (mysql-5.6.34.tar.gz) = 32094762	3	SIZE (mysql-5.6.35.tar.gz) = 32167628




# $FreeBSD$

[client]
port                            = 3306
socket                          = /tmp/mysql.sock

[mysql]
prompt                          = \u@\h [\d]>\_
no_auto_rehash

[mysqld]
user                            = mysql
port                            = 3306
socket                          = /tmp/mysql.sock
bind-address                    = 127.0.0.1
basedir                         = %%PREFIX%%
datadir                         = %%MY_DBDIR%%
tmpdir                          = %%MY_TMPDIR%%
slave-load-tmpdir               = %%MY_TMPDIR%%
secure-file-priv                = %%MY_SECDIR%%
log-bin                         = mysql-bin
log-output                      = TABLE
master-info-repository          = TABLE
relay-log-info-repository       = TABLE
relay-log-recovery              = 1
slow-query-log                  = 1
server-id                       = 1
sync_binlog                     = 1
sync_relay_log                  = 1
binlog_cache_size               = 16M
expire_logs_days                = 30
log-slave-updates               = 1
enforce-gtid-consistency        = 1
gtid-mode                       = ON
safe-user-create                = 1
lower_case_table_names          = 1
explicit-defaults-for-timestamp = 1
myisam-recover-options          = BACKUP,FORCE
open_files_limit                = 32768
table_open_cache                = 16384
table_definition_cache          = 8192
net_retry_count                 = 16384
key_buffer_size                 = 256M
max_allowed_packet              = 64M
query_cache_type                = 0
query_cache_size                = 0
long_query_time                 = 0.5
innodb_buffer_pool_size         = 1G
innodb_data_home_dir            = %%MY_DBDIR%%
innodb_log_group_home_dir       = %%MY_DBDIR%%
innodb_data_file_path           = ibdata1:128M:autoextend
innodb_flush_method             = O_DIRECT
innodb_log_file_size            = 256M
innodb_log_buffer_size          = 16M
innodb_write_io_threads         = 8
innodb_read_io_threads          = 8
innodb_autoinc_lock_mode        = 2
skip-symbolic-links

[mysqldump]
max_allowed_packet              = 256M
quote_names
quick

Lines 14-23 Link Here

(-)databases/mysql56-server/files/mysql-server.in (-6 / +24 lines)
14	# mysql_limits (bool): Set to "NO" by default.	14	# mysql_limits (bool): Set to "NO" by default.
15	# Set it to yes to run `limits -e -U mysql`	15	# Set it to yes to run `limits -e -U mysql`
16	# just before mysql starts.	16	# just before mysql starts.
17	# mysql_dbdir (str): Default to "/var/db/mysql"	17	# mysql_dbdir (str): Default to "%%MY_DBDIR%%"
18	# Base database directory.	18	# Base database directory.
		19	# mysql_confdir (str): Default to "%%ETCDIR%%"
		20	# Base configuration directory.
19	# mysql_optfile (str): Server-specific option file.	21	# mysql_optfile (str): Server-specific option file.
20	# Default to "${mysql_dbdir}/my.cnf".	22	# Default to "${mysql_confdir}/my.cnf".
21	# mysql_pidfile (str): Custum PID file path and name.	23	# mysql_pidfile (str): Custum PID file path and name.
22	# Default to "${mysql_dbdir}/${hostname}.pid".	24	# Default to "${mysql_dbdir}/${hostname}.pid".
23	# mysql_args (str): Custom additional arguments to be passed	25	# mysql_args (str): Custom additional arguments to be passed
Lines 33-40 Link Here
33		35
34	: ${mysql_enable="NO"}	36	: ${mysql_enable="NO"}
35	: ${mysql_limits="NO"}	37	: ${mysql_limits="NO"}
36	: ${mysql_dbdir="/var/db/mysql"}	38	: ${mysql_dbdir="%%MY_DBDIR%%"}
		39	: ${mysql_confdir="%%ETCDIR%%"}
		40	if [ -f "${mysql_dbdir}/my.cnf" ]; then
37	: ${mysql_optfile="${mysql_dbdir}/my.cnf"}	41	: ${mysql_optfile="${mysql_dbdir}/my.cnf"}
		42	else
		43	: ${mysql_optfile="${mysql_confdir}/my.cnf"}
		44	fi
38		45
39	mysql_user="mysql"	46	mysql_user="mysql"
40	mysql_limits_args="-e -U ${mysql_user}"	47	mysql_limits_args="-e -U ${mysql_user}"
Lines 41-52 Link Here
41	: ${hostname:=`/bin/hostname`}	48	: ${hostname:=`/bin/hostname`}
42	pidfile=${mysql_pidfile:-"${mysql_dbdir}/${hostname}.pid"}	49	pidfile=${mysql_pidfile:-"${mysql_dbdir}/${hostname}.pid"}
43	command="/usr/sbin/daemon"	50	command="/usr/sbin/daemon"
44	command_args="-c -f %%PREFIX%%/bin/mysqld_safe --defaults-extra-file=${mysql_optfile} --user=${mysql_user} --datadir=${mysql_dbdir} --pid-file=${pidfile} ${mysql_args}"	51	command_args="-c -f %%PREFIX%%/bin/mysqld_safe --defaults-extra-file=${mysql_optfile} --basedir=%%PREFIX%% --datadir=${mysql_dbdir} --pid-file=${pidfile} --user=${mysql_user} ${mysql_args} %%PERFSCHEMRC%%"
45	procname="%%PREFIX%%/libexec/mysqld"	52	procname="%%PREFIX%%/libexec/mysqld"
46	start_precmd="${name}_prestart"	53	start_precmd="${name}_prestart"
47	start_postcmd="${name}_poststart"	54	start_postcmd="${name}_poststart"
48	mysql_install_db="%%PREFIX%%/bin/mysql_install_db"	55	mysql_install_db="%%PREFIX%%/bin/mysql_install_db"
49	mysql_install_db_args="--basedir=%%PREFIX%% --defaults-extra-file=${mysql_optfile} --datadir=${mysql_dbdir} --force"	56	mysql_install_db_args="--defaults-extra-file=${mysql_optfile} --basedir=%%PREFIX%% --datadir=${mysql_dbdir} --user=${mysql_user} --force"
50		57
51	mysql_create_auth_tables()	58	mysql_create_auth_tables()
52	{	59	{
Lines 56-62 Link Here
56		63
57	mysql_prestart()	64	mysql_prestart()
58	{	65	{
59	if [ ! -d "${mysql_dbdir}/mysql/." ]; then	66	if [ -f "${mysql_dbdir}/my.cnf" ]; then
		67	echo ""
		68	echo "Please keep in mind that the default location for my.cnf has changed"
		69	echo "from \"%%MY_DBDIR%%/my.cnf\" to \"%%ETCDIR%%/my.cnf\". "
		70	echo "Please merge your existing my.cnf with the new default and move"
		71	echo "it to \"%%ETCDIR%%/my.cnf\"."
		72	echo "If you do not want to move your my.cnf to the new location then"
		73	echo "you must set \"mysql_optfile\" in /etc/rc.conf to \"/var/db/mysql/my.cnf\"."
		74	echo ""
		75	fi
		76
		77	if [ ! -d "${mysql_dbdir}/mysql" ]; then
60	mysql_create_auth_tables \|\| return 1	78	mysql_create_auth_tables \|\| return 1
61	fi	79	fi
62	if checkyesno mysql_limits; then	80	if checkyesno mysql_limits; then

Lines 1-6 Link Here

(-)databases/mysql56-server/files/patch-mysys_ssl_my_default.cc (-10 / +40 lines)
1	--- mysys_ssl/my_default.cc.orig 2013-01-22 17:54:49.000000000 +0100	1	--- mysys_ssl/my_default.cc.orig 2016-11-28 13:36:22 UTC
2	+++ mysys_ssl/my_default.cc 2013-02-13 11:08:15.000000000 +0100	2	+++ mysys_ssl/my_default.cc
3	@@ -119,7 +119,7 @@	3	@@ -110,7 +110,7 @@ static my_bool defaults_already_read= FA
4		4
5	/* Which directories are searched for options (and in which order) */	5	/* Which directories are searched for options (and in which order) */
6		6
Lines 9-26 Link Here
9	#define DEFAULT_DIRS_SIZE (MAX_DEFAULT_DIRS + 1) /* Terminate with NULL */	9	#define DEFAULT_DIRS_SIZE (MAX_DEFAULT_DIRS + 1) /* Terminate with NULL */
10	static const char **default_directories = NULL;	10	static const char **default_directories = NULL;
11		11
12	@@ -1395,7 +1395,10 @@	12	@@ -903,6 +903,14 @@ static int search_default_file_with_ext(
		13	return 1; /* Ignore wrong files */
		14	}
13		15
14	#if defined(DEFAULT_SYSCONFDIR)	16	+ if (strstr(name, "/etc") == name)
15	if (DEFAULT_SYSCONFDIR[0])
16	+ {	17	+ {
17	errors += add_directory(alloc, DEFAULT_SYSCONFDIR, dirs);	18	+ fprintf(stderr,
18	+ errors += add_directory(alloc, DEFAULT_SYSCONFDIR "/mysql", dirs);	19	+ "error: Config file %s in invalid location, please move to or merge with /usr/local%s\n",
		20	+ name,name);
		21	+ goto err;
19	+ }	22	+ }
20	#endif /* DEFAULT_SYSCONFDIR */	23	+
		24	while (mysql_file_getline(buff, sizeof(buff) - 1, fp, is_login_file))
		25	{
		26	line++;
		27	@@ -1241,7 +1249,8 @@ void my_print_default_files(const char *
		28	end[(strlen(end)-1)] = ' ';
		29	else
		30	strxmov(end, conf_file, *ext , " ", NullS);
		31	- fputs(name, stdout);
		32	+ if (strstr(name, "/etc") != name)
		33	+ fputs(name, stdout);
		34	}
		35	}
		36	}
		37	@@ -1400,13 +1409,8 @@ static const char **init_default_directo
21		38
		39	#else
		40
		41	- errors += add_directory(alloc, "/etc/", dirs);
		42	- errors += add_directory(alloc, "/etc/mysql/", dirs);
		43	-
		44	-#if defined(DEFAULT_SYSCONFDIR)
		45	- if (DEFAULT_SYSCONFDIR[0])
		46	- errors += add_directory(alloc, DEFAULT_SYSCONFDIR, dirs);
		47	-#endif /* DEFAULT_SYSCONFDIR */
		48	+ errors += add_directory(alloc, "/usr/local/etc/", dirs);
		49	+ errors += add_directory(alloc, "/usr/local/etc/mysql/", dirs);
		50
22	#endif	51	#endif
23	@@ -1466,7 +1469,7 @@	52
		53	@@ -1477,7 +1481,7 @@ int check_file_permissions(const char *f
24	MY_STAT stat_info;	54	MY_STAT stat_info;
25		55
26	if (!my_stat(file_name,&stat_info,MYF(0)))	56	if (!my_stat(file_name,&stat_info,MYF(0)))

Lines 1-6 Link Here

(-)databases/mysql56-server/pkg-message (-2 / +15 lines)
1	************************************************************************	1	*****************************************************************************
2		2
3	Remember to run mysql_upgrade the first time you start the MySQL server	3	Remember to run mysql_upgrade the first time you start the MySQL server
4	after an upgrade from an earlier version.	4	after an upgrade from an earlier version.
5		5
6	************************************************************************	6	Initial password for first time use of MySQL is saved in $HOME/.mysql_secret
		7	ie. when you want to use "mysql -u root -p" first you should see password
		8	in /root/.mysql_secret
		9
		10	*****************************************************************************
		11
		12	*****************************************************************************
		13
		14	Please keep in mind that the default location for my.cnf will be changed
		15	from "/var/db/mysql/my.cnf" to "/usr/local/etc/mysql/my.cnf" in the near
		16	future. If you do not want to move your my.cnf to the new location then
		17	you must set "mysql_optfile" in /etc/rc.conf to "/var/db/mysql/my.cnf".
		18
		19	*****************************************************************************

Lines 27-34 Link Here

(-)databases/mysql56-server/pkg-plist (+6 lines)
27	lib/mysql/plugin/adt_null.so	27	lib/mysql/plugin/adt_null.so
28	lib/mysql/plugin/auth.so	28	lib/mysql/plugin/auth.so
29	lib/mysql/plugin/auth_test_plugin.so	29	lib/mysql/plugin/auth_test_plugin.so
		30	lib/mysql/plugin/connection_control.so
30	lib/mysql/plugin/daemon_example.ini	31	lib/mysql/plugin/daemon_example.ini
31	lib/mysql/plugin/libdaemon_example.so	32	lib/mysql/plugin/libdaemon_example.so
		33	%%EXAMPLE%%lib/mysql/plugin/ha_example.so
32	lib/mysql/plugin/mypluglib.so	34	lib/mysql/plugin/mypluglib.so
33	lib/mysql/plugin/mysql_no_login.so	35	lib/mysql/plugin/mysql_no_login.so
34	lib/mysql/plugin/qa_auth_client.so	36	lib/mysql/plugin/qa_auth_client.so
Lines 130-132 Link Here
130	%%DATADIR%%/spanish/errmsg.sys	132	%%DATADIR%%/spanish/errmsg.sys
131	%%DATADIR%%/swedish/errmsg.sys	133	%%DATADIR%%/swedish/errmsg.sys
132	%%DATADIR%%/ukrainian/errmsg.sys	134	%%DATADIR%%/ukrainian/errmsg.sys
		135	@sample(root,wheel,0644) %%ETCDIR%%/my.cnf.sample
		136	@dir(mysql,mysql,0750) %%ETCDIR%%/keyring
		137	@dir(mysql,mysql,0750) %%MY_SECDIR%%
		138	@dir(mysql,mysql,0750) %%MY_TMPDIR%%

Return to bug 216244

Lines 2-11 Link Here

(-)databases/mysql56-client/Makefile (-3 / +10 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= mysql	4	PORTNAME= mysql
		5	PORTREVISION?= 0
5	PKGNAMESUFFIX= 56-client	6	PKGNAMESUFFIX= 56-client
6		7
7	COMMENT= Multithreaded SQL database (client)	8	COMMENT= Multithreaded SQL database (client)
8		9
		10	LICENSE+= LGPL21
		11
		12	BROKEN_powerpc64= Does not build
		13	BROKEN_sparc64= Does not build: reports unsupported compiler
		14
9	MASTERDIR= ${.CURDIR}/../mysql56-server	15	MASTERDIR= ${.CURDIR}/../mysql56-server
10		16
11	PKGMESSAGE= ${.CURDIR}/pkg-message	17	PKGMESSAGE= ${.CURDIR}/pkg-message
Lines 13-24 Link Here
13	PLIST= ${.CURDIR}/pkg-plist	19	PLIST= ${.CURDIR}/pkg-plist
14		20
15	CONFLICTS_INSTALL= mysql5[0-57-9]-client-* \	21	CONFLICTS_INSTALL= mysql5[0-57-9]-client-* \
16	mariadb-client- \	22	mysql[0-46-9][0-9]-client-* \
17	percona-client-	23	mariadb[0-9][0-9]-client-* \
		24	percona[0-9][0-9]-client-*
18		25
19	CMAKE_ARGS+= -DWITHOUT_SERVER=1	26	CMAKE_ARGS+= -DWITHOUT_SERVER=1
20		27
21	USE_LDCONFIG= ${PREFIX}/lib/mysql	28	USE_LDCONFIG+= ${PREFIX}/lib/mysql
22		29
23	MMAN1= comp_err.1 msql2mysql.1 mysql.1 mysql_config.1 mysql_config_editor.1 mysql_find_rows.1 \	30	MMAN1= comp_err.1 msql2mysql.1 mysql.1 mysql_config.1 mysql_config_editor.1 mysql_find_rows.1 \
24	mysql_waitpid.1 mysqlaccess.1 mysqladmin.1 mysqlbinlog.1 \	31	mysql_waitpid.1 mysqlaccess.1 mysqladmin.1 mysqlbinlog.1 \

Lines 1-6 Link Here

(-)databases/mysql56-client/files/patch-CMakeLists.txt (-5 / +5 lines)
1	--- CMakeLists.txt.orig 2016-03-03 16:35:33.000000000 +0100	1	--- CMakeLists.txt.orig 2016-11-28 13:36:22 UTC
2	+++ CMakeLists.txt 2016-04-19 17:30:13.343558770 +0200	2	+++ CMakeLists.txt
3	@@ -475,8 +475,8 @@ ENDIF()	3	@@ -481,8 +481,8 @@ ENDIF()
4		4
5	ADD_SUBDIRECTORY(extra)	5	ADD_SUBDIRECTORY(extra)
6	ADD_SUBDIRECTORY(client)	6	ADD_SUBDIRECTORY(client)
Lines 10-16 Link Here
10		10
11	IF(UNIX)	11	IF(UNIX)
12	ADD_SUBDIRECTORY(man)	12	ADD_SUBDIRECTORY(man)
13	@@ -546,18 +546,17 @@ ELSE()	13	@@ -552,18 +552,17 @@ ELSE()
14	SET(CPACK_GENERATOR "TGZ")	14	SET(CPACK_GENERATOR "TGZ")
15	ENDIF()	15	ENDIF()
16	ADD_SUBDIRECTORY(packaging/WiX)	16	ADD_SUBDIRECTORY(packaging/WiX)
Lines 30-36 Link Here
30	IF(NOT INSTALL_LAYOUT MATCHES "RPM")	30	IF(NOT INSTALL_LAYOUT MATCHES "RPM")
31	INSTALL(FILES COPYING LICENSE.mysql	31	INSTALL(FILES COPYING LICENSE.mysql
32	DESTINATION ${INSTALL_DOCREADMEDIR}	32	DESTINATION ${INSTALL_DOCREADMEDIR}
33	@@ -579,6 +578,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM")	33	@@ -585,6 +584,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM")
34	PATTERN "sp-imp-spec.txt" EXCLUDE	34	PATTERN "sp-imp-spec.txt" EXCLUDE
35	)	35	)
36	ENDIF()	36	ENDIF()

Lines 1-6 Link Here

(-)databases/mysql56-client/files/patch-extra_CMakeLists.txt (-4 / +12 lines)
1	--- extra/CMakeLists.txt.orig 2016-03-03 16:35:33.000000000 +0100	1	--- extra/CMakeLists.txt.orig 2016-11-28 13:36:22 UTC
2	+++ extra/CMakeLists.txt 2016-04-19 17:37:34.634528313 +0200	2	+++ extra/CMakeLists.txt
3	@@ -60,6 +60,7 @@ IF (WIN32 AND WITH_SSL_PATH AND HAVE_CRY	3	@@ -35,6 +35,7 @@ ENDIF()
		4
		5	ADD_CUSTOM_COMMAND(OUTPUT ${PROJECT_BINARY_DIR}/include/mysqld_error.h
		6	${PROJECT_BINARY_DIR}/sql/share/english/errmsg.sys
		7	+ COMMAND mkdir -p ${PROJECT_BINARY_DIR}/sql/share/
		8	COMMAND comp_err
		9	--charset=${PROJECT_SOURCE_DIR}/sql/share/charsets
		10	--out-dir=${PROJECT_BINARY_DIR}/sql/share/
		11	@@ -60,6 +61,7 @@ IF (WIN32 AND WITH_SSL_PATH AND HAVE_CRY
4	ENDIF()	12	ENDIF()
5		13
6		14
Lines 8-14 Link Here
8	MYSQL_ADD_EXECUTABLE(my_print_defaults my_print_defaults.c)	16	MYSQL_ADD_EXECUTABLE(my_print_defaults my_print_defaults.c)
9	TARGET_LINK_LIBRARIES(my_print_defaults mysys mysys_ssl)	17	TARGET_LINK_LIBRARIES(my_print_defaults mysys mysys_ssl)
10	SET_TARGET_PROPERTIES(my_print_defaults PROPERTIES LINKER_LANGUAGE CXX)	18	SET_TARGET_PROPERTIES(my_print_defaults PROPERTIES LINKER_LANGUAGE CXX)
11	@@ -96,10 +97,13 @@ IF(WITH_INNOBASE_STORAGE_ENGINE)	19	@@ -96,10 +98,13 @@ IF(WITH_INNOBASE_STORAGE_ENGINE)
12	MYSQL_ADD_EXECUTABLE(innochecksum innochecksum.cc ${INNOBASE_SOURCES})	20	MYSQL_ADD_EXECUTABLE(innochecksum innochecksum.cc ${INNOBASE_SOURCES})
13	TARGET_LINK_LIBRARIES(innochecksum mysys mysys_ssl)	21	TARGET_LINK_LIBRARIES(innochecksum mysys mysys_ssl)
14	ENDIF()	22	ENDIF()

Lines 1-13 Link Here

(-)databases/mysql56-client/files/patch-man_CMakeLists.txt (-4 / +6 lines)
1	--- man/CMakeLists.txt.orig 2011-10-22 14:08:32.000000000 +0200	1	--- man/CMakeLists.txt.orig 2016-11-28 13:36:22 UTC
2	+++ man/CMakeLists.txt 2011-10-22 14:22:42.000000000 +0200	2	+++ man/CMakeLists.txt
3	@@ -15,10 +15,6 @@	3	@@ -14,11 +14,7 @@
		4	# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
4		5
5	# Copy man pages	6	# Copy man pages
6	FILE(GLOB MAN1_FILES *.1)	7	-FILE(GLOB MAN1_FILES *.1)
7	-FILE(GLOB MAN1_EXCLUDE make_win_bin_dist.1)	8	-FILE(GLOB MAN1_EXCLUDE make_win_bin_dist.1)
8	-FILE(GLOB MAN1_NDB ndb*.1)	9	-FILE(GLOB MAN1_NDB ndb*.1)
9	-FILE(GLOB MAN8_FILES *.8)	10	-FILE(GLOB MAN8_FILES *.8)
10	-FILE(GLOB MAN8_NDB ndb*.8)	11	-FILE(GLOB MAN8_NDB ndb*.8)
		12	+FILE(GLOB MAN1_FILES comp_err.1 msql2mysql.1 mysql.1 mysql_config.1 mysql_config_editor.1 mysql_find_rows.1 mysql_waitpid.1 mysqlaccess.1 mysqladmin.1 mysqlbinlog.1 mysqlcheck.1 mysqldump.1 mysqlimport.1 mysqlshow.1 mysqlslap.1)
11	IF(MAN1_FILES)	13	IF(MAN1_FILES)
12	IF(MAN1_EXCLUDE)	14	IF(MAN1_EXCLUDE)
13	LIST(REMOVE_ITEM MAN1_FILES ${MAN1_EXCLUDE})	15	LIST(REMOVE_ITEM MAN1_FILES ${MAN1_EXCLUDE})

Lines 1-6 Link Here

(-)databases/mysql56-client/files/patch-scripts_CMakeLists.txt (-13 / +13 lines)
1	--- scripts/CMakeLists.txt.orig 2013-01-22 17:54:49.000000000 +0100	1	--- scripts/CMakeLists.txt.orig 2016-11-28 13:36:22 UTC
2	+++ scripts/CMakeLists.txt 2013-02-13 14:14:11.000000000 +0100	2	+++ scripts/CMakeLists.txt
3	@@ -71,6 +71,7 @@	3	@@ -71,6 +71,7 @@ IF(UNIX)
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	@@ -80,6 +81,7 @@	11	@@ -80,6 +81,7 @@ INSTALL(FILES
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	@@ -139,6 +141,7 @@	19	@@ -168,6 +170,7 @@ ENDIF()
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	@@ -175,6 +178,7 @@	27	@@ -204,6 +207,7 @@ INSTALL_SCRIPT(${CMAKE_CURRENT_BINARY_DI
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	@@ -199,6 +203,7 @@	35	@@ -228,6 +232,7 @@ ELSE()
36	SET(localstatedir ${MYSQL_DATADIR})	36	SET(localstatedir ${MYSQL_DATADIR})
37	ENDIF()	37	ENDIF()
38		38
Lines 40-54 Link Here
40	IF(UNIX)	40	IF(UNIX)
41	SET(EXT)	41	SET(EXT)
42	ELSE()	42	ELSE()
43	@@ -213,6 +218,7 @@	43	@@ -242,6 +247,7 @@ INSTALL_SCRIPT(
44	DESTINATION ${DEST}	44	DESTINATION ${DEST}
45	COMPONENT Server	45	COMPONENT Server
46	)	46	)
47	+ENDIF()	47	+ENDIF()
48		48
49
50	SET(prefix "${CMAKE_INSTALL_PREFIX}")	49	SET(prefix "${CMAKE_INSTALL_PREFIX}")
51	@@ -264,6 +270,8 @@	50	SET(sysconfdir ${prefix})
		51	@@ -298,6 +304,8 @@ MACRO(EXTRACT_LINK_LIBRARIES target var)
52	GET_FILENAME_COMPONENT(lib "${lib}" NAME_WE)	52	GET_FILENAME_COMPONENT(lib "${lib}" NAME_WE)
53	STRING(REGEX REPLACE "^lib" "" lib "${lib}")	53	STRING(REGEX REPLACE "^lib" "" lib "${lib}")
54	SET(${var} "${${var}}-l${lib} " )	54	SET(${var} "${${var}}-l${lib} " )
Lines 57-63 Link Here
57	ELSE()	57	ELSE()
58	SET(${var} "${${var}}-l${lib} " )	58	SET(${var} "${${var}}-l${lib} " )
59	ENDIF()	59	ENDIF()
60	@@ -316,17 +324,9 @@	60	@@ -353,17 +361,9 @@ ELSE()
61	SET(BIN_SCRIPTS	61	SET(BIN_SCRIPTS
62	msql2mysql	62	msql2mysql
63	mysql_config	63	mysql_config
Lines 75-81 Link Here
75	)	75	)
76	FOREACH(file ${BIN_SCRIPTS})	76	FOREACH(file ${BIN_SCRIPTS})
77	IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh)	77	IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh)
78	@@ -350,6 +350,7 @@	78	@@ -387,6 +387,7 @@ ELSE()
79	)	79	)
80	ENDFOREACH()	80	ENDFOREACH()
81		81
Lines 83-89 Link Here
83	# Input files with pl.in extension - drop the extension completely	83	# Input files with pl.in extension - drop the extension completely
84	SET(PLIN_FILES mysql_secure_installation)	84	SET(PLIN_FILES mysql_secure_installation)
85	FOREACH(file ${PLIN_FILES})	85	FOREACH(file ${PLIN_FILES})
86	@@ -362,6 +363,7 @@	86	@@ -399,6 +400,7 @@ ELSE()
87	INSTALL_SCRIPT(${CMAKE_CURRENT_BINARY_DIR}/${file} COMPONENT ${${file}_COMPONENT})	87	INSTALL_SCRIPT(${CMAKE_CURRENT_BINARY_DIR}/${file} COMPONENT ${${file}_COMPONENT})
88	ENDFOREACH()	88	ENDFOREACH()
89	ENDIF()	89	ENDIF()

Lines 1-6 Link Here

(-)databases/mysql56-client/files/patch-support-files_CMakeLists.txt (-5 / +5 lines)
1	--- support-files/CMakeLists.txt.orig 2013-01-22 17:54:50.000000000 +0100	1	--- support-files/CMakeLists.txt.orig 2016-11-28 13:36:22 UTC
2	+++ support-files/CMakeLists.txt 2013-02-13 11:13:32.000000000 +0100	2	+++ support-files/CMakeLists.txt
3	@@ -44,14 +44,17 @@	3	@@ -44,14 +44,17 @@ ELSE()
4	SET(inst_location ${INSTALL_SUPPORTFILESDIR})	4	SET(inst_location ${INSTALL_SUPPORTFILESDIR})
5	ENDIF()	5	ENDIF()
6		6
Lines 18-24 Link Here
18	FOREACH(script mysqld_multi.server mysql-log-rotate binary-configure)	18	FOREACH(script mysqld_multi.server mysql-log-rotate binary-configure)
19	CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${script}.sh	19	CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${script}.sh
20	${CMAKE_CURRENT_BINARY_DIR}/${script} @ONLY )	20	${CMAKE_CURRENT_BINARY_DIR}/${script} @ONLY )
21	@@ -68,8 +71,10 @@	21	@@ -68,8 +71,10 @@ IF(UNIX)
22	IF(INSTALL_SUPPORTFILESDIR)	22	IF(INSTALL_SUPPORTFILESDIR)
23	INSTALL(FILES magic DESTINATION ${inst_location} COMPONENT SupportFiles)	23	INSTALL(FILES magic DESTINATION ${inst_location} COMPONENT SupportFiles)
24	ENDIF()	24	ENDIF()
Lines 29-35 Link Here
29	CONFIGURE_FILE(MySQL-shared-compat.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/MySQL-shared-compat.spec @ONLY)	29	CONFIGURE_FILE(MySQL-shared-compat.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/MySQL-shared-compat.spec @ONLY)
30	CONFIGURE_FILE(mysql.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/mysql.spec @ONLY)	30	CONFIGURE_FILE(mysql.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/mysql.spec @ONLY)
31		31
32	@@ -94,3 +99,4 @@	32	@@ -94,3 +99,4 @@ IF(UNIX)
33	PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ	33	PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ
34	GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)	34	GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
35	ENDIF()	35	ENDIF()

Lines 2-8 Link Here

(-)databases/mysql56-server/Makefile (-15 / +89 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME?= mysql	4	PORTNAME?= mysql
5	PORTVERSION= 5.6.34	5	PORTVERSION= 5.6.35
6	PORTREVISION?= 0	6	PORTREVISION?= 0
7	CATEGORIES= databases ipv6	7	CATEGORIES= databases ipv6
8	MASTER_SITES= MYSQL/MySQL-5.6	8	MASTER_SITES= MYSQL/MySQL-5.6
Lines 11-38 Link Here
11	MAINTAINER= ale@FreeBSD.org	11	MAINTAINER= ale@FreeBSD.org
12	COMMENT?= Multithreaded SQL database (server)	12	COMMENT?= Multithreaded SQL database (server)
13		13
14	BROKEN_powerpc64= Does not build	14	LICENSE= GPLv2
15		15
16	SLAVEDIRS= databases/mysql56-client	16	SLAVEDIRS= databases/mysql56-client
17	USES= cmake shebangfix	17	USES= bison:build cmake:outsource compiler:c11 compiler:c++11-lib \
		18	cpe libedit localbase perl5 shebangfix ssl
18		19
19	CMAKE_ARGS+= -DINSTALL_DOCDIR="share/doc/mysql" \	20	USE_PERL5= run
		21
		22	MY_DBDIR= /var/db/mysql
		23	MY_SECDIR= /var/db/mysql_secure
		24	MY_TMPDIR= /var/db/mysql_tmpdir
		25
		26	LIB_DEPENDS+= libevent.so:devel/libevent2 \
		27	liblz4.so:archivers/liblz4
		28
		29	CMAKE_BUILD_TYPE= Release
		30
		31	CMAKE_ARGS+= -DINSTALL_LAYOUT=FREEBSD \
		32	-DINSTALL_LDCONFIGDIR="${LOCALBASE}/libdata/ldconfig" \
		33	-DINSTALL_PKGCONFIGDIR="${LOCALBASE}/libdata/pkgconfig" \
		34	-DINSTALL_DOCDIR="share/doc/mysql" \
20	-DINSTALL_DOCREADMEDIR="share/doc/mysql" \	35	-DINSTALL_DOCREADMEDIR="share/doc/mysql" \
21	-DINSTALL_INCLUDEDIR="include/mysql" \	36	-DINSTALL_INCLUDEDIR="include/mysql" \
22	-DINSTALL_INFODIR="info" \	37	-DINSTALL_INFODIR="info" \
23	-DINSTALL_LIBDIR="lib/mysql" \	38	-DINSTALL_LIBDIR="lib/mysql" \
24	-DINSTALL_MANDIR="man" \	39	-DINSTALL_MANDIR="man" \
25	-DINSTALL_MYSQLDATADIR="/var/db/mysql" \	40	-DINSTALL_MYSQLDATADIR="${MY_DBDIR}" \
		41	-DINSTALL_MYSQLKEYRINGDIR="etc/mysql/keyring" \
26	-DINSTALL_MYSQLSHAREDIR="share/mysql" \	42	-DINSTALL_MYSQLSHAREDIR="share/mysql" \
27	-DINSTALL_MYSQLTESTDIR="share/mysql/tests" \	43	-DINSTALL_MYSQLTESTDIR="share/mysql/tests" \
28	-DINSTALL_PLUGINDIR="lib/mysql/plugin" \	44	-DINSTALL_PLUGINDIR="lib/mysql/plugin" \
29	-DINSTALL_SBINDIR="libexec" \	45	-DINSTALL_SBINDIR="libexec" \
30	-DINSTALL_SCRIPTDIR="bin" \	46	-DINSTALL_SCRIPTDIR="bin" \
		47	-DINSTALL_SECURE_FILE_PRIVDIR="${MY_SECDIR}" \
31	-DINSTALL_SHAREDIR="share" \	48	-DINSTALL_SHAREDIR="share" \
32	-DINSTALL_SQLBENCHDIR="share/mysql" \	49	-DINSTALL_SQLBENCHDIR="share/mysql" \
33	-DINSTALL_SUPPORTFILESDIR="share/mysql" \	50	-DINSTALL_SUPPORTFILESDIR="share/mysql" \
		51	-DMYSQL_KEYRINGDIR="${ETCDIR}/keyring" \
		52	-DWITH_BOOST="${WRKSRC}/boost" \
34	-DWITH_EDITLINE=system \	53	-DWITH_EDITLINE=system \
35	-DWITH_LIBWRAP=1	54	-DWITH_LIBEVENT=system \
		55	-DWITH_LZ4=system \
		56	-DWITH_ZLIB=system \
		57	-DINSTALL_MYSQLTESTDIR=0
36		58
37	SHEBANG_FILES= scripts/.pl scripts/*.sh	59	SHEBANG_FILES= scripts/.pl scripts/*.sh
38		60
Lines 40-62 Link Here
40	.error You have `USE_MYSQL' variable defined either in environment or in make(1) arguments. Please undefine and try again.	62	.error You have `USE_MYSQL' variable defined either in environment or in make(1) arguments. Please undefine and try again.
41	.endif	63	.endif
42		64
		65	SUB_LIST= MY_DBDIR=${MY_DBDIR} \
		66	MY_SECDIR=${MY_SECDIR} \
		67	MY_TMPDIR=${MY_TMPDIR}
		68
		69	PLIST_SUB= MY_DBDIR=${MY_DBDIR} \
		70	MY_SECDIR=${MY_SECDIR} \
		71	MY_TMPDIR=${MY_TMPDIR}
		72
43	# MySQL-Server part	73	# MySQL-Server part
44	.if !defined(CLIENT_ONLY)	74	.if !defined(CLIENT_ONLY)
45	USE_MYSQL= yes	75	USES+= mysql:56
46	WANT_MYSQL_VER= 56
47		76
48	USES+= perl5
49	USE_PERL5= run
50
51	CONFLICTS_INSTALL= mysql5[0-57-9]-server-* \	77	CONFLICTS_INSTALL= mysql5[0-57-9]-server-* \
52	mariadb-server- \	78	mysql[0-46-9][0-9]-server-* \
53	percona-server-	79	mariadb[0-9][0-9]-server-* \
		80	percona[0-9][0-9]-server-*
54		81
55	USE_RC_SUBR= mysql-server	82	USE_RC_SUBR= mysql-server
56		83
		84	SUB_FILES= my.cnf.sample
		85
57	USERS= mysql	86	USERS= mysql
58	GROUPS= mysql	87	GROUPS= mysql
59		88
		89	USE_LDCONFIG+= ${PREFIX}/lib/mysql/plugin
		90
60	MMAN1= my_print_defaults.1 myisam_ftdump.1 myisamchk.1 myisamlog.1 myisampack.1 \	91	MMAN1= my_print_defaults.1 myisam_ftdump.1 myisamchk.1 myisamlog.1 myisampack.1 \
61	mysql.server.1 mysql_convert_table_format.1 mysql_fix_extensions.1 \	92	mysql.server.1 mysql_convert_table_format.1 mysql_fix_extensions.1 \
62	mysql_install_db.1 mysql_plugin.1 mysql_secure_installation.1 mysql_setpermission.1 \	93	mysql_install_db.1 mysql_plugin.1 mysql_secure_installation.1 mysql_setpermission.1 \
Lines 65-79 Link Here
65	mysqltest.1 perror.1 replace.1 resolve_stack_dump.1 resolveip.1	96	mysqltest.1 perror.1 replace.1 resolve_stack_dump.1 resolveip.1
66		97
67	CMAKE_ARGS+= -DWITH_EMBEDDED_SERVER="ON"	98	CMAKE_ARGS+= -DWITH_EMBEDDED_SERVER="ON"
		99
		100	OPTIONS_GROUP= STORAGE
		101	OPTIONS_GROUP_STORAGE= ARCHIVE BLACKHOLE EXAMPLE FEDERATED INNOBASE PARTITION PERFSCHEMA
		102	OPTIONS_SUB= YES
		103	STORAGE_DESC= Permissible "Storage Engines" (to compile statically into the server)
		104	ARCHIVE_DESC= Compile "Archive Storage" statically in server
		105	BLACKHOLE_DESC= Compile "Blackhole Storage" statically in server
		106	EXAMPLE_DESC= Compile "Example Storage" statically in server
		107	FEDERATED_DESC= Compile "Federated Storage" statically in server
		108	INNOBASE_DESC= Compile "InnoDB Storage" statically in server
		109	PARTITION_DESC= Compile "Partitioning support Storage" statically in server
		110	PERFSCHEMA_DESC= Compile "Performance Schema Storage" statically in server
		111
		112	ARCHIVE_CMAKE_ON= -DWITH_ARCHIVE_STORAGE_ENGINE=1
		113	BLACKHOLE_CMAKE_ON= -DWITH_BLACKHOLE_STORAGE_ENGINE=1
		114	EXAMPLE_CMAKE_ON= -DWITH_EXAMPLE_STORAGE_ENGINE=1
		115	FEDERATED_CMAKE_ON= -DWITH_FEDERATED_STORAGE_ENGINE=1
		116	INNOBASE_CMAKE_ON= -DWITH_INNOBASE_STORAGE_ENGINE=1
		117	PARTITION_CMAKE_ON= -DWITH_PARTITION_STORAGE_ENGINE=1
		118	PERFSCHEMA_CMAKE_ON= -DWITH_PERFSCHEMA_STORAGE_ENGINE=1
		119
		120	OPTIONS_GROUP+= FEATURES
		121	OPTIONS_GROUP_FEATURES= PERFSCHM
		122	FEATURES_DESC= Default features knobs
		123	PERFSCHM_DESC= Enable "Performance Schema" by default (High RAM usage)
		124	OPTIONS_DEFAULT+= PERFSCHM
		125
		126	PERFSCHM_SUB_LIST+= PERFSCHEMRC=""
		127	PERFSCHM_SUB_LIST_OFF+= PERFSCHEMRC="--skip-performance-schema"
		128	.endif
		129
		130	.include <bsd.port.pre.mk>
		131
		132	.if ${SSL_DEFAULT} == base
		133	CMAKE_ARGS+= -DWITH_SSL=system
68	.else	134	.else
69	USES+= libedit	135	CMAKE_ARGS+= -DWITH_SSL=${OPENSSLBASE}
70	.endif	136	.endif
71		137
72	post-patch:	138	post-patch:
73	@${REINPLACE_CMD} 's/*.1/${MMAN1}/' ${WRKSRC}/man/CMakeLists.txt	139	@${REINPLACE_CMD} 's/*.1/${MMAN1}/' ${WRKSRC}/man/CMakeLists.txt
74		140
75	.include <bsd.port.pre.mk>	141	.if !defined(CLIENT_ONLY)
		142	post-install:
		143	${MKDIR} ${STAGEDIR}${ETCDIR}
		144	${INSTALL_DATA} ${WRKDIR}/my.cnf.sample ${STAGEDIR}${ETCDIR}/my.cnf.sample
76		145
		146	${MKDIR} ${STAGEDIR}${ETCDIR}/keyring
		147	${MKDIR} ${STAGEDIR}${MY_SECDIR}
		148	${MKDIR} ${STAGEDIR}${MY_TMPDIR}
		149	.endif
		150
77	.if ${ARCH} == "armv6"	151	.if ${ARCH} == "armv6"
78	EXTRA_PATCHES+= ${FILESDIR}/extra-patch-config.h.cmake	152	EXTRA_PATCHES+= ${FILESDIR}/extra-patch-config.h.cmake
79	.endif	153	.endif

Line 0 Link Here

(-)databases/mysql56-server/files/my.cnf.sample.in (+63 lines)
	1	# $FreeBSD$
	2
	3	[client]
	4	port = 3306
	5	socket = /tmp/mysql.sock
	6
	7	[mysql]
	8	prompt = \u@\h [\d]>\_
	9	no_auto_rehash
	10
	11	[mysqld]
	12	user = mysql
	13	port = 3306
	14	socket = /tmp/mysql.sock
	15	bind-address = 127.0.0.1
	16	basedir = %%PREFIX%%
	17	datadir = %%MY_DBDIR%%
	18	tmpdir = %%MY_TMPDIR%%
	19	slave-load-tmpdir = %%MY_TMPDIR%%
	20	secure-file-priv = %%MY_SECDIR%%
	21	log-bin = mysql-bin
	22	log-output = TABLE
	23	master-info-repository = TABLE
	24	relay-log-info-repository = TABLE
	25	relay-log-recovery = 1
	26	slow-query-log = 1
	27	server-id = 1
	28	sync_binlog = 1
	29	sync_relay_log = 1
	30	binlog_cache_size = 16M
	31	expire_logs_days = 30
	32	log-slave-updates = 1
	33	enforce-gtid-consistency = 1
	34	gtid-mode = ON
	35	safe-user-create = 1
	36	lower_case_table_names = 1
	37	explicit-defaults-for-timestamp = 1
	38	myisam-recover-options = BACKUP,FORCE
	39	open_files_limit = 32768
	40	table_open_cache = 16384
	41	table_definition_cache = 8192
	42	net_retry_count = 16384
	43	key_buffer_size = 256M
	44	max_allowed_packet = 64M
	45	query_cache_type = 0
	46	query_cache_size = 0
	47	long_query_time = 0.5
	48	innodb_buffer_pool_size = 1G
	49	innodb_data_home_dir = %%MY_DBDIR%%
	50	innodb_log_group_home_dir = %%MY_DBDIR%%
	51	innodb_data_file_path = ibdata1:128M:autoextend
	52	innodb_flush_method = O_DIRECT
	53	innodb_log_file_size = 256M
	54	innodb_log_buffer_size = 16M
	55	innodb_write_io_threads = 8
	56	innodb_read_io_threads = 8
	57	innodb_autoinc_lock_mode = 2
	58	skip-symbolic-links
	59
	60	[mysqldump]
	61	max_allowed_packet = 256M
	62	quote_names
	63	quick