Update rabbitmq to 2.8.0.

Changes in 2.8.0:

* Dead lettering
* Internal flow control

3 files changed, 1 insertions, 61 deletions

diff --git a/net/rabbitmq/patches/patch-aa b/net/rabbitmq/patches/patch-aa
index 8b4663fceb7..457f431a8dc 100644
--- a/net/rabbitmq/patches/patch-aa
+++ b/net/rabbitmq/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.5 2012/01/04 19:08:30 fhajny Exp $
+$NetBSD: patch-aa,v 1.6 2012/03/22 11:58:58 fhajny Exp $
 
 Support for Python 2.7, drop dependency on gsed.
 --- Makefile.orig	2011-12-16 12:24:15.000000000 +0000
@@ -26,14 +26,3 @@ Support for Python 2.7, drop dependency on gsed.
  
  BASIC_PLT=basic.plt
  RABBIT_PLT=rabbit.plt
-@@ -246,7 +251,9 @@ stop-cover: all
- srcdist: distclean
- 	mkdir -p $(TARGET_SRC_DIR)/codegen
- 	cp -r ebin src include LICENSE LICENSE-MPL-RabbitMQ INSTALL README $(TARGET_SRC_DIR)
--	sed -i.save 's/%%VSN%%/$(VERSION)/' $(TARGET_SRC_DIR)/ebin/rabbit_app.in && rm -f $(TARGET_SRC_DIR)/ebin/rabbit_app.in.save
-+	sed 's/%%VSN%%/$(VERSION)/' $(TARGET_SRC_DIR)/ebin/rabbit_app.in \
-+		> $(TARGET_SRC_DIR)/ebin/rabbit_app.in.tmp && \
-+		mv $(TARGET_SRC_DIR)/ebin/rabbit_app.in.tmp $(TARGET_SRC_DIR)/ebin/rabbit_app.in
- 
- 	cp -r $(AMQP_CODEGEN_DIR)/* $(TARGET_SRC_DIR)/codegen/
- 	cp codegen.py Makefile generate_app generate_deps calculate-relative $(TARGET_SRC_DIR)
diff --git a/net/rabbitmq/patches/patch-plugins-src__do-package.mk b/net/rabbitmq/patches/patch-plugins-src__do-package.mk
deleted file mode 100644
index c29508fced1..00000000000
--- a/net/rabbitmq/patches/patch-plugins-src__do-package.mk
+++ /dev/null
@@ -1,34 +0,0 @@
-$NetBSD: patch-plugins-src__do-package.mk,v 1.1 2011/12/14 11:55:20 fhajny Exp $
-
-Drop dependency on gsed, gcp.
---- plugins-src/do-package.mk.orig	2011-11-08 16:55:55.000000000 +0000
-+++ plugins-src/do-package.mk
-@@ -286,7 +286,7 @@ $(eval $(foreach D,$(TEST_SOURCE_DIRS),$
- define run_broker
- 	rm -rf $(TEST_TMPDIR)
- 	mkdir -p $(foreach D,log plugins $(NODENAME),$(TEST_TMPDIR)/$(D))
--	cp -a $(PACKAGE_DIR)/dist/*.ez $(TEST_TMPDIR)/plugins
-+	cp -pR $(PACKAGE_DIR)/dist/*.ez $(TEST_TMPDIR)/plugins
- 	$(call copy,$(3),$(TEST_TMPDIR)/plugins)
- 	rm -f $(TEST_TMPDIR)/plugins/rabbit_common*.ez
- 	for plugin in \
-@@ -375,7 +375,7 @@ $(APP_DONE): $(EBIN_BEAMS) $(INCLUDE_HRL
- 	mkdir -p $(APP_DIR)/ebin $(APP_DIR)/include
- 	@echo [elided] copy beams to ebin
- 	@$(call copy,$(EBIN_BEAMS),$(APP_DIR)/ebin)
--	cp -a $(APP_FILE) $(APP_DIR)/ebin/$(APP_NAME).app
-+	cp -pR $(APP_FILE) $(APP_DIR)/ebin/$(APP_NAME).app
- 	$(call copy,$(INCLUDE_HRLS),$(APP_DIR)/include)
- 	$(construct_app_commands)
- 	touch $$@
-@@ -414,8 +414,8 @@ $(DEPS_FILE): $(SOURCE_ERLS) $(INCLUDE_H
- 	@echo [elided] generate deps
- 	@$$(if $$^,echo $$(subst : ,:,$$(foreach F,$$^,$$(abspath $$(F)):)) | escript $(abspath $(UMBRELLA_BASE_DIR)/generate_deps) $$@ '$$$$(EBIN_DIR)',echo >$$@)
- 	@echo [elided] fix test deps
--	@$$(foreach F,$(TEST_EBIN_BEAMS),sed -i -e 's|^$$$$(EBIN_DIR)/$$(notdir $$(F)):|$$$$(TEST_EBIN_DIR)/$$(notdir $$(F)):|' $$@ && ) :
--	sed -i -e 's|$$@|$$$$(DEPS_FILE)|' $$@
-+	@$$(foreach F,$(TEST_EBIN_BEAMS),sed -e 's|^$$$$(EBIN_DIR)/$$(notdir $$(F)):|$$$$(TEST_EBIN_DIR)/$$(notdir $$(F)):|' $$@  > $$@.tmp && mv $$@.tmp $$@ && ) :
-+	sed -e 's|$$@|$$$$(DEPS_FILE)|' $$@ > $$@.tmp && mv $$@.tmp $$@
- 
- $(eval $(call safe_include,$(DEPS_FILE)))
- 
diff --git a/net/rabbitmq/patches/patch-plugins-src__rabbitmq-erlang-client__Makefile b/net/rabbitmq/patches/patch-plugins-src__rabbitmq-erlang-client__Makefile
deleted file mode 100644
index 321095b9c59..00000000000
--- a/net/rabbitmq/patches/patch-plugins-src__rabbitmq-erlang-client__Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-plugins-src__rabbitmq-erlang-client__Makefile,v 1.1 2011/12/14 11:55:20 fhajny Exp $
-
-Drop dependency on gsed.
---- plugins-src/rabbitmq-erlang-client/Makefile.orig	2011-11-08 16:55:55.000000000 +0000
-+++ plugins-src/rabbitmq-erlang-client/Makefile
-@@ -39,7 +39,8 @@ distribution: documentation source_tarba
- 
- %.app: %.app.in $(SOURCES) $(BROKER_DIR)/generate_app
- 	escript  $(BROKER_DIR)/generate_app $< $@ $(SOURCE_DIR)
--	sed -i.save 's/%%VSN%%/$(VERSION)/' $@ && rm $@.save
-+	sed 's/%%VSN%%/$(VERSION)/' $@ > $@.tmp && \
-+		mv $@.tmp $@
- 
- ###############################################################################
- ##  Dialyzer