aboutsummaryrefslogtreecommitdiffstats
path: root/databases
diff options
context:
space:
mode:
authormiwi <miwi@FreeBSD.org>2015-12-29 09:15:45 +0800
committermiwi <miwi@FreeBSD.org>2015-12-29 09:15:45 +0800
commite041c67ed6517b2790846d6b5bda35b4d0ca9fbb (patch)
treeed7f6158ff8835cd29f42a2496c438ddd912f767 /databases
parent815374c27410795efa92c08354821518e5370415 (diff)
downloadfreebsd-ports-gnome-e041c67ed6517b2790846d6b5bda35b4d0ca9fbb.tar.gz
freebsd-ports-gnome-e041c67ed6517b2790846d6b5bda35b4d0ca9fbb.tar.zst
freebsd-ports-gnome-e041c67ed6517b2790846d6b5bda35b4d0ca9fbb.zip
- Update to 2.1.3
PR: 205666 Submitted by: xmj
Diffstat (limited to 'databases')
-rw-r--r--databases/opentsdb/Makefile6
-rw-r--r--databases/opentsdb/distinfo4
-rw-r--r--databases/opentsdb/files/patch-Makefile.in20
-rw-r--r--databases/opentsdb/pkg-plist2
4 files changed, 10 insertions, 22 deletions
diff --git a/databases/opentsdb/Makefile b/databases/opentsdb/Makefile
index cc76b050844a..704683549e8a 100644
--- a/databases/opentsdb/Makefile
+++ b/databases/opentsdb/Makefile
@@ -2,9 +2,9 @@
# $FreeBSD$
PORTNAME= opentsdb
-PORTVERSION= 2.1.1
+PORTVERSION= 2.1.3
CATEGORIES= databases java
-MASTER_SITES= https://github.com/OpenTSDB/opentsdb/releases/download/${PORTVERSION}/
+MASTER_SITES= https://github.com/OpenTSDB/opentsdb/releases/download/v${PORTVERSION}/
MAINTAINER= xmj@chaot.net
COMMENT= OpenTSDB is the Scalable Timeseries Database
@@ -45,7 +45,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}/Makefile.in
+ #${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
diff --git a/databases/opentsdb/distinfo b/databases/opentsdb/distinfo
index 75cf3d84450e..86fbe7f01430 100644
--- a/databases/opentsdb/distinfo
+++ b/databases/opentsdb/distinfo
@@ -1,2 +1,2 @@
-SHA256 (opentsdb-2.1.1.tar.gz) = 2b091fd59941a5af21f8fb5195025f541e15d83853f78e1b0ab90db4f36e8b9f
-SIZE (opentsdb-2.1.1.tar.gz) = 74609397
+SHA256 (opentsdb-2.1.3.tar.gz) = 771a846baf47f987e0ac78a009f558f246896acb1a468ed0a4a8f57f3cf03a16
+SIZE (opentsdb-2.1.3.tar.gz) = 74601205
diff --git a/databases/opentsdb/files/patch-Makefile.in b/databases/opentsdb/files/patch-Makefile.in
index 69ece9a707f9..15c4844ddd66 100644
--- a/databases/opentsdb/files/patch-Makefile.in
+++ b/databases/opentsdb/files/patch-Makefile.in
@@ -1,11 +1,8 @@
---- Makefile.in.orig 2015-09-12 19:49:17 UTC
+--- Makefile.in.orig 2015-11-11 20:54:56 UTC
+++ Makefile.in
-@@ -1415,9 +1415,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...
+@@ -1315,7 +1315,9 @@ printdeps:
install-exec-hook:
-- script=tsdb; pkgdatadir='$(pkgdatadir)'; configdir='$(pkgdatadir)/etc/opentsdb'; \
-+ script=tsdb; pkgdatadir='$(pkgdatadir)'; configdir='$(sysconfdir)/etc/opentsdb'; \
+ 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"
@@ -13,16 +10,7 @@
rm -f tsdb.tmp
$(builddata_SRC): .git/HEAD $(tsdb_SRC) $(top_srcdir)/build-aux/gen_build_data.sh
-@@ -1442,7 +1444,7 @@ gwtc: .gwtc-stamp
- @$(mkdir_p) gwt
- { cd $(srcdir) && cat $(httpui_SRC); } | $(MD5) >"$@-t"
- cmp -s "$@" "$@-t" && exit 0; \
-- $(JAVA) $(GWTC_JVM_ARGS) -cp $(GWT_CLASSPATH) com.google.gwt.dev.Compiler \
-+ $(JAVA) -Djava.util.prefs.userRoot=$(HOME) $(GWTC_JVM_ARGS) -cp $(GWT_CLASSPATH) com.google.gwt.dev.Compiler \
- $(GWTC_ARGS) -war gwt tsd.QueryUi
- @mv "$@-t" "$@"
- gwtdev: .gwtc-stamp
-@@ -1468,7 +1470,7 @@ gwttsd: staticroot
+@@ -1366,7 +1368,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 \
diff --git a/databases/opentsdb/pkg-plist b/databases/opentsdb/pkg-plist
index 0371916f605e..40c1aac8ca0b 100644
--- a/databases/opentsdb/pkg-plist
+++ b/databases/opentsdb/pkg-plist
@@ -14,7 +14,7 @@ bin/tsdb
%%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.1.jar
+%%DATADIR%%/lib/tsdb-2.1.3.jar
%%DATADIR%%/lib/zookeeper-3.3.6.jar
%%DATADIR%%/static/clear.cache.gif
%%DATADIR%%/static/favicon.ico