From owner-svn-ports-branches@freebsd.org  Wed Jan  6 15:55:42 2016
Return-Path: <owner-svn-ports-branches@freebsd.org>
Delivered-To: svn-ports-branches@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 19DB3A4ECB1;
 Wed,  6 Jan 2016 15:55:42 +0000 (UTC)
 (envelope-from miwi@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 C7FB11FB4;
 Wed,  6 Jan 2016 15:55:41 +0000 (UTC)
 (envelope-from miwi@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u06FteS0006940;
 Wed, 6 Jan 2016 15:55:40 GMT (envelope-from miwi@FreeBSD.org)
Received: (from miwi@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u06FteX6006938;
 Wed, 6 Jan 2016 15:55:40 GMT (envelope-from miwi@FreeBSD.org)
Message-Id: <201601061555.u06FteX6006938@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: miwi set sender to
 miwi@FreeBSD.org using -f
From: Martin Wilke <miwi@FreeBSD.org>
Date: Wed, 6 Jan 2016 15:55:40 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-branches@freebsd.org
Subject: svn commit: r405363 - in branches/2016Q1/databases/opentsdb: . files
X-SVN-Group: ports-branches
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-branches@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for all the branches of the ports tree
 <svn-ports-branches.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-branches>, 
 <mailto:svn-ports-branches-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-branches/>
List-Post: <mailto:svn-ports-branches@freebsd.org>
List-Help: <mailto:svn-ports-branches-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-branches>, 
 <mailto:svn-ports-branches-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 06 Jan 2016 15:55:42 -0000

Author: miwi
Date: Wed Jan  6 15:55:40 2016
New Revision: 405363
URL: https://svnweb.freebsd.org/changeset/ports/405363

Log:
  MFH: r405340
  
  - Fix wrong path searching for logback.xml
  - While here remove unused sed line
  - Bump PORTREVISION
  
  PR:		205868
  Submitted by:	Davide D'Amico (based on)
  Approved by:	Johannes Jost Meixner (maintainer)
  Approved by:    portmgr blanket

Modified:
  branches/2016Q1/databases/opentsdb/Makefile
  branches/2016Q1/databases/opentsdb/files/patch-Makefile.in   (contents, props changed)
Directory Properties:
  branches/2016Q1/   (props changed)

Modified: branches/2016Q1/databases/opentsdb/Makefile
==============================================================================
--- branches/2016Q1/databases/opentsdb/Makefile	Wed Jan  6 15:37:07 2016	(r405362)
+++ branches/2016Q1/databases/opentsdb/Makefile	Wed Jan  6 15:55:40 2016	(r405363)
@@ -3,6 +3,7 @@
 
 PORTNAME=	opentsdb
 PORTVERSION=	2.1.3
+PORTREVISION=	1
 CATEGORIES=	databases java
 MASTER_SITES=	https://github.com/OpenTSDB/opentsdb/releases/download/v${PORTVERSION}/
 
@@ -45,7 +46,6 @@ 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}/Makefile.in
 	${REINPLACE_CMD} -i "" -e "s|%%PREFIX%%|${PREFIX}|" ${WRKSRC}/src/utils/Config.java
 	${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
 

Modified: branches/2016Q1/databases/opentsdb/files/patch-Makefile.in
==============================================================================
--- branches/2016Q1/databases/opentsdb/files/patch-Makefile.in	Wed Jan  6 15:37:07 2016	(r405362)
+++ branches/2016Q1/databases/opentsdb/files/patch-Makefile.in	Wed Jan  6 15:55:40 2016	(r405363)
@@ -1,8 +1,11 @@
 --- Makefile.in.orig	2015-11-11 20:54:56 UTC
 +++ Makefile.in
-@@ -1315,7 +1315,9 @@ printdeps:
+@@ -1313,9 +1313,11 @@ printdeps:
+ # This is kind of a hack, but I couldn't find a better way to adjust the paths
+ # in the script before it gets installed...
  install-exec-hook:
- 	script=tsdb; pkgdatadir='$(pkgdatadir)'; configdir='$(sysconfigdir)/etc/opentsdb'; \
+-	script=tsdb; pkgdatadir='$(pkgdatadir)'; configdir='$(sysconfigdir)/etc/opentsdb'; \
++	script=tsdb; pkgdatadir='$(pkgdatadir)'; configdir='$(sysconfdir)/opentsdb'; \
            abs_srcdir=''; abs_builddir=''; $(edit_tsdb_script)
 +	chmod u+w "$(DESTDIR)$(bindir)/tsdb"
  	cat tsdb.tmp >"$(DESTDIR)$(bindir)/tsdb"