From 7c3efce46cfb6e07d71b41ad835b1b525a335dee Mon Sep 17 00:00:00 2001
From: Steve Powell <steve@rabbitmq.com>
Date: Fri, 10 Feb 2012 16:34:51 +0000
Subject: Get macports installation to create enabled_plugins_file directory if
 it doesn't exist.

---
 packaging/macports/Portfile.in | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packaging/macports/Portfile.in b/packaging/macports/Portfile.in
index 360fb394..08207205 100644
--- a/packaging/macports/Portfile.in
+++ b/packaging/macports/Portfile.in
@@ -48,6 +48,7 @@ set serveruser  rabbitmq
 set servergroup rabbitmq
 set serverhome ${prefix}/var/lib/rabbitmq
 set logdir ${prefix}/var/log/rabbitmq
+set enabledpluginsdir ${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
@@ -83,6 +84,7 @@ pre-destroot {
 }
 
 post-destroot {
+    xinstall -d -g [existsgroup ${servergroup}] -m 775 ${destroot}${enabledpluginsdir}
     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}
-- 
cgit v1.2.1


From 8f594c8bdd8de8abe3b4fe56a3a7fa7bc1877a6f Mon Sep 17 00:00:00 2001
From: Steve Powell <steve@rabbitmq.com>
Date: Fri, 10 Feb 2012 17:29:49 +0000
Subject: Ah? the number of indirections there are here?  :-(

---
 packaging/macports/Portfile.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packaging/macports/Portfile.in b/packaging/macports/Portfile.in
index 08207205..341b7ed1 100644
--- a/packaging/macports/Portfile.in
+++ b/packaging/macports/Portfile.in
@@ -75,6 +75,7 @@ destroot.destdir \
     MAN_DIR=${destroot}${prefix}/share/man
 
 destroot.keepdirs \
+    ${destroot}${enabledpluginsdir} \
     ${destroot}${logdir} \
     ${destroot}${mnesiadbdir}
 
-- 
cgit v1.2.1


From c5ab372f6cbdd4050646a6aa75d9bf3241928177 Mon Sep 17 00:00:00 2001
From: Simon MacMullen <simon@rabbitmq.com>
Date: Tue, 14 Feb 2012 14:23:38 +0000
Subject: It's not just for enabled plugins

---
 packaging/macports/Portfile.in | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packaging/macports/Portfile.in b/packaging/macports/Portfile.in
index 341b7ed1..6519b2bd 100644
--- a/packaging/macports/Portfile.in
+++ b/packaging/macports/Portfile.in
@@ -48,7 +48,7 @@ set serveruser  rabbitmq
 set servergroup rabbitmq
 set serverhome ${prefix}/var/lib/rabbitmq
 set logdir ${prefix}/var/log/rabbitmq
-set enabledpluginsdir ${prefix}/etc/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
@@ -75,7 +75,7 @@ destroot.destdir \
     MAN_DIR=${destroot}${prefix}/share/man
 
 destroot.keepdirs \
-    ${destroot}${enabledpluginsdir} \
+    ${destroot}${confdir} \
     ${destroot}${logdir} \
     ${destroot}${mnesiadbdir}
 
@@ -85,7 +85,7 @@ pre-destroot {
 }
 
 post-destroot {
-    xinstall -d -g [existsgroup ${servergroup}] -m 775 ${destroot}${enabledpluginsdir}
+    xinstall -d -g [existsgroup ${servergroup}] -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}
-- 
cgit v1.2.1


From 52fb8ba665ccaafabd37c0a8a40382d887e67493 Mon Sep 17 00:00:00 2001
From: Steve Powell <steve@rabbitmq.com>
Date: Wed, 22 Feb 2012 10:11:16 +0000
Subject: Take default owner/group for confdir

---
 packaging/macports/Portfile.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packaging/macports/Portfile.in b/packaging/macports/Portfile.in
index 6519b2bd..ebbc8f1b 100644
--- a/packaging/macports/Portfile.in
+++ b/packaging/macports/Portfile.in
@@ -85,7 +85,7 @@ pre-destroot {
 }
 
 post-destroot {
-    xinstall -d -g [existsgroup ${servergroup}] -m 775 ${destroot}${confdir}
+    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}
-- 
cgit v1.2.1