summaryrefslogtreecommitdiff
path: root/databases
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2003-09-19 14:34:57 +0000
committerwiz <wiz@pkgsrc.org>2003-09-19 14:34:57 +0000
commit9495ef66cf2aa959be00866739c22f29becb5a32 (patch)
tree856fee1132bfe7f430431f4d11e82718b656fd81 /databases
parentd9181d5f7b363e4f5a6a28d30cbd99be3169dd4f (diff)
downloadpkgsrc-9495ef66cf2aa959be00866739c22f29becb5a32.tar.gz
Do the chown of MYSQL_DATADIR to MYSQL_USER:MYSQL_GROUP automatically in
the install file instead of only mentioning it in MESSAGE. Closes PR 22197. tron says ok. Bump PKGREVISION.
Diffstat (limited to 'databases')
-rw-r--r--databases/mysql-server/INSTALL3
-rw-r--r--databases/mysql-server/MESSAGE7
-rw-r--r--databases/mysql-server/Makefile6
3 files changed, 7 insertions, 9 deletions
diff --git a/databases/mysql-server/INSTALL b/databases/mysql-server/INSTALL
index 1991dcb0f2e..fc672ca59cd 100644
--- a/databases/mysql-server/INSTALL
+++ b/databases/mysql-server/INSTALL
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.4 2003/08/30 20:22:51 jlam Exp $
+# $NetBSD: INSTALL,v 1.5 2003/09/19 14:34:57 wiz Exp $
case ${STAGE} in
POST-INSTALL)
@@ -6,5 +6,6 @@ POST-INSTALL)
${ECHO} "Initializing MySQL databases..."
${ECHO} "-------------------------------"
${PKG_PREFIX}/bin/mysql_install_db --force
+ ${CHOWN} -R @MYSQL_USER@:@MYSQL_GROUP@ @MYSQL_DATADIR@
;;
esac
diff --git a/databases/mysql-server/MESSAGE b/databases/mysql-server/MESSAGE
index 0ee02e6475f..4acb0fe7b23 100644
--- a/databases/mysql-server/MESSAGE
+++ b/databases/mysql-server/MESSAGE
@@ -1,10 +1,5 @@
===========================================================================
-$NetBSD: MESSAGE,v 1.6 2003/05/06 17:40:45 jmmv Exp $
-
-The MySQL directory `${MYSQL_DATADIR}' should be owned by the
-user `${MYSQL_USER}' and group `${MYSQL_GROUP}'. This can be done with:
- chown -R ${MYSQL_USER}:${MYSQL_GROUP} ${MYSQL_DATADIR}
-
+$NetBSD: MESSAGE,v 1.7 2003/09/19 14:34:57 wiz Exp $
If this is a new installation, please remember to set a password for
the MySQL root user! This is done by running both:
diff --git a/databases/mysql-server/Makefile b/databases/mysql-server/Makefile
index 8ff24b31d65..7770dd9f5ee 100644
--- a/databases/mysql-server/Makefile
+++ b/databases/mysql-server/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.46 2003/09/18 17:53:50 wiz Exp $
+# $NetBSD: Makefile,v 1.47 2003/09/19 14:34:58 wiz Exp $
PKGNAME= ${DISTNAME:S/-/-server-/}
-PKGREVISION= 5
+PKGREVISION= 6
SVR4_PKGNAME= mysqs
COMMENT= MySQL, a free SQL database (server)
@@ -41,6 +41,8 @@ PKG_GROUPS= ${MYSQL_GROUP}
RCD_SCRIPTS= mysqld
CONFIGURE_ARGS+= --with-mysqld-user=${MYSQL_USER}
FILES_SUBST+= MYSQL_DATADIR=${MYSQL_DATADIR}
+FILES_SUBST+= MYSQL_USER=${MYSQL_USER}
+FILES_SUBST+= MYSQL_GROUP=${MYSQL_GROUP}
MESSAGE_SUBST+= MYSQL_DATADIR=${MYSQL_DATADIR} \
MYSQL_USER=${MYSQL_USER} MYSQL_GROUP=${MYSQL_GROUP}
BUILD_DEFS+= MYSQL_DATADIR