Ticket #56488: tao-6.4.8-ryandesign.diff

Portfile

@@ -11 +11 @@
 
 name                tao
 set name_package    ACE+TAO
-version             6.4.5
-revision            1
+version             6.4.8
 distname            ${name_package}-${version}
 categories          devel
 platforms           darwin
@@ -45 +44 @@
                     patch-ace-config-macosx-sierra.h.diff \
                     patch-include-makeinclude-platform_macros.GNU.diff
 
-checksums           rmd160  2f1c9feee9744c64c0f8e1f866c841c40fedc986 \
-                    sha256  7b71f06a2d92c45989886877ca301cf5ac263d23d40f82d5b19af4a5d6775fe9
+checksums           rmd160  011c4bce5cde3cf0fa617133b18b31ee465318ea \
+                    sha256  5d0592e0d06bcdc79bf59372ea6302a1ccc72fc3c733de5f738dfc0c83f1c6c8 \
+                    size    23464186
 
 set os.name "sierra"
 array set os.names {
@@ -68 +68 @@
     }
 }
 
-set libenv          DYLD_LIBRARY_PATH=${worksrcpath}/lib
-set aceenv          ACE_ROOT=${worksrcpath}
-set taoenv          TAO_ROOT=${worksrcpath}/TAO
-set makearg         INSTALL_PREFIX=${prefix}
 set logdir          ${prefix}/var/log/tao
 set taodaemon       tao_cosnaming
 set daemondir       ${prefix}/etc/LaunchDaemons/org.macports.${taodaemon}
@@ -84 +80 @@
     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
-    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
 }
 
 depends_lib-append  path:bin/perl:perl5 \
@@ -129 +119 @@
 
 use_parallel_build  no
 
-build.env           "${libenv} ${aceenv} ${taoenv}"
-build.args-append   CC=${configure.cc} \
+build.env           DYLD_LIBRARY_PATH=${worksrcpath}/lib \
+                    ACE_ROOT=${worksrcpath} \
+                    TAO_ROOT=${worksrcpath}/TAO
+build.args          CC=${configure.cc} \
                     CXX=${configure.cxx} \
-                    CPP=${configure.cpp}
-build.pre_args      ${makearg} all
+                    CPP=${configure.cpp} \
+                    INSTALL_PREFIX=${prefix}
 build {
     foreach {subdir} $subdirs {
         build.dir ${worksrcpath}/${subdir}
@@ -141 +133 @@
     }
 }
 
-destroot.env        "${libenv} ${aceenv} ${taoenv}"
-destroot.pre_args   ${makearg} install
+destroot.env        {*}${build.env}
+destroot.args       {*}${build.args}
 destroot.keepdirs   ${logdir}
 destroot {
     xinstall -d -o ${taouser} -m 0755 ${logdir}