From owner-svn-ports-head@freebsd.org  Sun Oct  2 01:50:01 2016
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4166FAC68C8;
 Sun,  2 Oct 2016 01:50:01 +0000 (UTC)
 (envelope-from marino@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 mx1.freebsd.org (Postfix) with ESMTPS id 1264D126;
 Sun,  2 Oct 2016 01:50:01 +0000 (UTC)
 (envelope-from marino@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u921o0Rp016890;
 Sun, 2 Oct 2016 01:50:00 GMT (envelope-from marino@FreeBSD.org)
Received: (from marino@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u921o0OU016889;
 Sun, 2 Oct 2016 01:50:00 GMT (envelope-from marino@FreeBSD.org)
Message-Id: <201610020150.u921o0OU016889@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: marino set sender to
 marino@FreeBSD.org using -f
From: John Marino <marino@FreeBSD.org>
Date: Sun, 2 Oct 2016 01:50:00 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r423099 - head/databases/mariadb101-server
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 02 Oct 2016 01:50:01 -0000

Author: marino
Date: Sun Oct  2 01:50:00 2016
New Revision: 423099
URL: https://svnweb.freebsd.org/changeset/ports/423099

Log:
  databases/mariadb101: Fix OPSYS logic
  
  The intent was to check for GSSAPI BASE option set on FreeBSD 9, but
  the effect was an IGNORE set for all non-FreeBSD platforms.  Fix the
  logic to its original intent under the just-fix-it blanket.

Modified:
  head/databases/mariadb101-server/Makefile

Modified: head/databases/mariadb101-server/Makefile
==============================================================================
--- head/databases/mariadb101-server/Makefile	Sun Oct  2 01:07:32 2016	(r423098)
+++ head/databases/mariadb101-server/Makefile	Sun Oct  2 01:50:00 2016	(r423099)
@@ -154,13 +154,15 @@ IGNORE=		BASE_GSSAPI is not compatible w
 CMAKE_ARGS+=	-DWITHOUT_TOKUDB
 .endif
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000012
+.if ${OPSYS} == FreeBSD
+. if ${OSVERSION} >= 1000012
 CMAKE_ARGS+=	-DWITH_JEMALLOC="system"
-.else
+. else
 CMAKE_ARGS+=	-DWITH_JEMALLOC="no"
-.if ${PORT_OPTIONS:MGSSAPI_BASE}
+.  if ${PORT_OPTIONS:MGSSAPI_BASE}
 IGNORE=	requires a Kerberos implementation from ports on FreeBSD < 10. Select GSSAPI_HEIMDAL or GSSAPI_MIT option
-.endif
+.  endif
+. endif
 .endif
 
 post-patch: