CVS commit: pkgsrc/net/rabbitmq

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Thu Jan 28 13:18:15 UTC 2021

Modified Files:
        pkgsrc/net/rabbitmq: Makefile distinfo
Added Files:
        pkgsrc/net/rabbitmq/patches:
            patch-deps_rabbit__common_src_rabbit__env.erl

Log Message:
rabbitmq: use PkgSrc prefix; bump revision


To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.49 pkgsrc/net/rabbitmq/Makefile
cvs rdiff -u -r1.46 -r1.47 pkgsrc/net/rabbitmq/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/net/rabbitmq/patches/patch-deps_rabbit__common_src_rabbit__env.erl

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/rabbitmq/Makefile
diff -u pkgsrc/net/rabbitmq/Makefile:1.48 pkgsrc/net/rabbitmq/Makefile:1.49
--- pkgsrc/net/rabbitmq/Makefile:1.48   Tue Jan 26 11:29:54 2021
+++ pkgsrc/net/rabbitmq/Makefile        Thu Jan 28 13:18:15 2021
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.48 2021/01/26 11:29:54 adam Exp $
+# $NetBSD: Makefile,v 1.49 2021/01/28 13:18:15 adam Exp $
 
 DISTNAME=      rabbitmq-server-3.8.11
+PKGREVISION=   1
 PKGNAME=       ${DISTNAME:S/-server//}
 CATEGORIES=    net
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=rabbitmq/}
@@ -73,6 +74,12 @@ SUBST_SED.paths+=    -e 's|/var/log|${VARBA
 SUBST_SED.paths+=      -e 's|erl|${PREFIX}/bin/erl|g'
 SUBST_SED.paths+=      -e 's|@RABBITMQ_HOME@|${PREFIX}/${RABBITMQ_HOME}|g'
 
+SUBST_CLASSES+=                prefix
+SUBST_MESSAGE.prefix=  Setting prefix path
+SUBST_STAGE.prefix=    pre-build
+SUBST_FILES.prefix=    deps/rabbit_common/src/rabbit_env.erl
+SUBST_VARS.prefix=     PREFIX
+
 REPLACE_BASH+=         ${SCRIPTS_DIR}/rabbitmqctl
 REPLACE_BASH+=         ${SCRIPTS_DIR}/rabbitmq-defaults
 REPLACE_BASH+=         ${SCRIPTS_DIR}/rabbitmq-env

Index: pkgsrc/net/rabbitmq/distinfo
diff -u pkgsrc/net/rabbitmq/distinfo:1.46 pkgsrc/net/rabbitmq/distinfo:1.47
--- pkgsrc/net/rabbitmq/distinfo:1.46   Tue Jan 26 11:29:54 2021
+++ pkgsrc/net/rabbitmq/distinfo        Thu Jan 28 13:18:15 2021
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.46 2021/01/26 11:29:54 adam Exp $
+$NetBSD: distinfo,v 1.47 2021/01/28 13:18:15 adam Exp $
 
 SHA1 (rabbitmq-server-3.8.11.tar.xz) = 98ec2477882608bb853c477967f5e0b75a2d44e5
 RMD160 (rabbitmq-server-3.8.11.tar.xz) = f0b185bb8f4a9afae61b1eab45ef848f5c40dc04
 SHA512 (rabbitmq-server-3.8.11.tar.xz) = 022a850c62665c199863f0b40005e4a7404aa8af41f75e39309cae76638d6c0d85af9e433d1635cecd1c1d5fcbf2d21f55caa8e5eb09f7d245ce09aae5a0f48e
 Size (rabbitmq-server-3.8.11.tar.xz) = 3189984 bytes
 SHA1 (patch-Makefile) = 088a3ed04dc72215f1ca3b34b49bb4047a531e89
+SHA1 (patch-deps_rabbit__common_src_rabbit__env.erl) = 1e8222356162cba7362d22808671777f3fcf1629
 SHA1 (patch-deps_rabbit_scripts_rabbitmq-env) = db168c8ff5a5e7b22186f57947c27c7a1c5ccae6

Added files:

Index: pkgsrc/net/rabbitmq/patches/patch-deps_rabbit__common_src_rabbit__env.erl
diff -u /dev/null pkgsrc/net/rabbitmq/patches/patch-deps_rabbit__common_src_rabbit__env.erl:1.1
--- /dev/null   Thu Jan 28 13:18:15 2021
+++ pkgsrc/net/rabbitmq/patches/patch-deps_rabbit__common_src_rabbit__env.erl   Thu Jan 28 13:18:15 2021
@@ -0,0 +1,15 @@
+$NetBSD: patch-deps_rabbit__common_src_rabbit__env.erl,v 1.1 2021/01/28 13:18:15 adam Exp $
+
+Use PkgSrc prefix.
+
+--- deps/rabbit_common/src/rabbit_env.erl.orig 2021-01-28 09:54:36.000000000 +0000
++++ deps/rabbit_common/src/rabbit_env.erl
+@@ -1187,7 +1187,7 @@ erlang_dist_tcp_port(#{amqp_tcp_port := 
+ sys_prefix(#{os_type := {unix, _}} = Context) ->
+     case get_env_var("SYS_PREFIX") of
+         false ->
+-            update_context(Context, sys_prefix, "", default);
++            update_context(Context, sys_prefix, "@PREFIX@", default);
+         Value ->
+             Dir = normalize_path(Value),
+             update_context(Context, sys_prefix, Dir, environment)