5 files changed, 10 insertions, 33 deletions

diff --git a/databases/mysql57-server/Makefile b/databases/mysql57-server/Makefile
index 6def0b349f09..99d64eaddf46 100644
--- a/databases/mysql57-server/Makefile
+++ b/databases/mysql57-server/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	mysql
 PORTVERSION=	5.7.10
+PORTREVISION=	1
 CATEGORIES=	databases ipv6
 MASTER_SITES=	MYSQL/MySQL-5.7:MySQL SF/boost/boost/1.59.0:boost
 PKGNAMESUFFIX?=	57-server
diff --git a/databases/mysql57-server/files/mysql-server.in b/databases/mysql57-server/files/mysql-server.in
index b5015e5505f3..037310374cb1 100644
--- a/databases/mysql57-server/files/mysql-server.in
+++ b/databases/mysql57-server/files/mysql-server.in
@@ -46,7 +46,7 @@ procname="%%PREFIX%%/libexec/mysqld"
 start_precmd="${name}_prestart"
 start_postcmd="${name}_poststart"
 mysql_install_db="%%PREFIX%%/bin/mysql_install_db"
-mysql_install_db_args="--basedir=%%PREFIX%% --defaults-extra-file=${mysql_optfile} --datadir=${mysql_dbdir} --force"
+mysql_install_db_args="--defaults-extra-file=${mysql_optfile} --basedir=%%PREFIX%% --datadir=${mysql_dbdir} --mysqld-file=${procname}"
 
 mysql_create_auth_tables()
 {
diff --git a/databases/mysql57-server/files/patch-extra_CMakeLists.txt b/databases/mysql57-server/files/patch-extra_CMakeLists.txt
deleted file mode 100644
index 8b0589e04b02..000000000000
--- a/databases/mysql57-server/files/patch-extra_CMakeLists.txt
+++ /dev/null
@@ -1,31 +0,0 @@
---- extra/CMakeLists.txt.orig	2015-11-29 19:16:24 UTC
-+++ extra/CMakeLists.txt
-@@ -73,6 +73,7 @@ IF (WIN32 AND WITH_SSL_PATH AND HAVE_CRY
- ENDIF()
- 
- 
-+IF(FALSE)
- 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)
-@@ -101,6 +102,7 @@ TARGET_LINK_LIBRARIES(lz4_decompress ${L
- 
- MYSQL_ADD_EXECUTABLE(zlib_decompress zlib_decompress.cc)
- TARGET_LINK_LIBRARIES(zlib_decompress ${ZLIB_LIBRARY})
-+ENDIF()
- 
- IF(WITH_INNOBASE_STORAGE_ENGINE)
- 
-@@ -143,10 +145,12 @@ IF(WITH_INNOBASE_STORAGE_ENGINE)
-   ADD_DEPENDENCIES(innochecksum GenError)
- ENDIF()
- 
-+IF(FALSE)
- IF(UNIX)
-   MYSQL_ADD_EXECUTABLE(resolve_stack_dump resolve_stack_dump.cc)
-   TARGET_LINK_LIBRARIES(resolve_stack_dump mysys mysys_ssl)
- ENDIF()
-+ENDIF()
- 
- # In published release builds on Solaris, we need to bundle gcc source.
- # PB2 will take care of putting it in extra/ when needed
diff --git a/databases/mysql57-server/files/patch-storage_myisam_mi__dynrec.c b/databases/mysql57-server/files/patch-storage_myisam_mi__dynrec.c
index 9305f2ba7f93..57398630640b 100644
--- a/databases/mysql57-server/files/patch-storage_myisam_mi__dynrec.c
+++ b/databases/mysql57-server/files/patch-storage_myisam_mi__dynrec.c
@@ -1,4 +1,4 @@
---- storage/myisam/mi_dynrec.c.orig	2015-12-14 07:39:39 UTC
+--- storage/myisam/mi_dynrec.c.orig	2015-11-29 19:16:24 UTC
 +++ storage/myisam/mi_dynrec.c
 @@ -65,18 +65,13 @@ my_bool mi_dynmap_file(MI_INFO *info, my
      DBUG_RETURN(1);
diff --git a/databases/mysql57-server/pkg-plist b/databases/mysql57-server/pkg-plist
index f15f5f46cc03..0f57789bb2b5 100644
--- a/databases/mysql57-server/pkg-plist
+++ b/databases/mysql57-server/pkg-plist
@@ -1,4 +1,6 @@
 bin/innochecksum
+bin/lz4_decompress
+bin/my_print_defaults
 bin/myisam_ftdump
 bin/myisamchk
 bin/myisamlog
@@ -12,6 +14,11 @@ bin/mysqld_multi
 bin/mysqld_safe
 bin/mysqldumpslow
 bin/mysqltest
+bin/perror
+bin/replace
+bin/resolve_stack_dump
+bin/resolveip
+bin/zlib_decompress
 include/mysql/binary_log_types.h
 lib/mysql/libmysqld.a
 lib/mysql/plugin/adt_null.so