git: c4ac829e974e - main - databases/mysql80-server: bring back mysql_secure_installation (+)

The branch main has been updated by fluffy:

URL: https://cgit.FreeBSD.org/ports/commit/?id=c4ac829e974e1c9b1de8348588d73a3c1a166a22

commit c4ac829e974e1c9b1de8348588d73a3c1a166a22
Author:     Dima Panov <fluffy@FreeBSD.org>
AuthorDate: 2022-02-22 19:36:22 +0000
Commit:     Dima Panov <fluffy@FreeBSD.org>
CommitDate: 2022-02-22 19:36:22 +0000

    databases/mysql80-server: bring back mysql_secure_installation (+)
    
    Typo in patchfile leads to skip mysql_secure_installation.
    Bring it back.
    
    PR:             262123
    Submitted by:   amdmi3
    Approved by:    joneum (implicit)
---
 databases/mysql80-server/Makefile                          | 2 +-
 databases/mysql80-server/files/patch-client_CMakeLists.txt | 2 +-
 databases/mysql80-server/pkg-plist                         | 4 +++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/databases/mysql80-server/Makefile b/databases/mysql80-server/Makefile
index 781d91f5c3f1..ba3a5232c6f9 100644
--- a/databases/mysql80-server/Makefile
+++ b/databases/mysql80-server/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME?=		mysql
 PORTVERSION=		8.0.28
-PORTREVISION?=		0
+PORTREVISION?=		1
 CATEGORIES=		databases
 MASTER_SITES=		MYSQL/MySQL-8.0
 PKGNAMESUFFIX?=		80-server
diff --git a/databases/mysql80-server/files/patch-client_CMakeLists.txt b/databases/mysql80-server/files/patch-client_CMakeLists.txt
index e91bae0cceb7..6a433a889e80 100644
--- a/databases/mysql80-server/files/patch-client_CMakeLists.txt
+++ b/databases/mysql80-server/files/patch-client_CMakeLists.txt
@@ -56,7 +56,7 @@
    )
 +ENDIF()
 +
-+IF(NOT_WITHOUT_SERVER)
++IF(NOT WITHOUT_SERVER)
  MYSQL_ADD_EXECUTABLE(mysql_secure_installation
    mysql_secure_installation.cc
    LINK_LIBRARIES mysqlclient
diff --git a/databases/mysql80-server/pkg-plist b/databases/mysql80-server/pkg-plist
index 3410b5358397..ac9c0b0e34ce 100644
--- a/databases/mysql80-server/pkg-plist
+++ b/databases/mysql80-server/pkg-plist
@@ -6,13 +6,15 @@ bin/myisam_ftdump
 bin/myisamchk
 bin/myisamlog
 bin/myisampack
-bin/mysqldumpslow
 bin/mysql_client_test
 bin/mysql_keyring_encryption_test
+bin/mysql_secure_installation
+bin/mysql_ssl_rsa_setup
 bin/mysql_tzinfo_to_sql
 bin/mysql_upgrade
 bin/mysqld_multi
 bin/mysqld_safe
+bin/mysqldumpslow
 bin/mysqlrouter
 bin/mysqlrouter_keyring
 bin/mysqlrouter_passwd