Received: by mail.netbsd.org (Postfix, from userid 605) id D066D84DA2; Tue, 25 May 2021 11:14:56 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 1929C84CDC for ; Tue, 25 May 2021 11:14:56 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id LrT1s9sj64Wx for ; Tue, 25 May 2021 11:14:55 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 463CC84C86 for ; Tue, 25 May 2021 11:14:55 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 3EE78FA95; Tue, 25 May 2021 11:14:55 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_162194129540920" MIME-Version: 1.0 Date: Tue, 25 May 2021 11:14:55 +0000 From: "Jonathan Perkin" Subject: CVS commit: pkgsrc/databases To: pkgsrc-changes@NetBSD.org Reply-To: jperkin@netbsd.org X-Mailer: log_accum Message-Id: <20210525111455.3EE78FA95@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_162194129540920 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: jperkin Date: Tue May 25 11:14:55 UTC 2021 Modified Files: pkgsrc/databases/mariadb104-client: Makefile.common pkgsrc/databases/mariadb104-server: Makefile pkgsrc/databases/mariadb105-client: Makefile.common pkgsrc/databases/mariadb105-server: Makefile Log Message: mariadb*: Simplify variable assignment and dedup. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 pkgsrc/databases/mariadb104-client/Makefile.common cvs rdiff -u -r1.5 -r1.6 pkgsrc/databases/mariadb104-server/Makefile cvs rdiff -u -r1.2 -r1.3 pkgsrc/databases/mariadb105-client/Makefile.common cvs rdiff -u -r1.3 -r1.4 pkgsrc/databases/mariadb105-server/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_162194129540920 Content-Disposition: inline Content-Length: 5213 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/databases/mariadb104-client/Makefile.common diff -u pkgsrc/databases/mariadb104-client/Makefile.common:1.5 pkgsrc/databases/mariadb104-client/Makefile.common:1.6 --- pkgsrc/databases/mariadb104-client/Makefile.common:1.5 Tue May 25 11:06:41 2021 +++ pkgsrc/databases/mariadb104-client/Makefile.common Tue May 25 11:14:54 2021 @@ -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 Index: pkgsrc/databases/mariadb104-server/Makefile diff -u pkgsrc/databases/mariadb104-server/Makefile:1.5 pkgsrc/databases/mariadb104-server/Makefile:1.6 --- pkgsrc/databases/mariadb104-server/Makefile:1.5 Mon May 24 19:49:29 2021 +++ pkgsrc/databases/mariadb104-server/Makefile Tue May 25 11:14:54 2021 @@ -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 Index: pkgsrc/databases/mariadb105-client/Makefile.common diff -u pkgsrc/databases/mariadb105-client/Makefile.common:1.2 pkgsrc/databases/mariadb105-client/Makefile.common:1.3 --- pkgsrc/databases/mariadb105-client/Makefile.common:1.2 Tue May 25 11:06:41 2021 +++ pkgsrc/databases/mariadb105-client/Makefile.common Tue May 25 11:14:54 2021 @@ -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 Index: pkgsrc/databases/mariadb105-server/Makefile diff -u pkgsrc/databases/mariadb105-server/Makefile:1.3 pkgsrc/databases/mariadb105-server/Makefile:1.4 --- pkgsrc/databases/mariadb105-server/Makefile:1.3 Mon May 24 19:49:29 2021 +++ pkgsrc/databases/mariadb105-server/Makefile Tue May 25 11:14:55 2021 @@ -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 --_----------=_162194129540920--