From owner-svn-ports-head@FreeBSD.ORG  Thu Jul 24 18:52:53 2014
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id B38AB844;
 Thu, 24 Jul 2014 18:52:53 +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 A0B242B8F;
 Thu, 24 Jul 2014 18:52:53 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s6OIqrpQ014109;
 Thu, 24 Jul 2014 18:52:53 GMT (envelope-from rakuco@svn.freebsd.org)
Received: (from rakuco@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s6OIqrBB014108;
 Thu, 24 Jul 2014 18:52:53 GMT (envelope-from rakuco@svn.freebsd.org)
Message-Id: <201407241852.s6OIqrBB014108@svn.freebsd.org>
From: Raphael Kubo da Costa <rakuco@FreeBSD.org>
Date: Thu, 24 Jul 2014 18:52:53 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r362837 - head/Mk
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.18
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://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: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 24 Jul 2014 18:52:53 -0000

Author: rakuco
Date: Thu Jul 24 18:52:53 2014
New Revision: 362837
URL: http://svnweb.freebsd.org/changeset/ports/362837
QAT: https://qat.redports.org/buildarchive/r362837/

Log:
  qt4: Do not apply the patch from r362770 if EXTRA_PATCHES is unset.
  
  This unbreaks qmake4 and qt4-doc.

Modified:
  head/Mk/bsd.qt.mk

Modified: head/Mk/bsd.qt.mk
==============================================================================
--- head/Mk/bsd.qt.mk	Thu Jul 24 18:36:19 2014	(r362836)
+++ head/Mk/bsd.qt.mk	Thu Jul 24 18:52:53 2014	(r362837)
@@ -172,7 +172,8 @@ EXTRA_PATCHES?=	${.CURDIR:H:H}/devel/${_
 .  if ${_QT_VERSION:M5*}
 EXTRA_PATCHES+=	${.CURDIR:H:H}/devel/qt5-core/files/extrapatch-src__corelib__tools__qdatetime.cpp
 .  elif ${_QT_VERSION:M4*}
-EXTRA_PATCHES+=	${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-src-corelib-global-qglobal.h
+EXTRA_PATCHES?=	${EXTRA_PATCHES} \
+				${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-src-corelib-global-qglobal.h
 .  endif
 . endif