From cd814d3f7148417f11cf153a96d84bebf9478499 Mon Sep 17 00:00:00 2001
From: fhajny <fhajny>
Date: Tue, 14 Jun 2016 13:23:44 +0000
Subject: Use proper CONF_FILES for my.cnf. Makes mysql56-client look for it
 under $PKG_SYSCONFDIR, and prevents mysql_install_db from creating
 $PREFIX/my.cnf. Brings mysql56-client and mysql56-server in sync WRT my.cnf
 location. Bump respective PKGREVISIONs.

Noticed by peterkelm@ on Github.
---
 databases/mysql56-server/Makefile | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'databases/mysql56-server')

diff --git a/databases/mysql56-server/Makefile b/databases/mysql56-server/Makefile
index bc0a8b4f5e2..4febdf9f67f 100644
--- a/databases/mysql56-server/Makefile
+++ b/databases/mysql56-server/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.28 2016/04/18 10:32:47 adam Exp $
+# $NetBSD: Makefile,v 1.29 2016/06/14 13:23:45 fhajny Exp $
 
 PKGNAME=	${DISTNAME:S/-/-server-/}
+PKGREVISION=	1
 COMMENT=	MySQL 5, a free SQL database (server)
 
 CONFLICTS=	mysql3-server-[0-9]*
@@ -36,6 +37,8 @@ PLIST.auth_socket=	yes
 
 PTHREAD_OPTS+=		require
 
+CONF_FILES+=		share/mysql/my-default.cnf ${PKG_SYSCONFDIR}/my.cnf
+
 PKG_GROUPS=		${MYSQL_GROUP}
 PKG_USERS=		${MYSQL_USER}:${MYSQL_GROUP}
 
-- 
cgit v1.2.3