Index: net/rabbitmq/Makefile =================================================================== --- net/rabbitmq/Makefile +++ net/rabbitmq/Makefile @@ -2,39 +2,47 @@ # $FreeBSD$ PORTNAME= rabbitmq -PORTVERSION= 3.7.7 -PORTREVISION= 1 +PORTVERSION= 3.7.8 CATEGORIES= net MASTER_SITES= https://github.com/rabbitmq/rabbitmq-server/releases/download/v${PORTVERSION}/ DISTNAME= ${PORTNAME}-server-${PORTVERSION} MAINTAINER= erlang@FreeBSD.org -COMMENT= RabbitMQ is an implementation of AMQP +COMMENT= Message broker supporting AMQP 0.9.1, 1.0, MQTT 3.1, STOMP and more LICENSE= MPL11 LICENSE_FILE= ${WRKSRC}/LICENSE-MPL-RabbitMQ BROKEN_powerpc64= fails to build: (ArgumentError) argument error -BUILD_DEPENDS= erlang-runtime19>=19.3:lang/erlang-runtime19 \ +BUILD_DEPENDS= erlang-runtime${ERLANG_VERSION}>=${ERLANG_VERSION}:lang/erlang-runtime${ERLANG_VERSION} \ elixir:lang/elixir \ ${PYTHON_PKGNAMEPREFIX}simplejson>=2.0:devel/py-simplejson@${PY_FLAVOR} \ xmlto:textproc/xmlto \ zip:archivers/zip \ rsync:net/rsync -RUN_DEPENDS= erlang-runtime19>=19.3:lang/erlang-runtime19 +RUN_DEPENDS= erlang-runtime${ERLANG_VERSION}>=${ERLANG_VERSION}:lang/erlang-runtime${ERLANG_VERSION} + +USES= cpe gmake shebangfix tar:xz +USE_LOCALE= en_US.UTF-8 +USE_RC_SUBR= rabbitmq OPTIONS_DEFINE= ADMIN +OPTIONS_DEFAULT=OTP20 OPTIONS_SUB= yes +OPTIONS_SINGLE= ENV +OPTIONS_SINGLE_ENV=OTP20 OTP21 +OTP20_DESC= Use Erlang OTP20 +OTP20_VARS= ERLANG_VERSION=20 +OTP21_DESC= Use Erlang OTP21 +OTP21_VARS= ERLANG_VERSION=21 + ADMIN_DESC= Install rabbitmqadmin script ADMIN_USES= python ADMIN_USES_OFF= python:build ALL_TARGET= all manpages -USES= cpe gmake shebangfix tar:xz -USE_LOCALE= en_US.UTF-8 -USE_RC_SUBR= rabbitmq NO_ARCH= yes USERS= rabbitmq @@ -48,7 +56,7 @@ SCRIPTS_DIR= ${WRKSRC}/deps/rabbit/scripts SHEBANG_FILES= deps/rabbitmq_management/bin/rabbitmqadmin MAKE_ARGS+= PYTHON=${PYTHON_CMD} -MAKE_ENV+= PATH="${LOCALBASE}/lib/erlang19/bin:${PATH}" \ +MAKE_ENV+= PATH="${LOCALBASE}/lib/erlang${ERLANG_VERSION}/bin:${PATH}" \ TARGET_DIR="${STAGEDIR}${PREFIX}/lib/erlang/lib/rabbitmq_server-${PORTVERSION}" \ SBIN_DIR="${STAGEDIR}${PREFIX}/sbin/" \ MAN_DIR="${STAGEDIR}${PREFIX}/man" \ @@ -60,7 +68,7 @@ .include post-patch: - @${REINPLACE_CMD} -e 's|/etc/rabbitmq|${PREFIX}/etc/rabbitmq|g ; s|/var/lib|/var/db|g ; s|$${ERL_DIR}erl|${PREFIX}/lib/erlang19/bin/erl|g' \ + @${REINPLACE_CMD} -e 's|/etc/rabbitmq|${PREFIX}/etc/rabbitmq|g ; s|/var/lib|/var/db|g ; s|$${ERL_DIR}erl|${PREFIX}/lib/erlang${ERLANG_VERSION}/bin/erl|g' \ ${SCRIPTS_DIR}/rabbitmq-server \ ${SCRIPTS_DIR}/rabbitmqctl \ ${SCRIPTS_DIR}/rabbitmq-env \ Index: net/rabbitmq/distinfo =================================================================== --- net/rabbitmq/distinfo +++ net/rabbitmq/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1530985133 -SHA256 (rabbitmq-server-3.7.7.tar.xz) = 3549963ba562768387095eddeb2e69b6885fb11c7f4a3b8f53250694b4265431 -SIZE (rabbitmq-server-3.7.7.tar.xz) = 2517952 +TIMESTAMP = 1537705480 +SHA256 (rabbitmq-server-3.7.8.tar.xz) = bed39fd72b8c932fe5f356fbbc7d30a19d651213e1667d81f084bc31468f5a02 +SIZE (rabbitmq-server-3.7.8.tar.xz) = 2534936 Index: net/rabbitmq/files/patch-deps_rabbitmq__cli_lib_rabbitmq_cli_core_parser.ex =================================================================== --- net/rabbitmq/files/patch-deps_rabbitmq__cli_lib_rabbitmq_cli_core_parser.ex +++ /dev/null @@ -1,26 +0,0 @@ ---- deps/rabbitmq_cli/lib/rabbitmq/cli/core/parser.ex.orig 2018-06-14 08:10:14 UTC -+++ deps/rabbitmq_cli/lib/rabbitmq/cli/core/parser.ex -@@ -142,7 +142,12 @@ defmodule RabbitMQ.CLI.Core.Parser do - switches = default_switches() - aliases = default_aliases() - {options, tail, invalid} = -- OptionParser.parse_head(input, strict: switches, aliases: aliases) -+ OptionParser.parse_head( -+ input, -+ strict: switches, -+ aliases: aliases, -+ allow_nonexistent_atoms: true, -+ ) - norm_options = normalize_options(options, switches) |> Map.new - {norm_options, tail, invalid} - end -@@ -157,7 +162,8 @@ defmodule RabbitMQ.CLI.Core.Parser do - {options, args, invalid} = OptionParser.parse( - input, - strict: switches, -- aliases: aliases -+ aliases: aliases, -+ allow_nonexistent_atoms: true, - ) - norm_options = normalize_options(options, switches) |> Map.new - {args, norm_options, invalid} Index: net/rabbitmq/files/patch-deps_rabbitmq__cli_mix.exs =================================================================== --- net/rabbitmq/files/patch-deps_rabbitmq__cli_mix.exs +++ /dev/null @@ -1,13 +0,0 @@ ---- deps/rabbitmq_cli/mix.exs.orig 2018-06-14 08:10:14 UTC -+++ deps/rabbitmq_cli/mix.exs -@@ -19,8 +19,8 @@ defmodule RabbitMQCtl.MixfileBase do - def project do - [ - app: :rabbitmqctl, -- version: "3.7.5", -- elixir: "~> 1.6.0", -+ version: "3.7.8", -+ elixir: ">= 1.6.6 and < 1.8.0", - build_embedded: Mix.env == :prod, - start_permanent: Mix.env == :prod, - escript: [main_module: RabbitMQCtl, Index: net/rabbitmq/pkg-plist =================================================================== --- net/rabbitmq/pkg-plist +++ net/rabbitmq/pkg-plist @@ -24,6 +24,7 @@ lib/erlang/lib/rabbitmq_server-%%VERSION%%/LICENSE-httpc_aws lib/erlang/lib/rabbitmq_server-%%VERSION%%/LICENSE-rabbitmq_aws lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/background_gc.beam +lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/code_server_cache.beam lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/dtree.beam lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/gatherer.beam lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/gm.beam @@ -213,7 +214,7 @@ lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/ranch-1.5.0.ez lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/ranch_proxy_protocol-1.5.0.ez lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/recon-2.3.2.ez -lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/syslog-3.4.2.ez +lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/syslog-3.4.3.ez lib/erlang/lib/rabbitmq_server-%%VERSION%%/priv/schema/rabbit.schema lib/erlang/lib/rabbitmq_server-%%VERSION%%/sbin/cuttlefish lib/erlang/lib/rabbitmq_server-%%VERSION%%/sbin/rabbitmq-defaults