Index: Makefile
===================================================================
RCS file: /cvs/ports/net/rabbitmq/Makefile,v
retrieving revision 1.8
diff -a -u -p -r1.8 Makefile
--- Makefile	8 Jun 2011 18:00:50 -0000	1.8
+++ Makefile	14 Jun 2011 23:21:36 -0000
@@ -2,12 +2,10 @@
 
 COMMENT =	highly reliable Enterprise Messaging System
 
-V =		2.4.1
+V =		2.5.0
 DISTNAME =	rabbitmq-server-$V
 PKGNAME =	rabbitmq-$V
 CATEGORIES =	net
-
-REVISION =	2
 
 HOMEPAGE =	http://www.rabbitmq.com/
 
Index: distinfo
===================================================================
RCS file: /cvs/ports/net/rabbitmq/distinfo,v
retrieving revision 1.2
diff -a -u -p -r1.2 distinfo
--- distinfo	16 Apr 2011 09:11:07 -0000	1.2
+++ distinfo	14 Jun 2011 23:21:36 -0000
@@ -1,5 +1,5 @@
-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
+MD5 (rabbitmq-server-2.5.0.tar.gz) = tmW6ADqz+BGzBTCC/QBvqA==
+RMD160 (rabbitmq-server-2.5.0.tar.gz) = ShxUS4uW+ITn0H1FOpIaiGswEFQ=
+SHA1 (rabbitmq-server-2.5.0.tar.gz) = uBapuW59fPMGlsGVr2ppO+WK5ow=
+SHA256 (rabbitmq-server-2.5.0.tar.gz) = XkiOEcjOn7KfekggEubbMIE9KGQRiebzWX4Ak+ZWnUs=
+SIZE (rabbitmq-server-2.5.0.tar.gz) = 328333
Index: patches/patch-Makefile
===================================================================
RCS file: /cvs/ports/net/rabbitmq/patches/patch-Makefile,v
retrieving revision 1.3
diff -a -u -p -r1.3 patch-Makefile
--- patches/patch-Makefile	28 Apr 2011 11:28:43 -0000	1.3
+++ patches/patch-Makefile	14 Jun 2011 23:21:36 -0000
@@ -1,5 +1,5 @@
---- Makefile.orig	Thu Apr  7 15:55:08 2011
-+++ Makefile	Thu Apr 21 03:20:20 2011
+--- Makefile.orig	Thu Jun  9 16:24:13 2011
++++ Makefile	Wed Jun 15 01:25:17 2011
 @@ -20,21 +20,10 @@ 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
@@ -53,9 +53,9 @@
  	rm -f $(RABBIT_PLT)
  	rm -f $(DEPS_FILE)
  
-@@ -164,6 +156,21 @@ run-node: all
- run-tests: all
- 	echo "rabbit_tests:all_tests()." | $(ERL_CALL)
+@@ -165,6 +157,21 @@ run-tests: all
+ 	OUT=$$(echo "rabbit_tests:all_tests()." | $(ERL_CALL)) ; \
+ 	  echo $$OUT ; echo $$OUT | grep '^{ok, passed}$$' > /dev/null
  
 +regress:
 +	rm -rf $(REGRESS_DIR)
@@ -75,17 +75,17 @@
  start-background-node:
  	$(BASIC_SCRIPT_ENVIRONMENT_SETTINGS) \
  		RABBITMQ_NODE_ONLY=true \
-@@ -234,8 +241,7 @@ distclean: clean
+@@ -235,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 && \
+ 	    xsltproc --novalid $(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 +284,7 @@ install_bin: all install_dirs
+@@ -279,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; \
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/net/rabbitmq/pkg/PLIST,v
retrieving revision 1.3
diff -a -u -p -r1.3 PLIST
--- pkg/PLIST	28 Apr 2011 11:28:43 -0000	1.3
+++ pkg/PLIST	14 Jun 2011 23:21:36 -0000
@@ -82,6 +82,7 @@ lib/rabbitmq/ebin/rabbit_ssl.beam
 lib/rabbitmq/ebin/rabbit_sup.beam
 lib/rabbitmq/ebin/rabbit_tests.beam
 lib/rabbitmq/ebin/rabbit_tests_event_receiver.beam
+lib/rabbitmq/ebin/rabbit_trace.beam
 lib/rabbitmq/ebin/rabbit_types.beam
 lib/rabbitmq/ebin/rabbit_upgrade.beam
 lib/rabbitmq/ebin/rabbit_upgrade_functions.beam