Ticket #18633: patch-couchdb-devel_Portfile.diff

databases/couchdb-devel/Portfile

@@ -9 +9 @@
 description         couchdb is a document database server
 maintainers         jwa
 long_description    ${description}
-homepage            http://incubator.apache.org/couchdb/
-master_sites        http://incubator.apache.org/couchdb/
+homepage            http://couchdb.apache.org/
+master_sites        ${homepage}
 checksums           sha1 bf6506dd200ea18ea1331391da7aaece1188208d
 
 distname            couchdb-${version}
@@ -31 +31 @@
 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
 
 pre-configure {
     system "cd ${worksrcpath}; ./bootstrap"
 }
 
-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/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://svn.apache.org/repos/asf/incubator/couchdb/trunk
 livecheck.version       ${svn.tag}