Ticket #16947: patch-couchdb_Portfile.diff

databases/couchdb/Portfile

@@ -4 +4 @@
 
 name            couchdb
 version         0.8.1
+revision        1
 
 categories      databases
 platforms       darwin
@@ -12 +13 @@
 maintainers     jwa
 long_description        ${description}
 
-homepage        http://incubator.apache.org/couchdb/
+homepage        http://couchdb.apache.org/
 master_sites    apache
 master_sites.mirror_subdir      incubator/${name}/${version}-incubating/
 distname        apache-${name}-${version}-incubating
@@ -32 +33 @@
 set dbuser couchdb
 set logdir ${prefix}/var/log/couchdb
 set dbdir ${prefix}/var/lib/couchdb
-set piddir ${prefix}/var/run/
-set plistloc ${prefix}/etc/LaunchDaemons/org.macports.CouchDB
 
-variant server description {adds a startup item} {
+pre-destroot {
     addgroup ${dbgroup}
     adduser ${dbuser} gid=[existsgroup ${dbgroup}]
-
-    startupitem.create  yes
-    startupitem.type    launchd
-    startupitem.name    CouchDB
-#    startupitem.start  "\$\(${prefix}/bin/icu-config --invoke\) ${prefix}/bin/couchdb -b -o ${logdir}/couchdb.stdout -e ${logdir}/couchdb.stderr"
-    startupitem.start   "${prefix}/bin/couchdb -b -o ${logdir}/couchdb.stdout -e ${logdir}/couchdb.stderr"
-    startupitem.stop    "${prefix}/bin/couchdb -d"
+    xinstall -m 755 -o ${dbuser} -g ${dbgroup} -d \
+        ${destroot}${dbdir} \
+        ${destroot}${logdir}
+    destroot.keepdirs-append \
+        ${destroot}${dbdir} \
+        ${destroot}${logdir}
 }
 
-pre-destroot {
-    if { [variant_isset server] } {
-        xinstall -m 755 -o ${dbuser} -g ${dbgroup} -d \
-            ${destroot}${dbdir} \
-            ${destroot}${logdir} \
-            ${destroot}${piddir}
-        destroot.keepdirs-append \
-            ${destroot}${dbdir} \
-            ${destroot}${logdir} \
-            ${destroot}${piddir}
-    }
-}
-
-pre-install {
-    if { [variant_isset server] } {
-        system "touch ${destroot}${piddir}/couchdb.pid"
-        system "chown -R ${dbuser}:${dbgroup} ${destroot}${dbdir} ${destroot}${logdir} ${destroot}${piddir}/couchdb.pid"
-        system "cd ${destroot}${plistloc}; patch <${filespath}/patch-org.macports.CouchDB.plist.diff"
-    }
-}
-
 livecheck.check regex
 livecheck.url   http://incubator.apache.org/couchdb/downloads.html
 livecheck.regex apache-${name}-(0.\[0-9\].\[0-9\])