3 files changed, 30 insertions, 24 deletions

diff --git a/databases/hbase/Makefile b/databases/hbase/Makefile
index 25ff4699c2e7..69a363d28480 100644
--- a/databases/hbase/Makefile
+++ b/databases/hbase/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	hbase
-PORTVERSION=	0.98.4
-PORTREVISION=	1
+PORTVERSION=	0.98.9
 CATEGORIES=	databases java
 MASTER_SITES=	${MASTER_SITE_APACHE} \
 		LOCAL/demon/:maven \
@@ -49,7 +48,8 @@ SUB_LIST=	HBASE_USER="${HBASE_USER}" \
 PLIST_SUB=	HBASE_USER=${HBASE_USER} \
 		HBASE_GROUP=${HBASE_GROUP} \
 		HBASE_LOGDIR=${HBASE_LOGDIR} \
-		HBASE_RUNDIR=${HBASE_RUNDIR}
+		HBASE_RUNDIR=${HBASE_RUNDIR} \
+		PORTVERSION="${PORTVERSION}"
 
 post-patch:
 	${REINPLACE_CMD} -e "s#%%ETCDIR%%#${ETCDIR}#" ${WRKSRC}/conf/hbase-env.sh ${WRKSRC}/bin/hbase
diff --git a/databases/hbase/distinfo b/databases/hbase/distinfo
index 650c4f258198..a39c7bae1951 100644
--- a/databases/hbase/distinfo
+++ b/databases/hbase/distinfo
@@ -1,4 +1,4 @@
-SHA256 (hadoop/hbase-0.98.4-src.tar.gz) = 1ae25f98984af45c82f73638f8c0470a78b1fb68e4283341d08286ccb42bc326
-SIZE (hadoop/hbase-0.98.4-src.tar.gz) = 5567055
-SHA256 (hadoop/FreeBSD-hbase-0.98.4-maven-repository.tar.gz) = fa6afdb324e4d9d656e2e8801b7ebd411f038036409a96d9e23f35eaa5511216
-SIZE (hadoop/FreeBSD-hbase-0.98.4-maven-repository.tar.gz) = 143584202
+SHA256 (hadoop/hbase-0.98.9-src.tar.gz) = 351ea47325386323c9d9be6c0c7f01721b19924ffaf0471e962672bca1773846
+SIZE (hadoop/hbase-0.98.9-src.tar.gz) = 7611646
+SHA256 (hadoop/FreeBSD-hbase-0.98.9-maven-repository.tar.gz) = db6382b65a3aad48f9a42eece7ac498a9fe73ed1f06e10eb51e0bb959097c4db
+SIZE (hadoop/FreeBSD-hbase-0.98.9-maven-repository.tar.gz) = 146124469
diff --git a/databases/hbase/pkg-plist b/databases/hbase/pkg-plist
index e5297f1e9acd..466d8a1d8ed0 100644
--- a/databases/hbase/pkg-plist
+++ b/databases/hbase/pkg-plist
@@ -25,7 +25,6 @@ hbase/hbase-webapps/master/WEB-INF/web.xml
 hbase/hbase-webapps/master/index.html
 hbase/hbase-webapps/regionserver/WEB-INF/web.xml
 hbase/hbase-webapps/regionserver/index.html
-hbase/hbase-webapps/rest/WEB-INF/web.xml
 hbase/hbase-webapps/rest/index.html
 hbase/hbase-webapps/static/css/bootstrap-theme.css
 hbase/hbase-webapps/static/css/bootstrap-theme.min.css
@@ -76,21 +75,24 @@ hbase/lib/guava-12.0.1.jar
 hbase/lib/guice-3.0.jar
 hbase/lib/guice-servlet-3.0.jar
 hbase/lib/hamcrest-core-1.3.jar
-hbase/lib/hbase-client-0.98.4.jar
-hbase/lib/hbase-common-0.98.4-tests.jar
-hbase/lib/hbase-common-0.98.4.jar
-hbase/lib/hbase-examples-0.98.4.jar
-hbase/lib/hbase-hadoop-compat-0.98.4.jar
-hbase/lib/hbase-hadoop2-compat-0.98.4.jar
-hbase/lib/hbase-it-0.98.4-tests.jar
-hbase/lib/hbase-it-0.98.4.jar
-hbase/lib/hbase-prefix-tree-0.98.4.jar
-hbase/lib/hbase-protocol-0.98.4.jar
-hbase/lib/hbase-server-0.98.4-tests.jar
-hbase/lib/hbase-server-0.98.4.jar
-hbase/lib/hbase-shell-0.98.4.jar
-hbase/lib/hbase-testing-util-0.98.4.jar
-hbase/lib/hbase-thrift-0.98.4.jar
+hbase/lib/hbase-annotations-%%PORTVERSION%%.jar
+hbase/lib/hbase-checkstyle-%%PORTVERSION%%.jar
+hbase/lib/hbase-client-%%PORTVERSION%%.jar
+hbase/lib/hbase-common-%%PORTVERSION%%-tests.jar
+hbase/lib/hbase-common-%%PORTVERSION%%.jar
+hbase/lib/hbase-examples-%%PORTVERSION%%.jar
+hbase/lib/hbase-hadoop-compat-%%PORTVERSION%%.jar
+hbase/lib/hbase-hadoop2-compat-%%PORTVERSION%%.jar
+hbase/lib/hbase-it-%%PORTVERSION%%-tests.jar
+hbase/lib/hbase-it-%%PORTVERSION%%.jar
+hbase/lib/hbase-prefix-tree-%%PORTVERSION%%.jar
+hbase/lib/hbase-protocol-%%PORTVERSION%%.jar
+hbase/lib/hbase-rest-%%PORTVERSION%%.jar
+hbase/lib/hbase-server-%%PORTVERSION%%-tests.jar
+hbase/lib/hbase-server-%%PORTVERSION%%.jar
+hbase/lib/hbase-shell-%%PORTVERSION%%.jar
+hbase/lib/hbase-testing-util-%%PORTVERSION%%.jar
+hbase/lib/hbase-thrift-%%PORTVERSION%%.jar
 hbase/lib/high-scale-lib-1.1.1.jar
 hbase/lib/htrace-core-2.04.jar
 hbase/lib/httpclient-4.1.3.jar
@@ -107,6 +109,7 @@ hbase/lib/javax.servlet-3.1.jar
 hbase/lib/javax.servlet-api-3.0.1.jar
 hbase/lib/jaxb-api-2.2.2.jar
 hbase/lib/jaxb-impl-2.2.3-1.jar
+hbase/lib/jcodings-1.0.8.jar
 hbase/lib/jersey-client-1.9.jar
 hbase/lib/jersey-core-1.8.jar
 hbase/lib/jersey-grizzly2-1.9.jar
@@ -120,6 +123,7 @@ hbase/lib/jettison-1.3.1.jar
 hbase/lib/jetty-6.1.26.jar
 hbase/lib/jetty-sslengine-6.1.26.jar
 hbase/lib/jetty-util-6.1.26.jar
+hbase/lib/joni-2.1.2.jar
 hbase/lib/jruby-complete-1.6.8.jar
 hbase/lib/jsch-0.1.42.jar
 hbase/lib/jsp-2.1-6.1.14.jar
@@ -161,10 +165,12 @@ hbase/lib/ruby/shell/commands/clear_auths.rb
 hbase/lib/ruby/shell/commands/clone_snapshot.rb
 hbase/lib/ruby/shell/commands/close_region.rb
 hbase/lib/ruby/shell/commands/compact.rb
+hbase/lib/ruby/shell/commands/compact_rs.rb
 hbase/lib/ruby/shell/commands/count.rb
 hbase/lib/ruby/shell/commands/create.rb
 hbase/lib/ruby/shell/commands/create_namespace.rb
 hbase/lib/ruby/shell/commands/delete.rb
+hbase/lib/ruby/shell/commands/delete_all_snapshot.rb
 hbase/lib/ruby/shell/commands/delete_snapshot.rb
 hbase/lib/ruby/shell/commands/deleteall.rb
 hbase/lib/ruby/shell/commands/describe.rb
@@ -190,6 +196,7 @@ hbase/lib/ruby/shell/commands/incr.rb
 hbase/lib/ruby/shell/commands/is_disabled.rb
 hbase/lib/ruby/shell/commands/is_enabled.rb
 hbase/lib/ruby/shell/commands/list.rb
+hbase/lib/ruby/shell/commands/list_labels.rb
 hbase/lib/ruby/shell/commands/list_namespace.rb
 hbase/lib/ruby/shell/commands/list_namespace_tables.rb
 hbase/lib/ruby/shell/commands/list_peers.rb
@@ -200,7 +207,6 @@ hbase/lib/ruby/shell/commands/merge_region.rb
 hbase/lib/ruby/shell/commands/move.rb
 hbase/lib/ruby/shell/commands/put.rb
 hbase/lib/ruby/shell/commands/remove_peer.rb
-hbase/lib/ruby/shell/commands/rename_snapshot.rb
 hbase/lib/ruby/shell/commands/restore_snapshot.rb
 hbase/lib/ruby/shell/commands/revoke.rb
 hbase/lib/ruby/shell/commands/scan.rb