[72618] trunk/dports/graphics

[michaelld at macports.org]

Revision: 72618
          http://trac.macports.org/changeset/72618
Author:   michaelld at macports.org
Date:     2010-10-21 05:52:22 -0700 (Thu, 21 Oct 2010)
Log Message:
-----------
Changes to use qt4 portgroup.

Modified Paths:
--------------
    trunk/dports/graphics/qwt/Portfile
    trunk/dports/graphics/qwt52/Portfile

Modified: trunk/dports/graphics/qwt/Portfile
===================================================================
--- trunk/dports/graphics/qwt/Portfile	2010-10-21 12:51:52 UTC (rev 72617)
+++ trunk/dports/graphics/qwt/Portfile	2010-10-21 12:52:22 UTC (rev 72618)
@@ -5,7 +5,7 @@
 
 name                qwt
 version             5.1.2
-revision            1
+revision            2
 conflicts           qwt52
 categories          graphics science
 maintainers         michaelld
@@ -29,17 +29,14 @@
 
 patchfiles          patch-qwtconfig.pri.diff
 
-variant qt3 conflicts qt4 description {Use qt3-mac} {
-    depends_lib-append  port:qt3-mac
-}
+variant qt3 conflicts qt4 description {Use qt3-mac} {}
 
-variant qt4 conflicts qt3 description {Use qt4-mac} {
-    depends_lib-append  port:qt4-mac
-}
+variant qt4 conflicts qt3 description {Use qt4-mac} {}
 
 # move setting of 'qt_dir' outside variants, since 'if' statements are
 # processed in-order while variants are processed after everything else.
 if {[variant_isset qt3]} {
+    depends_lib-append  port:qt3-mac
     set qt_dir          ${prefix}/libexec/qt3-mac
 } else {
     # when variant 'qt3' is not set, use qt4 whether by default or via
@@ -47,7 +44,7 @@
     if {![variant_isset qt4]} {
         default_variants    +qt4
     }
-    set qt_dir          ${prefix}/libexec/qt4-mac
+    PortGroup           qt4 1.0
 }
 
 configure.cmd       ${qt_dir}/bin/qmake
@@ -64,7 +61,7 @@
     system "install_name_tool -id ${libqwt_file} ${destroot}${libqwt_file}"
 
     # (2) fix the install name of the plugin
-    set plugin_file [exec find ${destroot}${qt_dir}/plugins/designer -type f | \
+    set plugin_file [exec find ${destroot}${qt_plugins_dir}/designer -type f | \
                          sed -e "s@${destroot}@@g"]
     system "install_name_tool -id ${plugin_file} ${destroot}${plugin_file}"
 

Modified: trunk/dports/graphics/qwt52/Portfile
===================================================================
--- trunk/dports/graphics/qwt52/Portfile	2010-10-21 12:51:52 UTC (rev 72617)
+++ trunk/dports/graphics/qwt52/Portfile	2010-10-21 12:52:22 UTC (rev 72618)
@@ -5,6 +5,7 @@
 
 name                qwt52
 version             5.2.1
+revision            1
 conflicts           qwt
 categories          graphics science
 maintainers         michaelld
@@ -30,17 +31,14 @@
 
 patchfiles          patch-qwtconfig.pri.diff
 
-variant qt3 conflicts qt4 description {Use qt3-mac} {
-    depends_lib-append  port:qt3-mac
-}
+variant qt3 conflicts qt4 description {Use qt3-mac} {}
 
-variant qt4 conflicts qt3 description {Use qt4-mac} {
-    depends_lib-append  port:qt4-mac
-}
+variant qt4 conflicts qt3 description {Use qt4-mac} {}
 
 # move setting of 'qt_dir' outside variants, since 'if' statements are
 # processed in-order while variants are processed after everything else.
 if {[variant_isset qt3]} {
+    depends_lib-append  port:qt3-mac
     set qt_dir          ${prefix}/libexec/qt3-mac
 } else {
     # when variant 'qt3' is not set, use qt4 whether by default or via
@@ -48,7 +46,7 @@
     if {![variant_isset qt4]} {
         default_variants    +qt4
     }
-    set qt_dir          ${prefix}/libexec/qt4-mac
+    PortGroup           qt4 1.0
 }
 
 configure.cmd       ${qt_dir}/bin/qmake
@@ -65,7 +63,7 @@
     system "install_name_tool -id ${libqwt_file} ${destroot}${libqwt_file}"
 
     # (2) fix the install name of the plugin
-    set plugin_file [exec find ${destroot}${qt_dir}/plugins/designer -type f | \
+    set plugin_file [exec find ${destroot}${qt_plugins_dir}/designer -type f | \
                          sed -e "s@${destroot}@@g"]
     system "install_name_tool -id ${plugin_file} ${destroot}${plugin_file}"
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20101021/9a2a38c9/attachment-0001.html>