diff options
author | Max Brazhnikov <makc@FreeBSD.org> | 2010-06-09 19:41:21 +0000 |
---|---|---|
committer | Max Brazhnikov <makc@FreeBSD.org> | 2010-06-09 19:41:21 +0000 |
commit | c3929f27e745042fa2f021d2af16bf0b81917388 (patch) | |
tree | 3dbd19ce21d0084b146b4b5f59d6eb1fa2c9efbe /devel/qmake4 | |
parent | 29b24285c38f8d11b97e5b1d0d88c67f2579e5fc (diff) | |
download | ports-c3929f27e745042fa2f021d2af16bf0b81917388.tar.gz ports-c3929f27e745042fa2f021d2af16bf0b81917388.zip |
Update Qt to 4.6.3
Notes
Notes:
svn path=/head/; revision=256223
Diffstat (limited to 'devel/qmake4')
-rw-r--r-- | devel/qmake4/Makefile | 4 | ||||
-rw-r--r-- | devel/qmake4/files/Makefile.bsd | 5 | ||||
-rw-r--r-- | devel/qmake4/pkg-plist | 3 |
3 files changed, 9 insertions, 3 deletions
diff --git a/devel/qmake4/Makefile b/devel/qmake4/Makefile index 56ae69a69427..913a6e81417a 100644 --- a/devel/qmake4/Makefile +++ b/devel/qmake4/Makefile @@ -36,7 +36,9 @@ EXTRACT_AFTER_ARGS=| ${TAR} -xf - \ '${DISTNAME}/src/corelib/xml' \ '${DISTNAME}/src/3rdparty/md4' \ '${DISTNAME}/src/3rdparty/md5' \ - '${DISTNAME}/src/3rdparty/sha1' + '${DISTNAME}/src/3rdparty/sha1' \ + '${DISTNAME}/tools/shared/symbian' \ + '${DISTNAME}/tools/shared/windows' post-patch: @${REINPLACE_CMD} -e 's|-O2|${CXXFLAGS}|' \ diff --git a/devel/qmake4/files/Makefile.bsd b/devel/qmake4/files/Makefile.bsd index 9d6eac70db42..481fb4a429b7 100644 --- a/devel/qmake4/files/Makefile.bsd +++ b/devel/qmake4/files/Makefile.bsd @@ -11,14 +11,15 @@ NO_MAN= true # qmake.1 anyone? ${.CURDIR:H}/src/corelib/global ${.CURDIR:H}/src/corelib/plugin \ ${.CURDIR:H}/src/corelib/kernel ${.CURDIR:H}/src/corelib/codecs \ ${.CURDIR:H}/src/corelib/xml ${.CURDIR:H}/src/3rdparty/md4 \ - ${.CURDIR:H}/src/3rdparty/md5 ${.CURDIR:H}/src/3rdparty/sha1 + ${.CURDIR:H}/src/3rdparty/md5 ${.CURDIR:H}/src/3rdparty/sha1 \ + ${.CURDIR:H}/tools/shared/symbian ${.CURDIR:H}/tools/shared/windows CXXFLAGS+=-I${.CURDIR:H}/mkspecs/freebsd-g++ .for s in src/corelib/arch/generic src/corelib/global src/corelib/tools \ src/corelib/kernel src/corelib/codecs \ src/3rdparty/md5 src/3rdparty/md4 src/3rdparty/sha1 \ - include/QtCore include + tools/shared include/QtCore include CXXFLAGS+=-I${.CURDIR:H}/$s .endfor diff --git a/devel/qmake4/pkg-plist b/devel/qmake4/pkg-plist index 7a750191ac72..a8ac1e1930eb 100644 --- a/devel/qmake4/pkg-plist +++ b/devel/qmake4/pkg-plist @@ -69,6 +69,7 @@ share/qt4/mkspecs/features/silent.prf share/qt4/mkspecs/features/static.prf share/qt4/mkspecs/features/static_and_shared.prf share/qt4/mkspecs/features/staticlib.prf +share/qt4/mkspecs/features/symbian/add_mmp_rules.prf share/qt4/mkspecs/features/symbian/application_icon.prf share/qt4/mkspecs/features/symbian/armcc_warnings.prf share/qt4/mkspecs/features/symbian/data_caging_paths.prf @@ -274,12 +275,14 @@ share/qt4/mkspecs/solaris-g++-64/qplatformdefs.h share/qt4/mkspecs/solaris-g++/qmake.conf share/qt4/mkspecs/solaris-g++/qplatformdefs.h share/qt4/mkspecs/symbian-abld/qmake.conf +share/qt4/mkspecs/symbian-abld/qplatformdefs.h share/qt4/mkspecs/symbian-sbsv2/flm/qt/qmake_emulator_deployment.flm share/qt4/mkspecs/symbian-sbsv2/flm/qt/qmake_extra_pre_targetdep.flm share/qt4/mkspecs/symbian-sbsv2/flm/qt/qmake_post_link.flm share/qt4/mkspecs/symbian-sbsv2/flm/qt/qmake_store_build.flm share/qt4/mkspecs/symbian-sbsv2/flm/qt/qt.xml share/qt4/mkspecs/symbian-sbsv2/qmake.conf +share/qt4/mkspecs/symbian-sbsv2/qplatformdefs.h share/qt4/mkspecs/tru64-cxx/qmake.conf share/qt4/mkspecs/tru64-cxx/qplatformdefs.h share/qt4/mkspecs/tru64-g++/qmake.conf |