pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

Fix Bash usage in scripts



Module Name:	pkgsrc-wip
Committed By:	Filip Hajny <filip%joyent.com@localhost>
Pushed By:	fhajny
Date:		Thu Mar 31 18:43:57 2016 +0000
Changeset:	22aaef53af8b04dcf89a6baeb08209223ed648d9

Modified Files:
	riak/Makefile

Log Message:
Fix Bash usage in scripts

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=22aaef53af8b04dcf89a6baeb08209223ed648d9

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

diffstat:
 riak/Makefile | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diffs:
diff --git a/riak/Makefile b/riak/Makefile
index ad98779..cd4fb6b 100644
--- a/riak/Makefile
+++ b/riak/Makefile
@@ -22,7 +22,7 @@ EXTRACT_DIR.${SOLR}=	${WRKSRC}/deps/yokozuna/build
 
 USE_LANGUAGES=		c c++
 USE_LIBTOOL=		yes
-USE_TOOLS+=		gmake
+USE_TOOLS+=		bash:run gmake
 
 MAKE_JOBS_SAFE=		no
 
@@ -70,6 +70,9 @@ SUBST_FILES.pkgsrc+=	deps/cuttlefish/rebar.config
 SUBST_VARS.pkgsrc=	PREFIX PKG_SYSCONFDIR PKGVERSION_NOREV
 SUBST_VARS.pkgsrc+=	RIAK_USER RIAK_DATA RIAK_LOG RIAK_RUN
 
+REPLACE_BASH+=		deps/eper/priv/bin/*
+REPLACE_BASH+=		deps/yokozuna/build/${SOLR:S/.tgz//}/example/etc/create-solrtest.keystore.sh
+
 REPLACE_INTERPRETER+=	escript
 REPLACE.escript.old=	.*escript
 REPLACE.escript.new=	${PREFIX}/bin/escript


Home | Main Index | Thread Index | Old Index