Ticket #39687: Portfile.diff

File Portfile.diff, 2.8 KB (added by lockhart (Thomas Lockhart), 11 years ago)

Universal patch to upgrade to TAO-2.2.0 (corresponds to ACE-6.2.0).

  • Portfile

    old new  
    1212
    1313name                tao
    1414set name_package    ACE+TAO
    15 version             6.1.7
     15version             6.2.0
    1616distname            ${name_package}-${version}
    1717categories          devel
    1818platforms           darwin
    … …  
    4242
    4343patch.pre_args      -p1
    4444patchfiles          patch-ace-config.h.diff \
    45                     patch-ace-config-macosx-mountainlion.h.diff \
    46                     patch-include-makeinclude-platform_macros.GNU.diff \
    47                     patch-include-makeinclude-platform_macosx_mountainlion.GNU.diff
     45                    patch-include-makeinclude-platform_macros.GNU.diff
    4846
    49 checksums           rmd160  bc744bdf26eb19db89df7cd1636d3c544aeccfb2 \
    50                     sha256  102b47378858f8325c533e60c7691913177ef340a0ff47b72a9ad9bd7c55eb98
     47checksums           rmd160  c4f58f3a4bfb4338dc2b2216af771576555405fc \
     48                    sha256  be9a1ec02cf14eb6df352aeee2c20f7e9a775029adc5efad8838b6299defdef1
    5149
    52 set os.name         "lion"
     50set os.name         "mountainlion"
    5351array set os.names {
    5452     7  panther
    5553     8  tiger
    … …  
    7068set makearg         INSTALL_PREFIX=${prefix}
    7169set logdir          ${prefix}/var/log/tao
    7270set taodaemon       tao_cosnaming
     71set daemondir       ${prefix}/etc/LaunchDaemons/org.macports.${taodaemon}
    7372set taouser         _tao
    7473set subdirs         { . TAO }
    7574# set subdirs         { ace ACEXML ASNMP Kokyu MPC apps docs netsvcs TAO/tao TAO/orbsvcs }
    … …  
    133132    }
    134133
    135134    pre-install {
    136         delete ${destroot}${prefix}/etc/LaunchDaemons/org.macports.${taodaemon}/org.macports.${taodaemon}.plist
    137         delete ${destroot}${prefix}/etc/LaunchDaemons/org.macports.${taodaemon}/${taodaemon}.wrapper
     135        delete ${destroot}${daemondir}/org.macports.${taodaemon}.plist
     136        delete ${destroot}${daemondir}/${taodaemon}.wrapper
    138137        copy ${worksrcpath}/org.macports.${taodaemon}.plist \
    139             ${destroot}${prefix}/etc/LaunchDaemons/org.macports.${taodaemon}/org.macports.${taodaemon}.plist
     138            ${destroot}${daemondir}/org.macports.${taodaemon}.plist
    140139    }
    141140
    142141    startupitem.create  yes
    … …  
    168167        destroot.dir ${worksrcpath}/${subdir}
    169168        command_exec destroot
    170169    }
    171     # 6.1.4 and 6.1.5 do not have a mountainlion file
    172     # 6.1.7 has a *mountain-lion.h config file but a *mountain_lion.GNU makefile
    173     # will report this naming problem and keep using our own for now
    174     copy ${worksrcpath}/ace/config-macosx-mountainlion.h ${destroot}/${prefix}/include/ace/config-macosx-mountainlion.h
    175170    # Files required to build CosEvent classes but not installed
    176171    copy ${worksrcpath}/TAO/orbsvcs/orbsvcs/ESF ${destroot}/${prefix}/include/orbsvcs/ESF
    177172}