From owner-svn-ports-all@FreeBSD.ORG  Tue Nov 25 09:57:30 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 812DCED0;
 Tue, 25 Nov 2014 09:57:30 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::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 6D542DE9;
 Tue, 25 Nov 2014 09:57:30 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAP9vUAm058635;
 Tue, 25 Nov 2014 09:57:30 GMT (envelope-from marino@FreeBSD.org)
Received: (from marino@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAP9vUfq058634;
 Tue, 25 Nov 2014 09:57:30 GMT (envelope-from marino@FreeBSD.org)
Message-Id: <201411250957.sAP9vUfq058634@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: marino set sender to
 marino@FreeBSD.org using -f
From: John Marino <marino@FreeBSD.org>
Date: Tue, 25 Nov 2014 09:57:30 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r373396 - head/databases/mariadb55-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-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://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: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 25 Nov 2014 09:57:30 -0000

Author: marino
Date: Tue Nov 25 09:57:29 2014
New Revision: 373396
URL: https://svnweb.freebsd.org/changeset/ports/373396
QAT: https://qat.redports.org/buildarchive/r373396/

Log:
  databases/mariadb55-server: Fix FreeBSD 8 and 9 (jemallac issue)
  
  Bring in MariaDB 10's jemalloc logic to fix FreeBSD 8 and 9.
  While here, convert to USES+= execinfo
  
  PR:		195320
  Reported by:	FreeBSD 9 users
  Submitted by:	maintainer
  Final fix by:	marino

Modified:
  head/databases/mariadb55-server/Makefile

Modified: head/databases/mariadb55-server/Makefile
==============================================================================
--- head/databases/mariadb55-server/Makefile	Tue Nov 25 08:23:04 2014	(r373395)
+++ head/databases/mariadb55-server/Makefile	Tue Nov 25 09:57:29 2014	(r373396)
@@ -21,7 +21,7 @@ SUB_FILES=	pkg-message
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
 SLAVEDIRS=	databases/mariadb55-client
-USES=		cmake gmake shebangfix
+USES=		cmake execinfo gmake shebangfix
 SHEBANG_FILES=	scripts/*.sh
 NO_OPTIONS_SORT=yes
 
@@ -71,14 +71,10 @@ OPTIONS_DEFAULT+=	MAXKEY
 
 .include <bsd.port.options.mk>
 
-.if ${OSVERSION} < 1000052
-LIB_DEPENDS=	libexecinfo.so:${PORTSDIR}/devel/libexecinfo
-.endif
-
-.if ${OSVERSION} < 1000012
-CMAKE_ARGS+=	-DWITH_JEMALLOC="bundled"
-.else
+.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000012
 CMAKE_ARGS+=	-DWITH_JEMALLOC="system"
+.else
+CMAKE_ARGS+=	-DWITH_JEMALLOC="no"
 .endif
 
 .if ${PORT_OPTIONS:MSSL}