From owner-svn-ports-head@FreeBSD.ORG Sat Aug 24 20:04:02 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 7D43CCD5; Sat, 24 Aug 2013 20:04:02 +0000 (UTC) (envelope-from olgeni@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 68F6C20A9; Sat, 24 Aug 2013 20:04:02 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r7OK42IO035480; Sat, 24 Aug 2013 20:04:02 GMT (envelope-from olgeni@svn.freebsd.org) Received: (from olgeni@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r7OK417d035474; Sat, 24 Aug 2013 20:04:01 GMT (envelope-from olgeni@svn.freebsd.org) Message-Id: <201308242004.r7OK417d035474@svn.freebsd.org> From: Jimmy Olgeni Date: Sat, 24 Aug 2013 20:04:01 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r325310 - in head/net/rabbitmq: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 24 Aug 2013 20:04:02 -0000 Author: olgeni Date: Sat Aug 24 20:04:01 2013 New Revision: 325310 URL: http://svnweb.freebsd.org/changeset/ports/325310 Log: Upgrade to version 3.1.5. PR: ports/180389 (plus local changes) Submitted by: Anton Yuzhaninov Approved by: maintainer timeout Modified: head/net/rabbitmq/Makefile head/net/rabbitmq/distinfo (contents, props changed) head/net/rabbitmq/files/patch-rabbitmqctl (contents, props changed) head/net/rabbitmq/pkg-plist (contents, props changed) Modified: head/net/rabbitmq/Makefile ============================================================================== --- head/net/rabbitmq/Makefile Sat Aug 24 19:55:58 2013 (r325309) +++ head/net/rabbitmq/Makefile Sat Aug 24 20:04:01 2013 (r325310) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= rabbitmq -PORTVERSION= 3.0.4 +PORTVERSION= 3.1.5 CATEGORIES= net MASTER_SITES= http://www.rabbitmq.com/releases/rabbitmq-server/v${PORTVERSION}/ DISTNAME= ${PORTNAME}-server-${PORTVERSION} @@ -17,9 +17,10 @@ BUILD_DEPENDS= erl:${PORTSDIR}/lang/erla zip:${PORTSDIR}/archivers/zip RUN_DEPENDS= erl:${PORTSDIR}/lang/erlang -USE_GMAKE= yes -USE_PYTHON= yes +USES= gmake shebangfix +USE_PYTHON_BUILD=yes USE_RC_SUBR= rabbitmq +SHEBANG_FILES= plugins-src/rabbitmq-amqp1.0/codegen.py USERS= rabbitmq GROUPS= rabbitmq @@ -39,6 +40,13 @@ post-patch: ${SCRIPTS_DIR}/rabbitmq-server ${SCRIPTS_DIR}/rabbitmqctl \ ${SCRIPTS_DIR}/rabbitmq-env ${SCRIPTS_DIR}/rabbitmq-plugins \ ${SCRIPTS_DIR}/rabbitmq-defaults + @${REINPLACE_CMD} -e 's|VERSION=0.0.0|VERSION=${PORTVERSION}|g' \ + ${WRKSRC}/plugins-src/rabbitmq-erlang-client/Makefile \ + ${WRKSRC}/plugins-src/release.mk + @${REINPLACE_CMD} -e 's|VERSION:=0.0.0|VERSION:=${PORTVERSION}|g' \ + ${WRKSRC}/plugins-src/Makefile + @${REINPLACE_CMD} -e 's|VERSION?=0.0.0|VERSION?=${PORTVERSION}|g' \ + ${WRKSRC}/Makefile @${FIND} ${WRKSRC} -name "*.bak" -delete pre-install: Modified: head/net/rabbitmq/distinfo ============================================================================== --- head/net/rabbitmq/distinfo Sat Aug 24 19:55:58 2013 (r325309) +++ head/net/rabbitmq/distinfo Sat Aug 24 20:04:01 2013 (r325310) @@ -1,2 +1,2 @@ -SHA256 (rabbitmq-server-3.0.4.tar.gz) = e49dbcfd8b2085133847de33081e2defb1f4879d21a9776d54ab1f1988e0e163 -SIZE (rabbitmq-server-3.0.4.tar.gz) = 3314866 +SHA256 (rabbitmq-server-3.1.5.tar.gz) = c6952bdd0f0d9551fa4a068e65ad6506583a3e81babbb4e4747e0073366a6c35 +SIZE (rabbitmq-server-3.1.5.tar.gz) = 3562221 Modified: head/net/rabbitmq/files/patch-rabbitmqctl ============================================================================== --- head/net/rabbitmq/files/patch-rabbitmqctl Sat Aug 24 19:55:58 2013 (r325309) +++ head/net/rabbitmq/files/patch-rabbitmqctl Sat Aug 24 20:04:01 2013 (r325310) @@ -1,11 +1,14 @@ ---- scripts/rabbitmqctl.orig 2011-08-01 15:59:26.057347310 +0100 -+++ scripts/rabbitmqctl 2011-08-01 16:00:07.303513263 +0100 -@@ -20,7 +20,7 @@ - [ "x" = "x$RABBITMQ_NODENAME" ] && RABBITMQ_NODENAME=${NODENAME} - [ "x" = "x$RABBITMQ_CTL_ERL_ARGS" ] && RABBITMQ_CTL_ERL_ARGS=${CTL_ERL_ARGS} + +$FreeBSD$ + +--- scripts/rabbitmqctl.orig ++++ scripts/rabbitmqctl +@@ -26,7 +26,7 @@ --exec erl \ -+HOME=/var/db/rabbitmq exec erl \ + ##--- End of overridden variables + +-exec ${ERL_DIR}erl \ ++HOME=/var/db/rabbitmq exec ${ERL_DIR}erl \ -pa "${RABBITMQ_HOME}/ebin" \ -noinput \ -hidden \ Modified: head/net/rabbitmq/pkg-plist ============================================================================== --- head/net/rabbitmq/pkg-plist Sat Aug 24 19:55:58 2013 (r325309) +++ head/net/rabbitmq/pkg-plist Sat Aug 24 20:04:01 2013 (r325310) @@ -5,11 +5,13 @@ sbin/rabbitmqctl sbin/rabbitmq-plugins lib/erlang/lib/rabbitmq_server-%%VERSION%%/INSTALL lib/erlang/lib/rabbitmq_server-%%VERSION%%/LICENSE +lib/erlang/lib/rabbitmq_server-%%VERSION%%/LICENSE-APACHE2-ExplorerCanvas lib/erlang/lib/rabbitmq_server-%%VERSION%%/LICENSE-APL2-Stomp-Websocket lib/erlang/lib/rabbitmq_server-%%VERSION%%/LICENSE-Apache-Basho lib/erlang/lib/rabbitmq_server-%%VERSION%%/LICENSE-BSD-base64js lib/erlang/lib/rabbitmq_server-%%VERSION%%/LICENSE-BSD-glMatrix lib/erlang/lib/rabbitmq_server-%%VERSION%%/LICENSE-MIT-EJS10 +lib/erlang/lib/rabbitmq_server-%%VERSION%%/LICENSE-MIT-Flot lib/erlang/lib/rabbitmq_server-%%VERSION%%/LICENSE-MIT-Mochi lib/erlang/lib/rabbitmq_server-%%VERSION%%/LICENSE-MIT-Sammy060 lib/erlang/lib/rabbitmq_server-%%VERSION%%/LICENSE-MIT-eldap @@ -52,6 +54,7 @@ lib/erlang/lib/rabbitmq_server-%%VERSION lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_auth_mechanism_amqplain.beam lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_auth_mechanism_cr_demo.beam lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_auth_mechanism_plain.beam +lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_autoheal.beam lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_backing_queue.beam lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_backing_queue_qc.beam lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_basic.beam @@ -85,14 +88,20 @@ lib/erlang/lib/rabbitmq_server-%%VERSION lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_framing_amqp_0_9_1.beam lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_guid.beam lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_heartbeat.beam +lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_intermediate_sup.beam lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_limiter.beam lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_log.beam lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_memory_monitor.beam lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_mirror_queue_coordinator.beam lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_mirror_queue_master.beam lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_mirror_queue_misc.beam +lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_mirror_queue_mode.beam +lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_mirror_queue_mode_all.beam +lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_mirror_queue_mode_exactly.beam +lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_mirror_queue_mode_nodes.beam lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_mirror_queue_slave.beam lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_mirror_queue_slave_sup.beam +lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_mirror_queue_sync.beam lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_misc.beam lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_mnesia.beam lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_msg_file.beam @@ -135,6 +144,7 @@ lib/erlang/lib/rabbitmq_server-%%VERSION lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_vhost.beam lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_vm.beam lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_writer.beam +lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/supervised_lifecycle.beam lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/supervisor2.beam lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/supervisor2_tests.beam lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/tcp_acceptor.beam @@ -151,33 +161,33 @@ lib/erlang/lib/rabbitmq_server-%%VERSION lib/erlang/lib/rabbitmq_server-%%VERSION%%/include/rabbit_framing.hrl lib/erlang/lib/rabbitmq_server-%%VERSION%%/include/rabbit_msg_store.hrl lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/README -lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/amqp_client-0.0.0.ez -lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/cowboy-0.5.0-rmq0.0.0-git4b93c2d.ez -lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/eldap-0.0.0-gite309de4.ez -lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/mochiweb-2.3.1-rmq0.0.0-gitd541e9a.ez -lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_auth_backend_ldap-0.0.0.ez -lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_auth_mechanism_ssl-0.0.0.ez -lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_consistent_hash_exchange-0.0.0.ez -lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_federation-0.0.0.ez -lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_federation_management-0.0.0.ez -lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_jsonrpc-0.0.0.ez -lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_jsonrpc_channel-0.0.0.ez -lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_jsonrpc_channel_examples-0.0.0.ez -lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_management-0.0.0.ez -lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_management_agent-0.0.0.ez -lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_management_visualiser-0.0.0.ez -lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_mqtt-0.0.0.ez -lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_old_federation-0.0.0.ez -lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_shovel-0.0.0.ez -lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_shovel_management-0.0.0.ez -lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_stomp-0.0.0.ez -lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_tracing-0.0.0.ez -lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_web_dispatch-0.0.0.ez -lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_web_stomp-0.0.0.ez -lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_web_stomp_examples-0.0.0.ez -lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/rfc4627_jsonrpc-0.0.0-git7ab174b.ez -lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/sockjs-0.3.4-rmq0.0.0-git3132eb9.ez -lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/webmachine-1.9.1-rmq0.0.0-git52e62bc.ez +lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/amqp_client-%%VERSION%%.ez +lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/cowboy-0.5.0-rmq3.1.5-git4b93c2d.ez +lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/eldap-3.1.5-gite309de4.ez +lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/mochiweb-2.7.0-rmq3.1.5-git680dba8.ez +lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_amqp1_0-%%VERSION%%.ez +lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_auth_backend_ldap-%%VERSION%%.ez +lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_auth_mechanism_ssl-%%VERSION%%.ez +lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_consistent_hash_exchange-%%VERSION%%.ez +lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_federation-%%VERSION%%.ez +lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_federation_management-%%VERSION%%.ez +lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_jsonrpc-%%VERSION%%.ez +lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_jsonrpc_channel-%%VERSION%%.ez +lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_jsonrpc_channel_examples-%%VERSION%%.ez +lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_management-%%VERSION%%.ez +lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_management_agent-%%VERSION%%.ez +lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_management_visualiser-%%VERSION%%.ez +lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_mqtt-%%VERSION%%.ez +lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_shovel-%%VERSION%%.ez +lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_shovel_management-%%VERSION%%.ez +lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_stomp-%%VERSION%%.ez +lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_tracing-%%VERSION%%.ez +lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_web_dispatch-%%VERSION%%.ez +lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_web_stomp-%%VERSION%%.ez +lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_web_stomp_examples-%%VERSION%%.ez +lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/rfc4627_jsonrpc-3.1.5-git5e67120.ez +lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/sockjs-0.3.4-rmq3.1.5-git3132eb9.ez +lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/webmachine-1.10.3-rmq3.1.5-gite9359c7.ez lib/erlang/lib/rabbitmq_server-%%VERSION%%/sbin/rabbitmq-defaults lib/erlang/lib/rabbitmq_server-%%VERSION%%/sbin/rabbitmq-env lib/erlang/lib/rabbitmq_server-%%VERSION%%/sbin/rabbitmq-plugins