From owner-svn-ports-head@freebsd.org  Fri Oct 16 20:43:59 2020
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.nyi.freebsd.org (Postfix) with ESMTP id C513743FA38;
 Fri, 16 Oct 2020 20:43:59 +0000 (UTC)
 (envelope-from joneum@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
 client-signature RSA-PSS (4096 bits) client-digest SHA256)
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 4CCdRM4ddfz49YL;
 Fri, 16 Oct 2020 20:43:59 +0000 (UTC)
 (envelope-from joneum@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 82235162C9;
 Fri, 16 Oct 2020 20:43:59 +0000 (UTC)
 (envelope-from joneum@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 09GKhxDf018737;
 Fri, 16 Oct 2020 20:43:59 GMT (envelope-from joneum@FreeBSD.org)
Received: (from joneum@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id 09GKhwQU018731;
 Fri, 16 Oct 2020 20:43:58 GMT (envelope-from joneum@FreeBSD.org)
Message-Id: <202010162043.09GKhwQU018731@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: joneum set sender to
 joneum@FreeBSD.org using -f
From: Jochen Neumeister <joneum@FreeBSD.org>
Date: Fri, 16 Oct 2020 20:43:58 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r552522 - in head/databases: mysql56-server
 mysql56-server/files mysql57-server mysql57-server/files mysql80-server
 mysql80-server/files
X-SVN-Group: ports-head
X-SVN-Commit-Author: joneum
X-SVN-Commit-Paths: in head/databases: mysql56-server mysql56-server/files
 mysql57-server mysql57-server/files mysql80-server mysql80-server/files
X-SVN-Commit-Revision: 552522
X-SVN-Commit-Repository: ports
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.33
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 16 Oct 2020 20:43:59 -0000

Author: joneum
Date: Fri Oct 16 20:43:57 2020
New Revision: 552522
URL: https://svnweb.freebsd.org/changeset/ports/552522

Log:
  Fix pkg-messages
  
  PR:		250340
  Submitted by:	0mp
  Sponsored by:	Netzkommune GmbH

Added:
  head/databases/mysql56-server/files/pkg-message.in   (contents, props changed)
  head/databases/mysql57-server/files/pkg-message.in   (contents, props changed)
  head/databases/mysql80-server/files/pkg-message.in   (contents, props changed)
Deleted:
  head/databases/mysql56-server/pkg-message
  head/databases/mysql57-server/pkg-message
  head/databases/mysql80-server/pkg-message
Modified:
  head/databases/mysql56-server/Makefile
  head/databases/mysql57-server/Makefile
  head/databases/mysql80-server/Makefile

Modified: head/databases/mysql56-server/Makefile
==============================================================================
--- head/databases/mysql56-server/Makefile	Fri Oct 16 19:56:25 2020	(r552521)
+++ head/databases/mysql56-server/Makefile	Fri Oct 16 20:43:57 2020	(r552522)
@@ -3,7 +3,7 @@
 
 PORTNAME?=	mysql
 PORTVERSION=	5.6.49
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	databases
 MASTER_SITES=	MYSQL/MySQL-5.6
 PKGNAMESUFFIX?=	56-server
@@ -87,7 +87,7 @@ CONFLICTS_INSTALL=	mysql5[0-57-9]-server-* \
 
 USE_RC_SUBR=	mysql-server
 
-SUB_FILES=	my.cnf.sample
+SUB_FILES=	my.cnf.sample pkg-message
 
 USERS=		mysql
 GROUPS=		mysql

Added: head/databases/mysql56-server/files/pkg-message.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/databases/mysql56-server/files/pkg-message.in	Fri Oct 16 20:43:57 2020	(r552522)
@@ -0,0 +1,16 @@
+[
+{ type: install
+  message: <<EOM
+Please keep in mind that the default location for my.cnf will be changed
+from "/var/db/mysql/my.cnf" to "%%ETCDIR%%/my.cnf" in the near
+future.  If you do not want to move your my.cnf to the new location then
+you must set "mysql_optfile" in /etc/rc.conf to "/var/db/mysql/my.cnf".
+EOM
+}
+{ type: upgrade
+  message: <<EOM
+Remember to run mysql_upgrade the first time you start the MySQL server
+after an upgrade from an earlier version.
+EOM
+}
+]

Modified: head/databases/mysql57-server/Makefile
==============================================================================
--- head/databases/mysql57-server/Makefile	Fri Oct 16 19:56:25 2020	(r552521)
+++ head/databases/mysql57-server/Makefile	Fri Oct 16 20:43:57 2020	(r552522)
@@ -3,7 +3,7 @@
 
 PORTNAME?=	mysql
 PORTVERSION=	5.7.31
-PORTREVISION?=	1
+PORTREVISION?=	2
 CATEGORIES=	databases
 MASTER_SITES=	MYSQL/MySQL-5.7
 PKGNAMESUFFIX?=	57-server
@@ -91,7 +91,7 @@ CONFLICTS_INSTALL=	mysql5[0-68-9]-server-* \
 
 USE_RC_SUBR=	mysql-server
 
-SUB_FILES=	my.cnf.sample
+SUB_FILES=	my.cnf.sample pkg-message
 
 USERS=		mysql
 GROUPS=		mysql

Added: head/databases/mysql57-server/files/pkg-message.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/databases/mysql57-server/files/pkg-message.in	Fri Oct 16 20:43:57 2020	(r552522)
@@ -0,0 +1,19 @@
+[
+{ type: install
+  message: <<EOM
+Initial password for first time use of MySQL is saved in $HOME/.mysql_secret
+ie. when you want to use "mysql -u root -p" first you should see password
+in /root/.mysql_secret
+
+MySQL57 has a default %%ETCDIR%%/my.cnf,
+remember to replace it wit your own
+or set `mysql_optfile="$YOUR_CNF_FILE` in rc.conf.
+EOM
+}
+{ type: upgrade
+  message: <<EOM
+Remember to run mysql_upgrade the first time you start the MySQL server
+after an upgrade from an earlier version.
+EOM
+}
+]

Modified: head/databases/mysql80-server/Makefile
==============================================================================
--- head/databases/mysql80-server/Makefile	Fri Oct 16 19:56:25 2020	(r552521)
+++ head/databases/mysql80-server/Makefile	Fri Oct 16 20:43:57 2020	(r552522)
@@ -3,7 +3,7 @@
 
 PORTNAME?=		mysql
 PORTVERSION=		8.0.21
-PORTREVISION?=		2
+PORTREVISION?=		3
 CATEGORIES=		databases
 MASTER_SITES=		MYSQL/MySQL-8.0
 PKGNAMESUFFIX?=		80-server
@@ -120,7 +120,7 @@ CONFLICTS_INSTALL=	mysql8[1-9]-server-* \
 
 USE_RC_SUBR=	mysql-server
 
-SUB_FILES=	my.cnf.sample
+SUB_FILES=	my.cnf.sample pkg-message
 
 USERS=		mysql
 GROUPS=		mysql

Added: head/databases/mysql80-server/files/pkg-message.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/databases/mysql80-server/files/pkg-message.in	Fri Oct 16 20:43:57 2020	(r552522)
@@ -0,0 +1,21 @@
+[
+{ type: install
+  message: <<EOM
+There is no initial password for first time use of MySQL.
+Keep in mind to reset it to a secure password.
+
+MySQL80 has a default %%ETCDIR%%/my.cnf,
+remember to replace it with your own
+or set `mysql_optfile="$YOUR_CNF_FILE` in rc.conf.
+EOM
+}
+{ type: upgrade
+  message: <<EOM
+As of MySQL 8.0.16, the MySQL server performs the upgrade tasks previously
+handled by mysql_upgrade. Consequently, mysql_upgrade is unneeded and is
+deprecated as of that version, and will be removed in a future MySQL version.
+Because mysql_upgrade no longer performs upgrade tasks,
+it exits with status 0 unconditionally. 
+EOM
+}
+]