Fix building on FreeBSD 10+

Fix conflicts between client, server, and script packages
Shebangfix

The plists now are closer aligned with the mysql51-* ports

PR:		197679
PR:		171338

4 files changed, 126 insertions, 81 deletions

diff --git a/databases/mariadb-client/Makefile b/databases/mariadb-client/Makefile
index 3eed06103735..3cbff659ee5c 100644
--- a/databases/mariadb-client/Makefile
+++ b/databases/mariadb-client/Makefile
@@ -38,8 +38,12 @@ post-patch:
 	@${REINPLACE_CMD} -e "s|install-exec-am: install-binPROGRAMS|install-exec-am:|g" ${WRKSRC}/extra/Makefile.in
 	@${REINPLACE_CMD} -e "s|%%MANS%%|${MANS}|" ${WRKSRC}/man/Makefile.in
 	@${REINPLACE_CMD} -e "s|^\(install-man: install-man1\).*|\1|" ${WRKSRC}/man/Makefile.in
+	@${REINPLACE_CMD} -e "s|-fno-implicit-templates||g" ${WRKSRC}/configure
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/support-files/mysql.m4 ${STAGEDIR}${PREFIX}/share/aclocal/
 
+post-stage:
+	@${RM} -rf ${STAGEDIR}/${PREFIX}/include/mysql/private
+
 .include "${MASTERDIR}/Makefile"
diff --git a/databases/mariadb-client/pkg-plist b/databases/mariadb-client/pkg-plist
index e56e60537fb4..c91c176323f0 100644
--- a/databases/mariadb-client/pkg-plist
+++ b/databases/mariadb-client/pkg-plist
@@ -55,56 +55,6 @@ include/mysql/sslopt-case.h
 include/mysql/sslopt-longopts.h
 include/mysql/sslopt-vars.h
 include/mysql/typelib.h
-include/mysql/private/atomic/nolock.h
-include/mysql/private/atomic/rwlock.h
-include/mysql/private/atomic/x86-gcc.h
-include/mysql/private/atomic/generic-msvc.h
-include/mysql/private/atomic/gcc_builtins.h
-include/mysql/private/config-win.h
-include/mysql/private/config-netware.h
-include/mysql/private/lf.h
-include/mysql/private/my_bit.h
-include/mysql/private/heap.h
-include/mysql/private/maria.h
-include/mysql/private/myisamchk.h
-include/mysql/private/my_bitmap.h
-include/mysql/private/my_uctype.h
-include/mysql/private/myisam.h
-include/mysql/private/myisampack.h
-include/mysql/private/myisammrg.h
-include/mysql/private/ft_global.h
-include/mysql/private/mysys_err.h
-include/mysql/private/my_base.h
-include/mysql/private/help_start.h
-include/mysql/private/help_end.h
-include/mysql/private/my_nosys.h
-include/mysql/private/my_alarm.h
-include/mysql/private/queues.h
-include/mysql/private/rijndael.h
-include/mysql/private/sha1.h
-include/mysql/private/my_aes.h
-include/mysql/private/my_tree.h
-include/mysql/private/my_trie.h
-include/mysql/private/hash.h
-include/mysql/private/thr_alarm.h
-include/mysql/private/thr_lock.h
-include/mysql/private/t_ctype.h
-include/mysql/private/violite.h
-include/mysql/private/my_md5.h
-include/mysql/private/base64.h
-include/mysql/private/service_versions.h
-include/mysql/private/my_compare.h
-include/mysql/private/my_handler.h
-include/mysql/private/my_time.h
-include/mysql/private/my_vle.h
-include/mysql/private/my_user.h
-include/mysql/private/my_atomic.h
-include/mysql/private/my_libwrap.h
-include/mysql/private/my_stacktrace.h
-include/mysql/private/wqueue.h
-include/mysql/private/waiting_threads.h
-include/mysql/private/welcome_copyright_notice.h
-include/mysql/private/my_regex.h
 lib/mysql/libmysqlclient.a
 lib/mysql/libmysqlclient.so
 lib/mysql/libmysqlclient.so.16
diff --git a/databases/mariadb-server/Makefile b/databases/mariadb-server/Makefile
index e5a24a65c41d..48f093b43c82 100644
--- a/databases/mariadb-server/Makefile
+++ b/databases/mariadb-server/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	mariadb
 PORTVERSION=	5.3.12
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	databases ipv6
 MASTER_SITES=	http://ftp.osuosl.org/pub/mariadb/${PORTNAME}-${PORTVERSION}/kvm-tarbake-jaunty-x86/ \
 		http://mirrors.supportex.net/mariadb/${PORTNAME}-${PORTVERSION}/kvm-tarbake-jaunty-x86/ \
@@ -28,7 +28,8 @@ CONFLICTS?=	mariadb5[4-9]-server-* \
 		percona*-server-*
 
 GNU_CONFIGURE=	yes
-USES+=		libtool
+USES+=		libtool shebangfix
+SHEBANG_FILES=	scripts/*
 
 .if !defined(MARIADB_CLIENT_SLAVE)
 USE_MYSQL=	yes
@@ -87,10 +88,6 @@ OPTIONS_DEFAULT+=	ARIADB ARCHIVE BLACKHOLE SPHINX FEDX XTRADB HANDLERSOCKET
 
 .include <bsd.port.options.mk>
 
-.if ${OSVERSION} >= 1000000
-BROKEN=		Does not build under FreeBSD 10
-.endif
-
 .if ${OSVERSION} > 900000 && ${PORT_OPTIONS:MSTATIC}
 BROKEN=	WITH_STATIC is not functional on 9-current
 .endif
@@ -281,6 +278,60 @@ post-patch:
 	@${REINPLACE_CMD} -e "s|^\(pkginclude_HEADERS =\).*|\1|" ${WRKSRC}/cmd-line-utils/libedit/Makefile.in
 	@${REINPLACE_CMD} -e "s|^\(install-data-am:\) install-pkgincludeHEADERS|\1|g" ${WRKSRC}/extra/Makefile.in ${WRKSRC}/include/Makefile.in
 	@${REINPLACE_CMD} -e "s|^\(install-exec-am:\) install-pkglibLTLIBRARIES|\1|g" ${WRKSRC}/libmysql/Makefile.in
+	@${REINPLACE_CMD} -e "s|-fno-implicit-templates||g" ${WRKSRC}/configure
+
+post-stage:
+	# Delete files that should only be installed by client
+	@${RM} ${STAGEDIR}/${PREFIX}/bin/mysql_convert_table_format
+	@${RM} ${STAGEDIR}/${PREFIX}/bin/mysql_find_rows
+	@${RM} ${STAGEDIR}/${PREFIX}/bin/mysql_fix_extensions
+	@${RM} ${STAGEDIR}/${PREFIX}/bin/mysql_secure_installation
+	@${RM} ${STAGEDIR}/${PREFIX}/bin/mysql_setpermission
+	@${RM} ${STAGEDIR}/${PREFIX}/bin/mysql_zap
+	@${RM} ${STAGEDIR}/${PREFIX}/bin/mysqlaccess
+	@${RM} ${STAGEDIR}/${PREFIX}/bin/mysqld_multi
+	@${RM} ${STAGEDIR}/${PREFIX}/bin/mysqldumpslow
+	@${RM} ${STAGEDIR}/${PREFIX}/bin/mysqlhotcopy
+	@${RM} ${STAGEDIR}/${PREFIX}/include/mysql/client_plugin.h
+	@${RM} ${STAGEDIR}/${PREFIX}/include/mysql/decimal.h
+	@${RM} ${STAGEDIR}/${PREFIX}/include/mysql/errmsg.h
+	@${RM} ${STAGEDIR}/${PREFIX}/include/mysql/keycache.h
+	@${RM} ${STAGEDIR}/${PREFIX}/include/mysql/m_ctype.h
+	@${RM} ${STAGEDIR}/${PREFIX}/include/mysql/m_string.h
+	@${RM} ${STAGEDIR}/${PREFIX}/include/mysql/ma_dyncol.h
+	@${RM} ${STAGEDIR}/${PREFIX}/include/mysql/my_alloc.h
+	@${RM} ${STAGEDIR}/${PREFIX}/include/mysql/my_attribute.h
+	@${RM} ${STAGEDIR}/${PREFIX}/include/mysql/my_compiler.h
+	@${RM} ${STAGEDIR}/${PREFIX}/include/mysql/my_config.h
+	@${RM} ${STAGEDIR}/${PREFIX}/include/mysql/my_dbug.h
+	@${RM} ${STAGEDIR}/${PREFIX}/include/mysql/my_decimal_limits.h
+	@${RM} ${STAGEDIR}/${PREFIX}/include/mysql/my_dir.h
+	@${RM} ${STAGEDIR}/${PREFIX}/include/mysql/my_getopt.h
+	@${RM} ${STAGEDIR}/${PREFIX}/include/mysql/my_global.h
+	@${RM} ${STAGEDIR}/${PREFIX}/include/mysql/my_list.h
+	@${RM} ${STAGEDIR}/${PREFIX}/include/mysql/my_net.h
+	@${RM} ${STAGEDIR}/${PREFIX}/include/mysql/my_no_pthread.h
+	@${RM} ${STAGEDIR}/${PREFIX}/include/mysql/my_pthread.h
+	@${RM} ${STAGEDIR}/${PREFIX}/include/mysql/my_sys.h
+	@${RM} ${STAGEDIR}/${PREFIX}/include/mysql/my_valgrind.h
+	@${RM} ${STAGEDIR}/${PREFIX}/include/mysql/my_xml.h
+	@${RM} ${STAGEDIR}/${PREFIX}/include/mysql/mysql.h
+	@${RM} ${STAGEDIR}/${PREFIX}/include/mysql/mysql_com.h
+	@${RM} ${STAGEDIR}/${PREFIX}/include/mysql/mysql_embed.h
+	@${RM} ${STAGEDIR}/${PREFIX}/include/mysql/mysql_time.h
+	@${RM} ${STAGEDIR}/${PREFIX}/include/mysql/mysql_version.h
+	@${RM} ${STAGEDIR}/${PREFIX}/include/mysql/plugin.h
+	@${RM} ${STAGEDIR}/${PREFIX}/include/mysql/plugin_auth.h
+	@${RM} ${STAGEDIR}/${PREFIX}/include/mysql/plugin_auth_common.h
+	@${RM} ${STAGEDIR}/${PREFIX}/include/mysql/service_my_snprintf.h
+	@${RM} ${STAGEDIR}/${PREFIX}/include/mysql/service_progress_report.h
+	@${RM} ${STAGEDIR}/${PREFIX}/include/mysql/service_thd_alloc.h
+	@${RM} ${STAGEDIR}/${PREFIX}/include/mysql/services.h
+	@${RM} ${STAGEDIR}/${PREFIX}/include/mysql/sql_common.h
+	@${RM} ${STAGEDIR}/${PREFIX}/include/mysql/sslopt-case.h
+	@${RM} ${STAGEDIR}/${PREFIX}/include/mysql/sslopt-longopts.h
+	@${RM} ${STAGEDIR}/${PREFIX}/include/mysql/sslopt-vars.h
+	@${RM} ${STAGEDIR}/${PREFIX}/include/mysql/typelib.h
 
 .endif	# .if !defined(MARIADB_CLIENT_SLAVE)
 .endif	# .if !defined(MARIADB_SCRIPTS_SLAVE)
diff --git a/databases/mariadb-server/pkg-plist b/databases/mariadb-server/pkg-plist
index 40ad8644cacd..4ddb79d4754b 100644
--- a/databases/mariadb-server/pkg-plist
+++ b/databases/mariadb-server/pkg-plist
@@ -1,28 +1,3 @@
-bin/my_print_defaults
-bin/myisam_ftdump
-bin/myisamchk
-bin/myisamlog
-bin/myisampack
-bin/mysql_client_test_embedded
-bin/mysql_convert_table_format
-bin/mysql_find_rows
-bin/mysql_fix_extensions
-bin/mysql_install_db
-bin/mysql_secure_installation
-bin/mysql_setpermission
-bin/mysql_tzinfo_to_sql
-bin/mysql_waitpid
-bin/mysql_zap
-bin/mysqlaccess
-bin/mysqld_multi
-bin/mysqld_safe
-bin/mysqldumpslow
-bin/mysqlhotcopy
-bin/mysqltest_embedded
-bin/perror
-bin/replace
-bin/resolve_stack_dump
-bin/resolveip
 %%ARIADB%%bin/aria_chk
 %%ARIADB%%bin/aria_dump_log
 %%ARIADB%%bin/aria_ftdump
@@ -227,8 +202,31 @@ bin/resolveip
 %%STATIC%%lib/mysql/plugin/feedback.so.0
 %%STATIC%%lib/mysql/plugin/feedback.so.0.0.0
 %%XTRADB%%bin/innochecksum
+bin/my_print_defaults
+bin/myisam_ftdump
+bin/myisamchk
+bin/myisamlog
+bin/myisampack
+bin/mysql_client_test_embedded
+bin/mysql_install_db
+bin/mysql_tzinfo_to_sql
+bin/mysql_waitpid
+bin/mysqld_safe
+bin/mysqltest_embedded
+bin/perror
+bin/replace
+bin/resolve_stack_dump
+bin/resolveip
+include/mysql/private/atomic/gcc_builtins.h
+include/mysql/private/atomic/generic-msvc.h
+include/mysql/private/atomic/nolock.h
+include/mysql/private/atomic/rwlock.h
+include/mysql/private/atomic/x86-gcc.h
 include/mysql/private/authors.h
+include/mysql/private/base64.h
 include/mysql/private/client_settings.h
+include/mysql/private/config-netware.h
+include/mysql/private/config-win.h
 include/mysql/private/contributors.h
 include/mysql/private/create_options.h
 include/mysql/private/debug_sync.h
@@ -239,6 +237,7 @@ include/mysql/private/event_queue.h
 include/mysql/private/event_scheduler.h
 include/mysql/private/events.h
 include/mysql/private/field.h
+include/mysql/private/ft_global.h
 include/mysql/private/gcalc_slicescan.h
 include/mysql/private/gcalc_tools.h
 include/mysql/private/gstream.h
@@ -248,7 +247,11 @@ include/mysql/private/ha_ndbcluster_cond.h
 include/mysql/private/ha_ndbcluster_tables.h
 include/mysql/private/ha_partition.h
 include/mysql/private/handler.h
+include/mysql/private/hash.h
 include/mysql/private/hash_filo.h
+include/mysql/private/heap.h
+include/mysql/private/help_end.h
+include/mysql/private/help_start.h
 include/mysql/private/item.h
 include/mysql/private/item_cmpfunc.h
 include/mysql/private/item_create.h
@@ -262,15 +265,41 @@ include/mysql/private/item_timefunc.h
 include/mysql/private/item_xmlfunc.h
 include/mysql/private/lex.h
 include/mysql/private/lex_symbol.h
+include/mysql/private/lf.h
 include/mysql/private/log.h
 include/mysql/private/log_event.h
 include/mysql/private/log_event_old.h
 include/mysql/private/log_slow.h
+include/mysql/private/maria.h
 include/mysql/private/mem_root_array.h
 include/mysql/private/multi_range_read.h
+include/mysql/private/my_aes.h
+include/mysql/private/my_alarm.h
+include/mysql/private/my_atomic.h
+include/mysql/private/my_base.h
+include/mysql/private/my_bit.h
+include/mysql/private/my_bitmap.h
+include/mysql/private/my_compare.h
 include/mysql/private/my_decimal.h
+include/mysql/private/my_handler.h
+include/mysql/private/my_libwrap.h
+include/mysql/private/my_md5.h
+include/mysql/private/my_nosys.h
+include/mysql/private/my_regex.h
+include/mysql/private/my_stacktrace.h
+include/mysql/private/my_time.h
+include/mysql/private/my_tree.h
+include/mysql/private/my_trie.h
+include/mysql/private/my_uctype.h
+include/mysql/private/my_user.h
+include/mysql/private/my_vle.h
+include/mysql/private/myisam.h
+include/mysql/private/myisamchk.h
+include/mysql/private/myisammrg.h
+include/mysql/private/myisampack.h
 include/mysql/private/mysql_priv.h
 include/mysql/private/mysqld_suffix.h
+include/mysql/private/mysys_err.h
 include/mysql/private/opt_range.h
 include/mysql/private/opt_subselect.h
 include/mysql/private/parse_file.h
@@ -279,6 +308,8 @@ include/mysql/private/partition_info.h
 include/mysql/private/plistsort.c
 include/mysql/private/procedure.h
 include/mysql/private/protocol.h
+include/mysql/private/queues.h
+include/mysql/private/rijndael.h
 include/mysql/private/rpl_constants.h
 include/mysql/private/rpl_filter.h
 include/mysql/private/rpl_injector.h
@@ -290,7 +321,9 @@ include/mysql/private/rpl_rli.h
 include/mysql/private/rpl_tblmap.h
 include/mysql/private/rpl_utility.h
 include/mysql/private/scheduler.h
+include/mysql/private/service_versions.h
 include/mysql/private/set_var.h
+include/mysql/private/sha1.h
 include/mysql/private/slave.h
 include/mysql/private/sp.h
 include/mysql/private/sp_cache.h
@@ -327,10 +360,17 @@ include/mysql/private/sql_trigger.h
 include/mysql/private/sql_udf.h
 include/mysql/private/sql_view.h
 include/mysql/private/structs.h
+include/mysql/private/t_ctype.h
 include/mysql/private/table.h
+include/mysql/private/thr_alarm.h
+include/mysql/private/thr_lock.h
 include/mysql/private/tzfile.h
 include/mysql/private/tztime.h
 include/mysql/private/unireg.h
+include/mysql/private/violite.h
+include/mysql/private/waiting_threads.h
+include/mysql/private/welcome_copyright_notice.h
+include/mysql/private/wqueue.h
 lib/mysql/libdbug.a
 lib/mysql/libheap.a
 lib/mysql/libmyisam.a