From owner-svn-ports-all@freebsd.org  Sat Apr 23 12:01:13 2016
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 832B8B19B62;
 Sat, 23 Apr 2016 12:01:13 +0000 (UTC) (envelope-from lme@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 539C910E3;
 Sat, 23 Apr 2016 12:01:13 +0000 (UTC) (envelope-from lme@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3NC1Cpj053579;
 Sat, 23 Apr 2016 12:01:12 GMT (envelope-from lme@FreeBSD.org)
Received: (from lme@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3NC1Chs053578;
 Sat, 23 Apr 2016 12:01:12 GMT (envelope-from lme@FreeBSD.org)
Message-Id: <201604231201.u3NC1Chs053578@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: lme set sender to lme@FreeBSD.org
 using -f
From: Lars Engels <lme@FreeBSD.org>
Date: Sat, 23 Apr 2016 12:01:12 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r413866 - head/databases/opentsdb
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 23 Apr 2016 12:01:13 -0000

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: