Index: head/databases/opentsdb/Makefile
===================================================================
--- head/databases/opentsdb/Makefile	(revision 409368)
+++ head/databases/opentsdb/Makefile	(revision 409369)
@@ -1,57 +1,58 @@
 # Created by: Johannes Meixner <xmj@chaot.net>
 # $FreeBSD$
 
 PORTNAME=	opentsdb
 PORTVERSION=	2.2.0
+PORTREVISION=	1
 CATEGORIES=	databases java
 MASTER_SITES=	https://github.com/OpenTSDB/opentsdb/releases/download/v${PORTVERSION}/
 
 MAINTAINER=	xmj@chaot.net
 COMMENT=	OpenTSDB is the Scalable Timeseries Database
 
 LICENSE=	LGPL3
 
 BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash \
 		curl:${PORTSDIR}/ftp/curl \
 		gawk:${PORTSDIR}/lang/gawk
 LIB_DEPENDS=	libhadoop.so:${PORTSDIR}/devel/hadoop2
 RUN_DEPENDS=	hbase>0:${PORTSDIR}/databases/hbase
 
 USES=		gmake python
 USE_JAVA=	yes
 
 OPTIONS_DEFINE=		GNUPLOT
 OPTIONS_DEFAULT=	GNUPLOT
 
 GNUPLOT_RUN_DEPENDS=	gnuplot:${PORTSDIR}/math/gnuplot
 
 HAS_CONFIGURE=	yes
 MAKE_JOBS_UNSAFE=	yes
 
 OPENTSDB_LOGDIR=	/var/log/${PORTNAME}
 OPENTSDB_RUNDIR=	/var/run/${PORTNAME}
 
 OPENTSDB_USER=	opentsdb
 OPENTSDB_GROUP=	opentsdb
 
 USERS=		${OPENTSDB_USER}
 GROUPS=		${OPENTSDB_GROUP}
 
 USE_RC_SUBR=	opentsdb
 
 SUB_LIST=	OPENTSDB_USER="${OPENTSDB_USER}" \
 		OPENTSDB_LOGDIR="${OPENTSDB_LOGDIR}" \
 		OPENTSDB_RUNDIR="${OPENTSDB_RUNDIR}"
 
 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} -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:
 	${MKDIR} ${STAGEDIR}${ETCDIR} ${STAGEDIR}${OPENTSDB_LOGDIR} ${STAGEDIR}${OPENTSDB_RUNDIR}
 	${INSTALL_DATA} ${WRKSRC}/src/logback.xml ${STAGEDIR}${ETCDIR}
 	${INSTALL_DATA} ${WRKSRC}/src/opentsdb.conf ${STAGEDIR}${ETCDIR}/opentsdb.conf.sample
 	(cd "${STAGEDIR}${PREFIX}"; ${FIND} -s share/${PORTNAME}/static -name \*cache.html) >> ${TMPPLIST}
 
 .include <bsd.port.mk>
Index: head/databases/opentsdb/files/patch-Makefile.in
===================================================================
--- head/databases/opentsdb/files/patch-Makefile.in	(revision 409368)
+++ head/databases/opentsdb/files/patch-Makefile.in	(revision 409369)
@@ -1,11 +1,24 @@
---- Makefile.in.orig	2016-02-17 17:48:38 UTC
+The first hunk is to allow building as a user.
+Do not remove it unless it really builds as a user.
+
+--- Makefile.in.orig	2016-02-15 22:38:55 UTC
 +++ Makefile.in
-@@ -1562,7 +1562,7 @@ gwttsd: staticroot
+@@ -1511,7 +1511,9 @@ printdeps:
+ install-exec-hook:
+ 	script=tsdb; pkgdatadir='$(pkgdatadir)'; configdir='$(sysconfigdir)/etc/opentsdb'; \
+           abs_srcdir=''; abs_builddir=''; $(edit_tsdb_script)
++	chmod u+w "$(DESTDIR)$(bindir)/tsdb"
+ 	cat tsdb.tmp >"$(DESTDIR)$(bindir)/tsdb"
++	chmod u-w "$(DESTDIR)$(bindir)/tsdb"
+ 	rm -f tsdb.tmp
+ 
+ $(builddata_SRC): .git/HEAD $(tsdb_SRC) $(top_srcdir)/build-aux/gen_build_data.sh
+@@ -1562,7 +1564,7 @@ gwttsd: staticroot
  # how to tell it to install a bunch of files recursively for which I don't
  # know ahead of time what the file names are.
  install-data-local: staticroot install-data-lib install-data-tools \
 -    install-data-bin install-data-etc
 +    install-data-bin
  	@$(NORMAL_INSTALL)
  	test -z "$(staticdir)" || $(mkdir_p) "$(DESTDIR)$(staticdir)"
  	@set -e; pwd; ls -lFh; cd "$(DEV_TSD_STATICROOT)"; \
Index: head/databases/opentsdb/files/patch-src_utils_Config.java
===================================================================
--- head/databases/opentsdb/files/patch-src_utils_Config.java	(revision 409368)
+++ head/databases/opentsdb/files/patch-src_utils_Config.java	(revision 409369)
@@ -1,10 +1,10 @@
 --- src/utils/Config.java.orig	2016-02-15 22:56:56 UTC
 +++ src/utils/Config.java
 @@ -562,6 +562,7 @@ public class Config {
      } else {
        file_locations.add("/etc/opentsdb.conf");
        file_locations.add("/etc/opentsdb/opentsdb.conf");
-+      file_locations.add("/usr/local/etc/opentsdb/opentsdb.conf");
++      file_locations.add("%%PREFIX%%/etc/opentsdb/opentsdb.conf");
        file_locations.add("/opt/opentsdb/opentsdb.conf");
      }