svn commit: r405363 - in branches/2016Q1/databases/opentsdb: . files

[Martin Wilke]

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"