Sun May 23 19:09:19 2021 UTC ()
mariadb*: update COMMENTs


(nia)
diff -r1.3 -r1.4 pkgsrc/databases/mariadb104-client/Makefile
diff -r1.3 -r1.4 pkgsrc/databases/mariadb104-server/Makefile
diff -r1.1 -r1.2 pkgsrc/databases/mariadb105-client/Makefile
diff -r1.1 -r1.2 pkgsrc/databases/mariadb105-server/Makefile
cvs diff -r1.3 -r1.4 pkgsrc/databases/mariadb104-client/Makefile (switch to unified diff)

--- pkgsrc/databases/mariadb104-client/Makefile 2021/05/12 11:20:29 1.3
+++ pkgsrc/databases/mariadb104-client/Makefile 2021/05/23 19:09:18 1.4
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1# $NetBSD: Makefile,v 1.3 2021/05/12 11:20:29 nia Exp $ 1# $NetBSD: Makefile,v 1.4 2021/05/23 19:09:18 nia Exp $
2 2
3PKGNAME= ${DISTNAME:S/-/-client-/} 3PKGNAME= ${DISTNAME:S/-/-client-/}
4PKGREVISION= 2 4PKGREVISION= 2
5COMMENT= MariaDB 10.4, a free SQL database (client) 5COMMENT= MariaDB 10.4, a free MySQL compatible database (client)
6 6
7CONFLICTS= mysql-client-[0-9]* 7CONFLICTS= mysql-client-[0-9]*
8 8
9.include "Makefile.common" 9.include "Makefile.common"
10 10
11CMAKE_ARGS+= -DWITHOUT_SERVER=ON 11CMAKE_ARGS+= -DWITHOUT_SERVER=ON
12 12
13INSTALL_DIRS+= client include libmariadb man scripts 13INSTALL_DIRS+= client include libmariadb man scripts
14 14
15.include "options.mk" 15.include "options.mk"
16.include "../../mk/bsd.pkg.mk" 16.include "../../mk/bsd.pkg.mk"
cvs diff -r1.3 -r1.4 pkgsrc/databases/mariadb104-server/Makefile (switch to unified diff)

--- pkgsrc/databases/mariadb104-server/Makefile 2021/05/11 17:26:50 1.3
+++ pkgsrc/databases/mariadb104-server/Makefile 2021/05/23 19:09:18 1.4
@@ -1,77 +1,77 @@ @@ -1,77 +1,77 @@
1# $NetBSD: Makefile,v 1.3 2021/05/11 17:26:50 nia Exp $ 1# $NetBSD: Makefile,v 1.4 2021/05/23 19:09:18 nia Exp $
2 2
3PKGNAME= ${DISTNAME:S/-/-server-/} 3PKGNAME= ${DISTNAME:S/-/-server-/}
4PKGREVISION= 2 4PKGREVISION= 2
5COMMENT= MariaDB 10.4, a free SQL database (server) 5COMMENT= MariaDB 10.4, a free MySQL compatible database (server)
6 6
7CONFLICTS= mysql-server-[0-9]* 7CONFLICTS= mysql-server-[0-9]*
8 8
9.include "../../databases/mariadb104-client/Makefile.common" 9.include "../../databases/mariadb104-client/Makefile.common"
10 10
11CMAKE_ARGS+= -DPYTHON_SHEBANG=${PYTHONBIN} 11CMAKE_ARGS+= -DPYTHON_SHEBANG=${PYTHONBIN}
12 12
13BUILD_DEFS+= VARBASE 13BUILD_DEFS+= VARBASE
14 14
15.include "../../mk/bsd.fast.prefs.mk" 15.include "../../mk/bsd.fast.prefs.mk"
16 16
17.if !empty(MYSQL_DATADIR) 17.if !empty(MYSQL_DATADIR)
18MARIADB_DATADIR?= ${MYSQL_DATADIR} 18MARIADB_DATADIR?= ${MYSQL_DATADIR}
19.else 19.else
20MARIADB_DATADIR?= ${VARBASE}/db/mariadb 20MARIADB_DATADIR?= ${VARBASE}/db/mariadb
21.endif 21.endif
22 22
23.if !empty(MYSQL_USER) 23.if !empty(MYSQL_USER)
24MARIADB_USER?= ${MYSQL_USER} 24MARIADB_USER?= ${MYSQL_USER}
25.else 25.else
26MARIADB_USER?= mariadb 26MARIADB_USER?= mariadb
27.endif 27.endif
28 28
29.if !empty(MYSQL_GROUP) 29.if !empty(MYSQL_GROUP)
30MARIADB_GROUP?= ${MYSQL_GROUP} 30MARIADB_GROUP?= ${MYSQL_GROUP}
31.else 31.else
32MARIADB_GROUP?= mariadb 32MARIADB_GROUP?= mariadb
33.endif 33.endif
34 34
35PKG_USERS_VARS+= MARIADB_USER 35PKG_USERS_VARS+= MARIADB_USER
36PKG_GROUPS_VARS+= MARIADB_GROUP 36PKG_GROUPS_VARS+= MARIADB_GROUP
37 37
38PKG_GROUPS= ${MARIADB_GROUP} 38PKG_GROUPS= ${MARIADB_GROUP}
39PKG_USERS= ${MARIADB_USER}:${MARIADB_GROUP} 39PKG_USERS= ${MARIADB_USER}:${MARIADB_GROUP}
40 40
41PKG_GECOS.${MARIADB_USER}= MariaDB administrator 41PKG_GECOS.${MARIADB_USER}= MariaDB administrator
42PKG_HOME.${MARIADB_USER}= ${MARIADB_DATADIR} 42PKG_HOME.${MARIADB_USER}= ${MARIADB_DATADIR}
43PKG_SHELL.${MARIADB_USER}= ${SH} 43PKG_SHELL.${MARIADB_USER}= ${SH}
44 44
45RCD_SCRIPTS= mariadb 45RCD_SCRIPTS= mariadb
46SMF_NAME= mariadb 46SMF_NAME= mariadb
47SMF_METHODS= ${RCD_SCRIPTS} 47SMF_METHODS= ${RCD_SCRIPTS}
48 48
49FILES_SUBST+= HOSTNAME_CMD=${HOSTNAME_CMD:Q} 49FILES_SUBST+= HOSTNAME_CMD=${HOSTNAME_CMD:Q}
50FILES_SUBST+= MARIADB_DATADIR=${MARIADB_DATADIR} 50FILES_SUBST+= MARIADB_DATADIR=${MARIADB_DATADIR}
51FILES_SUBST+= MARIADB_USER=${MARIADB_USER} MARIADB_GROUP=${MARIADB_GROUP} 51FILES_SUBST+= MARIADB_USER=${MARIADB_USER} MARIADB_GROUP=${MARIADB_GROUP}
52BUILD_DEFS+= MARIADB_DATADIR 52BUILD_DEFS+= MARIADB_DATADIR
53 53
54OWN_DIRS_PERMS+= ${MARIADB_DATADIR} ${MARIADB_USER} ${MARIADB_GROUP} 0700 54OWN_DIRS_PERMS+= ${MARIADB_DATADIR} ${MARIADB_USER} ${MARIADB_GROUP} 0700
55OWN_DIRS_PERMS+= ${VARBASE}/run/mariadb ${MARIADB_USER} ${MARIADB_GROUP} 0700 55OWN_DIRS_PERMS+= ${VARBASE}/run/mariadb ${MARIADB_USER} ${MARIADB_GROUP} 0700
56OWN_DIRS_PERMS+= ${VARBASE}/log/mariadb ${MARIADB_USER} ${MARIADB_GROUP} 0700 56OWN_DIRS_PERMS+= ${VARBASE}/log/mariadb ${MARIADB_USER} ${MARIADB_GROUP} 0700
57 57
58USE_TOOLS= bash:run perl:run 58USE_TOOLS= bash:run perl:run
59REPLACE_BASH+= scripts/wsrep_sst_*.sh 59REPLACE_BASH+= scripts/wsrep_sst_*.sh
60REPLACE_BASH+= scripts/mariadb-service-convert 60REPLACE_BASH+= scripts/mariadb-service-convert
61 61
62post-install: 62post-install:
63 ${CHMOD} +x ${DESTDIR}${PREFIX}/bin/mysql_install_db 63 ${CHMOD} +x ${DESTDIR}${PREFIX}/bin/mysql_install_db
64 64
65.include "options.mk" 65.include "options.mk"
66.include "../../archivers/lz4/buildlink3.mk" 66.include "../../archivers/lz4/buildlink3.mk"
67.include "../../databases/mariadb104-client/buildlink3.mk" 67.include "../../databases/mariadb104-client/buildlink3.mk"
68.include "../../devel/boost-libs/buildlink3.mk" 68.include "../../devel/boost-libs/buildlink3.mk"
69.include "../../devel/libexecinfo/buildlink3.mk" 69.include "../../devel/libexecinfo/buildlink3.mk"
70.include "../../devel/libjudy/buildlink3.mk" 70.include "../../devel/libjudy/buildlink3.mk"
71.include "../../devel/msgpack/buildlink3.mk" 71.include "../../devel/msgpack/buildlink3.mk"
72.include "../../devel/pcre/buildlink3.mk" 72.include "../../devel/pcre/buildlink3.mk"
73.include "../../devel/snappy/buildlink3.mk" 73.include "../../devel/snappy/buildlink3.mk"
74.include "../../lang/python/application.mk" 74.include "../../lang/python/application.mk"
75.include "../../security/tcp_wrappers/buildlink3.mk" 75.include "../../security/tcp_wrappers/buildlink3.mk"
76.include "../../textproc/libxml2/buildlink3.mk" 76.include "../../textproc/libxml2/buildlink3.mk"
77.include "../../mk/bsd.pkg.mk" 77.include "../../mk/bsd.pkg.mk"
cvs diff -r1.1 -r1.2 pkgsrc/databases/mariadb105-client/Makefile (switch to unified diff)

--- pkgsrc/databases/mariadb105-client/Makefile 2021/05/23 15:32:47 1.1
+++ pkgsrc/databases/mariadb105-client/Makefile 2021/05/23 19:09:18 1.2
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1# $NetBSD: Makefile,v 1.1 2021/05/23 15:32:47 nia Exp $ 1# $NetBSD: Makefile,v 1.2 2021/05/23 19:09:18 nia Exp $
2 2
3PKGNAME= ${DISTNAME:S/-/-client-/} 3PKGNAME= ${DISTNAME:S/-/-client-/}
4COMMENT= MariaDB 10.5, a free SQL database (client) 4COMMENT= MariaDB 10.5, a free MySQL compatible database (client)
5 5
6CONFLICTS= mysql-client-[0-9]* 6CONFLICTS= mysql-client-[0-9]*
7 7
8.include "Makefile.common" 8.include "Makefile.common"
9 9
10CMAKE_ARGS+= -DWITHOUT_SERVER=ON 10CMAKE_ARGS+= -DWITHOUT_SERVER=ON
11 11
12INSTALL_DIRS+= client include libmariadb man scripts 12INSTALL_DIRS+= client include libmariadb man scripts
13 13
14.include "options.mk" 14.include "options.mk"
15.include "../../mk/bsd.pkg.mk" 15.include "../../mk/bsd.pkg.mk"
cvs diff -r1.1 -r1.2 pkgsrc/databases/mariadb105-server/Makefile (switch to unified diff)

--- pkgsrc/databases/mariadb105-server/Makefile 2021/05/23 15:32:48 1.1
+++ pkgsrc/databases/mariadb105-server/Makefile 2021/05/23 19:09:19 1.2
@@ -1,76 +1,76 @@ @@ -1,76 +1,76 @@
1# $NetBSD: Makefile,v 1.1 2021/05/23 15:32:48 nia Exp $ 1# $NetBSD: Makefile,v 1.2 2021/05/23 19:09:19 nia Exp $
2 2
3PKGNAME= ${DISTNAME:S/-/-server-/} 3PKGNAME= ${DISTNAME:S/-/-server-/}
4COMMENT= MariaDB 10.5, a free SQL database (server) 4COMMENT= MariaDB 10.5, a free MySQL compatible database (server)
5 5
6CONFLICTS= mysql-server-[0-9]* 6CONFLICTS= mysql-server-[0-9]*
7 7
8.include "../../databases/mariadb105-client/Makefile.common" 8.include "../../databases/mariadb105-client/Makefile.common"
9 9
10CMAKE_ARGS+= -DPYTHON_SHEBANG=${PYTHONBIN} 10CMAKE_ARGS+= -DPYTHON_SHEBANG=${PYTHONBIN}
11 11
12BUILD_DEFS+= VARBASE 12BUILD_DEFS+= VARBASE
13 13
14.include "../../mk/bsd.fast.prefs.mk" 14.include "../../mk/bsd.fast.prefs.mk"
15 15
16.if !empty(MYSQL_DATADIR) 16.if !empty(MYSQL_DATADIR)
17MARIADB_DATADIR?= ${MYSQL_DATADIR} 17MARIADB_DATADIR?= ${MYSQL_DATADIR}
18.else 18.else
19MARIADB_DATADIR?= ${VARBASE}/db/mariadb 19MARIADB_DATADIR?= ${VARBASE}/db/mariadb
20.endif 20.endif
21 21
22.if !empty(MYSQL_USER) 22.if !empty(MYSQL_USER)
23MARIADB_USER?= ${MYSQL_USER} 23MARIADB_USER?= ${MYSQL_USER}
24.else 24.else
25MARIADB_USER?= mariadb 25MARIADB_USER?= mariadb
26.endif 26.endif
27 27
28.if !empty(MYSQL_GROUP) 28.if !empty(MYSQL_GROUP)
29MARIADB_GROUP?= ${MYSQL_GROUP} 29MARIADB_GROUP?= ${MYSQL_GROUP}
30.else 30.else
31MARIADB_GROUP?= mariadb 31MARIADB_GROUP?= mariadb
32.endif 32.endif
33 33
34PKG_USERS_VARS+= MARIADB_USER 34PKG_USERS_VARS+= MARIADB_USER
35PKG_GROUPS_VARS+= MARIADB_GROUP 35PKG_GROUPS_VARS+= MARIADB_GROUP
36 36
37PKG_GROUPS= ${MARIADB_GROUP} 37PKG_GROUPS= ${MARIADB_GROUP}
38PKG_USERS= ${MARIADB_USER}:${MARIADB_GROUP} 38PKG_USERS= ${MARIADB_USER}:${MARIADB_GROUP}
39 39
40PKG_GECOS.${MARIADB_USER}= MariaDB administrator 40PKG_GECOS.${MARIADB_USER}= MariaDB administrator
41PKG_HOME.${MARIADB_USER}= ${MARIADB_DATADIR} 41PKG_HOME.${MARIADB_USER}= ${MARIADB_DATADIR}
42PKG_SHELL.${MARIADB_USER}= ${SH} 42PKG_SHELL.${MARIADB_USER}= ${SH}
43 43
44RCD_SCRIPTS= mariadb 44RCD_SCRIPTS= mariadb
45SMF_NAME= mariadb 45SMF_NAME= mariadb
46SMF_METHODS= ${RCD_SCRIPTS} 46SMF_METHODS= ${RCD_SCRIPTS}
47 47
48FILES_SUBST+= HOSTNAME_CMD=${HOSTNAME_CMD:Q} 48FILES_SUBST+= HOSTNAME_CMD=${HOSTNAME_CMD:Q}
49FILES_SUBST+= MARIADB_DATADIR=${MARIADB_DATADIR} 49FILES_SUBST+= MARIADB_DATADIR=${MARIADB_DATADIR}
50FILES_SUBST+= MARIADB_USER=${MARIADB_USER} MARIADB_GROUP=${MARIADB_GROUP} 50FILES_SUBST+= MARIADB_USER=${MARIADB_USER} MARIADB_GROUP=${MARIADB_GROUP}
51BUILD_DEFS+= MARIADB_DATADIR 51BUILD_DEFS+= MARIADB_DATADIR
52 52
53OWN_DIRS_PERMS+= ${MARIADB_DATADIR} ${MARIADB_USER} ${MARIADB_GROUP} 0700 53OWN_DIRS_PERMS+= ${MARIADB_DATADIR} ${MARIADB_USER} ${MARIADB_GROUP} 0700
54OWN_DIRS_PERMS+= ${VARBASE}/run/mariadb ${MARIADB_USER} ${MARIADB_GROUP} 0700 54OWN_DIRS_PERMS+= ${VARBASE}/run/mariadb ${MARIADB_USER} ${MARIADB_GROUP} 0700
55OWN_DIRS_PERMS+= ${VARBASE}/log/mariadb ${MARIADB_USER} ${MARIADB_GROUP} 0700 55OWN_DIRS_PERMS+= ${VARBASE}/log/mariadb ${MARIADB_USER} ${MARIADB_GROUP} 0700
56 56
57USE_TOOLS= bash:run perl:run 57USE_TOOLS= bash:run perl:run
58REPLACE_BASH+= scripts/wsrep_sst_*.sh 58REPLACE_BASH+= scripts/wsrep_sst_*.sh
59REPLACE_BASH+= scripts/mariadb-service-convert 59REPLACE_BASH+= scripts/mariadb-service-convert
60 60
61post-install: 61post-install:
62 ${CHMOD} +x ${DESTDIR}${PREFIX}/bin/mysql_install_db 62 ${CHMOD} +x ${DESTDIR}${PREFIX}/bin/mysql_install_db
63 63
64.include "options.mk" 64.include "options.mk"
65.include "../../archivers/lz4/buildlink3.mk" 65.include "../../archivers/lz4/buildlink3.mk"
66.include "../../databases/mariadb105-client/buildlink3.mk" 66.include "../../databases/mariadb105-client/buildlink3.mk"
67.include "../../devel/boost-libs/buildlink3.mk" 67.include "../../devel/boost-libs/buildlink3.mk"
68.include "../../devel/libexecinfo/buildlink3.mk" 68.include "../../devel/libexecinfo/buildlink3.mk"
69.include "../../devel/libjudy/buildlink3.mk" 69.include "../../devel/libjudy/buildlink3.mk"
70.include "../../devel/msgpack/buildlink3.mk" 70.include "../../devel/msgpack/buildlink3.mk"
71.include "../../devel/pcre/buildlink3.mk" 71.include "../../devel/pcre/buildlink3.mk"
72.include "../../devel/snappy/buildlink3.mk" 72.include "../../devel/snappy/buildlink3.mk"
73.include "../../lang/python/application.mk" 73.include "../../lang/python/application.mk"
74.include "../../security/tcp_wrappers/buildlink3.mk" 74.include "../../security/tcp_wrappers/buildlink3.mk"
75.include "../../textproc/libxml2/buildlink3.mk" 75.include "../../textproc/libxml2/buildlink3.mk"
76.include "../../mk/bsd.pkg.mk" 76.include "../../mk/bsd.pkg.mk"