Ticket #32015: rabbitmq270.patch

rabbitmq-server/files/rabbitmq-script-wrapper

@@ -29 +29 @@
 
 SCRIPT=`basename $0`
 
-if [ `id -u` = 0 ] ; then
-    SHELL=/bin/sh HOME=/var/lib/rabbitmq USER=rabbitmq LOGNAME=rabbitmq PATH="$(eval `PATH=MACPORTS_PREFIX/bin /usr/libexec/path_helper -s`; echo $PATH)" su -m rabbitmq -c "/usr/lib/rabbitmq/bin/${SCRIPT} ${CMDLINE}"
-elif [ `id -u` = `id -u rabbitmq` ] ; then
+if [ `id -u` = `id -u rabbitmq` -o "$SCRIPT" = "rabbitmq-plugins" ] ; then
     /usr/lib/rabbitmq/bin/${SCRIPT} "$@"
+elif [ `id -u` = 0 ] ; then
+    SHELL=/bin/sh HOME=/var/lib/rabbitmq USER=rabbitmq LOGNAME=rabbitmq PATH="$(eval `PATH=MACPORTS_PREFIX/bin /usr/libexec/path_helper -s`; echo $PATH)" su -m rabbitmq -c "/usr/lib/rabbitmq/bin/${SCRIPT} ${CMDLINE}"
 else
     /usr/lib/rabbitmq/bin/${SCRIPT}
     echo

rabbitmq-server/Portfile

@@ -3 +3 @@
 
 PortSystem 1.0
 name            rabbitmq-server
-version         2.6.1
+version         2.7.0
 categories      net 
 maintainers     paperplanes.de:meyer openmaintainer
 platforms       darwin
@@ -24 +24 @@
 
 checksums \
     ${name}-${version}${extract.suffix} \
-        sha1 628ec7453c0ee8ec3bad0780504e335b48f9b533 \
-        rmd160 818cd8bfbf5593b0cdb4bd4a71d4b7124472f35c \
+        sha1 f80d58f6b8635e09c1fbd81650a25182eb6cb4b3 \
+        rmd160 1cebc445e15f5667566e0fa7012c35f07922321f \
     ${name}-generic-unix-${version}${extract.suffix} \
-        sha1 2dad2383073d9a1e78236382baf1cbb30f4142f2 \
-        rmd160 9c75e17f9c4315670965a844c4585c56ef05f020
+        sha1 735f706ae8490c1d50df42c8a9a4e887a10ccde0 \
+        rmd160 95471452414eb862c0f456aa427bfa113764c01f
 
 depends_lib     port:erlang
 depends_build   port:libxslt
@@ -83 +83 @@
 
     reinplace -E "s:(/etc/rabbitmq/rabbitmq):${prefix}\\1:g" \
         ${realsbin}/rabbitmq-env
-    foreach var {CONFIG_FILE LOG_BASE MNESIA_BASE} {
+    foreach var {CONFIG_FILE LOG_BASE MNESIA_BASE ENABLED_PLUGINS_FILE} {
         reinplace -E "s:^($var)=/:\\1=${prefix}/:" \
             ${realsbin}/rabbitmq-server \
-            ${realsbin}/rabbitmqctl
+            ${realsbin}/rabbitmqctl \
+            ${realsbin}/rabbitmq-plugins
     }
 
     xinstall -m 555 ${filespath}/rabbitmq-script-wrapper \
                 ${wrappersbin}/rabbitmq-server
-
-    reinplace -E "s:MACPORTS_PREFIX/bin:${prefix}/bin:" \
+    reinplace -E "s:MACPORTS_PREFIX/bin:${prefix}/bin:g" \
                 ${wrappersbin}/rabbitmq-server
-    reinplace -E "s:/usr/lib/rabbitmq/bin/:${prefix}/lib/rabbitmq/bin/:" \
+    reinplace -E "s:/usr/lib/rabbitmq/bin/:${prefix}/lib/rabbitmq/bin/:g" \
                 ${wrappersbin}/rabbitmq-server
-    reinplace -E "s:/var/lib/rabbitmq:${prefix}/var/lib/rabbitmq:" \
+    reinplace -E "s:/var/lib/rabbitmq:${prefix}/var/lib/rabbitmq:g" \
                 ${wrappersbin}/rabbitmq-server
+
     file copy ${wrappersbin}/rabbitmq-server ${wrappersbin}/rabbitmqctl
+    file copy ${wrappersbin}/rabbitmq-server ${wrappersbin}/rabbitmq-plugins
 
-    xinstall -m 644 -W ${mansrc}/man1 rabbitmq-server.1.gz rabbitmqctl.1.gz \
+    xinstall -m 644 -W ${mansrc}/man1 rabbitmq-server.1.gz rabbitmqctl.1.gz rabbitmq-plugins.1.gz \
         ${mandest}/man1/
     xinstall -m 644 -W ${mansrc}/man5 rabbitmq-env.conf.5.gz ${mandest}/man5/
 }