[128303] trunk/dports/devel/tao/Portfile

[pixilla at macports.org]

Revision: 128303
          https://trac.macports.org/changeset/128303
Author:   pixilla at macports.org
Date:     2014-11-18 12:35:28 -0800 (Tue, 18 Nov 2014)
Log Message:
-----------
devel/tao:
- Fix startupitem location. (maintainer, closes #44897)

Modified Paths:
--------------
    trunk/dports/devel/tao/Portfile

Modified: trunk/dports/devel/tao/Portfile
===================================================================
--- trunk/dports/devel/tao/Portfile	2014-11-18 20:15:45 UTC (rev 128302)
+++ trunk/dports/devel/tao/Portfile	2014-11-18 20:35:28 UTC (rev 128303)
@@ -13,6 +13,7 @@
 name                tao
 set name_package    ACE+TAO
 version             6.2.6
+revision            1
 distname            ${name_package}-${version}
 categories          devel
 platforms           darwin
@@ -77,8 +78,7 @@
 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,13 +131,6 @@
             ${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,10 +160,25 @@
         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}"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20141118/3b6f9a9d/attachment.html>