Update to rabbitMQ 2.4.1, joint work from viq & Piotr Sikora, with small

tweaks by me (don't silent SUBST_CMD, no need to cvs rm/add files/rabbitmq.conf as it can be installed with the correct name) - add rc script, remove pkg/MESSAGE - fix rabbitmqctl args passing - install config file as rabbitmq-env.conf Needed by an upcoming erlang update.. Maintainer timeout, Piotr Sikora takes maintainership. ok stuartslolbunny@ (!?)
2011-04-16 09:11:07 +00:00 · 2011-04-16 09:11:07 +00:00 · 6dacddaa21
commit 6dacddaa21
parent 221b808ba2
9 changed files with 245 additions and 145 deletions
--- a/net/rabbitmq/Makefile
+++ b/net/rabbitmq/Makefile
@ -1,16 +1,15 @@
-# $OpenBSD: Makefile,v 1.4 2010/11/19 22:31:37 espie Exp $
+# $OpenBSD: Makefile,v 1.5 2011/04/16 09:11:07 landry Exp $

 COMMENT =	highly reliable Enterprise Messaging System

-V =		1.6.0
+V =		2.4.1
 DISTNAME =	rabbitmq-server-$V
 PKGNAME =	rabbitmq-$V
-REVISION =	0
 CATEGORIES =	net

 HOMEPAGE =	http://www.rabbitmq.com/

-MAINTAINER =	Mathieu Sauve-Frankel <msf@openbsd.org>
+MAINTAINER =	Piotr Sikora <piotr.sikora@frickle.com>

 # MPL
 PERMIT_PACKAGE_CDROM = Yes
@ -29,15 +28,22 @@ USE_GROFF =	Yes
 CONFIGURE_STYLE = none

 BUILD_DEPENDS =	${RUN_DEPENDS} \
-		devel/py-simplejson
+		${MODPY_JSON} \
+		textproc/libxslt \
+		textproc/xmlto
+
 RUN_DEPENDS =	lang/erlang

 MAKE_ENV =	PYTHON=${MODPY_BIN} 

+RABBITUSER =	_rabbitmq
+
+SUBST_VARS +=	RABBITUSER MODPY_VERSION
+
 pre-build:
-	@${SUBST_CMD} ${WRKSRC}/scripts/rabbitmqctl \
-		${WRKSRC}/scripts/rabbitmq-multi \
-		${WRKSRC}/scripts/rabbitmq-server
+	${SUBST_CMD} ${WRKSRC}/scripts/rabbitmqctl \
+		${WRKSRC}/scripts/rabbitmq-env \
+		${WRKSRC}/Makefile

 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/rabbitmq
@ -47,6 +53,6 @@ post-install:
 	done
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/rabbitmq
 	${INSTALL_DATA} ${FILESDIR}/rabbitmq.conf \
-		${PREFIX}/share/examples/rabbitmq/
+		${PREFIX}/share/examples/rabbitmq/rabbitmq-env.conf

 .include <bsd.port.mk>
--- a/net/rabbitmq/distinfo
+++ b/net/rabbitmq/distinfo
@ -1,5 +1,5 @@
-MD5 (rabbitmq-server-1.6.0.tar.gz) = rzsNho1Y5a77Twg3uCygEA==
-RMD160 (rabbitmq-server-1.6.0.tar.gz) = 1sneTh+0jGzrHLXXF8oq+14yZv4=
-SHA1 (rabbitmq-server-1.6.0.tar.gz) = GDTGcNB2+ph4IjqsqjWlplKPHYY=
-SHA256 (rabbitmq-server-1.6.0.tar.gz) = Cm4Pa0FUiQawf1G+FlHowFs2IfHCOOeWnvHcQMR6ego=
-SIZE (rabbitmq-server-1.6.0.tar.gz) = 130616
+MD5 (rabbitmq-server-2.4.1.tar.gz) = bbMbQ1O9RPium2dWsKgx5g==
+RMD160 (rabbitmq-server-2.4.1.tar.gz) = uPhMVwPmnbtz3o+EYVEO6kmKVxw=
+SHA1 (rabbitmq-server-2.4.1.tar.gz) = 1w0/x0/Vo/k6/kPbtt2ymwiv0v4=
+SHA256 (rabbitmq-server-2.4.1.tar.gz) = eHKtFSjFwjiDhL3We57+bpqfNFENJF+PwBLfoV3KAVk=
+SIZE (rabbitmq-server-2.4.1.tar.gz) = 324199
--- a/net/rabbitmq/patches/patch-Makefile
+++ b/net/rabbitmq/patches/patch-Makefile
@ -1,47 +1,97 @@
-$OpenBSD: patch-Makefile,v 1.1.1.1 2009/11/12 13:10:33 msf Exp $
-
- OpenBSD has Erlang > R12B-3. So we can just set USE_SPECS=true instead
-  of dealing with this shell stuff which is causing problems.
-
- Don't install .gz manpages.
-
--- Makefile.orig	Wed Jun 17 02:09:00 2009
-+++ Makefile	Mon Sep 21 22:33:36 2009
-@@ -11,15 +11,18 @@ BEAM_TARGETS=$(EBIN_DIR)/rabbit_framing.beam $(patsubs
- TARGETS=$(EBIN_DIR)/rabbit.app $(BEAM_TARGETS)
- WEB_URL=http://stage.rabbitmq.com/
- MANPAGES=$(patsubst %.pod, %.gz, $(wildcard docs/*.[0-9].pod))
+--- Makefile.orig	Thu Apr  7 15:55:08 2011
+++ Makefile	Sun Apr 10 19:24:41 2011
+@@ -20,21 +20,11 @@ MANPAGES=$(patsubst %.xml, %.gz, $(wildcard $(DOCS_DIR
+ WEB_MANPAGES=$(patsubst %.xml, %.man.xml, $(wildcard $(DOCS_DIR)/*.[0-9].xml) $(DOCS_DIR)/rabbitmq-service.xml)
+ USAGES_XML=$(DOCS_DIR)/rabbitmqctl.1.xml
+ USAGES_ERL=$(foreach XML, $(USAGES_XML), $(call usage_xml_to_erl, $(XML)))
 +TARGET_DIR=$(PREFIX)/lib/rabbitmq
 +SBIN_DIR=$(PREFIX)/sbin
 +MAN_DIR=$(PREFIX)/man
 
+-ifeq ($(shell python -c 'import simplejson' 2>/dev/null && echo yes),yes)
 -PYTHON=python
-+PYTHON?=python
+-else
+-ifeq ($(shell python2.6 -c 'import simplejson' 2>/dev/null && echo yes),yes)
+-PYTHON=python2.6
+-else
+-ifeq ($(shell python2.5 -c 'import simplejson' 2>/dev/null && echo yes),yes)
+-PYTHON=python2.5
+-else
+-# Hmm. Missing simplejson?
+-PYTHON=python
+-endif
+-endif
+-endif
+PYTHON?=python${MODPY_VERSION}
 
- ifndef USE_SPECS
- # our type specs rely on features / bug fixes in dialyzer that are
- # only available in R12B-3 upwards
- #
- # NB: the test assumes that version number will only contain single digits
-USE_SPECS=$(shell if [ $$(erl -noshell -eval 'io:format(erlang:system_info(version)), halt().') \> "5.6.2" ]; then echo "true"; else echo "false"; fi)
-+USE_SPECS=true
+ BASIC_PLT=basic.plt
+ RABBIT_PLT=rabbit.plt
+@@ -61,6 +51,9 @@ ERL_CALL=erl_call -sname $(RABBITMQ_NODENAME) -e
+ 
+ ERL_EBIN=erl -noinput -pa $(EBIN_DIR)
+ 
+REGRESS_DIR=/tmp/rabbitmq-regress
+REGRESS_EXEC=$(shell [ `id -u` = "0" ] && echo "HOME=$(REGRESS_DIR) su -m `id -u -n 1000` -c" || echo "HOME=$(REGRESS_DIR) sh -c")
+
+ define usage_xml_to_erl
+   $(subst __,_,$(patsubst $(DOCS_DIR)/rabbitmq%.1.xml, $(SOURCE_DIR)/rabbit_%_usage.erl, $(subst -,_,$(1))))
+ endef
+@@ -71,7 +64,7 @@ endef
+ 
+ ifneq "$(SBIN_DIR)" ""
+ ifneq "$(TARGET_DIR)" ""
+-SCRIPTS_REL_PATH=$(shell ./calculate-relative $(TARGET_DIR)/sbin $(SBIN_DIR))
+SCRIPTS_REL_PATH="../lib/rabbitmq/sbin"
+ endif
 endif
 
- #other args: +native +"{hipe,[o3,verbose]}" -Ddebug=true +debug_info +no_strict_record_tests
-@@ -154,7 +157,7 @@ distclean: clean
- 		-c "RabbitMQ AMQP Server" \
- 		-d "" \
- 		-r "" \
-		$< | gzip --best > $@
-+		$< > `dirname $@`/`basename $@ .gz`
+@@ -132,7 +125,7 @@ clean:
+ 	rm -f $(EBIN_DIR)/*.beam
+ 	rm -f $(EBIN_DIR)/rabbit.app $(EBIN_DIR)/rabbit.boot $(EBIN_DIR)/rabbit.script $(EBIN_DIR)/rabbit.rel
+ 	rm -f $(INCLUDE_DIR)/rabbit_framing.hrl $(SOURCE_DIR)/rabbit_framing_amqp_*.erl codegen.pyc
+-	rm -f $(DOCS_DIR)/*.[0-9].gz $(DOCS_DIR)/*.man.xml $(DOCS_DIR)/*.erl $(USAGES_ERL)
+	rm -f $(DOCS_DIR)/*.[0-9] $(DOCS_DIR)/*.man.xml $(DOCS_DIR)/*.erl $(USAGES_ERL)
+ 	rm -f $(RABBIT_PLT)
+ 	rm -f $(DEPS_FILE)
 
- docs_all: $(MANPAGES)
+@@ -164,6 +157,21 @@ run-node: all
+ run-tests: all
+ 	echo "rabbit_tests:all_tests()." | $(ERL_CALL)
 
-@@ -174,6 +177,6 @@ install: all docs_all
+regress:
+	rm -rf $(REGRESS_DIR)
+	mkdir -m 777 -p $(REGRESS_DIR)
+	RABBITMQ_NODENAME="rabbitmq-regress" \
+		RABBITMQ_NODE_PORT="55672" \
+		RABBITMQ_LOG_BASE="$(REGRESS_DIR)/logs" \
+		RABBITMQ_MNESIA_BASE="$(REGRESS_DIR)/mnesia" \
+		RABBITMQ_SERVER_START_ARGS="$(RABBITMQ_SERVER_START_ARGS) -detached" \
+		$(REGRESS_EXEC) ./scripts/rabbitmq-server
+	@sleep 5
+	echo "rabbit_tests:all_tests()." | $(REGRESS_EXEC) "erl_call -sname rabbitmq-regress -e" | tee $(REGRESS_DIR)/result
+	[ "`cat $(REGRESS_DIR)/result | cut -b2-3`" = "ok" ] || \
+		($(REGRESS_EXEC) "erl_call -sname rabbitmq-regress -e -q" && rm -rf $(REGRESS_DIR) && false)
+	$(REGRESS_EXEC) "erl_call -sname rabbitmq-regress -e -q" && rm -rf $(REGRESS_DIR) && echo "Passed."
+
+ start-background-node:
+ 	$(BASIC_SCRIPT_ENVIRONMENT_SETTINGS) \
+ 		RABBITMQ_NODE_ONLY=true \
+@@ -234,8 +242,7 @@ distclean: clean
+ %.gz: %.xml $(DOCS_DIR)/examples-to-end.xsl
+ 	xmlto --version | grep -E '^xmlto version 0\.0\.([0-9]|1[1-8])$$' >/dev/null || opt='--stringparam man.indent.verbatims=0' ; \
+ 	    xsltproc $(DOCS_DIR)/examples-to-end.xsl $< > $<.tmp && \
+-	    xmlto -o $(DOCS_DIR) $$opt man $<.tmp && \
+-	    gzip -f $(DOCS_DIR)/`basename $< .xml`
+	    xmlto -o $(DOCS_DIR) $$opt man $<.tmp
+ 	rm -f $<.tmp
+ 
+ # Use tmp files rather than a pipeline so that we get meaningful errors
+@@ -278,7 +285,7 @@ install_bin: all install_dirs
+ install_docs: docs_all install_dirs
 	for section in 1 5; do \
 		mkdir -p $(MAN_DIR)/man$$section; \
- 		for manpage in docs/*.$$section.pod; do \
-			cp docs/`basename $$manpage .pod`.gz $(MAN_DIR)/man$$section; \
-+			cp docs/`basename $$manpage .pod` $(MAN_DIR)/man$$section; \
+-		for manpage in $(DOCS_DIR)/*.$$section.gz; do \
+		for manpage in $(DOCS_DIR)/*.$$section; do \
+ 			cp $$manpage $(MAN_DIR)/man$$section; \
 		done; \
 	done
--- a/net/rabbitmq/patches/patch-scripts_rabbitmq-multi
+++ b/net/rabbitmq/patches/patch-scripts_rabbitmq-multi
@ -1,21 +0,0 @@
-$OpenBSD: patch-scripts_rabbitmq-multi,v 1.1.1.1 2009/11/12 13:10:33 msf Exp $
--- scripts/rabbitmq-multi.orig	Wed Aug 26 11:56:32 2009
-+++ scripts/rabbitmq-multi	Wed Aug 26 11:58:37 2009
-@@ -33,7 +33,7 @@ NODENAME=rabbit
- NODE_IP_ADDRESS=0.0.0.0
- NODE_PORT=5672
- SCRIPT_HOME=$(dirname $0)
-PIDS_FILE=/var/lib/rabbitmq/pids
-+PIDS_FILE=/var/run/rabbitmq/
- MULTI_ERL_ARGS=
- MULTI_START_ARGS=
- 
-@@ -60,7 +60,7 @@ export \
- set -f
- 
- exec erl \
-    -pa "`dirname $0`/../ebin" \
-+    -pa "${LOCALBASE}/lib/rabbitmq/ebin" \
-     -noinput \
-     -hidden \
-     ${RABBITMQ_MULTI_ERL_ARGS} \
--- a/net/rabbitmq/patches/patch-scripts_rabbitmq-server
+++ b/net/rabbitmq/patches/patch-scripts_rabbitmq-server
@ -1,21 +1,11 @@
-$OpenBSD: patch-scripts_rabbitmq-server,v 1.1.1.1 2009/11/12 13:10:33 msf Exp $
--- scripts/rabbitmq-server.orig	Wed Jun 17 02:09:00 2009
-+++ scripts/rabbitmq-server	Wed Aug 26 11:12:37 2009
-@@ -38,7 +38,7 @@ SERVER_ERL_ARGS="+K true +A30 \
+--- scripts/rabbitmq-server.orig	Tue Mar 22 18:43:29 2011
+++ scripts/rabbitmq-server	Mon Apr  4 20:19:59 2011
+@@ -19,7 +19,7 @@ SERVER_ERL_ARGS="+K true +A30 +P 1048576 \
 -kernel inet_default_connect_options [{nodelay,true}]"
- CLUSTER_CONFIG_FILE=/etc/rabbitmq/rabbitmq_cluster.config
+ CONFIG_FILE=/etc/rabbitmq/rabbitmq
 LOG_BASE=/var/log/rabbitmq
 -MNESIA_BASE=/var/lib/rabbitmq/mnesia
 +MNESIA_BASE=/var/rabbitmq/mnesia
 SERVER_START_ARGS=
 
- [ -f /etc/rabbitmq/rabbitmq.conf ] && . /etc/rabbitmq/rabbitmq.conf
-@@ -81,7 +81,7 @@ RABBITMQ_START_RABBIT=
- set -f
- 
- exec erl \
-    -pa "`dirname $0`/../ebin" \
-+    -pa "${LOCALBASE}/lib/rabbitmq/ebin" \
-     ${RABBITMQ_START_RABBIT} \
-     -sname ${RABBITMQ_NODENAME} \
-     -boot start_sasl \
+ . `dirname $0`/rabbitmq-env
--- a/net/rabbitmq/patches/patch-scripts_rabbitmqctl
+++ b/net/rabbitmq/patches/patch-scripts_rabbitmqctl
@ -1,36 +1,37 @@
-$OpenBSD: patch-scripts_rabbitmqctl,v 1.1.1.1 2009/11/12 13:10:33 msf Exp $
--- scripts/rabbitmqctl.orig	Wed Jun 17 02:09:00 2009
-+++ scripts/rabbitmqctl	Wed Nov 11 16:03:48 2009
-@@ -30,15 +30,21 @@
- ##   Contributor(s): ______________________________________.
- ##
+--- scripts/rabbitmqctl.orig	Thu Apr  7 15:55:08 2011
+++ scripts/rabbitmqctl	Sun Apr 10 19:07:59 2011
+@@ -20,12 +20,31 @@
+ [ "x" = "x$RABBITMQ_NODENAME" ] && RABBITMQ_NODENAME=${NODENAME}
+ [ "x" = "x$RABBITMQ_CTL_ERL_ARGS" ] && RABBITMQ_CTL_ERL_ARGS=${CTL_ERL_ARGS}
 
-[ -f /etc/rabbitmq/rabbitmq.conf ] && . /etc/rabbitmq/rabbitmq.conf
- 
-[ "x" = "x$RABBITMQ_CTL_ERL_ARGS" ] && RABBITMQ_CTL_ERL_ARGS=${CTL_ERL_ARGS}
-
 -exec erl \
-    -pa "`dirname $0`/../ebin" \
-    -noinput \
-    -hidden \
-    ${RABBITMQ_CTL_ERL_ARGS} \
-    -sname rabbitmqctl$$ \
-    -s rabbit_control \
-    -extra "$@"
-+if [ `id -u` = 0 ]; then
-+  [ -f /etc/rabbitmq/rabbitmq.conf ] && . /etc/rabbitmq/rabbitmq.conf
-+  
-+  [ "x" = "x$RABBITMQ_CTL_ERL_ARGS" ] && RABBITMQ_CTL_ERL_ARGS=${CTL_ERL_ARGS}
-+  
-+  su _rabbitmq -c "erl \\
-+      -pa ${LOCALBASE}/lib/rabbitmq/ebin \\
-+      -noinput \\
-+      -hidden \\
-+      ${RABBITMQ_CTL_ERL_ARGS} \\
-+      -sname rabbitmqctl$$ \\
-+      -s rabbit_control \\
-+      -extra $@"
-+else
-+      echo -e "\nOnly root should run `basename $0`\n"
-+      exit 1
+-    -pa "${RABBITMQ_HOME}/ebin" \
+ID=`id -g`
+GIDS=`id -G`
+RID=`id -g ${RABBITUSER}`
+
+EXEC_CMD="false"
+
+for GID in $GIDS; do
+    if [ $GID -eq 0 ] ; then
+        EXEC_CMD="su ${RABBITUSER} -c"
+    fi
+done
+if [ "$ID" -eq "$RID" ] ; then
+        EXEC_CMD="sh -c"
 +fi
+if [ "$EXEC_CMD" = "false" ] ; then
+        echo "This command can only be run by root or the user $RABBITUSER" >&2
+        exit 4
+fi
+
+$EXEC_CMD "erl \
+    -pa \"${RABBITMQ_HOME}/ebin\" \
+     -noinput \
+     -hidden \
+     ${RABBITMQ_CTL_ERL_ARGS} \
+     -sname rabbitmqctl$$ \
+     -s rabbit_control \
+     -nodename $RABBITMQ_NODENAME \
+-    -extra "$@"
+    -extra $*"
--- a/net/rabbitmq/pkg/MESSAGE
+++ b/net/rabbitmq/pkg/MESSAGE
@ -1,14 +0,0 @@
-To start RabbitMQ at boot and shut it down when the system goes down,
-add the following lines to /etc/rc.local and /etc/rc.shutdown, respectively:
-
-/etc/rc.local:
-
-if [ -x ${TRUEPREFIX}/sbin/rabbitmq-server ]; then
-	echo -n ' rabbitmq'
-	install -d -o _rabbitmq /var/run/rabbitmq
-	su -l _rabbitmq -c "${TRUEPREFIX}/sbin/rabbitmq-server -detached"
-fi
-
-/etc/rc.shutdown:
-
-	su -l _rabbitmq -c "${TRUEPREFIX}/sbin/rabbitmqctl stop"
--- a/net/rabbitmq/pkg/PLIST
+++ b/net/rabbitmq/pkg/PLIST
@ -1,62 +1,124 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2009/11/12 13:10:33 msf Exp $
+@comment $OpenBSD: PLIST,v 1.2 2011/04/16 09:11:07 landry Exp $
@newgroup _rabbitmq:646
@newuser _rabbitmq:646:_rabbitmq:daemon:RabbitMQ account:/var/rabbitmq:/bin/sh
 lib/rabbitmq/
 lib/rabbitmq/ebin/
+lib/rabbitmq/ebin/bpqueue.beam
+lib/rabbitmq/ebin/delegate.beam
+lib/rabbitmq/ebin/delegate_sup.beam
+lib/rabbitmq/ebin/file_handle_cache.beam
+lib/rabbitmq/ebin/gatherer.beam
 lib/rabbitmq/ebin/gen_server2.beam
+lib/rabbitmq/ebin/gm.beam
+lib/rabbitmq/ebin/gm_soak_test.beam
+lib/rabbitmq/ebin/gm_speed_test.beam
+lib/rabbitmq/ebin/gm_tests.beam
+lib/rabbitmq/ebin/pg_local.beam
 lib/rabbitmq/ebin/priority_queue.beam
 lib/rabbitmq/ebin/rabbit.app
 lib/rabbitmq/ebin/rabbit.beam
-lib/rabbitmq/ebin/rabbit.rel
 lib/rabbitmq/ebin/rabbit_access_control.beam
 lib/rabbitmq/ebin/rabbit_alarm.beam
 lib/rabbitmq/ebin/rabbit_amqqueue.beam
 lib/rabbitmq/ebin/rabbit_amqqueue_process.beam
 lib/rabbitmq/ebin/rabbit_amqqueue_sup.beam
 lib/rabbitmq/ebin/rabbit_app.in
+lib/rabbitmq/ebin/rabbit_auth_backend.beam
+lib/rabbitmq/ebin/rabbit_auth_backend_internal.beam
+lib/rabbitmq/ebin/rabbit_auth_mechanism.beam
+lib/rabbitmq/ebin/rabbit_auth_mechanism_amqplain.beam
+lib/rabbitmq/ebin/rabbit_auth_mechanism_cr_demo.beam
+lib/rabbitmq/ebin/rabbit_auth_mechanism_plain.beam
+lib/rabbitmq/ebin/rabbit_backing_queue.beam
 lib/rabbitmq/ebin/rabbit_basic.beam
 lib/rabbitmq/ebin/rabbit_binary_generator.beam
 lib/rabbitmq/ebin/rabbit_binary_parser.beam
+lib/rabbitmq/ebin/rabbit_binding.beam
 lib/rabbitmq/ebin/rabbit_channel.beam
+lib/rabbitmq/ebin/rabbit_channel_sup.beam
+lib/rabbitmq/ebin/rabbit_channel_sup_sup.beam
+lib/rabbitmq/ebin/rabbit_client_sup.beam
+lib/rabbitmq/ebin/rabbit_command_assembler.beam
+lib/rabbitmq/ebin/rabbit_connection_sup.beam
 lib/rabbitmq/ebin/rabbit_control.beam
+lib/rabbitmq/ebin/rabbit_ctl_usage.beam
+lib/rabbitmq/ebin/rabbit_direct.beam
 lib/rabbitmq/ebin/rabbit_error_logger.beam
 lib/rabbitmq/ebin/rabbit_error_logger_file_h.beam
+lib/rabbitmq/ebin/rabbit_event.beam
 lib/rabbitmq/ebin/rabbit_exchange.beam
+lib/rabbitmq/ebin/rabbit_exchange_type.beam
+lib/rabbitmq/ebin/rabbit_exchange_type_direct.beam
+lib/rabbitmq/ebin/rabbit_exchange_type_fanout.beam
+lib/rabbitmq/ebin/rabbit_exchange_type_headers.beam
+lib/rabbitmq/ebin/rabbit_exchange_type_topic.beam
 lib/rabbitmq/ebin/rabbit_framing.beam
-lib/rabbitmq/ebin/rabbit_framing_channel.beam
+lib/rabbitmq/ebin/rabbit_framing_amqp_0_8.beam
+lib/rabbitmq/ebin/rabbit_framing_amqp_0_9_1.beam
 lib/rabbitmq/ebin/rabbit_guid.beam
 lib/rabbitmq/ebin/rabbit_heartbeat.beam
 lib/rabbitmq/ebin/rabbit_limiter.beam
-lib/rabbitmq/ebin/rabbit_load.beam
 lib/rabbitmq/ebin/rabbit_log.beam
-lib/rabbitmq/ebin/rabbit_memsup_linux.beam
+lib/rabbitmq/ebin/rabbit_memory_monitor.beam
 lib/rabbitmq/ebin/rabbit_misc.beam
 lib/rabbitmq/ebin/rabbit_mnesia.beam
-lib/rabbitmq/ebin/rabbit_multi.beam
+lib/rabbitmq/ebin/rabbit_msg_file.beam
+lib/rabbitmq/ebin/rabbit_msg_store.beam
+lib/rabbitmq/ebin/rabbit_msg_store_ets_index.beam
+lib/rabbitmq/ebin/rabbit_msg_store_gc.beam
+lib/rabbitmq/ebin/rabbit_msg_store_index.beam
+lib/rabbitmq/ebin/rabbit_net.beam
 lib/rabbitmq/ebin/rabbit_networking.beam
 lib/rabbitmq/ebin/rabbit_node_monitor.beam
-lib/rabbitmq/ebin/rabbit_persister.beam
+lib/rabbitmq/ebin/rabbit_prelaunch.beam
+lib/rabbitmq/ebin/rabbit_queue_collector.beam
+lib/rabbitmq/ebin/rabbit_queue_index.beam
 lib/rabbitmq/ebin/rabbit_reader.beam
+lib/rabbitmq/ebin/rabbit_registry.beam
+lib/rabbitmq/ebin/rabbit_restartable_sup.beam
 lib/rabbitmq/ebin/rabbit_router.beam
 lib/rabbitmq/ebin/rabbit_sasl_report_file_h.beam
+lib/rabbitmq/ebin/rabbit_ssl.beam
 lib/rabbitmq/ebin/rabbit_sup.beam
 lib/rabbitmq/ebin/rabbit_tests.beam
-lib/rabbitmq/ebin/rabbit_tracer.beam
+lib/rabbitmq/ebin/rabbit_tests_event_receiver.beam
+lib/rabbitmq/ebin/rabbit_types.beam
+lib/rabbitmq/ebin/rabbit_upgrade.beam
+lib/rabbitmq/ebin/rabbit_upgrade_functions.beam
+lib/rabbitmq/ebin/rabbit_variable_queue.beam
+lib/rabbitmq/ebin/rabbit_version.beam
+lib/rabbitmq/ebin/rabbit_vhost.beam
 lib/rabbitmq/ebin/rabbit_writer.beam
+lib/rabbitmq/ebin/supervisor2.beam
 lib/rabbitmq/ebin/tcp_acceptor.beam
 lib/rabbitmq/ebin/tcp_acceptor_sup.beam
-lib/rabbitmq/ebin/tcp_client_sup.beam
 lib/rabbitmq/ebin/tcp_listener.beam
 lib/rabbitmq/ebin/tcp_listener_sup.beam
+lib/rabbitmq/ebin/test_sup.beam
+lib/rabbitmq/ebin/vm_memory_monitor.beam
+lib/rabbitmq/ebin/worker_pool.beam
+lib/rabbitmq/ebin/worker_pool_sup.beam
+lib/rabbitmq/ebin/worker_pool_worker.beam
 lib/rabbitmq/include/
+lib/rabbitmq/include/gm_specs.hrl
 lib/rabbitmq/include/rabbit.hrl
+lib/rabbitmq/include/rabbit_auth_backend_spec.hrl
+lib/rabbitmq/include/rabbit_auth_mechanism_spec.hrl
+lib/rabbitmq/include/rabbit_backing_queue_spec.hrl
+lib/rabbitmq/include/rabbit_exchange_type_spec.hrl
 lib/rabbitmq/include/rabbit_framing.hrl
-lib/rabbitmq/include/rabbit_framing_spec.hrl
-@man man/man1/rabbitmq-multi.1
+lib/rabbitmq/include/rabbit_msg_store.hrl
+lib/rabbitmq/include/rabbit_msg_store_index.hrl
+lib/rabbitmq/plugins/
+lib/rabbitmq/plugins/README
+lib/rabbitmq/sbin/
+lib/rabbitmq/sbin/rabbitmq-env
+lib/rabbitmq/sbin/rabbitmq-server
+lib/rabbitmq/sbin/rabbitmqctl
@man man/man1/rabbitmq-server.1
@man man/man1/rabbitmqctl.1
-@man man/man5/rabbitmq.conf.5
-sbin/rabbitmq-multi
+@man man/man5/rabbitmq-env.conf.5
+sbin/rabbitmq-env
 sbin/rabbitmq-server
 sbin/rabbitmqctl
 share/doc/rabbitmq/
@ -65,8 +127,9 @@ share/doc/rabbitmq/LICENSE
 share/doc/rabbitmq/LICENSE-MPL-RabbitMQ
 share/examples/rabbitmq/
@sample ${SYSCONFDIR}/rabbitmq/
-share/examples/rabbitmq/rabbitmq.conf
-@sample ${SYSCONFDIR}/rabbitmq/rabbitmq.conf
+share/examples/rabbitmq/rabbitmq-env.conf
+@sample ${SYSCONFDIR}/rabbitmq/rabbitmq-env.conf
+@rcscript ${RCDIR}/rabbitmq
@mode 700
@owner _rabbitmq
@group _rabbitmq
--- a/net/rabbitmq/pkg/rabbitmq.rc
+++ b/net/rabbitmq/pkg/rabbitmq.rc
@ -0,0 +1,25 @@
+#!/bin/sh
+#
+# $OpenBSD: rabbitmq.rc,v 1.1 2011/04/16 09:11:07 landry Exp $
+
+daemon="${TRUEPREFIX}/sbin/rabbitmq-server"
+daemon_flags="-detached"
+daemon_user="_rabbitmq"
+
+. /etc/rc.d/rc.subr
+
+rc_reload=NO
+
+rc_pre() {
+        install -d -o ${daemon_user} /var/run/rabbitmq
+}
+
+rc_check() {
+	${TRUEPREFIX}/sbin/rabbitmqctl status
+}
+
+rc_stop() {
+	${TRUEPREFIX}/sbin/rabbitmqctl stop
+}
+
+rc_cmd $1