mariadb104: Add support for embedded-server

[nia <nia%netbsd.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	nia <nia%netbsd.org@localhost>
Pushed By:	nee
Date:		Fri Mar 27 11:04:46 2020 +0000
Changeset:	7ad9733bccdc978e7fbf2e6645734c8737147430

Modified Files:
	mariadb104-client/options.mk
	mariadb104-server/Makefile
Added Files:
	mariadb104-server/PLIST.embedded

Log Message:
mariadb104: Add support for embedded-server

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=7ad9733bccdc978e7fbf2e6645734c8737147430

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

diffstat:
 mariadb104-client/options.mk     |  4 ++--
 mariadb104-server/Makefile       |  9 +++++++--
 mariadb104-server/PLIST.embedded | 15 +++++++++++++++
 3 files changed, 24 insertions(+), 4 deletions(-)

diffs:
diff --git a/mariadb104-client/options.mk b/mariadb104-client/options.mk
index 7f9064a3d9..749a8bd68c 100644
--- a/mariadb104-client/options.mk
+++ b/mariadb104-client/options.mk
@@ -2,8 +2,8 @@
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.mariadb104
 
-PKG_SUPPORTED_OPTIONS+=	ssl
-PKG_SUGGESTED_OPTIONS+=	ssl
+PKG_SUPPORTED_OPTIONS+=	embedded-server ssl
+PKG_SUGGESTED_OPTIONS+=	embedded-server ssl
 
 .include "../../mk/bsd.options.mk"
 
diff --git a/mariadb104-server/Makefile b/mariadb104-server/Makefile
index 6071abbfe2..089e0c74b4 100644
--- a/mariadb104-server/Makefile
+++ b/mariadb104-server/Makefile
@@ -7,14 +7,19 @@ CONFLICTS=	mysql-server-[0-9]*
 
 .include "../../wip/mariadb104-client/Makefile.common"
 
+.if !empty(PKG_OPTIONS:Membedded-server)
+CMAKE_ARGS+=			-DWITH_EMBEDDED_SERVER=ON
+PLIST_SRC+=			PLIST.embedded
+.else
+CMAKE_ARGS+=			-DWITH_EMBEDDED_SERVER=OFF
 # We only need readline to placate the configure script if we don't build
 # the embedded server as it is the only binary linked against "readline".
+BUILDLINK_DEPMETHOD.editline=	build
 BUILDLINK_DEPMETHOD.readline=	build
+.endif
 
 CMAKE_ARGS+=		-DPYTHON_SHEBANG=${PYTHONBIN}
 
-PLIST_VARS+=		embedded
-
 .include "../../mk/bsd.fast.prefs.mk"
 
 MYSQL_USER?=		mysql
diff --git a/mariadb104-server/PLIST.embedded b/mariadb104-server/PLIST.embedded
new file mode 100644
index 0000000000..7e48d3fe75
--- /dev/null
+++ b/mariadb104-server/PLIST.embedded
@@ -0,0 +1,15 @@
+@comment $NetBSD$
+bin/mariadb-client-test-embedded
+bin/mariadb-embedded
+bin/mariadb-test-embedded
+bin/mysql_client_test_embedded
+bin/mysql_embedded
+bin/mysqltest_embedded
+bin/test-connect-t
+include/mysql/server/private/embedded_priv.h
+lib/libmariadbd.a
+lib/libmariadbd.so
+lib/libmariadbd.so.19
+lib/libmysqld.a
+lib/libmysqld.so
+