diff options
| author | Raphael Kubo da Costa <rakuco@FreeBSD.org> | 2013-10-13 23:15:50 +0000 |
|---|---|---|
| committer | Raphael Kubo da Costa <rakuco@FreeBSD.org> | 2013-10-13 23:15:50 +0000 |
| commit | ecda38b0a51979110b18b1bcd5f03f5b6a55e13a (patch) | |
| tree | 6e4bc973485641dceb988b7456b64a08077dafe0 /Mk | |
| parent | . Remove zombie directories left by nethack3*-gnome removal. (diff) | |
Update Qt to 4.8.5 and Qt Creator to 2.8.0.
Proudly brought to you by the KDE on FreeBSD team, with commits by makc@,
Schaich Alonso and yours truly.
Besides the tons of upstream fixes, we have mkspecs for GCC 4.9 and clang33
(from ports), staging support in the Makefiles and dependency fixes related
to pkg-config.
Many thanks to the people who helped test the ports using our area51
repository, and also to the people who provided patches and bug reports via
GNATS!
PR: ports/180615
ports/181921
ports/182049
Notes
Notes:
svn path=/head/; revision=330266
Diffstat (limited to 'Mk')
| -rw-r--r-- | Mk/bsd.qt.mk | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/Mk/bsd.qt.mk b/Mk/bsd.qt.mk index a00da8a09b06..ace165716294 100644 --- a/Mk/bsd.qt.mk +++ b/Mk/bsd.qt.mk @@ -34,6 +34,10 @@ DISTNAME= qt-everywhere-opensource-src-${QT4_VERSION} DIST_SUBDIR= KDE #CONFLICTS+= Currently there are no conflicts \o/ + +# Stage support +DESTDIRNAME= INSTALL_ROOT + # rene: can go after a while CONFLICTS_BUILD= qt-3.* qt-copy-3.* @@ -106,9 +110,7 @@ QMAKE?= ${QT_PREFIX}/bin/qmake-qt4 QMAKEFLAGS+= QMAKE_CC="${CC}" QMAKE_CXX="${CXX}" \ QMAKE_LINK="${CXX}" QMAKE_LINK_SHLIB="${CXX}" \ QMAKE_LINK_C="${CC}" QMAKE_LINK_C_SHLIB="${CC}" \ - QMAKE_CFLAGS="${CFLAGS}" QMAKE_CXXFLAGS="${CXXFLAGS}" \ - QMAKE_CFLAGS_THREAD="${PTHREAD_CFLAGS}" \ - QMAKE_LFLAGS_THREAD="${PTHREAD_LIBS}" + QMAKE_CFLAGS="${CFLAGS}" QMAKE_CXXFLAGS="${CXXFLAGS}" QTCPPFLAGS?= QTCGFLIBS?= @@ -118,7 +120,7 @@ QTCGFLIBS?= # # QT4 version # -QT4_VERSION?= 4.8.4 +QT4_VERSION?= 4.8.5 _USE_QT4_ALL= accessible assistant assistant-adp assistantclient \ clucene codecs-cn codecs-jp codecs-kr codecs-tw corelib \ |