ports/125815: devel/cmake: fix finding linguist tools

Max Brazhnikov makc at issp.ac.ru
Sun Jul 20 23:00:07 UTC 2008


>Number:         125815
>Category:       ports
>Synopsis:       devel/cmake: fix finding linguist tools
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sun Jul 20 23:00:01 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator:     Max Brazhnikov
>Release:        FreeBSD 7.0-STABLE i386
>Organization:
>Environment:
FreeBSD luna.dio.ru 7.0-STABLE FreeBSD 7.0-STABLE #3: Sat Jul 12 00:03:43 MSD 2008     root at luna.dio.ru:/usr/obj/usr/freebsd/7/src/sys/LUNA  i386
>Description:
qt4 from ports (devel/qt4-linguist) installs lupdate and lrelease binaries with -qt4 suffix to not conflict with qt3. Cmake tries to find non-suffixed binaries when qt4 is requested.
>How-To-Repeat:
cd /usr/ports/devel/qsvn && make configure
check QT_LUPDATE_EXECUTABLE and/or QT_LRELEASE_EXECUTABLE in ${WRKSRC}/CMakeCache.txt
>Fix:


Patch attached with submission follows:

===> Generating patch
===> Viewing diff with more
diff -ruN --exclude=CVS /usr/ports/devel/cmake/Makefile /home/makc/porting/ports/devel/cmake/Makefile
--- /usr/ports/devel/cmake/Makefile	2008-05-28 02:12:02.000000000 +0400
+++ /home/makc/porting/ports/devel/cmake/Makefile	2008-07-21 02:39:47.000000000 +0400
@@ -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 -ruN --exclude=CVS /usr/ports/devel/cmake/files/patch-Modules_FindQt4.cmake /home/makc/porting/ports/devel/cmake/files/patch-Modules_FindQt4.cmake
--- /usr/ports/devel/cmake/files/patch-Modules_FindQt4.cmake	2008-05-28 02:12:02.000000000 +0400
+++ /home/makc/porting/ports/devel/cmake/files/patch-Modules_FindQt4.cmake	2008-07-21 02:37:27.000000000 +0400
@@ -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
+     )
===> Done


>Release-Note:
>Audit-Trail:
>Unformatted:



More information about the freebsd-ports-bugs mailing list