From owner-svn-ports-head@freebsd.org  Sun Nov  1 21:25:52 2015
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 5BE8CA24590;
 Sun,  1 Nov 2015 21:25:52 +0000 (UTC)
 (envelope-from antoine@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 1E8A51F2D;
 Sun,  1 Nov 2015 21:25:52 +0000 (UTC)
 (envelope-from antoine@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tA1LPpel032543;
 Sun, 1 Nov 2015 21:25:51 GMT (envelope-from antoine@FreeBSD.org)
Received: (from antoine@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id tA1LPp9b032542;
 Sun, 1 Nov 2015 21:25:51 GMT (envelope-from antoine@FreeBSD.org)
Message-Id: <201511012125.tA1LPp9b032542@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: antoine set sender to
 antoine@FreeBSD.org using -f
From: Antoine Brodin <antoine@FreeBSD.org>
Date: Sun, 1 Nov 2015 21:25:51 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r400629 - head/databases/tarantool
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.20
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, 01 Nov 2015 21:25:52 -0000

Author: antoine
Date: Sun Nov  1 21:25:50 2015
New Revision: 400629
URL: https://svnweb.freebsd.org/changeset/ports/400629

Log:
  Unbreak after the switch from USE_GCC=4.8+ to USE_GCC=yes
  
  Reported by:	pkg-fallout

Modified:
  head/databases/tarantool/Makefile

Modified: head/databases/tarantool/Makefile
==============================================================================
--- head/databases/tarantool/Makefile	Sun Nov  1 21:19:02 2015	(r400628)
+++ head/databases/tarantool/Makefile	Sun Nov  1 21:25:50 2015	(r400629)
@@ -47,14 +47,15 @@ PLIST_SUB+=	TT_USER=${USERS} \
 OPTIONS_DEFINE=	DEBUG
 DEBUG_DESC=	Enable debug
 
-.if defined(USE_GCC) && ${USE_GCC:S/+//} == 4.8
-EXTRA_PATCHES=	${FILESDIR}/extra-patch-src_trivia_config.h.cmake
-.endif
-
 NOT_FOR_ARCHS=	sparc64
 NOT_FOR_ARCHS_REASON=	not yet ported to this architecture
 
-.include <bsd.port.options.mk>
+.include <bsd.port.pre.mk>
+
+# XXX we rely on USES=perl5 to load bsd.default-versions.mk
+.if defined(USE_GCC) && ${USE_GCC} == yes && ${GCC_DEFAULT} == 4.8
+EXTRA_PATCHES=	${FILESDIR}/extra-patch-src_trivia_config.h.cmake
+.endif
 
 .if ${PORT_OPTIONS:MDEBUG}
 CMAKE_BUILD_TYPE=	RelWithDebugInfo
@@ -70,4 +71,4 @@ post-install:
 		${STAGEDIR}${TT_RUNDIR} \
 		${STAGEDIR}${ETCDIR}/instances.enabled
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>