Attachment #164766 for bug #205666

Lines 2-10 Link Here

(-)Makefile (-2 / +2 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= opentsdb	4	PORTNAME= opentsdb
5	PORTVERSION= 2.1.1	5	PORTVERSION= 2.1.3
6	CATEGORIES= databases java	6	CATEGORIES= databases java
7	MASTER_SITES= https://github.com/OpenTSDB/opentsdb/releases/download/${PORTVERSION}/	7	MASTER_SITES= https://github.com/OpenTSDB/opentsdb/releases/download/v${PORTVERSION}/
8		8
9	MAINTAINER= xmj@chaot.net	9	MAINTAINER= xmj@chaot.net
10	COMMENT= OpenTSDB is the Scalable Timeseries Database	10	COMMENT= OpenTSDB is the Scalable Timeseries Database

Lines 1-2 Link Here

(-)distinfo (-2 / +2 lines)
1	SHA256 (opentsdb-2.1.1.tar.gz) = 2b091fd59941a5af21f8fb5195025f541e15d83853f78e1b0ab90db4f36e8b9f	1	SHA256 (opentsdb-2.1.3.tar.gz) = 771a846baf47f987e0ac78a009f558f246896acb1a468ed0a4a8f57f3cf03a16
2	SIZE (opentsdb-2.1.1.tar.gz) = 74609397	2	SIZE (opentsdb-2.1.3.tar.gz) = 74601205




--- Makefile.in.orig	2015-12-28 15:21:05 UTC
+++ Makefile.in
@@ -1366,7 +1366,7 @@ gwttsd: staticroot
 # 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='$(pkgdatadir)/etc/opentsdb'; \
+	script=tsdb; pkgdatadir='$(pkgdatadir)'; configdir='$(sysconfdir)/etc/opentsdb'; \
           abs_srcdir=''; abs_builddir=''; $(edit_tsdb_script)
 	cat tsdb.tmp >"$(DESTDIR)$(bindir)/tsdb"
 	rm -f tsdb.tmp
@@ -1442,7 +1442,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 +1468,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 \

Lines 1-6 Link Here

(-)files/patch-configure (-2 / +2 lines)
1	--- configure.orig 2015-09-12 19:49:18 UTC	1	--- configure.orig 2015-11-11 20:54:56 UTC
2	+++ configure	2	+++ configure
3	@@ -1714,7 +1714,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu	3	@@ -1746,7 +1746,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
4		4
5		5
6	ac_aux_dir=	6	ac_aux_dir=

Lines 14-20 Link Here

(-)pkg-plist (-1 / +1 lines)
14	%%DATADIR%%/lib/netty-3.9.4.Final.jar	14	%%DATADIR%%/lib/netty-3.9.4.Final.jar
15	%%DATADIR%%/lib/protobuf-java-2.5.0.jar	15	%%DATADIR%%/lib/protobuf-java-2.5.0.jar
16	%%DATADIR%%/lib/slf4j-api-1.7.7.jar	16	%%DATADIR%%/lib/slf4j-api-1.7.7.jar
17	%%DATADIR%%/lib/tsdb-2.1.1.jar	17	%%DATADIR%%/lib/tsdb-2.1.3.jar
18	%%DATADIR%%/lib/zookeeper-3.3.6.jar	18	%%DATADIR%%/lib/zookeeper-3.3.6.jar
19	%%DATADIR%%/static/clear.cache.gif	19	%%DATADIR%%/static/clear.cache.gif
20	%%DATADIR%%/static/favicon.ico	20	%%DATADIR%%/static/favicon.ico

Return to bug 205666

Lines 1-24 Link Here

(-)files/patch-Makefile.in (-20 / +2 lines)
1	--- Makefile.in.orig 2015-09-12 19:49:17 UTC	1	--- Makefile.in.orig 2015-12-28 15:21:05 UTC
2	+++ Makefile.in	2	+++ Makefile.in
3	@@ -1415,7 +1415,7 @@ printdeps:	3	@@ -1366,7 +1366,7 @@ gwttsd: staticroot
4	# This is kind of a hack, but I couldn't find a better way to adjust the paths
5	# in the script before it gets installed...
6	install-exec-hook:
7	- script=tsdb; pkgdatadir='$(pkgdatadir)'; configdir='$(pkgdatadir)/etc/opentsdb'; \
8	+ script=tsdb; pkgdatadir='$(pkgdatadir)'; configdir='$(sysconfdir)/etc/opentsdb'; \
9	abs_srcdir=''; abs_builddir=''; $(edit_tsdb_script)
10	cat tsdb.tmp >"$(DESTDIR)$(bindir)/tsdb"
11	rm -f tsdb.tmp
12	@@ -1442,7 +1442,7 @@ gwtc: .gwtc-stamp
13	@$(mkdir_p) gwt
14	{ cd $(srcdir) && cat $(httpui_SRC); } \| $(MD5) >"$@-t"
15	cmp -s "$@" "$@-t" && exit 0; \
16	- $(JAVA) $(GWTC_JVM_ARGS) -cp $(GWT_CLASSPATH) com.google.gwt.dev.Compiler \
17	+ $(JAVA) -Djava.util.prefs.userRoot=$(HOME) $(GWTC_JVM_ARGS) -cp $(GWT_CLASSPATH) com.google.gwt.dev.Compiler \
18	$(GWTC_ARGS) -war gwt tsd.QueryUi
19	@mv "$@-t" "$@"
20	gwtdev: .gwtc-stamp
21	@@ -1468,7 +1468,7 @@ gwttsd: staticroot
22	# how to tell it to install a bunch of files recursively for which I don't	4	# how to tell it to install a bunch of files recursively for which I don't
23	# know ahead of time what the file names are.	5	# know ahead of time what the file names are.
24	install-data-local: staticroot install-data-lib install-data-tools \	6	install-data-local: staticroot install-data-lib install-data-tools \