4 files changed, 107 insertions, 108 deletions

diff --git a/net/rabbitmq/Makefile b/net/rabbitmq/Makefile
index 270690e518e1..ffaf48be5f81 100644
--- a/net/rabbitmq/Makefile
+++ b/net/rabbitmq/Makefile
@@ -6,9 +6,10 @@
 #
 
 PORTNAME=	rabbitmq
-PORTVERSION=	1.3.0
+PORTVERSION=	1.4.0
 CATEGORIES=	net
-MASTER_SITES=	http://www.rabbitmq.com/releases/source/
+MASTER_SITES=	http://www.rabbitmq.com/releases/rabbitmq-server/v${PORTVERSION}/
+DISTNAME=	${PORTNAME}-server-${PORTVERSION}
 
 MAINTAINER=	pneumann@gmail.com
 COMMENT=	RabbitMQ is an implementation of AMQP
@@ -18,21 +19,16 @@ RUN_DEPENDS=	erlc:${PORTSDIR}/lang/erlang-lite
 
 USE_GMAKE=	yes
 USE_PYTHON=	yes
-ALL_TARGET=	server
-SCRIPTS_DIR=	${WRKSRC}/erlang/rabbit/scripts/
+MAKE_ENV+=	TARGET_DIR="${PREFIX}/lib/erlang/lib/rabbitmq-${PORTVERSION}" SBIN_DIR="${PREFIX}/sbin/"
+SCRIPTS_DIR=	${WRKSRC}/scripts/
 USE_RC_SUBR=	rabbitmq
+PLIST_SUB=	"VERSION=${PORTVERSION}"
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/etc/default|${PREFIX}/etc/rabbitmq|g ; s|/var/lib|/var/db|g' \
 		${SCRIPTS_DIR}/rabbitmq-multi ${SCRIPTS_DIR}/rabbitmq-server ${SCRIPTS_DIR}/rabbitmqctl
 
-do-install:
 	@${MKDIR} /var/log/rabbitmq /var/db/rabbitmq/mnesia ${PREFIX}/etc/rabbitmq
 	@${FIND} ${WRKSRC} -name "*.bak" | ${XARGS} ${RM}
-	@cd ${WRKSRC}/erlang/rabbit/dist && ${FIND} . \
-		| ${CPIO} -pdmu ${PREFIX}/lib/erlang/lib/${PORTNAME}-${PORTVERSION}
-	@${INSTALL_SCRIPT} ${SCRIPTS_DIR}/rabbitmq-multi ${PREFIX}/bin
-	@${INSTALL_SCRIPT} ${SCRIPTS_DIR}/rabbitmq-server ${PREFIX}/bin
-	@${INSTALL_SCRIPT} ${SCRIPTS_DIR}/rabbitmqctl ${PREFIX}/bin
 
 .include <bsd.port.mk>
diff --git a/net/rabbitmq/distinfo b/net/rabbitmq/distinfo
index cf60d289937f..2b46e0b15cea 100644
--- a/net/rabbitmq/distinfo
+++ b/net/rabbitmq/distinfo
@@ -1,3 +1,3 @@
-MD5 (rabbitmq-1.3.0.tar.gz) = 3206716f78a22e5c1d82529c660410d5
-SHA256 (rabbitmq-1.3.0.tar.gz) = 0de5000c937a6fc78f0f247b8d04a480dada20213602e4d333b3da427b59d758
-SIZE (rabbitmq-1.3.0.tar.gz) = 2085989
+MD5 (rabbitmq-server-1.4.0.tar.gz) = ac43cb6178d992eae192ebe19557ccd5
+SHA256 (rabbitmq-server-1.4.0.tar.gz) = d00b3022a71a4eb3b028e1eb3c1a0881c2a93bf6d705a9351fc42c87c55aeca1
+SIZE (rabbitmq-server-1.4.0.tar.gz) = 108625
diff --git a/net/rabbitmq/files/patch-Makefile b/net/rabbitmq/files/patch-Makefile
new file mode 100644
index 000000000000..337609893f48
--- /dev/null
+++ b/net/rabbitmq/files/patch-Makefile
@@ -0,0 +1,11 @@
+--- Makefile.orig	2008-08-15 20:56:25.000000000 -0400
++++ Makefile	2008-08-15 20:57:14.000000000 -0400
+@@ -113,7 +113,7 @@
+ 		cp BUILD $(GENERIC_STAGE_DIR); \
+ 	fi
+ 
+-	sed -i 's/%%VERSION%%/$(VERSION)/' $(GENERIC_STAGE_DIR)/ebin/rabbit.app
++	#sed -i 's/%%VERSION%%/$(VERSION)/' $(GENERIC_STAGE_DIR)/ebin/rabbit.app
+ 
+ srcdist: distclean
+ 	$(MAKE) VERSION=$(VERSION) GENERIC_STAGE_DIR=dist/$(TARBALL_NAME) generic_stage
diff --git a/net/rabbitmq/pkg-plist b/net/rabbitmq/pkg-plist
index e804f630f657..36812a1ecb1d 100644
--- a/net/rabbitmq/pkg-plist
+++ b/net/rabbitmq/pkg-plist
@@ -1,98 +1,90 @@
-bin/rabbitmq-multi
-bin/rabbitmq-server
-bin/rabbitmqctl
-lib/erlang/lib/rabbitmq-1.3.0/src/tcp_listener_sup.erl
-lib/erlang/lib/rabbitmq-1.3.0/src/tcp_listener.erl
-lib/erlang/lib/rabbitmq-1.3.0/src/tcp_client_sup.erl
-lib/erlang/lib/rabbitmq-1.3.0/src/tcp_acceptor_sup.erl
-lib/erlang/lib/rabbitmq-1.3.0/src/tcp_acceptor.erl
-lib/erlang/lib/rabbitmq-1.3.0/src/rabbit_writer.erl
-lib/erlang/lib/rabbitmq-1.3.0/src/rabbit_tracer.erl
-lib/erlang/lib/rabbitmq-1.3.0/src/rabbit_ticket.erl
-lib/erlang/lib/rabbitmq-1.3.0/src/rabbit_tests.erl
-lib/erlang/lib/rabbitmq-1.3.0/src/rabbit_sup.erl
-lib/erlang/lib/rabbitmq-1.3.0/src/rabbit_router.erl
-lib/erlang/lib/rabbitmq-1.3.0/src/rabbit_realm.erl
-lib/erlang/lib/rabbitmq-1.3.0/src/rabbit_reader.erl
-lib/erlang/lib/rabbitmq-1.3.0/src/rabbit_persister.erl
-lib/erlang/lib/rabbitmq-1.3.0/src/rabbit_node_monitor.erl
-lib/erlang/lib/rabbitmq-1.3.0/src/rabbit_networking.erl
-lib/erlang/lib/rabbitmq-1.3.0/src/rabbit_multi.erl
-lib/erlang/lib/rabbitmq-1.3.0/src/rabbit_mnesia.erl
-lib/erlang/lib/rabbitmq-1.3.0/src/rabbit_misc.erl
-lib/erlang/lib/rabbitmq-1.3.0/src/rabbit_log.erl
-lib/erlang/lib/rabbitmq-1.3.0/src/rabbit_load.erl
-lib/erlang/lib/rabbitmq-1.3.0/src/rabbit_heartbeat.erl
-lib/erlang/lib/rabbitmq-1.3.0/src/rabbit_gensym.erl
-lib/erlang/lib/rabbitmq-1.3.0/src/rabbit_framing_channel.erl
-lib/erlang/lib/rabbitmq-1.3.0/src/rabbit_framing.erl
-lib/erlang/lib/rabbitmq-1.3.0/src/rabbit_exchange.erl
-lib/erlang/lib/rabbitmq-1.3.0/src/rabbit_error_logger.erl
-lib/erlang/lib/rabbitmq-1.3.0/src/rabbit_control.erl
-lib/erlang/lib/rabbitmq-1.3.0/src/rabbit_channel0.erl
-lib/erlang/lib/rabbitmq-1.3.0/src/rabbit_channel.erl
-lib/erlang/lib/rabbitmq-1.3.0/src/rabbit_binary_parser.erl
-lib/erlang/lib/rabbitmq-1.3.0/src/rabbit_binary_generator.erl
-lib/erlang/lib/rabbitmq-1.3.0/src/rabbit_amqqueue_process.erl
-lib/erlang/lib/rabbitmq-1.3.0/src/rabbit_amqqueue.erl
-lib/erlang/lib/rabbitmq-1.3.0/src/rabbit_access_control.erl
-lib/erlang/lib/rabbitmq-1.3.0/src/rabbit.erl
-lib/erlang/lib/rabbitmq-1.3.0/src/buffering_proxy.erl
-lib/erlang/lib/rabbitmq-1.3.0/scripts/rabbitmqctl.bat
-lib/erlang/lib/rabbitmq-1.3.0/scripts/rabbitmqctl
-lib/erlang/lib/rabbitmq-1.3.0/scripts/rabbitmq-server.bat
-lib/erlang/lib/rabbitmq-1.3.0/scripts/rabbitmq-server
-lib/erlang/lib/rabbitmq-1.3.0/scripts/rabbitmq-multi.bat
-lib/erlang/lib/rabbitmq-1.3.0/scripts/rabbitmq-multi
-lib/erlang/lib/rabbitmq-1.3.0/include/rabbit_framing.hrl
-lib/erlang/lib/rabbitmq-1.3.0/include/rabbit.hrl
-lib/erlang/lib/rabbitmq-1.3.0/ebin/tcp_listener_sup.beam
-lib/erlang/lib/rabbitmq-1.3.0/ebin/tcp_listener.beam
-lib/erlang/lib/rabbitmq-1.3.0/ebin/tcp_client_sup.beam
-lib/erlang/lib/rabbitmq-1.3.0/ebin/tcp_acceptor_sup.beam
-lib/erlang/lib/rabbitmq-1.3.0/ebin/tcp_acceptor.beam
-lib/erlang/lib/rabbitmq-1.3.0/ebin/rabbit_writer.beam
-lib/erlang/lib/rabbitmq-1.3.0/ebin/rabbit_tracer.beam
-lib/erlang/lib/rabbitmq-1.3.0/ebin/rabbit_ticket.beam
-lib/erlang/lib/rabbitmq-1.3.0/ebin/rabbit_tests.beam
-lib/erlang/lib/rabbitmq-1.3.0/ebin/rabbit_sup.beam
-lib/erlang/lib/rabbitmq-1.3.0/ebin/rabbit_router.beam
-lib/erlang/lib/rabbitmq-1.3.0/ebin/rabbit_realm.beam
-lib/erlang/lib/rabbitmq-1.3.0/ebin/rabbit_reader.beam
-lib/erlang/lib/rabbitmq-1.3.0/ebin/rabbit_persister.beam
-lib/erlang/lib/rabbitmq-1.3.0/ebin/rabbit_node_monitor.beam
-lib/erlang/lib/rabbitmq-1.3.0/ebin/rabbit_networking.beam
-lib/erlang/lib/rabbitmq-1.3.0/ebin/rabbit_multi.beam
-lib/erlang/lib/rabbitmq-1.3.0/ebin/rabbit_mnesia.beam
-lib/erlang/lib/rabbitmq-1.3.0/ebin/rabbit_misc.beam
-lib/erlang/lib/rabbitmq-1.3.0/ebin/rabbit_log.beam
-lib/erlang/lib/rabbitmq-1.3.0/ebin/rabbit_load.beam
-lib/erlang/lib/rabbitmq-1.3.0/ebin/rabbit_heartbeat.beam
-lib/erlang/lib/rabbitmq-1.3.0/ebin/rabbit_gensym.beam
-lib/erlang/lib/rabbitmq-1.3.0/ebin/rabbit_framing_channel.beam
-lib/erlang/lib/rabbitmq-1.3.0/ebin/rabbit_framing.beam
-lib/erlang/lib/rabbitmq-1.3.0/ebin/rabbit_exchange.beam
-lib/erlang/lib/rabbitmq-1.3.0/ebin/rabbit_error_logger.beam
-lib/erlang/lib/rabbitmq-1.3.0/ebin/rabbit_control.beam
-lib/erlang/lib/rabbitmq-1.3.0/ebin/rabbit_channel0.beam
-lib/erlang/lib/rabbitmq-1.3.0/ebin/rabbit_channel.beam
-lib/erlang/lib/rabbitmq-1.3.0/ebin/rabbit_binary_parser.beam
-lib/erlang/lib/rabbitmq-1.3.0/ebin/rabbit_binary_generator.beam
-lib/erlang/lib/rabbitmq-1.3.0/ebin/rabbit_amqqueue_process.beam
-lib/erlang/lib/rabbitmq-1.3.0/ebin/rabbit_amqqueue.beam
-lib/erlang/lib/rabbitmq-1.3.0/ebin/rabbit_access_control.beam
-lib/erlang/lib/rabbitmq-1.3.0/ebin/rabbit.rel
-lib/erlang/lib/rabbitmq-1.3.0/ebin/rabbit.beam
-lib/erlang/lib/rabbitmq-1.3.0/ebin/rabbit.app
-lib/erlang/lib/rabbitmq-1.3.0/ebin/buffering_proxy.beam
-lib/erlang/lib/rabbitmq-1.3.0/LICENSE-MPL-RabbitMQ
-lib/erlang/lib/rabbitmq-1.3.0/LICENSE
-lib/erlang/lib/rabbitmq-1.3.0/INSTALL
-@dirrm lib/erlang/lib/rabbitmq-1.3.0/src
-@dirrm lib/erlang/lib/rabbitmq-1.3.0/scripts
-@dirrm lib/erlang/lib/rabbitmq-1.3.0/include
-@dirrm lib/erlang/lib/rabbitmq-1.3.0/ebin
-@dirrm lib/erlang/lib/rabbitmq-1.3.0/
+sbin/rabbitmq-multi
+sbin/rabbitmq-server
+sbin/rabbitmqctl
+lib/erlang/lib/rabbitmq-%%VERSION%%/INSTALL
+lib/erlang/lib/rabbitmq-%%VERSION%%/LICENSE
+lib/erlang/lib/rabbitmq-%%VERSION%%/LICENSE-MPL-RabbitMQ
+lib/erlang/lib/rabbitmq-%%VERSION%%/ebin/buffering_proxy.beam
+lib/erlang/lib/rabbitmq-%%VERSION%%/ebin/rabbit.app
+lib/erlang/lib/rabbitmq-%%VERSION%%/ebin/rabbit.beam
+lib/erlang/lib/rabbitmq-%%VERSION%%/ebin/rabbit.rel
+lib/erlang/lib/rabbitmq-%%VERSION%%/ebin/rabbit_access_control.beam
+lib/erlang/lib/rabbitmq-%%VERSION%%/ebin/rabbit_amqqueue.beam
+lib/erlang/lib/rabbitmq-%%VERSION%%/ebin/rabbit_amqqueue_process.beam
+lib/erlang/lib/rabbitmq-%%VERSION%%/ebin/rabbit_amqqueue_sup.beam
+lib/erlang/lib/rabbitmq-%%VERSION%%/ebin/rabbit_binary_generator.beam
+lib/erlang/lib/rabbitmq-%%VERSION%%/ebin/rabbit_binary_parser.beam
+lib/erlang/lib/rabbitmq-%%VERSION%%/ebin/rabbit_channel.beam
+lib/erlang/lib/rabbitmq-%%VERSION%%/ebin/rabbit_control.beam
+lib/erlang/lib/rabbitmq-%%VERSION%%/ebin/rabbit_error_logger.beam
+lib/erlang/lib/rabbitmq-%%VERSION%%/ebin/rabbit_exchange.beam
+lib/erlang/lib/rabbitmq-%%VERSION%%/ebin/rabbit_framing.beam
+lib/erlang/lib/rabbitmq-%%VERSION%%/ebin/rabbit_framing_channel.beam
+lib/erlang/lib/rabbitmq-%%VERSION%%/ebin/rabbit_heartbeat.beam
+lib/erlang/lib/rabbitmq-%%VERSION%%/ebin/rabbit_load.beam
+lib/erlang/lib/rabbitmq-%%VERSION%%/ebin/rabbit_log.beam
+lib/erlang/lib/rabbitmq-%%VERSION%%/ebin/rabbit_misc.beam
+lib/erlang/lib/rabbitmq-%%VERSION%%/ebin/rabbit_mnesia.beam
+lib/erlang/lib/rabbitmq-%%VERSION%%/ebin/rabbit_multi.beam
+lib/erlang/lib/rabbitmq-%%VERSION%%/ebin/rabbit_networking.beam
+lib/erlang/lib/rabbitmq-%%VERSION%%/ebin/rabbit_node_monitor.beam
+lib/erlang/lib/rabbitmq-%%VERSION%%/ebin/rabbit_persister.beam
+lib/erlang/lib/rabbitmq-%%VERSION%%/ebin/rabbit_reader.beam
+lib/erlang/lib/rabbitmq-%%VERSION%%/ebin/rabbit_realm.beam
+lib/erlang/lib/rabbitmq-%%VERSION%%/ebin/rabbit_router.beam
+lib/erlang/lib/rabbitmq-%%VERSION%%/ebin/rabbit_sup.beam
+lib/erlang/lib/rabbitmq-%%VERSION%%/ebin/rabbit_tests.beam
+lib/erlang/lib/rabbitmq-%%VERSION%%/ebin/rabbit_ticket.beam
+lib/erlang/lib/rabbitmq-%%VERSION%%/ebin/rabbit_tracer.beam
+lib/erlang/lib/rabbitmq-%%VERSION%%/ebin/rabbit_writer.beam
+lib/erlang/lib/rabbitmq-%%VERSION%%/ebin/tcp_acceptor.beam
+lib/erlang/lib/rabbitmq-%%VERSION%%/ebin/tcp_acceptor_sup.beam
+lib/erlang/lib/rabbitmq-%%VERSION%%/ebin/tcp_client_sup.beam
+lib/erlang/lib/rabbitmq-%%VERSION%%/ebin/tcp_listener.beam
+lib/erlang/lib/rabbitmq-%%VERSION%%/ebin/tcp_listener_sup.beam
+lib/erlang/lib/rabbitmq-%%VERSION%%/include/rabbit.hrl
+lib/erlang/lib/rabbitmq-%%VERSION%%/include/rabbit_framing.hrl
+lib/erlang/lib/rabbitmq-%%VERSION%%/include/rabbit_framing_spec.hrl
+lib/erlang/lib/rabbitmq-%%VERSION%%/src/buffering_proxy.erl
+lib/erlang/lib/rabbitmq-%%VERSION%%/src/rabbit.erl
+lib/erlang/lib/rabbitmq-%%VERSION%%/src/rabbit_access_control.erl
+lib/erlang/lib/rabbitmq-%%VERSION%%/src/rabbit_amqqueue.erl
+lib/erlang/lib/rabbitmq-%%VERSION%%/src/rabbit_amqqueue_process.erl
+lib/erlang/lib/rabbitmq-%%VERSION%%/src/rabbit_amqqueue_sup.erl
+lib/erlang/lib/rabbitmq-%%VERSION%%/src/rabbit_binary_generator.erl
+lib/erlang/lib/rabbitmq-%%VERSION%%/src/rabbit_binary_parser.erl
+lib/erlang/lib/rabbitmq-%%VERSION%%/src/rabbit_channel.erl
+lib/erlang/lib/rabbitmq-%%VERSION%%/src/rabbit_control.erl
+lib/erlang/lib/rabbitmq-%%VERSION%%/src/rabbit_error_logger.erl
+lib/erlang/lib/rabbitmq-%%VERSION%%/src/rabbit_exchange.erl
+lib/erlang/lib/rabbitmq-%%VERSION%%/src/rabbit_framing.erl
+lib/erlang/lib/rabbitmq-%%VERSION%%/src/rabbit_framing_channel.erl
+lib/erlang/lib/rabbitmq-%%VERSION%%/src/rabbit_heartbeat.erl
+lib/erlang/lib/rabbitmq-%%VERSION%%/src/rabbit_load.erl
+lib/erlang/lib/rabbitmq-%%VERSION%%/src/rabbit_log.erl
+lib/erlang/lib/rabbitmq-%%VERSION%%/src/rabbit_misc.erl
+lib/erlang/lib/rabbitmq-%%VERSION%%/src/rabbit_mnesia.erl
+lib/erlang/lib/rabbitmq-%%VERSION%%/src/rabbit_multi.erl
+lib/erlang/lib/rabbitmq-%%VERSION%%/src/rabbit_networking.erl
+lib/erlang/lib/rabbitmq-%%VERSION%%/src/rabbit_node_monitor.erl
+lib/erlang/lib/rabbitmq-%%VERSION%%/src/rabbit_persister.erl
+lib/erlang/lib/rabbitmq-%%VERSION%%/src/rabbit_reader.erl
+lib/erlang/lib/rabbitmq-%%VERSION%%/src/rabbit_realm.erl
+lib/erlang/lib/rabbitmq-%%VERSION%%/src/rabbit_router.erl
+lib/erlang/lib/rabbitmq-%%VERSION%%/src/rabbit_sup.erl
+lib/erlang/lib/rabbitmq-%%VERSION%%/src/rabbit_tests.erl
+lib/erlang/lib/rabbitmq-%%VERSION%%/src/rabbit_ticket.erl
+lib/erlang/lib/rabbitmq-%%VERSION%%/src/rabbit_tracer.erl
+lib/erlang/lib/rabbitmq-%%VERSION%%/src/rabbit_writer.erl
+lib/erlang/lib/rabbitmq-%%VERSION%%/src/tcp_acceptor.erl
+lib/erlang/lib/rabbitmq-%%VERSION%%/src/tcp_acceptor_sup.erl
+lib/erlang/lib/rabbitmq-%%VERSION%%/src/tcp_client_sup.erl
+lib/erlang/lib/rabbitmq-%%VERSION%%/src/tcp_listener.erl
+lib/erlang/lib/rabbitmq-%%VERSION%%/src/tcp_listener_sup.erl
+@dirrm lib/erlang/lib/rabbitmq-%%VERSION%%/src
+@dirrm lib/erlang/lib/rabbitmq-%%VERSION%%/include
+@dirrm lib/erlang/lib/rabbitmq-%%VERSION%%/ebin
+@dirrm lib/erlang/lib/rabbitmq-%%VERSION%%
 @dirrmtry /var/log/rabbitmq
 @dirrmtry /var/db/rabbitmq/mnesia
 @dirrmtry etc/rabbitmq