svn commit: r363309 - in head/databases/hbase: . files

[Dmitry Sivachenko]

Author: demon
Date: Tue Jul 29 12:13:59 2014
New Revision: 363309
URL: http://svnweb.freebsd.org/changeset/ports/363309
QAT: https://qat.redports.org/buildarchive/r363309/

Log:
  Install sample configs in EXAMPLESDIR;
  Minor tweaks.

Added:
  head/databases/hbase/files/pkg-message.in   (contents, props changed)
Modified:
  head/databases/hbase/Makefile
  head/databases/hbase/files/hbase-env-dist.sh.in
  head/databases/hbase/pkg-plist

Modified: head/databases/hbase/Makefile
==============================================================================
--- head/databases/hbase/Makefile	Tue Jul 29 12:10:41 2014	(r363308)
+++ head/databases/hbase/Makefile	Tue Jul 29 12:13:59 2014	(r363309)
@@ -36,7 +36,7 @@ HBASE_GROUP=	hbase
 USERS=		${HBASE_USER}
 GROUPS=		${HBASE_GROUP}
 
-SUB_FILES=	hbase-env-dist.sh
+SUB_FILES=	hbase-env-dist.sh pkg-message
 USE_RC_SUBR=    hbase_master hbase_regionserver
 SUB_LIST=	HBASE_USER="${HBASE_USER}" \
 		JAVA_HOME="${JAVA_HOME}" \
@@ -63,8 +63,8 @@ post-build:
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/hbase/bin
 	cd ${HBASE_DIST}/bin && ${INSTALL_SCRIPT} *.sh hbase ${STAGEDIR}${PREFIX}/hbase/bin/
-	${MKDIR} ${STAGEDIR}${ETCDIR}
-	cd ${HBASE_DIST} && ${COPYTREE_SHARE} conf ${STAGEDIR}${PREFIX}/hbase/
+	${MKDIR} ${STAGEDIR}${ETCDIR} ${STAGEDIR}${EXAMPLESDIR}
+	cd ${HBASE_DIST} && ${COPYTREE_SHARE} conf ${STAGEDIR}${EXAMPLESDIR}/
 	${INSTALL_DATA} ${WRKDIR}/hbase-env-dist.sh ${STAGEDIR}${ETCDIR}/
 	cd ${HBASE_DIST}/docs && ${COPYTREE_SHARE} "*" ${STAGEDIR}${DOCSDIR}/
 	cd ${HBASE_DIST} && ${COPYTREE_SHARE} hbase-webapps ${STAGEDIR}${PREFIX}/hbase/

Modified: head/databases/hbase/files/hbase-env-dist.sh.in
==============================================================================
--- head/databases/hbase/files/hbase-env-dist.sh.in	Tue Jul 29 12:10:41 2014	(r363308)
+++ head/databases/hbase/files/hbase-env-dist.sh.in	Tue Jul 29 12:13:59 2014	(r363309)
@@ -1,3 +1,7 @@
+# This file contains FreeBSD-specific configuration parameters.
+# It is not supposed to be edited.  It will be overwritten during upgrades.
+# Edit hbase-env.sh instead.
+
 export JAVA_HOME=%%JAVA_HOME%%
 export HBASE_LOG_DIR=%%HBASE_LOG_DIR%%
 export HBASE_PID_DIR=%%HBASE_PID_DIR%%

Added: head/databases/hbase/files/pkg-message.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/databases/hbase/files/pkg-message.in	Tue Jul 29 12:13:59 2014	(r363309)
@@ -0,0 +1,4 @@
+********************************************************************************
+*           HBase binaries are installed in %%PREFIX%%/hbase/bin/              *
+*           Consider adding this directory to your $PATH.                      *
+********************************************************************************

Modified: head/databases/hbase/pkg-plist
==============================================================================
--- head/databases/hbase/pkg-plist	Tue Jul 29 12:10:41 2014	(r363308)
+++ head/databases/hbase/pkg-plist	Tue Jul 29 12:13:59 2014	(r363309)
@@ -14,12 +14,12 @@ hbase/bin/rolling-restart.sh
 hbase/bin/start-hbase.sh
 hbase/bin/stop-hbase.sh
 hbase/bin/zookeepers.sh
-hbase/conf/hadoop-metrics2-hbase.properties
-hbase/conf/hbase-env.sh
-hbase/conf/hbase-policy.xml
-hbase/conf/hbase-site.xml
-hbase/conf/log4j.properties
-hbase/conf/regionservers
+%%EXAMPLESDIR%%/conf/hadoop-metrics2-hbase.properties
+%%EXAMPLESDIR%%/conf/hbase-env.sh
+%%EXAMPLESDIR%%/conf/hbase-policy.xml
+%%EXAMPLESDIR%%/conf/hbase-site.xml
+%%EXAMPLESDIR%%/conf/log4j.properties
+%%EXAMPLESDIR%%/conf/regionservers
 hbase/hbase-webapps/master/WEB-INF/web.xml
 hbase/hbase-webapps/master/index.html
 hbase/hbase-webapps/regionserver/WEB-INF/web.xml
@@ -9947,7 +9947,6 @@ hbase/lib/zookeeper-3.4.6.jar
 %%PORTDOCS%%%%DOCSDIR%%/zookeeper/zk.sasl.auth.html
 %%PORTDOCS%%%%DOCSDIR%%/zookeeper/zookeeper.html
 @dirrm hbase/bin
- at dirrm hbase/conf
 @dirrm hbase/hbase-webapps/master/WEB-INF
 @dirrm hbase/hbase-webapps/master
 @dirrm hbase/hbase-webapps/regionserver/WEB-INF
@@ -10464,6 +10463,8 @@ hbase/lib/zookeeper-3.4.6.jar
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/xref-test
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/zookeeper
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
+ at dirrm %%EXAMPLESDIR%%/conf
+ at dirrm %%EXAMPLESDIR%%
 @dirrmtry %%ETCDIR%%
 @cwd /
 @owner %%HBASE_USER%%