Wed Dec 14 13:07:38 2011 UTC ()
Use Bash as interpretter in scripts properly


(fhajny)
diff -r1.3 -r1.4 pkgsrc/net/rabbitmq/Makefile
cvs diff -r1.3 -r1.4 pkgsrc/net/rabbitmq/Makefile (expand / switch to unified diff)

--- pkgsrc/net/rabbitmq/Makefile 2011/12/14 11:55:20 1.3
+++ pkgsrc/net/rabbitmq/Makefile 2011/12/14 13:07:38 1.4
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.3 2011/12/14 11:55:20 fhajny Exp $ 1# $NetBSD: Makefile,v 1.4 2011/12/14 13:07:38 fhajny Exp $
2# 2#
3 3
4PKGNAME= rabbitmq-${RMQ_VERSION} 4PKGNAME= rabbitmq-${RMQ_VERSION}
5DISTNAME= rabbitmq-server-${RMQ_VERSION} 5DISTNAME= rabbitmq-server-${RMQ_VERSION}
6CATEGORIES= net 6CATEGORIES= net
7MASTER_SITES= http://www.rabbitmq.com/releases/rabbitmq-server/v${RMQ_VERSION}/ 7MASTER_SITES= http://www.rabbitmq.com/releases/rabbitmq-server/v${RMQ_VERSION}/
8 8
9MAINTAINER= filip@joyent.com 9MAINTAINER= filip@joyent.com
10HOMEPAGE= http://www.rabbitmq.com/server.html 10HOMEPAGE= http://www.rabbitmq.com/server.html
11COMMENT= Implementation of AMQP that provides robust messaging for applications 11COMMENT= Implementation of AMQP that provides robust messaging for applications
12LICENSE= mpl-1.1 12LICENSE= mpl-1.1
13 13
14PKG_DESTDIR_SUPPORT= user-destdir 14PKG_DESTDIR_SUPPORT= user-destdir
@@ -53,29 +53,32 @@ SCRIPTS_DIR= ${WRKSRC}/scripts @@ -53,29 +53,32 @@ SCRIPTS_DIR= ${WRKSRC}/scripts
53 53
54PLIST_SUBST+= RMQ_VERSION=${RMQ_VERSION} 54PLIST_SUBST+= RMQ_VERSION=${RMQ_VERSION}
55 55
56SUBST_CLASSES+= paths 56SUBST_CLASSES+= paths
57SUBST_MESSAGE.paths= Setting standard paths 57SUBST_MESSAGE.paths= Setting standard paths
58SUBST_STAGE.paths= post-patch 58SUBST_STAGE.paths= post-patch
59SUBST_FILES.paths= ${SCRIPTS_DIR}/rabbitmqctl ${SCRIPTS_DIR}/rabbitmq-env 59SUBST_FILES.paths= ${SCRIPTS_DIR}/rabbitmqctl ${SCRIPTS_DIR}/rabbitmq-env
60SUBST_FILES.paths+= ${SCRIPTS_DIR}/rabbitmq-plugins ${SCRIPTS_DIR}/rabbitmq-server 60SUBST_FILES.paths+= ${SCRIPTS_DIR}/rabbitmq-plugins ${SCRIPTS_DIR}/rabbitmq-server
61SUBST_SED.paths= -e 's|/etc/rabbitmq|${PKG_SYSCONFDIR}|g' 61SUBST_SED.paths= -e 's|/etc/rabbitmq|${PKG_SYSCONFDIR}|g'
62SUBST_SED.paths+= -e 's|/var/lib|${VARBASE}/db|g' 62SUBST_SED.paths+= -e 's|/var/lib|${VARBASE}/db|g'
63SUBST_SED.paths+= -e 's|/var/log|${VARBASE}/log|g' 63SUBST_SED.paths+= -e 's|/var/log|${VARBASE}/log|g'
64SUBST_SED.paths+= -e 's|@PREFIX@|${PREFIX}|g' 64SUBST_SED.paths+= -e 's|@PREFIX@|${PREFIX}|g'
65SUBST_SED.paths+= -e 's|erl|${PREFIX}/bin/erl|g' 65SUBST_SED.paths+= -e 's|erl|${PREFIX}/bin/erl|g'
66SUBST_SED.paths+= -e 's|/bin/sh|/bin/ksh|g' 
67SUBST_SED.paths+= -e 's|readlink|${PREFIX}/bin/${GNU_PROGRAM_PREFIX}readlink|g' 66SUBST_SED.paths+= -e 's|readlink|${PREFIX}/bin/${GNU_PROGRAM_PREFIX}readlink|g'
68 67
 68REPLACE_BASH+= ${SCRIPTS_DIR}/rabbitmqctl
 69REPLACE_BASH+= ${SCRIPTS_DIR}/rabbitmq-env
 70REPLACE_BASH+= ${SCRIPTS_DIR}/rabbitmq-server
 71
69MAKE_ENV+= TARGET_DIR="${DESTDIR}${PREFIX}/lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}" 72MAKE_ENV+= TARGET_DIR="${DESTDIR}${PREFIX}/lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}"
70MAKE_ENV+= SBIN_DIR="${DESTDIR}${PREFIX}/sbin/" 73MAKE_ENV+= SBIN_DIR="${DESTDIR}${PREFIX}/sbin/"
71MAKE_ENV+= MAN_DIR="${DESTDIR}${PREFIX}/man" 74MAKE_ENV+= MAN_DIR="${DESTDIR}${PREFIX}/man"
72MAKE_ENV+= RMQ_VERSION=${RMQ_VERSION} 75MAKE_ENV+= RMQ_VERSION=${RMQ_VERSION}
73MAKE_ENV+= MAKE_SHELL="${RMQ_SHELL}" 76MAKE_ENV+= MAKE_SHELL="${RMQ_SHELL}"
74 77
75INSTALL_ENV+= TARGET_DIR="${DESTDIR}${PREFIX}/lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}" 78INSTALL_ENV+= TARGET_DIR="${DESTDIR}${PREFIX}/lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}"
76INSTALL_ENV+= SBIN_DIR="${DESTDIR}${PREFIX}/sbin/" 79INSTALL_ENV+= SBIN_DIR="${DESTDIR}${PREFIX}/sbin/"
77INSTALL_ENV+= MAN_DIR="${DESTDIR}${PREFIX}/man" 80INSTALL_ENV+= MAN_DIR="${DESTDIR}${PREFIX}/man"
78INSTALL_ENV+= RMQ_VERSION=${RMQ_VERSION} 81INSTALL_ENV+= RMQ_VERSION=${RMQ_VERSION}
79INSTALL_ENV+= MAKE_SHELL="${RMQ_SHELL}" 82INSTALL_ENV+= MAKE_SHELL="${RMQ_SHELL}"
80 83
81REPLACE_PYTHON+= calculate-relative 84REPLACE_PYTHON+= calculate-relative