From ab25ca436d0c3fdd6b54dcf1d0ddf5952283de7e Mon Sep 17 00:00:00 2001
From: Mahdi Mokhtari <mmokhi@FreeBSD.org>
Date: Wed, 11 Apr 2018 14:37:40 +0000
Subject: databases/mysql56-server: Fix ${name}_limits regression on 11-STABLE
 The commit adding the ${name}_limits to 11 is reverted in r332363 Change the
 Makefile conditions/vars so that  new ${name}_limits mechanism is only
 present on 12-CURRENT (>=1200057)

PR:		227435
Reported by:	0mp
---
 databases/mysql56-server/Makefile | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'databases/mysql56-server')

diff --git a/databases/mysql56-server/Makefile b/databases/mysql56-server/Makefile
index 269d17980294..679c5456b725 100644
--- a/databases/mysql56-server/Makefile
+++ b/databases/mysql56-server/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME?=	mysql
 PORTVERSION=	5.6.39
-PORTREVISION?=	2
+PORTREVISION?=	3
 CATEGORIES=	databases ipv6
 MASTER_SITES=	MYSQL/MySQL-5.6
 PKGNAMESUFFIX?=	56-server
@@ -135,11 +135,10 @@ FEDERATED_SUB_LIST_OFF+=	FEDER=""
 
 .include <bsd.port.options.mk>
 
-.if ${OPSYS} != FreeBSD || ${OSVERSION} < 1101514 || \
-	${OSVERSION} >= 1200000 && ${OSVERSION} < 1200057
-SUB_LIST+=	LEGACY_LIMITS="" MODERN_LIMITS="@comment "
-.else
+.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200057
 SUB_LIST+=	LEGACY_LIMITS="@comment " MODERN_LIMITS=""
+.else
+SUB_LIST+=	LEGACY_LIMITS="" MODERN_LIMITS="@comment "
 .endif
 
 .include <bsd.port.pre.mk>
-- 
cgit v1.2.3