mariadb104: Add support for embedded-server

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"
 

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

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
+