diff options
| author | rakuco <rakuco@FreeBSD.org> | 2014-07-25 02:52:53 +0800 |
|---|---|---|
| committer | rakuco <rakuco@FreeBSD.org> | 2014-07-25 02:52:53 +0800 |
| commit | 61e264e947904ae4bbd6e1b521197730be6f7b70 (patch) | |
| tree | 28ae1f1956bd9bbd4e8da538a052a35d42f0cd06 | |
| parent | f791c9d8ac6b9121d88b8aab2e615826eb4dcbed (diff) | |
| download | freebsd-ports-gnome-61e264e947904ae4bbd6e1b521197730be6f7b70.tar.gz freebsd-ports-gnome-61e264e947904ae4bbd6e1b521197730be6f7b70.tar.zst freebsd-ports-gnome-61e264e947904ae4bbd6e1b521197730be6f7b70.zip | |
qt4: Do not apply the patch from r362770 if EXTRA_PATCHES is unset.
This unbreaks qmake4 and qt4-doc.
| -rw-r--r-- | Mk/bsd.qt.mk | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Mk/bsd.qt.mk b/Mk/bsd.qt.mk index 07ba5f402356..f2ec761fca9a 100644 --- a/Mk/bsd.qt.mk +++ b/Mk/bsd.qt.mk @@ -172,7 +172,8 @@ EXTRA_PATCHES?= ${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-configure \ . 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 |