Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 17 Nov 2014 12:44:18 +0000 (UTC)
From:      Dmitry Sivachenko <demon@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r372664 - in head/databases/hbase: . files
Message-ID:  <201411171244.sAHCiIsl039557@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: demon
Date: Mon Nov 17 12:44:17 2014
New Revision: 372664
URL: https://svnweb.freebsd.org/changeset/ports/372664
QAT: https://qat.redports.org/buildarchive/r372664/

Log:
  Do install hirb.rb.
  Pointed out by:	Piotr Kubaj <pkubaj@riseup.net>
  
  Patch hbase script to use correct location of config directory.

Added:
  head/databases/hbase/files/patch-bin-hbase   (contents, props changed)
Modified:
  head/databases/hbase/Makefile
  head/databases/hbase/pkg-plist

Modified: head/databases/hbase/Makefile
==============================================================================
--- head/databases/hbase/Makefile	Mon Nov 17 11:35:49 2014	(r372663)
+++ head/databases/hbase/Makefile	Mon Nov 17 12:44:17 2014	(r372664)
@@ -3,6 +3,7 @@
 
 PORTNAME=	hbase
 PORTVERSION=	0.98.4
+PORTREVISION=	1
 CATEGORIES=	databases java
 MASTER_SITES=	${MASTER_SITE_APACHE} \
 		LOCAL/demon/:maven \
@@ -51,7 +52,7 @@ PLIST_SUB=	HBASE_USER=${HBASE_USER} \
 		HBASE_RUNDIR=${HBASE_RUNDIR}
 
 post-patch:
-	${REINPLACE_CMD} -e "s#%%ETCDIR%%#${ETCDIR}#" ${WRKSRC}/conf/hbase-env.sh
+	${REINPLACE_CMD} -e "s#%%ETCDIR%%#${ETCDIR}#" ${WRKSRC}/conf/hbase-env.sh ${WRKSRC}/bin/hbase
 	${RM} ${WRKSRC}/conf/hbase-env.sh.bak ${WRKSRC}/conf/hbase-env.sh.orig
 
 do-build:
@@ -65,7 +66,7 @@ post-build:
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/hbase/bin
-	cd ${HBASE_DIST}/bin && ${INSTALL_SCRIPT} *.sh hbase ${STAGEDIR}${PREFIX}/hbase/bin/
+	cd ${HBASE_DIST}/bin && ${INSTALL_SCRIPT} *.sh hbase hirb.rb ${STAGEDIR}${PREFIX}/hbase/bin/
 	${MKDIR} ${STAGEDIR}${ETCDIR} ${STAGEDIR}${EXAMPLESDIR}
 	cd ${HBASE_DIST} && ${COPYTREE_SHARE} conf ${STAGEDIR}${EXAMPLESDIR}/
 	${INSTALL_DATA} ${WRKDIR}/hbase-env-dist.sh ${STAGEDIR}${ETCDIR}/

Added: head/databases/hbase/files/patch-bin-hbase
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/databases/hbase/files/patch-bin-hbase	Mon Nov 17 12:44:17 2014	(r372664)
@@ -0,0 +1,10 @@
+--- bin/hbase.orig	2014-07-14 09:50:03.000000000 +0400
++++ bin/hbase	2014-11-17 15:26:40.000000000 +0300
+@@ -55,6 +55,7 @@
+ bin=`dirname "$0"`
+ bin=`cd "$bin">/dev/null; pwd`
+ 
++export HBASE_CONF_DIR=%%ETCDIR%%
+ # This will set HBASE_HOME, etc.
+ . "$bin"/hbase-config.sh
+ 

Modified: head/databases/hbase/pkg-plist
==============================================================================
--- head/databases/hbase/pkg-plist	Mon Nov 17 11:35:49 2014	(r372663)
+++ head/databases/hbase/pkg-plist	Mon Nov 17 12:44:17 2014	(r372664)
@@ -6,6 +6,7 @@ hbase/bin/hbase-common.sh
 hbase/bin/hbase-config.sh
 hbase/bin/hbase-daemon.sh
 hbase/bin/hbase-daemons.sh
+hbase/bin/hirb.rb
 hbase/bin/local-master-backup.sh
 hbase/bin/local-regionservers.sh
 hbase/bin/master-backup.sh



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201411171244.sAHCiIsl039557>