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

[febeling at macports.org]

Revision: 47309
          http://trac.macports.org/changeset/47309
Author:   febeling at macports.org
Date:     2009-02-25 13:52:45 -0800 (Wed, 25 Feb 2009)
Log Message:
-----------
databases/couchdb: use upstream launchd plist.
* assume co-maintainership as agreed with the maintainer
* remove variant +server, since it is not really needed
* closes #16947

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

Modified: trunk/dports/databases/couchdb/Portfile
===================================================================
--- trunk/dports/databases/couchdb/Portfile	2009-02-25 21:22:59 UTC (rev 47308)
+++ trunk/dports/databases/couchdb/Portfile	2009-02-25 21:52:45 UTC (rev 47309)
@@ -4,15 +4,16 @@
 
 name		couchdb
 version		0.8.1
+revision        1
 
 categories	databases
 platforms	darwin
 
 description	couchdb is a document database server
-maintainers	jwa
+maintainers	jwa febeling
 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,42 +33,18 @@
 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\])
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090225/f51990b7/attachment.html>