[52812] trunk/dports/net/rabbitmq-server

febeling at macports.org febeling at macports.org
Tue Jun 23 12:25:05 PDT 2009


Revision: 52812
          http://trac.macports.org/changeset/52812
Author:   febeling at macports.org
Date:     2009-06-23 12:25:05 -0700 (Tue, 23 Jun 2009)
Log Message:
-----------
net/rabbitmq-server: upadate, new maintainer, openmaintainer.

Modified Paths:
--------------
    trunk/dports/net/rabbitmq-server/Portfile

Added Paths:
-----------
    trunk/dports/net/rabbitmq-server/files/rabbitmq-script-wrapper

Removed Paths:
-------------
    trunk/dports/net/rabbitmq-server/files/rabbitmqctl_wrapper

Modified: trunk/dports/net/rabbitmq-server/Portfile
===================================================================
--- trunk/dports/net/rabbitmq-server/Portfile	2009-06-23 18:54:21 UTC (rev 52811)
+++ trunk/dports/net/rabbitmq-server/Portfile	2009-06-23 19:25:05 UTC (rev 52812)
@@ -2,11 +2,11 @@
 # $Id$
 
 PortSystem      1.0
-
 name            rabbitmq-server
-version         1.5.3
-categories      net
-maintainers     rabbitmq.com:tonyg
+version         1.6.0
+revision        0
+categories      net 
+maintainers     paperplanes.de:meyer rabbitmq.com:tonyg openmaintainer
 platforms       darwin
 description     The RabbitMQ AMQP Server
 long_description    \
@@ -19,9 +19,9 @@
 master_sites    http://www.rabbitmq.com/releases/rabbitmq-server/v${version}/
 
 checksums \
-    md5 3242a67885c2471b5ab62254bf024679 \
-    sha1 f4d6a01eaa2c74fa32f567fe410d21d9be1b43aa \
-    rmd160 1a1c4b97d765548028c161d1617905151ca9e040
+    md5 af3b0d868d58e5aefb4f0837b82ca010 \
+    sha1 1834c670d076fa9878223aacaa35a5a6528f1d86 \
+    rmd160 d6c9de4e1fb48c6ceb1cb5d717ca2afb5e3266fe
 
 depends_build   port:erlang port:py25-simplejson
 depends_run     port:erlang
@@ -32,6 +32,8 @@
 set logdir ${prefix}/var/log/rabbitmq
 set mnesiadbdir ${prefix}/var/lib/rabbitmq/mnesia
 set plistloc ${prefix}/etc/LaunchDaemons/org.macports.rabbitmq-server
+set sbindir ${destroot}${prefix}/lib/rabbitmq/bin
+set wrappersbin ${destroot}${prefix}/sbin
 
 use_configure   no
 
@@ -41,7 +43,7 @@
 
 destroot.destdir \
     TARGET_DIR=${destroot}${prefix}/lib/erlang/lib/rabbitmq_server-${version} \
-    SBIN_DIR=${destroot}${prefix}/sbin \
+    SBIN_DIR=${sbindir} \
     MAN_DIR=${destroot}${prefix}/share/man
 
 destroot.keepdirs \
@@ -59,32 +61,36 @@
     xinstall -d -g [existsgroup ${servergroup}] -m 775 ${destroot}${mnesiadbdir}
 
     reinplace -E "s:(/etc/rabbitmq/rabbitmq.conf):${prefix}\\1:g" \
-        ${destroot}${prefix}/sbin/rabbitmq-multi \
-        ${destroot}${prefix}/sbin/rabbitmq-server \
-        ${destroot}${prefix}/sbin/rabbitmqctl
-    reinplace -E "s:(RABBITMQ_CLUSTER_CONFIG_FILE)=/:\\1=${prefix}/:" \
-        ${destroot}${prefix}/sbin/rabbitmq-multi \
-        ${destroot}${prefix}/sbin/rabbitmq-server \
-        ${destroot}${prefix}/sbin/rabbitmqctl
-    reinplace -E "s:(RABBITMQ_LOG_BASE)=/:\\1=${prefix}/:" \
-        ${destroot}${prefix}/sbin/rabbitmq-multi \
-        ${destroot}${prefix}/sbin/rabbitmq-server \
-        ${destroot}${prefix}/sbin/rabbitmqctl
-    reinplace -E "s:(RABBITMQ_MNESIA_BASE)=/:\\1=${prefix}/:" \
-        ${destroot}${prefix}/sbin/rabbitmq-multi \
-        ${destroot}${prefix}/sbin/rabbitmq-server \
-        ${destroot}${prefix}/sbin/rabbitmqctl
-    reinplace -E "s:(RABBITMQ_PIDS_FILE)=/:\\1=${prefix}/:" \
-        ${destroot}${prefix}/sbin/rabbitmq-multi \
-        ${destroot}${prefix}/sbin/rabbitmq-server \
-        ${destroot}${prefix}/sbin/rabbitmqctl
+        ${sbindir}/rabbitmq-multi \
+        ${sbindir}/rabbitmq-server \
+        ${sbindir}/rabbitmqctl
+    reinplace -E "s:(CLUSTER_CONFIG_FILE)=/:\\1=${prefix}/:" \
+        ${sbindir}/rabbitmq-multi \
+        ${sbindir}/rabbitmq-server \
+        ${sbindir}/rabbitmqctl
+    reinplace -E "s:(LOG_BASE)=/:\\1=${prefix}/:" \
+        ${sbindir}/rabbitmq-multi \
+        ${sbindir}/rabbitmq-server \
+        ${sbindir}/rabbitmqctl
+    reinplace -E "s:(MNESIA_BASE)=/:\\1=${prefix}/:" \
+        ${sbindir}/rabbitmq-multi \
+        ${sbindir}/rabbitmq-server \
+        ${sbindir}/rabbitmqctl
+    reinplace -E "s:(PIDS_FILE)=/:\\1=${prefix}/:" \
+        ${sbindir}/rabbitmq-multi \
+        ${sbindir}/rabbitmq-server \
+        ${sbindir}/rabbitmqctl
 
-    file rename ${destroot}${prefix}/sbin/rabbitmqctl ${destroot}${prefix}/sbin/rabbitmqctl_real
-    xinstall -m 555 ${filespath}/rabbitmqctl_wrapper ${destroot}${prefix}/sbin
-    file rename ${destroot}${prefix}/sbin/rabbitmqctl_wrapper ${destroot}${prefix}/sbin/rabbitmqctl
+    xinstall -m 555 ${filespath}/rabbitmq-script-wrapper \
+                ${wrappersbin}/rabbitmq-multi
 
-    reinplace -E "s:@PREFIX@:${prefix}:" \
-        ${destroot}${prefix}/sbin/rabbitmqctl
+    reinplace -E "s:/usr/lib/rabbitmq/bin/:${prefix}/lib/rabbitmq/bin/:" \
+                ${wrappersbin}/rabbitmq-multi
+    reinplace -E "s:/var/lib/rabbitmq:${prefix}/var/lib/rabbitmq:" \
+                ${wrappersbin}/rabbitmq-multi
+    file copy ${wrappersbin}/rabbitmq-multi ${wrappersbin}/rabbitmq-server
+    file copy ${wrappersbin}/rabbitmq-multi ${wrappersbin}/rabbitmqctl
+
 }
 
 pre-install {

Copied: trunk/dports/net/rabbitmq-server/files/rabbitmq-script-wrapper (from rev 52810, trunk/dports/net/rabbitmq-server/files/rabbitmqctl_wrapper)
===================================================================
--- trunk/dports/net/rabbitmq-server/files/rabbitmq-script-wrapper	                        (rev 0)
+++ trunk/dports/net/rabbitmq-server/files/rabbitmq-script-wrapper	2009-06-23 19:25:05 UTC (rev 52812)
@@ -0,0 +1,13 @@
+#!/bin/bash
+cd /var/lib/rabbitmq
+
+SCRIPT=`basename $0`
+
+if [ `id -u` = 0 ] ; then
+    exec sudo -u rabbitmq -H /usr/lib/rabbitmq/bin/${SCRIPT} "$@"
+else
+    /usr/lib/rabbitmq/bin/${SCRIPT}
+    echo -e "\nOnly root should run ${SCRIPT}\n"
+    exit 1
+fi
+

Deleted: trunk/dports/net/rabbitmq-server/files/rabbitmqctl_wrapper
===================================================================
--- trunk/dports/net/rabbitmq-server/files/rabbitmqctl_wrapper	2009-06-23 18:54:21 UTC (rev 52811)
+++ trunk/dports/net/rabbitmq-server/files/rabbitmqctl_wrapper	2009-06-23 19:25:05 UTC (rev 52812)
@@ -1,2 +0,0 @@
-#!/bin/bash
-exec sudo -H -u rabbitmq "@PREFIX@/sbin/rabbitmqctl_real" "$@"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090623/52da9fd7/attachment-0001.html>


More information about the macports-changes mailing list