CVS commit: pkgsrc/databases

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Mon May 10 17:31:27 UTC 2021

Modified Files:
        pkgsrc/databases/mariadb104-client: buildlink3.mk options.mk
        pkgsrc/databases/mariadb104-server: buildlink3.mk options.mk

Log Message:
mariadb104*: use consistent name in options and buildlink


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/databases/mariadb104-client/buildlink3.mk \
    pkgsrc/databases/mariadb104-client/options.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/databases/mariadb104-server/buildlink3.mk \
    pkgsrc/databases/mariadb104-server/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/databases/mariadb104-client/buildlink3.mk
diff -u pkgsrc/databases/mariadb104-client/buildlink3.mk:1.2 pkgsrc/databases/mariadb104-client/buildlink3.mk:1.3
--- pkgsrc/databases/mariadb104-client/buildlink3.mk:1.2        Mon May 10 14:15:55 2021
+++ pkgsrc/databases/mariadb104-client/buildlink3.mk    Mon May 10 17:31:27 2021
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2021/05/10 14:15:55 nia Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2021/05/10 17:31:27 nia Exp $
 
 # This buildlink file uses mysql-client and not mariadb-client,
 # because some packages depending on it expect BUILDLINK_*.mysql-client
@@ -15,10 +15,10 @@ BUILDLINK_PKGSRCDIR.mysql-client?=  ../..
 BUILDLINK_INCDIRS.mysql-client+=       include/mysql
 BUILDLINK_LIBDIRS.mysql-client+=       lib
 
-pkgbase := mariadb-client
+pkgbase := mysql-client
 .include "../../mk/pkg-build-options.mk"
 
-.if ${PKG_BUILD_OPTIONS.mariadb-client:Mssl}
+.if ${PKG_BUILD_OPTIONS.mysql-client:Mssl}
 .  include "../../security/openssl/buildlink3.mk"
 .endif
 .include "../../devel/zlib/buildlink3.mk"
Index: pkgsrc/databases/mariadb104-client/options.mk
diff -u pkgsrc/databases/mariadb104-client/options.mk:1.2 pkgsrc/databases/mariadb104-client/options.mk:1.3
--- pkgsrc/databases/mariadb104-client/options.mk:1.2   Mon May 10 14:22:56 2021
+++ pkgsrc/databases/mariadb104-client/options.mk       Mon May 10 17:31:27 2021
@@ -1,6 +1,6 @@
-# $NetBSD: options.mk,v 1.2 2021/05/10 14:22:56 wiz Exp $
+# $NetBSD: options.mk,v 1.3 2021/05/10 17:31:27 nia Exp $
 
-PKG_OPTIONS_VAR=       PKG_OPTIONS.mariadb-client
+PKG_OPTIONS_VAR=       PKG_OPTIONS.mysql-client
 
 PKG_SUPPORTED_OPTIONS+=        ssl
 PKG_SUGGESTED_OPTIONS+=        ssl

Index: pkgsrc/databases/mariadb104-server/buildlink3.mk
diff -u pkgsrc/databases/mariadb104-server/buildlink3.mk:1.1 pkgsrc/databases/mariadb104-server/buildlink3.mk:1.2
--- pkgsrc/databases/mariadb104-server/buildlink3.mk:1.1        Sat May  8 19:47:16 2021
+++ pkgsrc/databases/mariadb104-server/buildlink3.mk    Mon May 10 17:31:27 2021
@@ -1,15 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.1 2021/05/08 19:47:16 jdolecek Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2021/05/10 17:31:27 nia Exp $
 
-BUILDLINK_TREE+=       mariadb-server
+BUILDLINK_TREE+=       mysql-server
 
-.if !defined(MARIADB_SERVER_BUILDLINK3_MK)
-MARIADB_SERVER_BUILDLINK3_MK:=
+.if !defined(MYSQL_SERVER_BUILDLINK3_MK)
+MYSQL_SERVER_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.mariadb-server+= mariadb-server>=10.4.0
-BUILDLINK_ABI_DEPENDS.mariadb-server+= mariadb-server>=10.4.0
-BUILDLINK_PKGSRCDIR.mariadb-server?=   ../../databases/mariadb104-server
-BUILDLINK_LIBDIRS.mariadb-server+=     lib
+BUILDLINK_API_DEPENDS.mysql-server+=   mariadb-server>=10.4.0
+BUILDLINK_ABI_DEPENDS.mysql-server+=   mariadb-server>=10.4.0
+BUILDLINK_PKGSRCDIR.mysql-server?=     ../../databases/mariadb104-server
+BUILDLINK_LIBDIRS.mysql-server+=       lib
 
-.endif # MARIADB_SERVER_BUILDLINK3_MK
+.endif # MYSQL_SERVER_BUILDLINK3_MK
 
-BUILDLINK_TREE+=       -mariadb-server
+BUILDLINK_TREE+=       -mysql-server
Index: pkgsrc/databases/mariadb104-server/options.mk
diff -u pkgsrc/databases/mariadb104-server/options.mk:1.1 pkgsrc/databases/mariadb104-server/options.mk:1.2
--- pkgsrc/databases/mariadb104-server/options.mk:1.1   Mon May 10 14:15:55 2021
+++ pkgsrc/databases/mariadb104-server/options.mk       Mon May 10 17:31:27 2021
@@ -1,6 +1,6 @@
-# $NetBSD: options.mk,v 1.1 2021/05/10 14:15:55 nia Exp $
+# $NetBSD: options.mk,v 1.2 2021/05/10 17:31:27 nia Exp $
 
-PKG_OPTIONS_VAR=       PKG_OPTIONS.mariadb-server
+PKG_OPTIONS_VAR=       PKG_OPTIONS.mysql-server
 
 PKG_SUPPORTED_OPTIONS+=        embedded-server ssl
 PKG_SUGGESTED_OPTIONS+=        embedded-server ssl