Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 23 Apr 2016 12:01:12 +0000 (UTC)
From:      Lars Engels <lme@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r413866 - head/databases/opentsdb
Message-ID:  <201604231201.u3NC1Chs053578@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: lme
Date: Sat Apr 23 12:01:12 2016
New Revision: 413866
URL: https://svnweb.freebsd.org/changeset/ports/413866

Log:
  - Use shebangfix for check_tsd
  - Use Java 1.8+
  - Bump PORTREVISION
  
  PR:		        208531
  Submitted by:	Johan Ström <johan@stromnet.se>
  Approved by:	maintainer
  Sponsored by:	Essen Linuxhotel Hackathon 2016

Modified:
  head/databases/opentsdb/Makefile

Modified: head/databases/opentsdb/Makefile
==============================================================================
--- head/databases/opentsdb/Makefile	Sat Apr 23 11:51:10 2016	(r413865)
+++ head/databases/opentsdb/Makefile	Sat Apr 23 12:01:12 2016	(r413866)
@@ -3,7 +3,7 @@
 
 PORTNAME=	opentsdb
 PORTVERSION=	2.2.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	databases java
 MASTER_SITES=	https://github.com/OpenTSDB/opentsdb/releases/download/v${PORTVERSION}/
 
@@ -18,8 +18,11 @@ BUILD_DEPENDS=	bash:shells/bash \
 LIB_DEPENDS=	libhadoop.so:devel/hadoop2
 RUN_DEPENDS=	hbase>0:databases/hbase
 
-USES=		gmake python
+USES=		gmake python shebangfix
 USE_JAVA=	yes
+JAVA_VERSION=	1.8+
+SHEBANG_FILES=	tools/check_tsd tools/opentsdb_restart.py \
+		tools/tsddrain.py
 
 OPTIONS_DEFINE=		GNUPLOT
 OPTIONS_DEFAULT=	GNUPLOT
@@ -47,6 +50,7 @@ SUB_LIST=	OPENTSDB_USER="${OPENTSDB_USER
 post-patch:
 	${REINPLACE_CMD} -i "" -e "s|python|${PYTHON_CMD}|" ${WRKSRC}/build-aux/gen_build_data.sh
 	${REINPLACE_CMD} -i "" -e "s|%%PREFIX%%|${PREFIX}|" ${WRKSRC}/src/utils/Config.java
+	${REINPLACE_CMD} -e "s#%%JAVA_VERSION%%#${JAVA_VERSION}#" ${WRKSRC}/tsdb.in
 	${REINPLACE_CMD} -i "" -e "s|tsd.http.staticroot =|tsd.http.staticroot = ${DATADIR}/static|; s|tsd.http.cachedir =|tsd.http.cachedir = /tmp/opentsdb|; s|tsd.network.port =|tsd.network.port = 4242|;" ${WRKSRC}/src/opentsdb.conf
 
 post-install:



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