Ticket #55466: Portfile.diff

File Portfile.diff, 2.6 KB (added by lockhart (Thomas Lockhart), 7 years ago)

Remove explicit .plist and add a patch for the TAO Sierra configuration file.

  • Portfile

    old new  
    1212name                tao
    1313set name_package    ACE+TAO
    1414version             6.4.5
     15revision            1
    1516distname            ${name_package}-${version}
    1617categories          devel
    1718platforms           darwin
     
    4142
    4243patch.pre_args      -p1
    4344patchfiles          patch-ace-config.h.diff \
     45                    patch-ace-config-macosx-sierra.h.diff \
    4446                    patch-include-makeinclude-platform_macros.GNU.diff
    45 #                    patch-include-makeinclude-platform_macosx_elcapitan.GNU.diff
    4647
    4748checksums           rmd160  2f1c9feee9744c64c0f8e1f866c841c40fedc986 \
    4849                    sha256  7b71f06a2d92c45989886877ca301cf5ac263d23d40f82d5b19af4a5d6775fe9
     
    7980
    8081add_users ${taouser} group=${taouser} realname=TAO\ Server
    8182
    82 post-extract {
    83     copy ${filespath}/org.macports.${taodaemon}.plist ${worksrcpath}/
    84 }
    85 
    8683post-patch {
    8784    reinplace "s|@MACOSX@|${os.name}|g" \
    8885        ${worksrcpath}/ace/config.h \
     
    123120}
    124121
    125122variant server description {Enable CosNaming server} {
    126     post-patch {
    127         ui_info "patching org.macports.${taodaemon}.plist"
    128         reinplace "s|@PREFIX@|${prefix}|g" \
    129             ${worksrcpath}/org.macports.${taodaemon}.plist
    130         reinplace "s|@USER@|${taouser}|g" \
    131             ${worksrcpath}/org.macports.${taodaemon}.plist
    132         reinplace "s|@DAEMON@|${taodaemon}|g" \
    133             ${worksrcpath}/org.macports.${taodaemon}.plist
    134     }
    135 
    136123    startupitem.create  yes
    137124    startupitem.name    ${taodaemon}
     125    startupitem.executable  ${prefix}/bin/${taodaemon} -ORBListenEndpoints iiop://:2809
    138126}
    139127
    140128use_configure       no
     
    162150        destroot.dir ${worksrcpath}/${subdir}
    163151        command_exec destroot
    164152    }
    165     xinstall -d -m 0755 ${destroot}${daemondir}
    166     copy ${worksrcpath}/org.macports.${taodaemon}.plist \
    167         ${destroot}${daemondir}/org.macports.${taodaemon}.plist
    168153    # Files required to build CosEvent classes but not installed
    169154    copy ${worksrcpath}/TAO/orbsvcs/orbsvcs/ESF ${destroot}/${prefix}/include/orbsvcs/ESF
    170155}
    171156
    172 pre-activate {
    173     if { [file exists ${daemondir}/org.macports.${taodaemon}.plist] } {
    174         catch {[file delete -force ${daemondir}/org.macports.${taodaemon}.plist]}
    175     }
    176 }
    177 
    178 pre-deactivate {
    179     if { [file exists ${daemondir}/org.macports.${taodaemon}.plist] } {
    180         catch {system "launchctl unload ${daemondir}/org.macports.${taodaemon}.plist"}
    181     }
    182 }
    183 
    184157livecheck.type      regex
    185158livecheck.url       ${master_sites}
    186159livecheck.regex     "ACE\\+TAO-(\[0-9.\]+\[0-9\]+)${extract.suffix}"