databases/mariadb103-server: Security update to 10.3.15

 - refactored Makefile using more OPTIONS helpers

MFH:		2019Q2
Security:	4e1997e8-5de0-11e9-b95c-b499baebfeaf

3 files changed, 4 insertions, 27 deletions

diff --git a/databases/mariadb103-client/Makefile b/databases/mariadb103-client/Makefile
index f336d508877a..1a9072a932c9 100644
--- a/databases/mariadb103-client/Makefile
+++ b/databases/mariadb103-client/Makefile
@@ -12,27 +12,6 @@ FILESDIR=	${.CURDIR}/files
 PATCHDIR=	${.CURDIR}/files
 PLIST=		${.CURDIR}/pkg-plist
 
-CMAKE_ARGS+=	-DWITHOUT_SERVER=1 \
-		-DCONC_WITH_UNITTEST=0 \
-		-DCONC_WITH_MYSQLCOMPAT=1 \
-		-DWITH_WSREP=0
-
-USE_LDCONFIG=	${PREFIX}/lib/mysql
-
-CLIENT_ONLY=	yes
-
 CONFLICTS_INSTALL=	databases/mytop
 
-post-configure:
-	${REINPLACE_CMD} -Ee 's|(#define INCLUDE.*)"$$|\1 -I${PREFIX}/include"|' \
-		-e 's|(#define LIBS .*)"$$|\1 -L${PREFIX}/lib"|' \
-		${WRKSRC}/libmariadb/mariadb_config/mariadb_config.c
-
-post-install:
-	${RM} -r ${STAGEDIR}${DATADIR}
-	${RM} -r ${STAGEDIR}${PREFIX}/include/mysql/server
-
-post-install-GSSAPI_NONE:
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/mysql/plugin/auth_gssapi_client.so
-
 .include "${MASTERDIR}/Makefile"
diff --git a/databases/mariadb103-client/files/patch-CMakeLists.txt b/databases/mariadb103-client/files/patch-CMakeLists.txt
index d5fda2c811bc..29db2065e7cb 100644
--- a/databases/mariadb103-client/files/patch-CMakeLists.txt
+++ b/databases/mariadb103-client/files/patch-CMakeLists.txt
@@ -1,11 +1,11 @@
---- CMakeLists.txt.orig	2018-05-23 20:38:41 UTC
+--- CMakeLists.txt.orig	2019-05-13 18:13:05 UTC
 +++ CMakeLists.txt
-@@ -479,14 +479,16 @@ ADD_CUSTOM_TARGET(INFO_BIN ALL
+@@ -491,14 +491,16 @@ ADD_CUSTOM_TARGET(INFO_BIN ALL
    WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
  )
  
 +IF(FALSE)
- INSTALL_DOCUMENTATION(README.md CREDITS COPYING COPYING.thirdparty
+ INSTALL_DOCUMENTATION(README.md CREDITS COPYING THIRDPARTY
                        EXCEPTIONS-CLIENT COMPONENT Readme)
 +ENDIF()
  
diff --git a/databases/mariadb103-client/pkg-plist b/databases/mariadb103-client/pkg-plist
index fe530b39d7bc..e514c7a873a4 100644
--- a/databases/mariadb103-client/pkg-plist
+++ b/databases/mariadb103-client/pkg-plist
@@ -64,8 +64,8 @@ libdata/pkgconfig/libmariadb.pc
 @comment man/man1/galera_new_cluster.1.gz
 @comment man/man1/galera_recovery.1.gz
 @comment man/man1/innochecksum.1.gz
-@comment man/man1/mariadb-service-convert.1.gz
 @comment man/man1/mariabackup.1.gz
+@comment man/man1/mariadb-service-convert.1.gz
 man/man1/msql2mysql.1.gz
 @comment man/man1/mbstream.1.gz
 @comment man/man1/my_print_defaults.1.gz
@@ -119,8 +119,6 @@ man/man1/replace.1.gz
 @comment man/man1/wsrep_sst_mysqldump.1.gz
 @comment man/man1/wsrep_sst_rsync.1.gz
 @comment man/man1/wsrep_sst_rsync_wan.1.gz
-@comment man/man1/wsrep_sst_xtrabackup-v2.1.gz
-@comment man/man1/wsrep_sst_xtrabackup.1.gz
 @comment man/man8/mysqld.8.gz
 @comment share/aclocal/mysql.m4
 share/pkgconfig/mariadb.pc