diff options
| author | Alberto Villa <avilla@FreeBSD.org> | 2011-10-16 22:42:43 +0000 |
|---|---|---|
| committer | Alberto Villa <avilla@FreeBSD.org> | 2011-10-16 22:42:43 +0000 |
| commit | 2300301988660bc50856e772eae46a2276b17ba4 (patch) | |
| tree | fa03e2a64463a364674ce0e9ae16719e92fc6265 /Mk | |
| parent | Add samba36 to the list (diff) | |
- Update Qt to 4.7.4.
- Make sure internal paths are added before system ones.
- Remove phonon-gstreamer dependency from qt4-webkit.
- Remove qt4-gui dependency from qt4-dbus.
Notes
Notes:
svn path=/head/; revision=283621
Diffstat (limited to 'Mk')
| -rw-r--r-- | Mk/bsd.qt.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Mk/bsd.qt.mk b/Mk/bsd.qt.mk index 63711d604a59..53890f61eeee 100644 --- a/Mk/bsd.qt.mk +++ b/Mk/bsd.qt.mk @@ -44,7 +44,6 @@ CONFIGURE_ENV+= CC="" CXX="" # Keep in sync with devel/qmake4/files/qconfig.cpp CONFIGURE_ARGS+=-fast -platform ${QMAKESPEC} \ - -L${PREFIX}/${QT_LIBDIR_REL} \ -qt-gif -system-libjpeg -system-libpng \ -system-libmng -system-libtiff -system-zlib \ -opensource -confirm-license \ @@ -60,7 +59,9 @@ CONFIGURE_ARGS+=-fast -platform ${QMAKESPEC} \ -translationdir ${PREFIX}/share/qt4/translations \ -sysconfdir ${PREFIX}/etc/xdg \ -examplesdir ${PREFIX}/share/examples/qt4/examples \ - -demosdir ${PREFIX}/share/examples/qt4/demos + -demosdir ${PREFIX}/share/examples/qt4/demos \ + -phonon \ + -no-phonon-backend PLIST_SUB+= SHLIB_VER=${QT4_VERSION:C/-.*//} \ SHLIB_SHVER=${QT4_VERSION:R} @@ -145,9 +146,8 @@ QTCGFLIBS?= # # QT4 version -# Don't forget to update ${PORTSDIR}/devel/qt4/files/patch-configure ! # -QT4_VERSION?= 4.7.3 +QT4_VERSION?= 4.7.4 _QT_COMPONENTS_ALL= accessible assistant assistant-adp assistantclient \ clucene codecs-cn codecs-jp codecs-kr codecs-tw corelib \ |