From owner-svn-ports-all@freebsd.org  Sun Aug  2 19:42:20 2020
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@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 8B4FD3A5958;
 Sun,  2 Aug 2020 19:42:20 +0000 (UTC)
 (envelope-from brnrd@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 4BKWcr2s5Hz3c2c;
 Sun,  2 Aug 2020 19:42:20 +0000 (UTC)
 (envelope-from brnrd@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 4656A883E;
 Sun,  2 Aug 2020 19:42:20 +0000 (UTC)
 (envelope-from brnrd@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 072JgKFB020914;
 Sun, 2 Aug 2020 19:42:20 GMT (envelope-from brnrd@FreeBSD.org)
Received: (from brnrd@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id 072JgJBc020912;
 Sun, 2 Aug 2020 19:42:19 GMT (envelope-from brnrd@FreeBSD.org)
Message-Id: <202008021942.072JgJBc020912@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: brnrd set sender to
 brnrd@FreeBSD.org using -f
From: Bernard Spil <brnrd@FreeBSD.org>
Date: Sun, 2 Aug 2020 19:42:19 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r543994 - in head/databases/mariadb105-server: . files
X-SVN-Group: ports-head
X-SVN-Commit-Author: brnrd
X-SVN-Commit-Paths: in head/databases/mariadb105-server: . files
X-SVN-Commit-Revision: 543994
X-SVN-Commit-Repository: ports
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.33
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 02 Aug 2020 19:42:20 -0000

Author: brnrd
Date: Sun Aug  2 19:42:19 2020
New Revision: 543994
URL: https://svnweb.freebsd.org/changeset/ports/543994

Log:
  databases/mariadb105-server: Fix broken rc.d startup
  
  PR:		248186
  Submitted by:	Naram Qashat <cyberbotx cyberbotx com>

Modified:
  head/databases/mariadb105-server/Makefile
  head/databases/mariadb105-server/files/mysql-server.in

Modified: head/databases/mariadb105-server/Makefile
==============================================================================
--- head/databases/mariadb105-server/Makefile	Sun Aug  2 19:40:05 2020	(r543993)
+++ head/databases/mariadb105-server/Makefile	Sun Aug  2 19:42:19 2020	(r543994)
@@ -3,7 +3,7 @@
 
 PORTNAME?=	mariadb
 PORTVERSION=	10.5.4
-PORTREVISION?=	1
+PORTREVISION?=	2
 CATEGORIES=	databases
 MASTER_SITES=	http://mirrors.supportex.net/${SITESDIR}/ \
 		http://mirror2.hs-esslingen.de/pub/Mirrors/${SITESDIR}/ \

Modified: head/databases/mariadb105-server/files/mysql-server.in
==============================================================================
--- head/databases/mariadb105-server/files/mysql-server.in	Sun Aug  2 19:40:05 2020	(r543993)
+++ head/databases/mariadb105-server/files/mysql-server.in	Sun Aug  2 19:42:19 2020	(r543994)
@@ -99,7 +99,7 @@ fi
 pidfile=$mysql_pidfile
 mysql_install_db="%%PREFIX%%/bin/mariadb-install-db"
 mysql_install_db_args="--basedir=%%PREFIX%% --datadir=${mysql_dbdir} --force"
-command_args="-c -f %%PREFIX%%/bin/mariadb-safe --defaults-extra-file=${mysql_optfile} --user=${mysql_user} --datadir=${mysql_dbdir} --pid-file=${pidfile} ${mysql_args}"
+command_args="-c -f %%PREFIX%%/bin/mariadbd-safe --defaults-extra-file=${mysql_optfile} --user=${mysql_user} --datadir=${mysql_dbdir} --pid-file=${pidfile} ${mysql_args}"
 
 mysql_create_auth_tables()
 {