[72674] trunk/dports/aqua/qtoctave-mac

[and.damore at macports.org]

Revision: 72674
          http://trac.macports.org/changeset/72674
Author:   and.damore at macports.org
Date:     2010-10-23 03:23:36 -0700 (Sat, 23 Oct 2010)
Log Message:
-----------
fixed qt requirement check, closing ticket #26941

Modified Paths:
--------------
    trunk/dports/aqua/qtoctave-mac/Portfile

Added Paths:
-----------
    trunk/dports/aqua/qtoctave-mac/files/
    trunk/dports/aqua/qtoctave-mac/files/patch-cmakelists_txt.diff

Modified: trunk/dports/aqua/qtoctave-mac/Portfile
===================================================================
--- trunk/dports/aqua/qtoctave-mac/Portfile	2010-10-23 10:16:57 UTC (rev 72673)
+++ trunk/dports/aqua/qtoctave-mac/Portfile	2010-10-23 10:23:36 UTC (rev 72674)
@@ -24,6 +24,8 @@
                     sha1    1d18058c7549a3f25cd648183db3d99ef755257e \
                     rmd160  9e4725cc2a52cfe9b7ec1e1b74becba8146b74f0
 
+patchfiles          patch-cmakelists_txt.diff
+
 configure.cmd       cmake
 configure.pre_args  -DCMAKE_INSTALL_PREFIX=${prefix}
 configure.args      ${qt_cmake_defines} \

Added: trunk/dports/aqua/qtoctave-mac/files/patch-cmakelists_txt.diff
===================================================================
--- trunk/dports/aqua/qtoctave-mac/files/patch-cmakelists_txt.diff	                        (rev 0)
+++ trunk/dports/aqua/qtoctave-mac/files/patch-cmakelists_txt.diff	2010-10-23 10:23:36 UTC (rev 72674)
@@ -0,0 +1,14 @@
+--- CMakeLists.txt.orig	2010-10-23 08:58:23.000000000 +0200
++++ CMakeLists.txt	2010-10-23 11:39:03.000000000 +0200
+@@ -28,9 +28,9 @@
+ 
+ include(UseQt4)
+ 
+-if( NOT ${QT_VERSION_MAJOR} EQUAL 4 OR NOT ${QT_VERSION_MINOR} EQUAL 6   )
++if( NOT ${QT_VERSION_MAJOR} EQUAL 4 OR NOT ${QT_VERSION_MINOR} GREATER 5   )
+ 	MESSAGE (FATAL_ERROR 
+-			"Qt version 4.6 required.\n"
++			"Qt version greater than or equal to 4.6 required.\n"
+ 			"Qt version installed is: ${QT_VERSION_MAJOR}.${QT_VERSION_MINOR}\n"
+ 			"Please install required version.\n"
+ 		)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20101023/222ad1f8/attachment.html>