Ticket #34666: Portfile-cleanup.diff

Portfile

@@ -3 +3 @@
 
 PortSystem          1.0
 
-# Disable the full universal support since ACE already does most of this
-# and the extra stuff in muniversal (including making two build trees
-# and using libtool to merge libraries) does not work for this case.
-# PortGroup           muniversal 1.0
-
 name                ace
 set name_package    ACE
 version             6.1.2
-revision            1
+revision            2
 distname            ${name_package}-${version}
 categories          devel
 maintainers         fourpalms.org:lockhart openmaintainer
@@ -37 +32 @@
 
 universal_variant   yes
 
-variant ssl description {Enable SSL} {
-        depends_lib port:openssl
-}
-
 use_bzip2           yes
 
 worksrcdir          ACE_wrappers
@@ -61 +52 @@
     11  lion
     12  mountainlion
 }
-if {"darwin" == ${os.platform}} {
-    foreach {key value} [array get os.names]  {
-        if {${key} == ${os.major}} {
-            set os.name ${value}
-        }
+foreach {key value} [array get os.names]  {
+    if {${key} == ${os.major}} {
+        set os.name ${value}
     }
 }
+
 set libenv          DYLD_LIBRARY_PATH=${worksrcpath}/lib
 set aceenv          ACE_ROOT=${worksrcpath}
 set makearg         INSTALL_PREFIX=${prefix}
@@ -78 +68 @@
         ${worksrcpath}/ace/config.h \
         ${worksrcpath}/include/makeinclude/platform_macros.GNU
     # disable the assignment for compilers in lion and use our environment instead
+    ui_info "patching platform_macosx_lion.GNU"
     reinplace "s|^\\(CXX:=.*\\)|# \\1|g" \
         ${worksrcpath}/include/makeinclude/platform_macosx_lion.GNU
     reinplace "s|^\\(CC:=.*\\)|# \\1|g" \
         ${worksrcpath}/include/makeinclude/platform_macosx_lion.GNU
+}
 
-    if {[variant_exists universal] && [variant_isset universal]} {
-        ui_debug "Enabling a universal build"
+depends_lib-append  path:bin/perl:perl5
+
+proc setuniversalflags {fname cxxflags ldflags} {
+    set apat "-arch \[ \]*\[a-z\]\[_a-z0-9\]*"
+    if {[file exists ${fname}]} {
+        reinplace "s|^\\(\[ \]*FLAGS_C_CC\[ \]*+=\[ \]*\\)${apat}\\(\[ \]*${apat}\\)*|\\1${cxxflags}|g" \
+            ${fname}
+        reinplace "s|^\\(\[ \]*LDFLAGS\[ \]*+=\[ \]*\\)${apat}\\(\[ \]*${apat}\\)*|\\1${ldflags}|g" \
+            ${fname}
+    } else {
+        ui_warn "File ${fname} not found for patching"
+    }
+}
+
+variant universal {
+    post-patch {
+        ui_info "patching platform_macros.GNU"
         reinplace "s|buildbits=64|buildbits=universal|g" \
             ${worksrcpath}/include/makeinclude/platform_macros.GNU
-        # do not set universal=1 which tries i386 and PPC but fails
-        reinplace "s|universal=0|universal=0|g" \
-            ${worksrcpath}/include/makeinclude/platform_macros.GNU
+        setuniversalflags ${worksrcpath}/include/makeinclude/platform_macosx_${os.name}.GNU \
+            ${configure.universal_cxxflags} ${configure.universal_ldflags}
     }
+}
 
-    if {[variant_exists ssl] && [variant_isset ssl]} {
-        ui_debug "Enabling SSL"
+variant ssl description {Enable SSL} {
+    depends_lib-append port:openssl
+
+    post-patch {
         reinplace "s|ssl=0|ssl=1|g" \
             ${worksrcpath}/include/makeinclude/platform_macros.GNU
     }
 }
 
-depends_lib         path:bin/perl:perl5
-
 use_configure       no
 
 use_parallel_build  no