diff options
Diffstat (limited to 'devel/qt4')
| -rw-r--r-- | devel/qt4/Makefile | 2 | ||||
| -rw-r--r-- | devel/qt4/distinfo | 4 | ||||
| -rw-r--r-- | devel/qt4/files/patch-configure | 7 |
3 files changed, 7 insertions, 6 deletions
diff --git a/devel/qt4/Makefile b/devel/qt4/Makefile index 18c17073d9e5..93754d776988 100644 --- a/devel/qt4/Makefile +++ b/devel/qt4/Makefile @@ -26,7 +26,7 @@ CODECS_DESC= CN, JP, KR, TW codecs support SQL_PLUGINS_DESC= Install database plugins for QtSql TOOLS_DESC= Install Qt tools (qmake, moc, etc.) -NO_STAGE= yes +NO_MTREE= yes .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MCODECS} diff --git a/devel/qt4/distinfo b/devel/qt4/distinfo index 2563b7f44ad2..e74ce75635f7 100644 --- a/devel/qt4/distinfo +++ b/devel/qt4/distinfo @@ -1,2 +1,2 @@ -SHA256 (KDE/qt-everywhere-opensource-src-4.8.4.tar.gz) = 33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270 -SIZE (KDE/qt-everywhere-opensource-src-4.8.4.tar.gz) = 236593028 +SHA256 (KDE/qt-everywhere-opensource-src-4.8.5.tar.gz) = eb728f8268831dc4373be6403b7dd5d5dde03c169ad6882f9a8cb560df6aa138 +SIZE (KDE/qt-everywhere-opensource-src-4.8.5.tar.gz) = 241491467 diff --git a/devel/qt4/files/patch-configure b/devel/qt4/files/patch-configure index bede68d7870e..91537eb8dab8 100644 --- a/devel/qt4/files/patch-configure +++ b/devel/qt4/files/patch-configure @@ -39,12 +39,13 @@ echo "Creating qmake. Please wait..." OLD_QCONFIG_H= -@@ -5831,14 +5826,6 @@ +@@ -5995,15 +5995,6 @@ + QMakeVar add QMAKE_CXXFLAGS -fpermissive X11TESTS_FLAGS="$X11TESTS_FLAGS -fpermissive" fi - +- - # Check we actually have X11 :-) -- "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/xlib "XLib" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS +- compileTest x11/xlib "XLib" $X11TESTS_FLAGS - if [ $? != "0" ]; then - echo "Basic XLib functionality test failed!" - echo " You might need to modify the include and library search paths by editing" |