Use pkg-message.in instead of post-install so it will appear in a

binary package.
Push UID/GID/group/user substitutions into Makefile, use SUBST_LIST.
Tidy up variable definitions in Makefile.

Suggested by:	wxs

2 files changed, 20 insertions, 4 deletions

diff --git a/net/rabbitmq/files/pkg-install.in b/net/rabbitmq/files/pkg-install.in
index 6dc6a8397ca5..7066ed2a81e7 100644
--- a/net/rabbitmq/files/pkg-install.in
+++ b/net/rabbitmq/files/pkg-install.in
@@ -1,9 +1,9 @@
 #!/bin/sh
 
-RABBITMQ_USER=rabbitmq
-RABBITMQ_GROUP=${RABBITMQ_USER}
-RABBITMQ_UID=135
-RABBITMQ_GID=${RABBITMQ_UID}
+RABBITMQ_GID=%%RABBITMQ_GID%%
+RABBITMQ_GROUP=%%RABBITMQ_GROUP%%
+RABBITMQ_UID=%%RABBITMQ_UID%%
+RABBITMQ_USER=%%RABBITMQ_USER%%
 
 case $2 in
 PRE-INSTALL)
diff --git a/net/rabbitmq/files/pkg-message.in b/net/rabbitmq/files/pkg-message.in
new file mode 100644
index 000000000000..6678185bc221
--- /dev/null
+++ b/net/rabbitmq/files/pkg-message.in
@@ -0,0 +1,16 @@
+
+##############################################################################
+
+Please note:
+The "rabbitmqctl" command must be run as the %%RABBITMQ_USER%% user,
+with a real shell, and with the ${HOME} environment variable set to that
+user's real home directory.
+
+su users can do something like this:
+ # env HOME=/home/%%RABBITMQ_USER%% su -m %%RABBITMQ_USER%% -c 'rabbitmqctl ...'
+
+sudo users can do something like this:
+ # sudo -H -u %%RABBITMQ_USER%% rabbitmqctl ...
+
+##############################################################################
+