Ticket #34616: Portfile-6.1.2-universal.diff

Portfile

@@ -2 +2 @@
 # $Id: Portfile 93489 2012-05-24 05:19:35Z ryandesign@macports.org $
 
 # MacPorts specification for the TAO CORBA package.
-# Includes ACE even though the libACE package is available
+# Includes ACE even though the ace port is available
 # since TAO can not be built against an installed version of ACE.
 # Thanks to the boost port maintainers for a great example to follow.
 # Thomas Lockhart
 # 2012-02-06
 
 PortSystem          1.0
-PortGroup           muniversal 1.0
+# Disable the full universal support since TAO 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                tao
 set name_package    ACE+TAO
 version             6.1.2
+revision            1
 distname            ${name_package}-${version}
 categories          devel
 platforms           darwin
@@ -34 +38 @@
 master_sites        http://download.dre.vanderbilt.edu/previous_versions \
                     ftp://download.dre.vanderbilt.edu/previous_versions
 
+universal_variant   yes
+
+variant ssl description {Enable SSL} {
+        depends_lib port:openssl
+}
+
 use_bzip2           yes
 
 worksrcdir          ACE_wrappers
@@ -81 +91 @@
     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
+    }
+
     reinplace "s|@PREFIX@|${prefix}|g" \
         ${worksrcpath}/org.macports.${taodaemon}.plist
     reinplace "s|@USER@|${taouser}|g" \
@@ -104 +135 @@
 build.pre_args      ${makearg} all
 build {
     foreach {subdir} $subdirs {
-        build.dir           ${worksrcpath}/${subdir}
+        build.dir ${worksrcpath}/${subdir}
         command_exec build
     }
 }
@@ -115 +146 @@
 destroot {
     xinstall -d -o ${taouser} -m 0755 ${logdir}
     foreach {subdir} $subdirs {
-        destroot.dir        ${worksrcpath}/${subdir}
+        destroot.dir ${worksrcpath}/${subdir}
         command_exec destroot
     }
     # Files required to build CosEvent classes but not installed