Ticket #34658: Portfile-6.1.2-universal.diff

Portfile

@@ -2 +2 @@
 # $Id: Portfile 93487 2012-05-24 00:41:47Z ryandesign@macports.org $
 
 PortSystem          1.0
-PortGroup           muniversal 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
 distname            ${name_package}-${version}
 categories          devel
 maintainers         fourpalms.org:lockhart openmaintainer
@@ -30 +34 @@
 homepage            http://www.cs.wustl.edu/~schmidt/ACE.html
 master_sites        http://download.dre.vanderbilt.edu/previous_versions
 
+universal_variant   yes
+
+variant ssl description {Enable SSL} {
+        depends_lib port:openssl
+}
+
 use_bzip2           yes
 
 worksrcdir          ACE_wrappers
@@ -57 +67 @@
         }
     }
 }
+set libenv          DYLD_LIBRARY_PATH=${worksrcpath}/lib
+set aceenv          ACE_ROOT=${worksrcpath}
+set makearg         INSTALL_PREFIX=${prefix}
+set subdirs         { . }
 
 post-patch {
     reinplace "s|@MACOSX@|${os.name}|g" \
         ${worksrcpath}/ace/config.h \
         ${worksrcpath}/include/makeinclude/platform_macros.GNU
+    # disable the assignment for compilers in lion and use our environment instead
+    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"
+        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
+    }
+
+    if {[variant_exists ssl] && [variant_isset ssl]} {
+        ui_debug "Enabling SSL"
+        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
 
-build.env-append    "DYLD_LIBRARY_PATH=${worksrcpath}/lib"
-build.env-append    "ACE_ROOT=${worksrcpath}"
-build.env-append    "INSTALL_PREFIX=${prefix}"
-
-destroot.env-append "DYLD_LIBRARY_PATH=${worksrcpath}/lib"
-destroot.env-append "ACE_ROOT=${worksrcpath}"
-destroot.args-append "INSTALL_PREFIX=${prefix}"
+build.env           "${libenv} ${aceenv}"
+build.args-append   CC=${configure.cc} \
+                    CXX=${configure.cxx} \
+                    CPP=${configure.cpp}
+build.pre_args      ${makearg} all
+build {
+    foreach {subdir} $subdirs {
+        build.dir ${worksrcpath}/${subdir}
+        command_exec build
+    }
+}
+
+destroot.env        "${libenv} ${aceenv}"
+destroot.pre_args   ${makearg} install
+destroot {
+    foreach {subdir} $subdirs {
+        destroot.dir ${worksrcpath}/${subdir}
+        command_exec destroot
+    }
+}
 
 livecheck.url       ${master_sites}
 livecheck.regex     ${name_package}-(\\d+\[0-9a-z.\]*)${extract.suffix}