Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 29 Dec 2015 01:15:45 +0000 (UTC)
From:      Martin Wilke <miwi@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r404713 - in head/databases/opentsdb: . files
Message-ID:  <201512290115.tBT1FjJT019681@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: miwi
Date: Tue Dec 29 01:15:45 2015
New Revision: 404713
URL: https://svnweb.freebsd.org/changeset/ports/404713

Log:
  - Update to 2.1.3
  
  PR:		205666
  Submitted by:	xmj

Modified:
  head/databases/opentsdb/Makefile
  head/databases/opentsdb/distinfo
  head/databases/opentsdb/files/patch-Makefile.in
  head/databases/opentsdb/pkg-plist

Modified: head/databases/opentsdb/Makefile
==============================================================================
--- head/databases/opentsdb/Makefile	Tue Dec 29 01:01:06 2015	(r404712)
+++ head/databases/opentsdb/Makefile	Tue Dec 29 01:15:45 2015	(r404713)
@@ -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
 

Modified: head/databases/opentsdb/distinfo
==============================================================================
--- head/databases/opentsdb/distinfo	Tue Dec 29 01:01:06 2015	(r404712)
+++ head/databases/opentsdb/distinfo	Tue Dec 29 01:15:45 2015	(r404713)
@@ -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

Modified: head/databases/opentsdb/files/patch-Makefile.in
==============================================================================
--- head/databases/opentsdb/files/patch-Makefile.in	Tue Dec 29 01:01:06 2015	(r404712)
+++ head/databases/opentsdb/files/patch-Makefile.in	Tue Dec 29 01:15:45 2015	(r404713)
@@ -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 \

Modified: head/databases/opentsdb/pkg-plist
==============================================================================
--- head/databases/opentsdb/pkg-plist	Tue Dec 29 01:01:06 2015	(r404712)
+++ head/databases/opentsdb/pkg-plist	Tue Dec 29 01:15:45 2015	(r404713)
@@ -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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201512290115.tBT1FjJT019681>