Attachment 89587 Details for Bug 126560 – file.diff

[patch] file.diff

file.diff (text/plain), 12.50 KB, created by Phillip N. on 2008-08-16 02:40:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Phillip N.

Created: 2008-08-16 02:40:01 UTC

Size: 12.50 KB

patch

obsolete

>diff -ruN rabbitmq.orig/Makefile rabbitmq/Makefile
>--- rabbitmq.orig/Makefile	2008-07-13 21:51:37.000000000 -0400
>+++ rabbitmq/Makefile	2008-08-15 21:03:23.000000000 -0400
>@@ -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,15 @@
> 
> 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
> 
> 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 -ruN rabbitmq.orig/distinfo rabbitmq/distinfo
>--- rabbitmq.orig/distinfo	2008-07-13 21:51:37.000000000 -0400
>+++ rabbitmq/distinfo	2008-07-29 13:09:25.000000000 -0400
>@@ -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 -ruN rabbitmq.orig/files/patch-Makefile rabbitmq/files/patch-Makefile
>--- rabbitmq.orig/files/patch-Makefile	1969-12-31 21:00:00.000000000 -0300
>+++ rabbitmq/files/patch-Makefile	2008-08-15 21:07:39.000000000 -0400
>@@ -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 -ruN rabbitmq.orig/pkg-plist rabbitmq/pkg-plist
>--- rabbitmq.orig/pkg-plist	2008-07-13 21:51:37.000000000 -0400
>+++ rabbitmq/pkg-plist	2008-08-15 21:07:07.000000000 -0400
>@@ -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-1.4.0/INSTALL
>+lib/erlang/lib/rabbitmq-1.4.0/LICENSE
>+lib/erlang/lib/rabbitmq-1.4.0/LICENSE-MPL-RabbitMQ
>+lib/erlang/lib/rabbitmq-1.4.0/ebin/buffering_proxy.beam
>+lib/erlang/lib/rabbitmq-1.4.0/ebin/rabbit.app
>+lib/erlang/lib/rabbitmq-1.4.0/ebin/rabbit.beam
>+lib/erlang/lib/rabbitmq-1.4.0/ebin/rabbit.rel
>+lib/erlang/lib/rabbitmq-1.4.0/ebin/rabbit_access_control.beam
>+lib/erlang/lib/rabbitmq-1.4.0/ebin/rabbit_amqqueue.beam
>+lib/erlang/lib/rabbitmq-1.4.0/ebin/rabbit_amqqueue_process.beam
>+lib/erlang/lib/rabbitmq-1.4.0/ebin/rabbit_amqqueue_sup.beam
>+lib/erlang/lib/rabbitmq-1.4.0/ebin/rabbit_binary_generator.beam
>+lib/erlang/lib/rabbitmq-1.4.0/ebin/rabbit_binary_parser.beam
>+lib/erlang/lib/rabbitmq-1.4.0/ebin/rabbit_channel.beam
>+lib/erlang/lib/rabbitmq-1.4.0/ebin/rabbit_control.beam
>+lib/erlang/lib/rabbitmq-1.4.0/ebin/rabbit_error_logger.beam
>+lib/erlang/lib/rabbitmq-1.4.0/ebin/rabbit_exchange.beam
>+lib/erlang/lib/rabbitmq-1.4.0/ebin/rabbit_framing.beam
>+lib/erlang/lib/rabbitmq-1.4.0/ebin/rabbit_framing_channel.beam
>+lib/erlang/lib/rabbitmq-1.4.0/ebin/rabbit_heartbeat.beam
>+lib/erlang/lib/rabbitmq-1.4.0/ebin/rabbit_load.beam
>+lib/erlang/lib/rabbitmq-1.4.0/ebin/rabbit_log.beam
>+lib/erlang/lib/rabbitmq-1.4.0/ebin/rabbit_misc.beam
>+lib/erlang/lib/rabbitmq-1.4.0/ebin/rabbit_mnesia.beam
>+lib/erlang/lib/rabbitmq-1.4.0/ebin/rabbit_multi.beam
>+lib/erlang/lib/rabbitmq-1.4.0/ebin/rabbit_networking.beam
>+lib/erlang/lib/rabbitmq-1.4.0/ebin/rabbit_node_monitor.beam
>+lib/erlang/lib/rabbitmq-1.4.0/ebin/rabbit_persister.beam
>+lib/erlang/lib/rabbitmq-1.4.0/ebin/rabbit_reader.beam
>+lib/erlang/lib/rabbitmq-1.4.0/ebin/rabbit_realm.beam
>+lib/erlang/lib/rabbitmq-1.4.0/ebin/rabbit_router.beam
>+lib/erlang/lib/rabbitmq-1.4.0/ebin/rabbit_sup.beam
>+lib/erlang/lib/rabbitmq-1.4.0/ebin/rabbit_tests.beam
>+lib/erlang/lib/rabbitmq-1.4.0/ebin/rabbit_ticket.beam
>+lib/erlang/lib/rabbitmq-1.4.0/ebin/rabbit_tracer.beam
>+lib/erlang/lib/rabbitmq-1.4.0/ebin/rabbit_writer.beam
>+lib/erlang/lib/rabbitmq-1.4.0/ebin/tcp_acceptor.beam
>+lib/erlang/lib/rabbitmq-1.4.0/ebin/tcp_acceptor_sup.beam
>+lib/erlang/lib/rabbitmq-1.4.0/ebin/tcp_client_sup.beam
>+lib/erlang/lib/rabbitmq-1.4.0/ebin/tcp_listener.beam
>+lib/erlang/lib/rabbitmq-1.4.0/ebin/tcp_listener_sup.beam
>+lib/erlang/lib/rabbitmq-1.4.0/include/rabbit.hrl
>+lib/erlang/lib/rabbitmq-1.4.0/include/rabbit_framing.hrl
>+lib/erlang/lib/rabbitmq-1.4.0/include/rabbit_framing_spec.hrl
>+lib/erlang/lib/rabbitmq-1.4.0/src/buffering_proxy.erl
>+lib/erlang/lib/rabbitmq-1.4.0/src/rabbit.erl
>+lib/erlang/lib/rabbitmq-1.4.0/src/rabbit_access_control.erl
>+lib/erlang/lib/rabbitmq-1.4.0/src/rabbit_amqqueue.erl
>+lib/erlang/lib/rabbitmq-1.4.0/src/rabbit_amqqueue_process.erl
>+lib/erlang/lib/rabbitmq-1.4.0/src/rabbit_amqqueue_sup.erl
>+lib/erlang/lib/rabbitmq-1.4.0/src/rabbit_binary_generator.erl
>+lib/erlang/lib/rabbitmq-1.4.0/src/rabbit_binary_parser.erl
>+lib/erlang/lib/rabbitmq-1.4.0/src/rabbit_channel.erl
>+lib/erlang/lib/rabbitmq-1.4.0/src/rabbit_control.erl
>+lib/erlang/lib/rabbitmq-1.4.0/src/rabbit_error_logger.erl
>+lib/erlang/lib/rabbitmq-1.4.0/src/rabbit_exchange.erl
>+lib/erlang/lib/rabbitmq-1.4.0/src/rabbit_framing.erl
>+lib/erlang/lib/rabbitmq-1.4.0/src/rabbit_framing_channel.erl
>+lib/erlang/lib/rabbitmq-1.4.0/src/rabbit_heartbeat.erl
>+lib/erlang/lib/rabbitmq-1.4.0/src/rabbit_load.erl
>+lib/erlang/lib/rabbitmq-1.4.0/src/rabbit_log.erl
>+lib/erlang/lib/rabbitmq-1.4.0/src/rabbit_misc.erl
>+lib/erlang/lib/rabbitmq-1.4.0/src/rabbit_mnesia.erl
>+lib/erlang/lib/rabbitmq-1.4.0/src/rabbit_multi.erl
>+lib/erlang/lib/rabbitmq-1.4.0/src/rabbit_networking.erl
>+lib/erlang/lib/rabbitmq-1.4.0/src/rabbit_node_monitor.erl
>+lib/erlang/lib/rabbitmq-1.4.0/src/rabbit_persister.erl
>+lib/erlang/lib/rabbitmq-1.4.0/src/rabbit_reader.erl
>+lib/erlang/lib/rabbitmq-1.4.0/src/rabbit_realm.erl
>+lib/erlang/lib/rabbitmq-1.4.0/src/rabbit_router.erl
>+lib/erlang/lib/rabbitmq-1.4.0/src/rabbit_sup.erl
>+lib/erlang/lib/rabbitmq-1.4.0/src/rabbit_tests.erl
>+lib/erlang/lib/rabbitmq-1.4.0/src/rabbit_ticket.erl
>+lib/erlang/lib/rabbitmq-1.4.0/src/rabbit_tracer.erl
>+lib/erlang/lib/rabbitmq-1.4.0/src/rabbit_writer.erl
>+lib/erlang/lib/rabbitmq-1.4.0/src/tcp_acceptor.erl
>+lib/erlang/lib/rabbitmq-1.4.0/src/tcp_acceptor_sup.erl
>+lib/erlang/lib/rabbitmq-1.4.0/src/tcp_client_sup.erl
>+lib/erlang/lib/rabbitmq-1.4.0/src/tcp_listener.erl
>+lib/erlang/lib/rabbitmq-1.4.0/src/tcp_listener_sup.erl
>+@dirrm lib/erlang/lib/rabbitmq-1.4.0/src
>+@dirrm lib/erlang/lib/rabbitmq-1.4.0/include
>+@dirrm lib/erlang/lib/rabbitmq-1.4.0/ebin
>+@dirrm lib/erlang/lib/rabbitmq-1.4.0
> @dirrmtry /var/log/rabbitmq
> @dirrmtry /var/db/rabbitmq/mnesia
> @dirrmtry etc/rabbitmq
>--- rabbitmq-1.4.0.patch ends here ---

Actions: View | Diff

Attachments on bug 126560: 89586 | 89587