kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

mariadb*: Simplify variable assignment and dedup.

Browse source
This commit is contained in:
jperkin 2021-05-25 11:14:54 +00:00
parent c48324dbac
commit 010a9a6d69
4 changed files with 22 additions and 90 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
databases/mariadb104-client/Makefile.common
View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile.common,v 1.5 2021/05/25 11:06:41 jperkin Exp $
# $NetBSD: Makefile.common,v 1.6 2021/05/25 11:14:54 jperkin Exp $
#
# used by databases/mariadb104-client/Makefile
# used by databases/mariadb104-server/Makefile
@ -24,32 +24,13 @@ PLIST_SRC= ${PLIST_SRC_DFLT}
.include "../../mk/bsd.prefs.mk"
# home directory (location of the databases)
.if !empty(MYSQL_DATADIR)
MARIADB_DATADIR?= ${MYSQL_DATADIR}
.else
MARIADB_DATADIR?= ${VARBASE}/db/mariadb
.endif
# default character set
.if !empty(MYSQL_CHARSET)
MARIADB_CHARSET?= ${MYSQL_CHARSET}
.else
MARIADB_CHARSET?= utf8mb4
.endif
# additional character set to be compiled in
.if !empty(MYSQL_COLLATION)
MARIADB_COLLATION?= ${MYSQL_COLLATION}
.else
MARIADB_COLLATION?= utf8mb4_unicode_ci
.endif
.if !empty(MYSQL_EXTRA_CHARSET)
MARIADB_EXTRA_CHARSET?= ${MYSQL_EXTRA_CHARSET}
.else
MARIADB_EXTRA_CHARSET?= all
.endif
#
# Use MySQL defaults if set.
#
MARIADB_DATADIR?= ${MYSQL_DATADIR:U${VARBASE}/db/mariadb}
MARIADB_CHARSET?= ${MYSQL_CHARSET:Uutf8mb4}
MARIADB_COLLATION?= ${MYSQL_COLLATION:Uutf8mb4_unicode_ci}
MARIADB_EXTRA_CHARSET?= ${MYSQL_EXTRA_CHARSET:Uall}
BUILD_DEFS+= VARBASE

21
databases/mariadb104-server/Makefile
View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.5 2021/05/24 19:49:29 wiz Exp $
# $NetBSD: Makefile,v 1.6 2021/05/25 11:14:54 jperkin Exp $
PKGNAME= ${DISTNAME:S/-/-server-/}
PKGREVISION= 3
@ -14,23 +14,8 @@ BUILD_DEFS+= VARBASE
.include "../../mk/bsd.fast.prefs.mk"
.if !empty(MYSQL_DATADIR)
MARIADB_DATADIR?= ${MYSQL_DATADIR}
.else
MARIADB_DATADIR?= ${VARBASE}/db/mariadb
.endif
.if !empty(MYSQL_USER)
MARIADB_USER?= ${MYSQL_USER}
.else
MARIADB_USER?= mariadb
.endif
.if !empty(MYSQL_GROUP)
MARIADB_GROUP?= ${MYSQL_GROUP}
.else
MARIADB_GROUP?= mariadb
.endif
MARIADB_USER?= ${MYSQL_USER:Umariadb}
MARIADB_GROUP?= ${MYSQL_GROUP:Umariadb}
PKG_USERS_VARS+= MARIADB_USER
PKG_GROUPS_VARS+= MARIADB_GROUP

35
databases/mariadb105-client/Makefile.common
View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile.common,v 1.2 2021/05/25 11:06:41 jperkin Exp $
# $NetBSD: Makefile.common,v 1.3 2021/05/25 11:14:54 jperkin Exp $
#
# used by databases/mariadb105-client/Makefile
# used by databases/mariadb105-server/Makefile
@ -24,32 +24,13 @@ PLIST_SRC= ${PLIST_SRC_DFLT}
.include "../../mk/bsd.prefs.mk"
# home directory (location of the databases)
.if !empty(MYSQL_DATADIR)
MARIADB_DATADIR?= ${MYSQL_DATADIR}
.else
MARIADB_DATADIR?= ${VARBASE}/db/mariadb
.endif
# default character set
.if !empty(MYSQL_CHARSET)
MARIADB_CHARSET?= ${MYSQL_CHARSET}
.else
MARIADB_CHARSET?= utf8mb4
.endif
# additional character set to be compiled in
.if !empty(MYSQL_COLLATION)
MARIADB_COLLATION?= ${MYSQL_COLLATION}
.else
MARIADB_COLLATION?= utf8mb4_unicode_ci
.endif
.if !empty(MYSQL_EXTRA_CHARSET)
MARIADB_EXTRA_CHARSET?= ${MYSQL_EXTRA_CHARSET}
.else
MARIADB_EXTRA_CHARSET?= all
.endif
#
# Use MySQL defaults if set.
#
MARIADB_DATADIR?= ${MYSQL_DATADIR:U${VARBASE}/db/mariadb}
MARIADB_CHARSET?= ${MYSQL_CHARSET:Uutf8mb4}
MARIADB_COLLATION?= ${MYSQL_COLLATION:Uutf8mb4_unicode_ci}
MARIADB_EXTRA_CHARSET?= ${MYSQL_EXTRA_CHARSET:Uall}
BUILD_DEFS+= VARBASE

21
databases/mariadb105-server/Makefile
View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.3 2021/05/24 19:49:29 wiz Exp $
# $NetBSD: Makefile,v 1.4 2021/05/25 11:14:55 jperkin Exp $
PKGNAME= ${DISTNAME:S/-/-server-/}
PKGREVISION= 1
@ -14,23 +14,8 @@ BUILD_DEFS+= VARBASE
.include "../../mk/bsd.fast.prefs.mk"
.if !empty(MYSQL_DATADIR)
MARIADB_DATADIR?= ${MYSQL_DATADIR}
.else
MARIADB_DATADIR?= ${VARBASE}/db/mariadb
.endif
.if !empty(MYSQL_USER)
MARIADB_USER?= ${MYSQL_USER}
.else
MARIADB_USER?= mariadb
.endif
.if !empty(MYSQL_GROUP)
MARIADB_GROUP?= ${MYSQL_GROUP}
.else
MARIADB_GROUP?= mariadb
.endif
MARIADB_USER?= ${MYSQL_USER:Umariadb}
MARIADB_GROUP?= ${MYSQL_GROUP:Umariadb}
PKG_USERS_VARS+= MARIADB_USER
PKG_GROUPS_VARS+= MARIADB_GROUP