From thierry@FreeBSD.org  Fri Apr 25 20:24:44 2008
Return-Path: <thierry@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 1D626106567C;
	Fri, 25 Apr 2008 20:24:44 +0000 (UTC)
	(envelope-from thierry@FreeBSD.org)
Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28])
	by mx1.freebsd.org (Postfix) with ESMTP id A1F908FC1F;
	Fri, 25 Apr 2008 20:24:43 +0000 (UTC)
	(envelope-from thierry@FreeBSD.org)
Received: from freefall.freebsd.org (thierry@localhost [127.0.0.1])
	by freefall.freebsd.org (8.14.2/8.14.2) with ESMTP id m3PKOhIH084535;
	Fri, 25 Apr 2008 20:24:43 GMT
	(envelope-from thierry@freefall.freebsd.org)
Received: (from thierry@localhost)
	by freefall.freebsd.org (8.14.2/8.14.1/Submit) id m3PKOhHp084534;
	Fri, 25 Apr 2008 20:24:43 GMT
	(envelope-from thierry)
Message-Id: <200804252024.m3PKOhHp084534@freefall.freebsd.org>
Date: Fri, 25 Apr 2008 20:24:43 GMT
From: Thierry Thomas <thierry@FreeBSD.org>
Reply-To: Thierry Thomas <thierry@FreeBSD.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc: kde@freebsd.org
Subject: devel/cmake: fix Qt4 configuration.
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         123092
>Category:       ports
>Synopsis:       devel/cmake: fix Qt4 configuration.
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    kde
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Apr 25 20:30:02 UTC 2008
>Closed-Date:    Tue May 27 22:18:08 UTC 2008
>Last-Modified:  Tue May 27 22:18:08 UTC 2008
>Originator:     Thierry Thomas
>Release:        FreeBSD 7.0-STABLE i386
>Organization:
Kabbale Eros
>Environment:
System: FreeBSD freefall.freebsd.org 7.0-STABLE FreeBSD 7.0-STABLE #34: Sat Apr 12 11:52:18 UTC 2008 simon@freefall.freebsd.org:/usr/src/sys/i386/compile/FREEFALL i386


	
>Description:
	When using cmake to build an application depending on Qt4, it
	fails to detect qmake-qt4 if qmake exists, and then even if
	moc-qt4 and uic-qt4 have been found, they are not registered.

	The following patch fixes these problems.

>How-To-Repeat:
	Try to upgrade ParaView (the port science/paraview) to v. 3.2.x.

>Fix:
	Please consider the hereunder patch:

--- cmake.diff begins here ---
diff -urN devel/cmake.orig/Makefile devel/cmake/Makefile
--- devel/cmake.orig/Makefile	2008-04-25 22:07:06.000000000 +0200
+++ devel/cmake/Makefile	2008-04-25 17:46:13.000000000 +0200
@@ -7,6 +7,7 @@
 
 PORTNAME=	cmake
 PORTVERSION=	2.4.8
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://www.cmake.org/files/v${PORTVERSION:C/\.[[:digit:]]+$//}/ \
 		${MASTER_SITE_LOCAL}
diff -urN devel/cmake.orig/files/patch-Modules_FindQt4.cmake devel/cmake/files/patch-Modules_FindQt4.cmake
--- devel/cmake.orig/files/patch-Modules_FindQt4.cmake	1970-01-01 01:00:00.000000000 +0100
+++ devel/cmake/files/patch-Modules_FindQt4.cmake	2008-04-25 21:45:34.000000000 +0200
@@ -0,0 +1,23 @@
+--- ./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 @@
+ 
+ GET_FILENAME_COMPONENT(qt_install_version "[HKEY_CURRENT_USER\\Software\\trolltech\\Versions;DefaultQtVersion]" NAME)
+ # check for qmake
+-FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake qmake4 qmake-qt4 PATHS
++FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake-qt4 qmake4 qmake PATHS
+   "[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 @@
+     "${QT_UIC_EXECUTABLE_INTERNAL}" QT_UIC_EXECUTABLE_INTERNAL)
+ 
+   SET(QT_MOC_EXECUTABLE 
+-    ${QT_MOC_EXECUTABLE_INTERNAL} CACHE FILEPATH "The moc executable")
++    ${QT_MOC_EXECUTABLE_INTERNAL} CACHE FILEPATH "The moc executable" FORCE)
+   SET(QT_UIC_EXECUTABLE 
+-    ${QT_UIC_EXECUTABLE_INTERNAL} CACHE FILEPATH "The uic executable")
++    ${QT_UIC_EXECUTABLE_INTERNAL} CACHE FILEPATH "The uic executable" FORCE)
+ 
+   FIND_PROGRAM(QT_UIC3_EXECUTABLE
+     NAMES uic3
--- cmake.diff ends here ---

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->kde 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Fri Apr 25 20:30:09 UTC 2008 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

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

From: Thierry Thomas <thierry@FreeBSD.org>
To: FreeBSD-gnats-submit@FreeBSD.org
Cc:  
Subject: Re: ports/123092: devel/cmake: fix Qt4 configuration.
Date: Sun, 4 May 2008 14:16:41 +0200

 On Fri 25 apr 08 at 22:24:43 +0200, Thierry Thomas <thierry@FreeBSD.org>
  wrote:
 
 > >Description:
 > 	When using cmake to build an application depending on Qt4, it
 > 	fails to detect qmake-qt4 if qmake exists, and then even if
 > 	moc-qt4 and uic-qt4 have been found, they are not registered.
 > 
 > 	The following patch fixes these problems.
 > 
 > >How-To-Repeat:
 > 	Try to upgrade ParaView (the port science/paraview) to v. 3.2.x.
 
 A patch to upgrade paraview to v. 3.2.1 is available at
 <http://people.freebsd.org/~thierry/ports/paraview-3.2.1.diff>
 
 Try to build it without and with the included patch to
 Modules/FindQt4.cmake.
 
 Regards,
 -- 
 Th. Thomas.

From: Thierry Thomas <thierry@FreeBSD.org>
To: FreeBSD-gnats-submit@FreeBSD.org
Cc:  
Subject: Re: ports/123092: devel/cmake: fix Qt4 configuration.
Date: Sun, 18 May 2008 16:38:52 +0200

 Note: the previous patch of Paraview is intended to be built by cmake
 2.4.8. If you update cmake to 2.2.6, the proposed patch
 devel/cmake/files/patch-Modules_FindQt4.cmake is still applicable, but
 Paraview-3.2.1 won't build as-is, due to another problem.
 
 Paraview-3.2.1 was supposed to support cmake-2.6.0, and if detected it
 uses two new cmake commands (get_property & export), but according to
 <http://www.cmake.org/HTML/cmake-2.6.html#command:get_property>
 and
 <http://www.cmake.org/HTML/cmake-2.6.html#command:export>
 they have not been implemented as expected by the paraview team!
 
 I have updated my patches to support cmake-2.6.0, and it is available at
 <http://people.freebsd.org/~thierry/ports/paraview-3.2.1%2bcmake-2.2.6.diff>
 
 Best regards,
 -- 
 Th. Thomas.
State-Changed-From-To: open->closed 
State-Changed-By: miwi 
State-Changed-When: Tue May 27 22:18:07 UTC 2008 
State-Changed-Why:  
Committed. Thanks! (with update to 2.6.0). 

http://www.freebsd.org/cgi/query-pr.cgi?pr=123092 
>Unformatted:
