From owner-svn-ports-all@freebsd.org  Wed Apr 11 14:40:52 2018
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9C372F99B7D;
 Wed, 11 Apr 2018 14:40:52 +0000 (UTC)
 (envelope-from mmokhi@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 6FC72851CD;
 Wed, 11 Apr 2018 14:40:52 +0000 (UTC)
 (envelope-from mmokhi@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 69FE21D7C1;
 Wed, 11 Apr 2018 14:40:52 +0000 (UTC)
 (envelope-from mmokhi@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w3BEeqbk028784;
 Wed, 11 Apr 2018 14:40:52 GMT (envelope-from mmokhi@FreeBSD.org)
Received: (from mmokhi@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w3BEeqr4028783;
 Wed, 11 Apr 2018 14:40:52 GMT (envelope-from mmokhi@FreeBSD.org)
Message-Id: <201804111440.w3BEeqr4028783@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: mmokhi set sender to
 mmokhi@FreeBSD.org using -f
From: Mahdi Mokhtari <mmokhi@FreeBSD.org>
Date: Wed, 11 Apr 2018 14:40:52 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r467051 - head/databases/mysql57-server
X-SVN-Group: ports-head
X-SVN-Commit-Author: mmokhi
X-SVN-Commit-Paths: head/databases/mysql57-server
X-SVN-Commit-Revision: 467051
X-SVN-Commit-Repository: ports
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 11 Apr 2018 14:40:52 -0000

Author: mmokhi
Date: Wed Apr 11 14:40:52 2018
New Revision: 467051
URL: https://svnweb.freebsd.org/changeset/ports/467051

Log:
  databases/mysql57-server: Fix ${name}_limits regression on 11-STABLE
  This is port of r467049 (that was done on mysql56-server)
  
  PR:		227435
  Reported by:	0mp

Modified:
  head/databases/mysql57-server/Makefile

Modified: head/databases/mysql57-server/Makefile
==============================================================================
--- head/databases/mysql57-server/Makefile	Wed Apr 11 14:38:20 2018	(r467050)
+++ head/databases/mysql57-server/Makefile	Wed Apr 11 14:40:52 2018	(r467051)
@@ -3,7 +3,7 @@
 
 PORTNAME?=	mysql
 PORTVERSION=	5.7.21
-PORTREVISION?=	2
+PORTREVISION?=	3
 CATEGORIES=	databases ipv6
 MASTER_SITES=	MYSQL/MySQL-5.7
 PKGNAMESUFFIX?=	57-server
@@ -144,11 +144,10 @@ CMAKE_ARGS+=	-DWITH_AUTHENTICATION_LDAP=0
 
 .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>