[70523] trunk/dports/aqua

[michaelld at macports.org]

Revision: 70523
          http://trac.macports.org/changeset/70523
Author:   michaelld at macports.org
Date:     2010-08-12 06:48:14 -0700 (Thu, 12 Aug 2010)
Log Message:
-----------
Fix for ticket #26034: On 10.4, the 'depth' option of 'find' doesn't
work the same as under 10.5+.  Replace that with a combination of
'ls | grep | sed'.

Modified Paths:
--------------
    trunk/dports/aqua/qt4-mac/Portfile
    trunk/dports/aqua/qt4-mac-devel/Portfile

Modified: trunk/dports/aqua/qt4-mac/Portfile
===================================================================
--- trunk/dports/aqua/qt4-mac/Portfile	2010-08-12 13:42:25 UTC (rev 70522)
+++ trunk/dports/aqua/qt4-mac/Portfile	2010-08-12 13:48:14 UTC (rev 70523)
@@ -306,17 +306,17 @@
     # ${qt_dir}/include/FOO, for each FOO in the frameworks, and link
     # into the headers provided by the FOO framework
     if {![variant_isset no_framework]} {
-        foreach tfm [exec find ${destroot}${qt_dir}/lib -name "*.framework" \
-                         -type d -depth 1 | sed -e "s@\.framework@@g" \
-                         -e "s@${destroot}${qt_dir}/lib/@@g"] {
+        # retrieve list of all installed frameworks
+        foreach framework [exec ls ${destroot_qt}/lib | \
+                               grep framework | \
+                               sed -e "s@\\.framework.*@@"] {
             # remove the include directory, if it exists
-            if {[file exists ${destroot_qt}/include/${tfm}] } {
-                # if it exists
-                delete ${destroot_qt}/include/${tfm}
+            if {[file exists ${destroot_qt}/include/${framework}] } {
+                delete ${destroot_qt}/include/${framework}
             }
-            # link into the framework's Headers
-            ln -s ${qt_dir}/lib/${tfm}.framework/Headers \
-                ${destroot_qt}/include/${tfm}
+            # link in the framework's Headers
+            ln -s ${qt_dir}/lib/${framework}.framework/Headers \
+                ${destroot_qt}/include/${framework}
         }
     }
 

Modified: trunk/dports/aqua/qt4-mac-devel/Portfile
===================================================================
--- trunk/dports/aqua/qt4-mac-devel/Portfile	2010-08-12 13:42:25 UTC (rev 70522)
+++ trunk/dports/aqua/qt4-mac-devel/Portfile	2010-08-12 13:48:14 UTC (rev 70523)
@@ -301,17 +301,17 @@
     # ${qt_dir}/include/FOO, for each FOO in the frameworks, and link
     # into the headers provided by the FOO framework
     if {![variant_isset no_framework]} {
-        foreach tfm [exec find ${destroot}${qt_dir}/lib -name "*.framework" \
-                         -type d -depth 1 | sed -e "s@\.framework@@g" \
-                         -e "s@${destroot}${qt_dir}/lib/@@g"] {
+        # retrieve list of all installed frameworks
+        foreach framework [exec ls ${destroot_qt}/lib | \
+                               grep framework | \
+                               sed -e "s@\\.framework.*@@"] {
             # remove the include directory, if it exists
-            if {[file exists ${destroot_qt}/include/${tfm}] } {
-                # if it exists
-                delete ${destroot_qt}/include/${tfm}
+            if {[file exists ${destroot_qt}/include/${framework}] } {
+                delete ${destroot_qt}/include/${framework}
             }
-            # link into the framework's Headers
-            ln -s ${qt_dir}/lib/${tfm}.framework/Headers \
-                ${destroot_qt}/include/${tfm}
+            # link in the framework's Headers
+            ln -s ${qt_dir}/lib/${framework}.framework/Headers \
+                ${destroot_qt}/include/${framework}
         }
     }
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100812/54dddaaa/attachment.html>