[71903] trunk/dports/databases/couchdb/Portfile

[jwa at macports.org]

Revision: 71903
          http://trac.macports.org/changeset/71903
Author:   jwa at macports.org
Date:     2010-09-26 05:56:54 -0700 (Sun, 26 Sep 2010)
Log Message:
-----------
variable cleanup, inspired by ticket #26632

Modified Paths:
--------------
    trunk/dports/databases/couchdb/Portfile

Modified: trunk/dports/databases/couchdb/Portfile
===================================================================
--- trunk/dports/databases/couchdb/Portfile	2010-09-26 11:31:41 UTC (rev 71902)
+++ trunk/dports/databases/couchdb/Portfile	2010-09-26 12:56:54 UTC (rev 71903)
@@ -43,6 +43,7 @@
 set dbdir ${prefix}/var/lib/couchdb
 set plistdir /Library/LaunchDaemons
 startupitem.uniquename org.apache.couchdb
+set plist ${startupitem.uniquename}.plist
 
 post-destroot {
     addgroup ${dbgroup}
@@ -54,11 +55,10 @@
     destroot.keepdirs-append \
         ${destroot}${dbdir} \
         ${destroot}${logdir}
-    set plist org.apache.couchdb.plist
-    system "cd ${destroot}/Library/LaunchDaemons && ln -sf ${prefix}/Library/LaunchDaemons/${plist}"
+    system "cd ${destroot}${plistdir} && ln -sf ${prefix}${plistdir}/${plist}"
 # the following patches can be removed after next version
-    reinplace "s;`/opt/local/bin/icu-config --invoke`;;" ${destroot}${prefix}/bin/couchdb
-    reinplace "s;^.*DYLD_LIBRARY_PATH.*$;;g" ${destroot}${prefix}/Library/LaunchDaemons/org.apache.couchdb.plist
+    reinplace "s;`${prefix}/bin/icu-config --invoke`;;" ${destroot}${prefix}/bin/couchdb
+    reinplace "s;^.*DYLD_LIBRARY_PATH.*$;;g" ${destroot}${prefix}${plistdir}/${plist}
 }
 
 post-activate {
@@ -66,7 +66,7 @@
     ui_msg "# Run the following command to install the CouchDB launchd"
     ui_msg "# startup item in order to start and re-start service automatically:"
     ui_msg "#"
-    ui_msg "# sudo launchctl load -w /Library/LaunchDaemons/org.apache.couchdb.plist"
+    ui_msg "# sudo launchctl load -w ${plistdir}/${plist}"
     ui_msg "########################################################################"
 }
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100926/93241fcf/attachment.html>