[93517] trunk/dports/devel/tao

[pixilla at macports.org]

Revision: 93517
          https://trac.macports.org/changeset/93517
Author:   pixilla at macports.org
Date:     2012-05-25 07:24:34 -0700 (Fri, 25 May 2012)
Log Message:
-----------
devel/tao:
- Maintainer update. Closes #34616
- Fix +universal variant.
- Add +ssl variant.

Modified Paths:
--------------
    trunk/dports/devel/tao/Portfile
    trunk/dports/devel/tao/files/patch-include-makeinclude-platform_macros.GNU.diff

Modified: trunk/dports/devel/tao/Portfile
===================================================================
--- trunk/dports/devel/tao/Portfile	2012-05-25 13:15:22 UTC (rev 93516)
+++ trunk/dports/devel/tao/Portfile	2012-05-25 14:24:34 UTC (rev 93517)
@@ -2,18 +2,23 @@
 # $Id$
 
 # 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,6 +39,12 @@
 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,6 +92,27 @@
     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,7 +136,7 @@
 build.pre_args      ${makearg} all
 build {
     foreach {subdir} $subdirs {
-        build.dir           ${worksrcpath}/${subdir}
+        build.dir ${worksrcpath}/${subdir}
         command_exec build
     }
 }
@@ -115,7 +147,7 @@
 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

Modified: trunk/dports/devel/tao/files/patch-include-makeinclude-platform_macros.GNU.diff
===================================================================
--- trunk/dports/devel/tao/files/patch-include-makeinclude-platform_macros.GNU.diff	2012-05-25 13:15:22 UTC (rev 93516)
+++ trunk/dports/devel/tao/files/patch-include-makeinclude-platform_macros.GNU.diff	2012-05-25 14:24:34 UTC (rev 93517)
@@ -1,11 +1,13 @@
 --- ACE_wrappers.orig/include/makeinclude/platform_macros.GNU	1969-12-31 16:00:00.000000000 -0800
 +++ ACE_wrappers/include/makeinclude/platform_macros.GNU	2012-02-10 22:47:24.000000000 -0800
-@@ -0,0 +1,11 @@
+@@ -0,0 +1,13 @@
 +buildbits=64
++universal=0
 +install_rpath=0
 +inline=1
 +shared_libs_only=1
 +ec_typed_events=0
++ssl=0
 +
 +LDFLAGS+= -Wl,-rpath,$(INSTALL_PREFIX)/$(INSTALL_LIB)
 +
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120525/5ddff2bd/attachment.html>