Ticket #44897: Portfile.diff

Portfile

@@ -13 +13 @@
 name                tao
 set name_package    ACE+TAO
 version             6.2.6
+revision            1
 distname            ${name_package}-${version}
 categories          devel
 platforms           darwin
@@ -77 +78 @@
 add_users ${taouser} group=${taouser} realname=TAO\ Server
 
 post-extract {
-    copy ${filespath}/org.macports.${taodaemon}.plist \
-        ${worksrcpath}/
+    copy ${filespath}/org.macports.${taodaemon}.plist ${worksrcpath}/
 }
 
 post-patch {
@@ -131 +131 @@
             ${worksrcpath}/org.macports.${taodaemon}.plist
     }
 
-    pre-install {
-        file delete ${destroot}${daemondir}/org.macports.${taodaemon}.plist
-        file delete ${destroot}${daemondir}/${taodaemon}.wrapper
-        copy ${worksrcpath}/org.macports.${taodaemon}.plist \
-            ${destroot}${daemondir}/org.macports.${taodaemon}.plist
-    }
-
     startupitem.create  yes
     startupitem.name    ${taodaemon}
 }
@@ -167 +160 @@
         destroot.dir ${worksrcpath}/${subdir}
         command_exec destroot
     }
+    xinstall -d -m 0755 ${destroot}${daemondir}
+    copy ${worksrcpath}/org.macports.${taodaemon}.plist \
+        ${destroot}${daemondir}/org.macports.${taodaemon}.plist
     # Files required to build CosEvent classes but not installed
     copy ${worksrcpath}/TAO/orbsvcs/orbsvcs/ESF ${destroot}/${prefix}/include/orbsvcs/ESF
 }
 
+pre-activate {
+    if { [file exists ${daemondir}/org.macports.${taodaemon}.plist] } {
+        catch {[file delete -force ${daemondir}/org.macports.${taodaemon}.plist]}
+    }
+}
+
+pre-deactivate {
+    if { [file exists ${daemondir}/org.macports.${taodaemon}.plist] } {
+        catch {system "launchctl unload ${daemondir}/org.macports.${taodaemon}.plist"}
+    }
+}
+
 livecheck.type      regex
 livecheck.url       ${master_sites}
 livecheck.regex     "ACE\\+TAO-(\[0-9.\]+\[0-9\]+)${extract.suffix}"