[92346] trunk/dports/devel/libunwind-headers/Portfile

[jeremyhu at macports.org]

Revision: 92346
          https://trac.macports.org/changeset/92346
Author:   jeremyhu at macports.org
Date:     2012-04-25 10:42:42 -0700 (Wed, 25 Apr 2012)
Log Message:
-----------
libunwind-headers: Fix some incorrect availability macros on Leopard (#34211)

Modified Paths:
--------------
    trunk/dports/devel/libunwind-headers/Portfile

Modified: trunk/dports/devel/libunwind-headers/Portfile
===================================================================
--- trunk/dports/devel/libunwind-headers/Portfile	2012-04-25 17:24:18 UTC (rev 92345)
+++ trunk/dports/devel/libunwind-headers/Portfile	2012-04-25 17:42:42 UTC (rev 92346)
@@ -7,7 +7,7 @@
 
 name                    libunwind-headers
 version                 30
-revision                2
+revision                3
 categories              devel
 maintainers             mfeiri openmaintainer
 homepage                http://opensource.apple.com/source/libunwind/
@@ -35,25 +35,25 @@
 
     foreach header [glob ${worksrcpath}/*/{,*/}*.h{,pp}] {
         if {${os.major} < 11} {
-            reinplace "s|__MAC_10_7|1070|g" ${header}
+            reinplace "s|__MAC_10_7|__MAC_NA|g" ${header}
             reinplace "s|AVAILABLE_MAC_OS_X_VERSION_10_\\(.\\)_AND_LATER_BUT_DEPRECATED_IN_MAC_OS_X_VERSION_10_7|AVAILABLE_MAC_OS_X_VERSION_10_\\1_AND_LATER|" ${header}
             reinplace "s|AVAILABLE_MAC_OS_X_VERSION_10_7_AND_LATER|__attribute__((unavailable))|g" ${header}
         }
         if {${os.major} < 10} {
-            reinplace "s|__MAC_10_6|1060|g" ${header}
+            reinplace "s|__MAC_10_6|__MAC_NA|g" ${header}
             reinplace "s|AVAILABLE_MAC_OS_X_VERSION_10_\\(.\\)_AND_LATER_BUT_DEPRECATED_IN_MAC_OS_X_VERSION_10_6|AVAILABLE_MAC_OS_X_VERSION_10_\\1_AND_LATER|" ${header}
             reinplace "s|AVAILABLE_MAC_OS_X_VERSION_10_6_AND_LATER|__attribute__((unavailable))|g" ${header}
         }
         if {${os.major} < 9} {
-            reinplace "s|__MAC_10_5|1050|g" ${header}
+            reinplace "s|__MAC_10_5|__MAC_NA|g" ${header}
             reinplace "s|AVAILABLE_MAC_OS_X_VERSION_10_\\(.\\)_AND_LATER_BUT_DEPRECATED_IN_MAC_OS_X_VERSION_10_5|AVAILABLE_MAC_OS_X_VERSION_10_\\1_AND_LATER|" ${header}
             reinplace "s|AVAILABLE_MAC_OS_X_VERSION_10_5_AND_LATER|__attribute__((unavailable))|g" ${header}
 
             reinplace "s|Availability.h|AvailabilityMacros.h|g" ${header}
-            reinplace "s|__OSX_AVAILABLE_STARTING(10.*)|__attribute__((unavailable))|g" ${header}
-            reinplace "s|__OSX_AVAILABLE_BUT_DEPRECATED(10.*)|__attribute__((unavailable))|g" ${header}
+            reinplace "s|__OSX_AVAILABLE_STARTING(__MAC_NA)|__attribute__((unavailable))|g" ${header}
+            reinplace "s|__OSX_AVAILABLE_BUT_DEPRECATED(__MAC_NA)|__attribute__((unavailable))|g" ${header}
             reinplace "s|__OSX_AVAILABLE_STARTING(__MAC_10_\\(\[^,\]*\\),.*)|AVAILABLE_MAC_OS_X_VERSION_10_\\1_AND_LATER|g" ${header}
-            reinplace "s|__OSX_AVAILABLE_BUT_DEPRECATED(__MAC_10_\\(\[^,\]*\\),10.*)|AVAILABLE_MAC_OS_X_VERSION_10_\\1_AND_LATER|g" ${header}
+            reinplace "s|__OSX_AVAILABLE_BUT_DEPRECATED(__MAC_10_\\(\[^,\]*\\),__MAC_NA,.*)|AVAILABLE_MAC_OS_X_VERSION_10_\\1_AND_LATER|g" ${header}
             reinplace "s|__OSX_AVAILABLE_BUT_DEPRECATED(__MAC_10_\\(\[^,\]*\\),__MAC_10_\\(\[^,\]*\\),.*)|AVAILABLE_MAC_OS_X_VERSION_10_\\1_AND_LATER_BUT_DEPRECATED_IN_MAC_OS_X_VERSION_10_\\2|g" ${header}
         }
     }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120425/567bd310/attachment.html>