[47908] trunk/dports/databases/couchdb

[febeling at macports.org]

Revision: 47908
          http://trac.macports.org/changeset/47908
Author:   febeling at macports.org
Date:     2009-03-09 14:38:35 -0700 (Mon, 09 Mar 2009)
Log Message:
-----------
databases/couchdb: Simplyfication, bugfix, consistency with couchdb-devel.
* use launchd plist to discard stdout/stderr
* fix path of symlink to launchd plist from system location
* discard obsolete patches from workaround

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

Added Paths:
-----------
    trunk/dports/databases/couchdb/files/patch-plist_redirects_to_devnull.diff

Removed Paths:
-------------
    trunk/dports/databases/couchdb/files/patch-etc-Makefile.in.diff
    trunk/dports/databases/couchdb/files/patch-plist_stdout_stderr.diff

Modified: trunk/dports/databases/couchdb/Portfile
===================================================================
--- trunk/dports/databases/couchdb/Portfile	2009-03-09 21:04:32 UTC (rev 47907)
+++ trunk/dports/databases/couchdb/Portfile	2009-03-09 21:38:35 UTC (rev 47908)
@@ -4,7 +4,7 @@
 
 name		couchdb
 version		0.8.1
-revision        2
+revision        3
 
 categories	databases
 platforms	darwin
@@ -29,8 +29,7 @@
     port:spidermonkey \
     port:erlang
 
-patchfiles      patch-plist_stdout_stderr.diff \
-	patch-etc-Makefile.in.diff
+patchfiles      patch-plist_redirects_to_devnull.diff
 
 set dbgroup couchdb
 set dbuser couchdb
@@ -49,7 +48,7 @@
         ${destroot}${dbdir} \
         ${destroot}${logdir}
     set plist org.apache.couchdb.plist
-    ln -sf ${destroot}${prefix}${plistdir}${plist} \
+    ln -sf ${destroot}${prefix}${plistdir}/${plist} \
         ${destroot}${plistdir}/${plist}
 }
 

Deleted: trunk/dports/databases/couchdb/files/patch-etc-Makefile.in.diff
===================================================================
--- trunk/dports/databases/couchdb/files/patch-etc-Makefile.in.diff	2009-03-09 21:04:32 UTC (rev 47907)
+++ trunk/dports/databases/couchdb/files/patch-etc-Makefile.in.diff	2009-03-09 21:38:35 UTC (rev 47908)
@@ -1,10 +0,0 @@
---- etc/Makefile.in.orig	2009-03-03 23:07:16.000000000 +0100
-+++ etc/Makefile.in	2009-03-03 23:08:46.000000000 +0100
-@@ -638,6 +638,7 @@
- 	sed -e "s|%configure_input%|$@. Generated from $< by configure.|" \
- 	    -e "s|%bindir%|$(bindir)|" \
- 	    -e "s|%couchdb_command_name%|$(couchdb_command_name)|" \
-+	    -e "s|%localstatelogdir%|$(localstatelogdir)|" \
- 	< $< > $@
- 
- install-data-hook:

Added: trunk/dports/databases/couchdb/files/patch-plist_redirects_to_devnull.diff
===================================================================
--- trunk/dports/databases/couchdb/files/patch-plist_redirects_to_devnull.diff	                        (rev 0)
+++ trunk/dports/databases/couchdb/files/patch-plist_redirects_to_devnull.diff	2009-03-09 21:38:35 UTC (rev 47908)
@@ -0,0 +1,15 @@
+Index: etc/launchd/org.apache.couchdb.plist.tpl.in
+===================================================================
+--- etc/launchd/org.apache.couchdb.plist.tpl.in	(revision 748340)
++++ etc/launchd/org.apache.couchdb.plist.tpl.in	(working copy)
+@@ -18,6 +18,10 @@
+     </array>
+     <key>UserName</key>
+     <string>couchdb</string>
++    <key>StandardOutPath</key>
++    <string>/dev/null</string>
++    <key>StandardErrorPath</key>
++    <string>/dev/null</string>
+     <key>RunAtLoad</key>
+     <true/>
+     <key>KeepAlive</key>

Deleted: trunk/dports/databases/couchdb/files/patch-plist_stdout_stderr.diff
===================================================================
--- trunk/dports/databases/couchdb/files/patch-plist_stdout_stderr.diff	2009-03-09 21:04:32 UTC (rev 47907)
+++ trunk/dports/databases/couchdb/files/patch-plist_stdout_stderr.diff	2009-03-09 21:38:35 UTC (rev 47908)
@@ -1,50 +0,0 @@
-Index: bin/couchdb.tpl.in
-===================================================================
---- bin/couchdb.tpl.in	(revision 748340)
-+++ bin/couchdb.tpl.in	(working copy)
-@@ -222,7 +222,16 @@
-                 sleep $RESPAWN_TIMEOUT
-             done
-         else
--            eval exec $command
-+            if test "$PID_FILE_GIVEN" = "true"; then
-+                PID_FLAG="-pidfile $PID_FILE"
-+            fi
-+            if test "$STDOUT_REDIR" = "true"; then
-+                STDOUT_DEST="> $STDOUT_FILE"
-+            fi
-+            if test "$STDERR_REDIR" = "true"; then
-+                STDERR_DEST="2> $STDERR_FILE"
-+            fi
-+            eval exec $command $PID_FLAG $STDOUT_DEST $STDERR_DEST
-         fi
-     fi
- }
-@@ -273,9 +282,9 @@
-             -b) shift; BACKGROUND_BOOLEAN=true;;
-             -r) shift; RESPAWN_TIMEOUT=$1; shift;;
-             -R) shift; RECURSED_BOOLEAN=true;;
--            -p) shift; PID_FILE=$1; shift;;
--            -o) shift; STDOUT_FILE=$1; shift;;
--            -e) shift; STDERR_FILE=$1; shift;;
-+            -p) shift; PID_FILE=$1; PID_FILE_GIVEN=true; shift;;
-+            -o) shift; STDOUT_FILE=$1; STDOUT_REDIR=true; shift;;
-+            -e) shift; STDERR_FILE=$1; STDERR_REDIR=true; shift;;
-             -s) shift; check_status; exit $SCRIPT_OK;;
-             -k) shift; KILL_BOOLEAN=true;;
-             -d) shift; SHUTDOWN_BOOLEAN=true;;
-Index: etc/launchd/org.apache.couchdb.plist.tpl.in
-===================================================================
---- etc/launchd/org.apache.couchdb.plist.tpl.in	(revision 748340)
-+++ etc/launchd/org.apache.couchdb.plist.tpl.in	(working copy)
-@@ -15,6 +15,10 @@
-     <key>ProgramArguments</key>
-     <array>
-       <string>%bindir%/%couchdb_command_name%</string>
-+      <string>-o</string>
-+      <string>%localstatelogdir%/couchdb.stdout</string>
-+      <string>-e</string>
-+      <string>%localstatelogdir%/couchdb.stderr</string>
-     </array>
-     <key>UserName</key>
-     <string>couchdb</string>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090309/98daad0a/attachment.html>