From owner-svn-ports-all@freebsd.org  Sun Feb 14 13:21:28 2016
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@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 49D28AA1C6A;
 Sun, 14 Feb 2016 13:21:28 +0000 (UTC)
 (envelope-from rakuco@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 15C80127C;
 Sun, 14 Feb 2016 13:21:28 +0000 (UTC)
 (envelope-from rakuco@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u1EDLR90045364;
 Sun, 14 Feb 2016 13:21:27 GMT (envelope-from rakuco@FreeBSD.org)
Received: (from rakuco@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u1EDLQWx045362;
 Sun, 14 Feb 2016 13:21:26 GMT (envelope-from rakuco@FreeBSD.org)
Message-Id: <201602141321.u1EDLQWx045362@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: rakuco set sender to
 rakuco@FreeBSD.org using -f
From: Raphael Kubo da Costa <rakuco@FreeBSD.org>
Date: Sun, 14 Feb 2016 13:21:26 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r408855 - in head/devel: qt4-corelib qt4/files
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.20
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 14 Feb 2016 13:21:28 -0000

Author: rakuco
Date: Sun Feb 14 13:21:26 2016
New Revision: 408855
URL: https://svnweb.freebsd.org/changeset/ports/408855

Log:
  Use the right macro name when checking whether libc++ is being used.
  
  This fixes a copy-paste error introduced in r397043 ("Update the Qt4 ports to
  4.8.7"): libc++ defines _LIBCPP_VERSION, not _LIBCPP_VER (which is defined by a
  Dinkumware-based standard library used by QNX). In practice, this meant
  Q_COMPILER_INITIALIZER_LISTS was never being enabled with clang.
  
  Submitted by:	Tobias Berner <tcberner@gmail.com>

Modified:
  head/devel/qt4-corelib/Makefile
  head/devel/qt4/files/extrapatch-src-corelib-global-qglobal.h

Modified: head/devel/qt4-corelib/Makefile
==============================================================================
--- head/devel/qt4-corelib/Makefile	Sun Feb 14 12:56:30 2016	(r408854)
+++ head/devel/qt4-corelib/Makefile	Sun Feb 14 13:21:26 2016	(r408855)
@@ -3,7 +3,7 @@
 
 PORTNAME=	corelib
 DISTVERSION=	${QT4_VERSION}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 PKGNAMEPREFIX=	qt4-
 

Modified: head/devel/qt4/files/extrapatch-src-corelib-global-qglobal.h
==============================================================================
--- head/devel/qt4/files/extrapatch-src-corelib-global-qglobal.h	Sun Feb 14 12:56:30 2016	(r408854)
+++ head/devel/qt4/files/extrapatch-src-corelib-global-qglobal.h	Sun Feb 14 13:21:26 2016	(r408855)
@@ -27,7 +27,7 @@ __GLIBCXX__) and not worth the effort.
 + */
 +#      if defined(__cplusplus)  /* Only C++ has ciso646. */
 +#        include <ciso646>
-+#        if defined(_LIBCPP_VER)
++#        if defined(_LIBCPP_VERSION)
 +#          define Q_COMPILER_INITIALIZER_LISTS
 +#        endif
 +#      endif