From nobody@FreeBSD.org  Sun Jul 20 22:56:57 2008
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A1B111065677
	for <freebsd-gnats-submit@FreeBSD.org>; Sun, 20 Jul 2008 22:56:57 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21])
	by mx1.freebsd.org (Postfix) with ESMTP id 9D7528FC12
	for <freebsd-gnats-submit@FreeBSD.org>; Sun, 20 Jul 2008 22:56:57 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.14.2/8.14.2) with ESMTP id m6KMuvXZ091067
	for <freebsd-gnats-submit@FreeBSD.org>; Sun, 20 Jul 2008 22:56:57 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.14.2/8.14.1/Submit) id m6KMuuZr091066;
	Sun, 20 Jul 2008 22:56:56 GMT
	(envelope-from nobody)
Message-Id: <200807202256.m6KMuuZr091066@www.freebsd.org>
Date: Sun, 20 Jul 2008 22:56:56 GMT
From: Max Brazhnikov <makc@issp.ac.ru>
To: freebsd-gnats-submit@FreeBSD.org
Subject: devel/cmake: fix finding linguist tools
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         125815
>Category:       ports
>Synopsis:       devel/cmake: fix finding linguist tools
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    kde
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sun Jul 20 23:00:01 UTC 2008
>Closed-Date:    Fri Aug 01 13:01:20 UTC 2008
>Last-Modified:  Fri Aug  1 13:10:03 UTC 2008
>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@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:
Responsible-Changed-From-To: freebsd-ports-bugs->kde 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Sun Jul 20 23:00:15 UTC 2008 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=125815 
State-Changed-From-To: open->closed 
State-Changed-By: arved 
State-Changed-When: Fri Aug 1 13:01:14 UTC 2008 
State-Changed-Why:  
committed, thanks 

http://www.freebsd.org/cgi/query-pr.cgi?pr=125815 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/125815: commit references a PR
Date: Fri,  1 Aug 2008 13:01:35 +0000 (UTC)

 arved       2008-08-01 13:01:07 UTC
 
   FreeBSD ports repository
 
   Modified files:
     devel/cmake          Makefile 
     devel/cmake/files    patch-Modules_FindQt4.cmake 
   Log:
   Fix detection of qt4's lupdate and lrelease binaries
   
   PR:             125815
   Submitted by:   Max Brazhnikov
   
   Revision  Changes    Path
   1.24      +1 -0      ports/devel/cmake/Makefile
   1.2       +20 -4     ports/devel/cmake/files/patch-Modules_FindQt4.cmake
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
