Ticket #34285: rabbitmq-2.8.2.patch

rabbitmq-server/files/rabbitmq-script-wrapper

@@ -12 +12 @@
 ##  The Original Code is RabbitMQ.
 ##
 ##  The Initial Developer of the Original Code is VMware, Inc.
-##  Copyright (c) 2007-2011 VMware, Inc.  All rights reserved.
+##  Copyright (c) 2007-2012 VMware, Inc.  All rights reserved.
 ##
 
 # Escape spaces and quotes, because shell is revolting.
@@ -32 +32 @@
 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}"
+    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.7.1
+version         2.8.2
 categories      net 
 maintainers     paperplanes.de:meyer openmaintainer
 platforms       darwin
@@ -24 +24 @@
 
 checksums \
     ${name}-${version}${extract.suffix} \
-        sha1 769515be389f413857a932a944611c957c83da2e \
-        rmd160 903ba8cc47455174ffd7e2df8937c93bf9807706 \
+        sha1 3d0da2996a30747c5875cfbf887c61d80d765ef4 \
+        rmd160 89509488902089d3c457dfcf3cc44a6b615b33cf \
     ${name}-generic-unix-${version}${extract.suffix} \
-        sha1 4ae8be34dabdf0f5582bf1968c3235bd4742e2ec \
-        rmd160 082b25ca817a5e1584a930cee6850cb3101ab458
+        sha1 b564d3277af5531f120bff822560b157432b2fa7 \
+        rmd160 b2e38f9163e05bc73fa793f6120c99940239a7f1
 
 depends_lib     port:erlang
 depends_build   port:libxslt
@@ -48 +48 @@
 set servergroup rabbitmq
 set serverhome ${prefix}/var/lib/rabbitmq
 set logdir ${prefix}/var/log/rabbitmq
+set confdir ${prefix}/etc/rabbitmq
 set mnesiadbdir ${prefix}/var/lib/rabbitmq/mnesia
 set plistloc ${prefix}/etc/LaunchDaemons/org.macports.rabbitmq-server
 set sbindir ${destroot}${prefix}/lib/rabbitmq/bin
@@ -62 +63 @@
 
 build.env-append HOME=${workpath}
 
+build.env-append VERSION=${version}
+
+destroot.env-append VERSION=${version}
+
 destroot.target install_bin
 
 destroot.destdir \
@@ -70 +75 @@
     MAN_DIR=${destroot}${prefix}/share/man
 
 destroot.keepdirs \
+    ${destroot}${confdir} \
     ${destroot}${logdir} \
     ${destroot}${mnesiadbdir}
 
@@ -79 +85 @@
 }
 
 post-destroot {
+    xinstall -d -m 775 ${destroot}${confdir}
     xinstall -d -g [existsgroup ${servergroup}] -m 775 ${destroot}${logdir}
     xinstall -d -g [existsgroup ${servergroup}] -m 775 ${destroot}${serverhome}
     xinstall -d -g [existsgroup ${servergroup}] -m 775 ${destroot}${mnesiadbdir}
 
-    reinplace -E "s:(/etc/rabbitmq/rabbitmq):${prefix}\\1:g" \
-        ${realsbin}/rabbitmq-env
-    foreach var {CONFIG_FILE LOG_BASE MNESIA_BASE ENABLED_PLUGINS_FILE} {
-        reinplace -E "s:^($var)=/:\\1=${prefix}/:" \
-            ${realsbin}/rabbitmq-server \
-            ${realsbin}/rabbitmqctl \
-            ${realsbin}/rabbitmq-plugins
-    }
+    reinplace -E "s:^SYS_PREFIX=\${RABBITMQ_HOME}$:SYS_PREFIX=${prefix}:" \
+        ${realsbin}/rabbitmq-defaults
+    reinplace -E "s:^SYS_PREFIX=$:SYS_PREFIX=${prefix}:" \
+        ${realsbin}/rabbitmq-defaults
 
     xinstall -m 555 ${filespath}/rabbitmq-script-wrapper \
                 ${wrappersbin}/rabbitmq-server
-    reinplace -E "s:MACPORTS_PREFIX/bin:${prefix}/bin:g" \
+    reinplace -E "s:@MACPORTS_PREFIX@:${prefix}:g" \
                 ${wrappersbin}/rabbitmq-server
     reinplace -E "s:/usr/lib/rabbitmq/bin/:${prefix}/lib/rabbitmq/bin/:g" \
                 ${wrappersbin}/rabbitmq-server