Make sure scripts use Bash, fixes the plugins script.

Clean up and work around the silly coreutils (readlink) dependency.
Bump PKGREVISION.

3 files changed, 49 insertions, 14 deletions

diff --git a/net/rabbitmq/Makefile b/net/rabbitmq/Makefile
index 7b2296fd5fc..a03ada0fb20 100644
--- a/net/rabbitmq/Makefile
+++ b/net/rabbitmq/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.20 2015/06/09 12:41:08 fhajny Exp $
+# $NetBSD: Makefile,v 1.21 2015/11/20 12:26:21 fhajny Exp $
 
 PKGNAME=		rabbitmq-${RMQ_VERSION}
 DISTNAME=		rabbitmq-server-${RMQ_VERSION}
+PKGREVISION=		1
 CATEGORIES=		net
 MASTER_SITES=		http://www.rabbitmq.com/releases/rabbitmq-server/v${RMQ_VERSION}/
 
@@ -17,7 +18,6 @@ MAKE_JOBS_SAFE=		no
 BUILD_DEPENDS+=		libxslt-[0-9]*:../../textproc/libxslt
 BUILD_DEPENDS+=		${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
 BUILD_DEPENDS+=		xmlto-[0-9]*:../../textproc/xmlto
-DEPENDS+=		coreutils-[0-9]*:../../sysutils/coreutils
 DEPENDS+=		${PYPKGPREFIX}-simplejson>=2:../../converters/py-simplejson
 
 PYTHON_VERSIONS_INCOMPATIBLE=	33 34 # not yet ported as of 3.2.2
@@ -55,6 +55,8 @@ FILES_SUBST+=		RMQ_USER=${RMQ_USER}
 FILES_SUBST+=		RMQ_GROUP=${RMQ_GROUP}
 FILES_SUBST+=		RMQ_DIR=${RMQ_DIR}
 
+RABBITMQ_HOME=		${PREFIX}/lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}
+
 INSTALLATION_DIRS+=	share/examples/rabbitmq
 
 SCRIPTS_DIR=		${WRKSRC}/scripts
@@ -70,15 +72,16 @@ SUBST_FILES.paths+=	${SCRIPTS_DIR}/rabbitmq-defaults
 SUBST_SED.paths=	-e 's|/etc/rabbitmq|${PKG_SYSCONFDIR}|g'
 SUBST_SED.paths+=	-e 's|/var/lib|${VARBASE}/db|g'
 SUBST_SED.paths+=	-e 's|/var/log|${VARBASE}/log|g'
-SUBST_SED.paths+=	-e 's|@PREFIX@|${PREFIX}|g'
 SUBST_SED.paths+=	-e 's|erl|${PREFIX}/bin/erl|g'
-SUBST_SED.paths+=	-e 's|readlink|${PREFIX}/bin/greadlink|g'
+SUBST_VARS.paths=	RABBITMQ_HOME
 
 REPLACE_BASH+=		${SCRIPTS_DIR}/rabbitmqctl
+REPLACE_BASH+=		${SCRIPTS_DIR}/rabbitmq-defaults
 REPLACE_BASH+=		${SCRIPTS_DIR}/rabbitmq-env
+REPLACE_BASH+=		${SCRIPTS_DIR}/rabbitmq-plugins
 REPLACE_BASH+=		${SCRIPTS_DIR}/rabbitmq-server
 
-MAKE_ENV+=		TARGET_DIR="${DESTDIR}${PREFIX}/lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}"
+MAKE_ENV+=		TARGET_DIR="${DESTDIR}${RABBITMQ_HOME}"
 MAKE_ENV+=		SBIN_DIR="${DESTDIR}${PREFIX}/sbin/"
 MAKE_ENV+=		MAN_DIR="${DESTDIR}${PREFIX}/man"
 MAKE_ENV+=		DOC_INSTALL_DIR="${DESTDIR}${PREFIX}/share/examples/rabbitmq"
@@ -86,18 +89,12 @@ MAKE_ENV+=		RMQ_VERSION=${RMQ_VERSION}
 MAKE_ENV+=		MAKE_SHELL="${RMQ_SHELL}"
 MAKE_ENV+=		GIT_SSL_NO_VERIFY=true
 
-INSTALL_ENV+=		TARGET_DIR="${DESTDIR}${PREFIX}/lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}"
-INSTALL_ENV+=		SBIN_DIR="${DESTDIR}${PREFIX}/sbin/"
-INSTALL_ENV+=		MAN_DIR="${DESTDIR}${PREFIX}/man"
-INSTALL_ENV+=		DOC_INSTALL_DIR="${DESTDIR}${PREFIX}/share/examples/rabbitmq"
-INSTALL_ENV+=		RMQ_VERSION=${RMQ_VERSION}
-INSTALL_ENV+=		MAKE_SHELL="${RMQ_SHELL}"
-
 REPLACE_PYTHON+=	calculate-relative
 REPLACE_PYTHON+=	plugins-src/rabbitmq-amqp1.0/codegen.py
 
 post-install:
-	${INSTALL_DATA} ${FILESDIR}/rabbitmq-env.conf ${DESTDIR}${PREFIX}/share/examples/rabbitmq/rabbitmq-env.conf
+	${INSTALL_DATA} ${FILESDIR}/rabbitmq-env.conf 				\
+		${DESTDIR}${PREFIX}/share/examples/rabbitmq/rabbitmq-env.conf
 
 .include "../../lang/erlang/buildlink3.mk"
 .include "../../lang/python/application.mk"
diff --git a/net/rabbitmq/distinfo b/net/rabbitmq/distinfo
index 045caf593e5..41fa1f74e9e 100644
--- a/net/rabbitmq/distinfo
+++ b/net/rabbitmq/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.26 2015/11/04 17:41:21 agc Exp $
+$NetBSD: distinfo,v 1.27 2015/11/20 12:26:21 fhajny Exp $
 
 SHA1 (rabbitmq-server-3.5.6.tar.gz) = 51543b70ab913fcec088257265d0e112b4d8b019
 RMD160 (rabbitmq-server-3.5.6.tar.gz) = 2fb2531f1c5aeb04f760d1e79394aa7eee9beae9
@@ -6,3 +6,4 @@ SHA512 (rabbitmq-server-3.5.6.tar.gz) = e346d84b2ea4af3004e3906c99d82bef40283f0d
 Size (rabbitmq-server-3.5.6.tar.gz) = 3747595 bytes
 SHA1 (patch-aa) = 615aa7cb9775655ca5b3aaa392d51fbf1ab7083e
 SHA1 (patch-plugins-src_do-package.mk) = c1f4a6422a9cb7bac4e1d6bdb671a87a16f73764
+SHA1 (patch-scripts_rabbitmq-env) = bd6608096f5e52693b9491e161116a92e00fb331
diff --git a/net/rabbitmq/patches/patch-scripts_rabbitmq-env b/net/rabbitmq/patches/patch-scripts_rabbitmq-env
new file mode 100644
index 00000000000..d818498e11d
--- /dev/null
+++ b/net/rabbitmq/patches/patch-scripts_rabbitmq-env
@@ -0,0 +1,37 @@
+$NetBSD: patch-scripts_rabbitmq-env,v 1.1 2015/11/20 12:26:21 fhajny Exp $
+
+Remove cumbersome symlink handling, we know where stuff is.
+
+--- scripts/rabbitmq-env.orig	2015-10-07 12:45:15.000000000 +0000
++++ scripts/rabbitmq-env
+@@ -15,29 +15,7 @@
+ ##  Copyright (c) 2007-2015 Pivotal Software, Inc.  All rights reserved.
+ ##
+ 
+-# We set +e here since since our test for "readlink -f" below needs to
+-# be able to fail.
+-set +e
+-# Determine where this script is really located (if this script is
+-# invoked from another script, this is the location of the caller)
+-SCRIPT_PATH="$0"
+-while [ -h "$SCRIPT_PATH" ] ; do
+-    # Determine if readlink -f is supported at all. TODO clean this up.
+-    FULL_PATH=`readlink -f $SCRIPT_PATH 2>/dev/null`
+-    if [ "$?" != "0" ]; then
+-      REL_PATH=`readlink $SCRIPT_PATH`
+-      if expr "$REL_PATH" : '/.*' > /dev/null; then
+-        SCRIPT_PATH="$REL_PATH"
+-      else
+-        SCRIPT_PATH="`dirname "$SCRIPT_PATH"`/$REL_PATH"
+-      fi
+-    else
+-      SCRIPT_PATH=$FULL_PATH
+-    fi
+-done
+-set -e
+-
+-SCRIPT_DIR=`dirname $SCRIPT_PATH`
++SCRIPT_DIR="@RABBITMQ_HOME@/sbin"
+ RABBITMQ_HOME="${SCRIPT_DIR}/.."
+ 
+ ## Set defaults