diff options
| author | Tilman Keskinoz <arved@FreeBSD.org> | 2008-08-01 13:01:07 +0000 |
|---|---|---|
| committer | Tilman Keskinoz <arved@FreeBSD.org> | 2008-08-01 13:01:07 +0000 |
| commit | 56a121095ff5694437fcd8da3330f72dd8e15688 (patch) | |
| tree | 5c0e9f1b2fba37d16f4ecc9c2bb98c3d8d585de0 | |
| parent | d31eb81ef00bccbe0c464d97599f152383f8d35a (diff) | |
| download | ports-56a121095ff5694437fcd8da3330f72dd8e15688.tar.gz ports-56a121095ff5694437fcd8da3330f72dd8e15688.zip | |
Fix detection of qt4's lupdate and lrelease binaries
PR: 125815
Submitted by: Max Brazhnikov
Notes
Notes:
svn path=/head/; revision=217920
| -rw-r--r-- | devel/cmake/Makefile | 1 | ||||
| -rw-r--r-- | devel/cmake/files/patch-Modules_FindQt4.cmake | 24 |
2 files changed, 21 insertions, 4 deletions
diff --git a/devel/cmake/Makefile b/devel/cmake/Makefile index 68d5d97bec4a..8b240fbc5ec0 100644 --- a/devel/cmake/Makefile +++ b/devel/cmake/Makefile @@ -7,6 +7,7 @@ PORTNAME= cmake PORTVERSION= 2.6.0 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= http://www.cmake.org/files/v${PORTVERSION:C/\.[[:digit:]]+$//}/ \ ${MASTER_SITE_LOCAL} diff --git a/devel/cmake/files/patch-Modules_FindQt4.cmake b/devel/cmake/files/patch-Modules_FindQt4.cmake index 7667e25d09f2..27a5aaeff783 100644 --- a/devel/cmake/files/patch-Modules_FindQt4.cmake +++ b/devel/cmake/files/patch-Modules_FindQt4.cmake @@ -1,6 +1,6 @@ ---- ./Modules/FindQt4.cmake.orig 2008-01-21 19:59:51.000000000 +0100 -+++ ./Modules/FindQt4.cmake 2008-04-25 21:45:15.000000000 +0200 -@@ -250,7 +250,7 @@ +--- ./Modules/FindQt4.cmake.orig 2008-05-05 22:25:53.000000000 +0400 ++++ ./Modules/FindQt4.cmake 2008-07-21 02:37:16.000000000 +0400 +@@ -293,7 +293,7 @@ GET_FILENAME_COMPONENT(qt_install_version "[HKEY_CURRENT_USER\\Software\\trolltech\\Versions;DefaultQtVersion]" NAME) # check for qmake @@ -9,7 +9,7 @@ "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\4.0.0;InstallDir]/bin" "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\4.0.0;InstallDir]/bin" "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\${qt_install_version};InstallDir]/bin" -@@ -790,9 +790,9 @@ +@@ -915,9 +915,9 @@ "${QT_UIC_EXECUTABLE_INTERNAL}" QT_UIC_EXECUTABLE_INTERNAL) SET(QT_MOC_EXECUTABLE @@ -21,3 +21,19 @@ FIND_PROGRAM(QT_UIC3_EXECUTABLE NAMES uic3 +@@ -944,13 +944,13 @@ + ) + + FIND_PROGRAM(QT_LUPDATE_EXECUTABLE +- NAMES lupdate ++ NAMES lupdate-qt4 + PATHS ${QT_BINARY_DIR} + NO_DEFAULT_PATH + ) + + FIND_PROGRAM(QT_LRELEASE_EXECUTABLE +- NAMES lrelease ++ NAMES lrelease-qt4 + PATHS ${QT_BINARY_DIR} + NO_DEFAULT_PATH + ) |