Index: head/databases/opentsdb/Makefile =================================================================== --- head/databases/opentsdb/Makefile (revision 409312) +++ head/databases/opentsdb/Makefile (revision 409313) @@ -1,58 +1,57 @@ # Created by: Johannes Meixner # $FreeBSD$ PORTNAME= opentsdb -PORTVERSION= 2.1.3 -PORTREVISION= 1 +PORTVERSION= 2.2.0 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 Index: head/databases/opentsdb/distinfo =================================================================== --- head/databases/opentsdb/distinfo (revision 409312) +++ head/databases/opentsdb/distinfo (revision 409313) @@ -1,2 +1,2 @@ -SHA256 (opentsdb-2.1.3.tar.gz) = 771a846baf47f987e0ac78a009f558f246896acb1a468ed0a4a8f57f3cf03a16 -SIZE (opentsdb-2.1.3.tar.gz) = 74601205 +SHA256 (opentsdb-2.2.0.tar.gz) = 5689d4d83ee21f1ce5892d064d6738bfa9fdef99f106f45d5c38eefb9476dfb5 +SIZE (opentsdb-2.2.0.tar.gz) = 76793860 Index: head/databases/opentsdb/files/patch-Makefile.in =================================================================== --- head/databases/opentsdb/files/patch-Makefile.in (revision 409312) +++ head/databases/opentsdb/files/patch-Makefile.in (revision 409313) @@ -1,24 +1,11 @@ ---- Makefile.in.orig 2015-11-11 20:54:56 UTC +--- Makefile.in.orig 2016-02-17 17:48:38 UTC +++ Makefile.in -@@ -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='$(sysconfdir)/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 -@@ -1366,7 +1368,7 @@ gwttsd: staticroot +@@ -1562,7 +1562,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-configure =================================================================== --- head/databases/opentsdb/files/patch-configure (revision 409312) +++ head/databases/opentsdb/files/patch-configure (revision 409313) @@ -1,11 +1,11 @@ ---- configure.orig 2015-09-12 19:49:18 UTC +--- configure.orig 2016-02-15 22:38:55 UTC +++ configure @@ -1714,7 +1714,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu ac_aux_dir= -for ac_dir in build-aux "$srcdir"/build-aux; do +for ac_dir in `pwd`/build-aux; do if test -f "$ac_dir/install-sh"; then ac_aux_dir=$ac_dir ac_install_sh="$ac_aux_dir/install-sh -c" Index: head/databases/opentsdb/files/patch-src_utils_Config.java =================================================================== --- head/databases/opentsdb/files/patch-src_utils_Config.java (revision 409312) +++ head/databases/opentsdb/files/patch-src_utils_Config.java (revision 409313) @@ -1,10 +1,10 @@ ---- src/utils/Config.java.orig 2015-11-04 10:25:48 UTC +--- src/utils/Config.java.orig 2016-02-15 22:56:56 UTC +++ src/utils/Config.java -@@ -509,6 +509,7 @@ public class Config { +@@ -562,6 +562,7 @@ public class Config { } else { file_locations.add("/etc/opentsdb.conf"); file_locations.add("/etc/opentsdb/opentsdb.conf"); -+ file_locations.add("%%PREFIX%%/etc/opentsdb/opentsdb.conf"); ++ file_locations.add("/usr/local/etc/opentsdb/opentsdb.conf"); file_locations.add("/opt/opentsdb/opentsdb.conf"); } Index: head/databases/opentsdb/pkg-plist =================================================================== --- head/databases/opentsdb/pkg-plist (revision 409312) +++ head/databases/opentsdb/pkg-plist (revision 409313) @@ -1,47 +1,46 @@ bin/tsdb %%DATADIR%%/bin/mygnuplot.bat %%DATADIR%%/bin/mygnuplot.sh %%DATADIR%%/bin/tsdb %%DATADIR%%/lib/async-1.4.0.jar -%%DATADIR%%/lib/asynchbase-1.6.0.jar +%%DATADIR%%/lib/asynchbase-1.7.1.jar +%%DATADIR%%/lib/commons-math3-3.4.1.jar %%DATADIR%%/lib/guava-18.0.jar %%DATADIR%%/lib/jackson-annotations-2.4.3.jar %%DATADIR%%/lib/jackson-core-2.4.3.jar %%DATADIR%%/lib/jackson-databind-2.4.3.jar %%DATADIR%%/lib/log4j-over-slf4j-1.7.7.jar %%DATADIR%%/lib/logback-classic-1.0.13.jar %%DATADIR%%/lib/logback-core-1.0.13.jar %%DATADIR%%/lib/netty-3.9.4.Final.jar %%DATADIR%%/lib/protobuf-java-2.5.0.jar %%DATADIR%%/lib/slf4j-api-1.7.7.jar -%%DATADIR%%/lib/tsdb-2.1.3.jar -%%DATADIR%%/lib/zookeeper-3.3.6.jar +%%DATADIR%%/lib/tsdb-2.2.0.jar +%%DATADIR%%/lib/zookeeper-3.4.5.jar %%DATADIR%%/static/clear.cache.gif +%%DATADIR%%/static/opentsdb_header.jpg %%DATADIR%%/static/favicon.ico -%%DATADIR%%/static/gwt/standard/images/corner.png -%%DATADIR%%/static/gwt/standard/images/corner_ie6.png -%%DATADIR%%/static/gwt/standard/images/hborder.png -%%DATADIR%%/static/gwt/standard/images/hborder_ie6.png -%%DATADIR%%/static/gwt/standard/images/ie6/corner_dialog_topleft.png -%%DATADIR%%/static/gwt/standard/images/ie6/corner_dialog_topright.png -%%DATADIR%%/static/gwt/standard/images/ie6/hborder_blue_shadow.png -%%DATADIR%%/static/gwt/standard/images/ie6/hborder_gray_shadow.png -%%DATADIR%%/static/gwt/standard/images/ie6/vborder_blue_shadow.png -%%DATADIR%%/static/gwt/standard/images/ie6/vborder_gray_shadow.png -%%DATADIR%%/static/gwt/standard/images/splitPanelThumb.png -%%DATADIR%%/static/gwt/standard/images/vborder.png -%%DATADIR%%/static/gwt/standard/images/vborder_ie6.png -%%DATADIR%%/static/gwt/standard/standard.css -%%DATADIR%%/static/gwt/standard/standard_rtl.css +%%DATADIR%%/static/gwt/opentsdb/images/corner.png +%%DATADIR%%/static/gwt/opentsdb/images/hborder.png +%%DATADIR%%/static/gwt/opentsdb/images/ie6/corner_dialog_topleft.png +%%DATADIR%%/static/gwt/opentsdb/images/ie6/corner_dialog_topright.png +%%DATADIR%%/static/gwt/opentsdb/images/ie6/hborder_blue_shadow.png +%%DATADIR%%/static/gwt/opentsdb/images/ie6/hborder_gray_shadow.png +%%DATADIR%%/static/gwt/opentsdb/images/ie6/vborder_blue_shadow.png +%%DATADIR%%/static/gwt/opentsdb/images/ie6/vborder_gray_shadow.png +%%DATADIR%%/static/gwt/opentsdb/images/splitPanelThumb.png +%%DATADIR%%/static/gwt/opentsdb/images/vborder.png +%%DATADIR%%/static/gwt/opentsdb/opentsdb.css +%%DATADIR%%/static/gwt/opentsdb/opentsdb_rtl.css %%DATADIR%%/static/hosted.html %%DATADIR%%/static/queryui.nocache.js %%DATADIR%%/tools/check_tsd %%DATADIR%%/tools/clean_cache.sh %%DATADIR%%/tools/create_table.sh %%DATADIR%%/tools/opentsdb_restart.py %%DATADIR%%/tools/tsddrain.py %%DATADIR%%/tools/upgrade_1to2.sh %%ETCDIR%%/logback.xml @sample %%ETCDIR%%/opentsdb.conf.sample @dir(opentsdb,opentsdb,750) /var/log/opentsdb @dir(opentsdb,opentsdb,750) /var/run/opentsdb