From owner-svn-ports-head@freebsd.org  Mon May 30 05:52:58 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 59CB8B54716;
 Mon, 30 May 2016 05:52:58 +0000 (UTC)
 (envelope-from danfe@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 1D44A1667;
 Mon, 30 May 2016 05:52:58 +0000 (UTC)
 (envelope-from danfe@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u4U5qvRW027371;
 Mon, 30 May 2016 05:52:57 GMT (envelope-from danfe@FreeBSD.org)
Received: (from danfe@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4U5qvkw027370;
 Mon, 30 May 2016 05:52:57 GMT (envelope-from danfe@FreeBSD.org)
Message-Id: <201605300552.u4U5qvkw027370@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: danfe set sender to
 danfe@FreeBSD.org using -f
From: Alexey Dokuchaev <danfe@FreeBSD.org>
Date: Mon, 30 May 2016 05:52:57 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r416138 - head/audio/ardour
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.22
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: Mon, 30 May 2016 05:52:58 -0000

Author: danfe
Date: Mon May 30 05:52:57 2016
New Revision: 416138
URL: https://svnweb.freebsd.org/changeset/ports/416138

Log:
  During the exp-run in PR 208158, it was found that audio/ardour gives errors
  with libc++ 3.8.0.  This is because the std::map's allocator was not defined
  correctly.  Fix the `fast_pool_allocator' definition to use a `const double'.
  
  PR:		209332
  Submitted by:	dim

Modified:
  head/audio/ardour/Makefile

Modified: head/audio/ardour/Makefile
==============================================================================
--- head/audio/ardour/Makefile	Mon May 30 05:39:57 2016	(r416137)
+++ head/audio/ardour/Makefile	Mon May 30 05:52:57 2016	(r416138)
@@ -67,6 +67,8 @@ MAKE_ARGS+=	FPU_OPTIMIZATION=0
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%CFLAGS%%|${CFLAGS}|' ${WRKSRC}/SConstruct
 	@${REINPLACE_CMD} -e 's|alsa_pcm|oss|g' ${WRKSRC}/templates/*.template
+	@${REINPLACE_CMD} -e 's|std::pair<double|std::pair<const double|' \
+		${WRKSRC}/gtk2_ardour/tempo_lines.h
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/ardour2/templates