From 9a6b1092ccc0ac76f6efdaca4b013dfa9d1bcf87 Mon Sep 17 00:00:00 2001
From: brnrd <brnrd@FreeBSD.org>
Date: Tue, 3 Apr 2018 19:10:28 +0000
Subject: databases/mariadb101-server: Fix mysql_limits

 - 11-STABLE and 12-CURRENT add limits support to rc.subr(8)
   leading to variable conflicts with rc.d/mysql

PR:		227225
Submitted by:	0mp
---
 databases/mariadb101-server/Makefile | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'databases/mariadb101-server/Makefile')

diff --git a/databases/mariadb101-server/Makefile b/databases/mariadb101-server/Makefile
index 42217cf31cb2..998eaef4f15b 100644
--- a/databases/mariadb101-server/Makefile
+++ b/databases/mariadb101-server/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME?=	mariadb
 PORTVERSION=	10.1.32
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	databases ipv6
 MASTER_SITES=	http://ftp.osuosl.org/pub/${SITESDIR}/ \
 		http://mirrors.supportex.net/${SITESDIR}/ \
@@ -183,6 +183,15 @@ post-install-MROONGA-on:
 		${STAGEDIR}${PREFIX}/share/mysql
 .endif # defined(CLIENT_ONLY)
 
+.include <bsd.port.options.mk>
+
+.if ${OPSYS} != FreeBSD || ${OSVERSION} < 1101515 || \
+	${OSVERSION} >= 1200000 && ${OSVERSION} < 1200057
+SUB_LIST+=	LEGACY_LIMITS="" MODERN_LIMITS="@comment "
+.else
+SUB_LIST+=	LEGACY_LIMITS="@comment " MODERN_LIMITS=""
+.endif
+
 .include <bsd.port.pre.mk>
 
 .if ${SSL_DEFAULT} != base && ${PORT_OPTIONS:MGSSAPI_BASE}
-- 
cgit