From owner-svn-ports-head@freebsd.org  Mon Mar  4 06:43:08 2019
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:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id D649615057C7;
 Mon,  4 Mar 2019 06:43:08 +0000 (UTC)
 (envelope-from jbeich@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 server-signature RSA-PSS (4096 bits)
 client-signature RSA-PSS (4096 bits) client-digest SHA256)
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 70BC18AA91;
 Mon,  4 Mar 2019 06:43:08 +0000 (UTC)
 (envelope-from jbeich@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 0609650E;
 Mon,  4 Mar 2019 06:43:07 +0000 (UTC)
 (envelope-from jbeich@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x246h6UK080768;
 Mon, 4 Mar 2019 06:43:06 GMT (envelope-from jbeich@FreeBSD.org)
Received: (from jbeich@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id x246h6lJ080767;
 Mon, 4 Mar 2019 06:43:06 GMT (envelope-from jbeich@FreeBSD.org)
Message-Id: <201903040643.x246h6lJ080767@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: jbeich set sender to
 jbeich@FreeBSD.org using -f
From: Jan Beich <jbeich@FreeBSD.org>
Date: Mon, 4 Mar 2019 06:43:06 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r494553 - head/audio/skype-call-recorder
X-SVN-Group: ports-head
X-SVN-Commit-Author: jbeich
X-SVN-Commit-Paths: head/audio/skype-call-recorder
X-SVN-Commit-Revision: 494553
X-SVN-Commit-Repository: ports
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Rspamd-Queue-Id: 70BC18AA91
X-Spamd-Bar: --
Authentication-Results: mx1.freebsd.org
X-Spamd-Result: default: False [-2.94 / 15.00];
 local_wl_from(0.00)[FreeBSD.org];
 NEURAL_HAM_MEDIUM(-1.00)[-0.999,0];
 NEURAL_HAM_SHORT(-0.94)[-0.940,0];
 ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US];
 NEURAL_HAM_LONG(-1.00)[-0.999,0]
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.29
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, 04 Mar 2019 06:43:09 -0000

Author: jbeich
Date: Mon Mar  4 06:43:06 2019
New Revision: 494553
URL: https://svnweb.freebsd.org/changeset/ports/494553

Log:
  audio/skype-call-recorder: unbreak with libc++ 8
  
  In file included from call.cpp:24:
  In file included from /usr/local/include/qt4/QtCore/QStringList:1:
  In file included from /usr/local/include/qt4/QtCore/qstringlist.h:45:
  In file included from /usr/local/include/qt4/QtCore/qalgorithms.h:45:
  In file included from /usr/local/include/qt4/QtCore/qglobal.h:68:
  In file included from /usr/include/c++/v1/algorithm:640:
  In file included from /usr/include/c++/v1/initializer_list:47:
  In file included from /usr/include/c++/v1/cstddef:38:
  version:1:1: error: expected unqualified-id
  0.11
  ^
  
  PR:		236192
  Approved by:	portmgr blanket

Modified:
  head/audio/skype-call-recorder/Makefile   (contents, props changed)

Modified: head/audio/skype-call-recorder/Makefile
==============================================================================
--- head/audio/skype-call-recorder/Makefile	Mon Mar  4 06:00:43 2019	(r494552)
+++ head/audio/skype-call-recorder/Makefile	Mon Mar  4 06:43:06 2019	(r494553)
@@ -31,5 +31,9 @@ post-patch:
 		${WRKSRC}/CMakeLists.txt
 	@${REINPLACE_CMD} -e 's,date --utc,TZ=UTC date,' \
 		${WRKSRC}/makeversion
+# Avoid conflict with C++20 <version> by adding .txt suffix
+	@${MV} ${WRKSRC}/version ${WRKSRC}/version.txt
+	@${REINPLACE_CMD} -i .c++20 's,src/version,&.txt,' \
+		${WRKSRC}/makeversion
 
 .include <bsd.port.mk>