3 files changed, 5 insertions, 38 deletions

diff --git a/databases/mariadb-scripts/Makefile b/databases/mariadb-scripts/Makefile
index 3489c3dbff76..9d770812ac71 100644
--- a/databases/mariadb-scripts/Makefile
+++ b/databases/mariadb-scripts/Makefile
@@ -27,7 +27,12 @@ MAN1=		msql2mysql.1 mysql_convert_table_format.1 mysql_find_rows.1 \
 		mysql_setpermission.1 mysql_zap.1 mysqlaccess.1 \
 		mysqldumpslow.1 mysqlhotcopy.1 mysqld_multi.1
 
+EXTRA_PATCHES=	${MASTERDIR}/files/patch-Makefile.in ${MASTERDIR}/files/patch-man__Makefile.in
+MDB_SCRIPTS_SUBDIRS=	scripts @man_dirs@
+
 post-patch:
+	@${REINPLACE_CMD} -e "s|%%SUBDIRS%%|${MDB_SCRIPTS_SUBDIRS}|" ${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e "s|%%MANS%%|${MAN1}|" ${WRKSRC}/man/Makefile.in
+	@${REINPLACE_CMD} -e "s|^\(install-man: install-man1\).*|\1|" ${WRKSRC}/man/Makefile.in
 
 .include "${MASTERDIR}/Makefile"
diff --git a/databases/mariadb-scripts/files/patch-Makefile.in b/databases/mariadb-scripts/files/patch-Makefile.in
deleted file mode 100644
index c60fbc44d875..000000000000
--- a/databases/mariadb-scripts/files/patch-Makefile.in
+++ /dev/null
@@ -1,18 +0,0 @@
---- Makefile.in.orig	2011-03-01 22:25:33.000000000 -0800
-+++ Makefile.in	2011-06-01 22:04:40.000000000 -0700
-@@ -476,14 +476,7 @@
- 			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
-+SUBDIRS = scripts @man_dirs@
- 
- DIST_SUBDIRS = . include Docs zlib \
- 			cmd-line-utils sql-common scripts \
diff --git a/databases/mariadb-scripts/files/patch-man__Makefile.in b/databases/mariadb-scripts/files/patch-man__Makefile.in
deleted file mode 100644
index 5346b3739310..000000000000
--- a/databases/mariadb-scripts/files/patch-man__Makefile.in
+++ /dev/null
@@ -1,20 +0,0 @@
---- 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
-@@ -676,7 +676,7 @@
- 
- install-info: install-info-am
- 
--install-man: install-man1 install-man8
-+install-man: install-man1
- 
- installcheck-am:
-