Ticket #56489: ace-6.4.8-ryandesign.diff

Portfile

@@ -4 +4 @@
 
 name                ace
 set name_package    ACE
-version             6.4.5
+version             6.4.8
 distname            ${name_package}-${version}
 categories          devel
 maintainers         {gmail.com:tlockhart1976 @lockhart} openmaintainer
@@ -38 +38 @@
 patchfiles          patch-ace-config.h.diff \
                     patch-include-makeinclude-platform_macros.GNU.diff
 
-checksums           rmd160  e4f4645f8561e180811950ea0261eba625e1e51c \
-                    sha256  004198f7a07fc2938986399d654547ff3811936b16202fdab59b3beb365dd82f
+checksums           rmd160  0b8a65df846331bec1d69ce781d22508cf67f37f \
+                    sha256  0f8121a8e3f49e217644a353d439d148f1d6fe52487ae6bd80572a2bb4f30ca4 \
+                    size    8381452
 
 set os.name "sierra"
 array set os.names {
@@ -61 +62 @@
     }
 }
 
-set libenv          DYLD_LIBRARY_PATH=${worksrcpath}/lib
-set aceenv          ACE_ROOT=${worksrcpath}
-set makearg         INSTALL_PREFIX=${prefix}
 # omit examples and test programs to cut build time by 60%
 # set subdirs         { . }
 set subdirs         { ace ACEXML ASNMP Kokyu apps netsvcs }
@@ -72 +70 @@
     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
@@ -117 +109 @@
 
 use_parallel_build  no
 
-build.env           "${libenv} ${aceenv}"
-build.args-append   CC=${configure.cc} \
+build.env           DYLD_LIBRARY_PATH=${worksrcpath}/lib \
+                    ACE_ROOT=${worksrcpath}
+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}
@@ -129 +122 @@
     }
 }
 
-destroot.env        "${libenv} ${aceenv}"
-destroot.args-append CC=${configure.cc} \
-                    CXX=${configure.cxx} \
-                    CPP=${configure.cpp}
-destroot.pre_args   ${makearg} install
+destroot.env        {*}${build.env}
+destroot.args       {*}${build.args}
 destroot {
     foreach {subdir} $subdirs {
         destroot.dir ${worksrcpath}/${subdir}