svn commit: r362837 - head/Mk

Raphael Kubo da Costa rakuco at FreeBSD.org
Thu Jul 24 18:52:53 UTC 2014


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
 


More information about the svn-ports-all mailing list