4 files changed, 69 insertions, 4 deletions

diff --git a/databases/mariadb-server/files/mysql-server.in b/databases/mariadb-server/files/mysql-server.in
index 37af2233ad55..c8c522bb8a05 100644
--- a/databases/mariadb-server/files/mysql-server.in
+++ b/databases/mariadb-server/files/mysql-server.in
@@ -1,12 +1,10 @@
 #!/bin/sh
-#
+
 # $FreeBSD$
 #
-
 # PROVIDE: mysql
 # REQUIRE: LOGIN
 # KEYWORD: shutdown
-
 #
 # Add the following line to /etc/rc.conf to enable mysql:
 # mysql_enable (bool):	Set to "NO" by default.
@@ -18,7 +16,6 @@
 #			Base database directory.
 # mysql_args (str):	Custom additional arguments to be passed
 #			to mysqld_safe (default empty).
-#
 
 . /etc/rc.subr
 
diff --git a/databases/mariadb-server/files/patch-Makefile.in b/databases/mariadb-server/files/patch-Makefile.in
new file mode 100644
index 000000000000..d8ae17962963
--- /dev/null
+++ b/databases/mariadb-server/files/patch-Makefile.in
@@ -0,0 +1,30 @@
+--- Makefile.in.orig	2011-03-01 22:25:33.000000000 -0800
++++ Makefile.in	2011-06-03 15:19:13.000000000 -0700
+@@ -476,24 +476,9 @@
+ 			CMakeLists.txt \
+ 			config/ac-macros/libevent_configure.m4
+ 
+-SUBDIRS = . include @docs_dirs@ @zlib_dir@ \
+-			@readline_topdir@ sql-common scripts \
+-			libservices \
+-			@sql_union_dirs@ storage \
+-			@sql_server@ @man_dirs@ tests \
+-			netware @libmysqld_dirs@ \
+-			mysql-test support-files sql-bench @tools_dirs@ \
+-			win
+-
+-DIST_SUBDIRS = . include Docs zlib \
+-			cmd-line-utils sql-common scripts \
+-			libservices \
+-			strings mysys dbug extra regex libmysql libmysql_r client unittest storage plugin \
+-			vio sql man tests \
+-			netware libmysqld \
+-			mysql-test support-files sql-bench server-tools \
+-			win \
+-			BUILD
++SUBDIRS = %%SUBDIRS%%
++
++DIST_SUBDIRS = %%SUBDIRS%%
+ 
+ DISTCLEANFILES = ac_available_languages_fragment
+ 
diff --git a/databases/mariadb-server/files/patch-man__Makefile.in b/databases/mariadb-server/files/patch-man__Makefile.in
new file mode 100644
index 000000000000..9326a9645bbb
--- /dev/null
+++ b/databases/mariadb-server/files/patch-man__Makefile.in
@@ -0,0 +1,11 @@
+--- man/Makefile.in.orig	2011-03-01 22:25:06.000000000 -0800
++++ man/Makefile.in	2011-06-01 22:55:49.000000000 -0700
+@@ -450,7 +450,7 @@
+ yassl_taocrypt_extra_cxxflags = @yassl_taocrypt_extra_cxxflags@
+ yassl_thread_cxxflags = @yassl_thread_cxxflags@
+ zlib_dir = @zlib_dir@
+-man1_MANS = @man1_files@
++man1_MANS = %%MANS%%
+ man8_MANS = @man8_files@
+ EXTRA_DIST = $(man1_MANS) $(man8_MANS)
+ all: all-am
diff --git a/databases/mariadb-server/files/scripts__Makefile.in b/databases/mariadb-server/files/scripts__Makefile.in
new file mode 100644
index 000000000000..9a5f9c36ef3d
--- /dev/null
+++ b/databases/mariadb-server/files/scripts__Makefile.in
@@ -0,0 +1,27 @@
+--- scripts/Makefile.in.orig	2011-03-01 22:25:08.000000000 -0800
++++ scripts/Makefile.in	2011-06-03 21:58:20.000000000 -0700
+@@ -479,14 +479,11 @@
+ 
+ bin_SCRIPTS = @server_scripts@ \
+ 			msql2mysql \
+-			mysql_config \
+-			mysql_fix_privilege_tables \
+ 			mysql_fix_extensions \
+ 			mysql_setpermission \
+ 			mysql_secure_installation \
+ 			mysql_zap \
+ 			mysqlaccess \
+-			mysqlbug \
+ 			mysql_convert_table_format \
+ 			mysql_find_rows \
+ 			mysqlhotcopy \
+@@ -528,8 +525,7 @@
+ 			mysql_system_tables_fix.sql \
+ 			CMakeLists.txt
+ 
+-dist_pkgdata_DATA = fill_help_tables.sql \
+-			mysql_fix_privilege_tables.sql \
++dist_pkgdata_DATA = fill_help_tables.sql mysql_system_tables.sql mysql_system_tables_data.sql fill_help_tables.sql \
+ 			mysql_system_tables.sql \
+ 			mysql_system_tables_data.sql \
+ 			mysql_test_data_timezone.sql