Attachment #167133 for bug #207292

View | Details | Raw Unified | Return to bug 207292
Collapse All | Expand All

Lines 2-9 Link Here

(-)Makefile (-2 / +1 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= opentsdb	4	PORTNAME= opentsdb
5	PORTVERSION= 2.1.3	5	PORTVERSION= 2.2.0
6	PORTREVISION= 1
7	CATEGORIES= databases java	6	CATEGORIES= databases java
8	MASTER_SITES= https://github.com/OpenTSDB/opentsdb/releases/download/v${PORTVERSION}/	7	MASTER_SITES= https://github.com/OpenTSDB/opentsdb/releases/download/v${PORTVERSION}/
9		8

Lines 1-2 Link Here

(-)distinfo (-2 / +2 lines)
1	SHA256 (opentsdb-2.1.3.tar.gz) = 771a846baf47f987e0ac78a009f558f246896acb1a468ed0a4a8f57f3cf03a16	1	SHA256 (opentsdb-2.2.0.tar.gz) = 5689d4d83ee21f1ce5892d064d6738bfa9fdef99f106f45d5c38eefb9476dfb5
2	SIZE (opentsdb-2.1.3.tar.gz) = 74601205	2	SIZE (opentsdb-2.2.0.tar.gz) = 76793860




--- Makefile.in.orig	2016-02-17 17:48:38 UTC
+++ Makefile.in
@@ -1562,7 +1562,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='$(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
 # 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-4 Link Here

(-)files/patch-configure (-1 / +1 lines)
1	--- configure.orig 2015-09-12 19:49:18 UTC	1	--- configure.orig 2016-02-15 22:38:55 UTC
2	+++ configure	2	+++ configure
3	@@ -1714,7 +1714,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu	3	@@ -1714,7 +1714,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
4		4

Lines 1-10 Link Here

(-)files/patch-src_utils_Config.java (-3 / +3 lines)
1	--- src/utils/Config.java.orig 2015-11-04 10:25:48 UTC	1	--- src/utils/Config.java.orig 2016-02-15 22:56:56 UTC
2	+++ src/utils/Config.java	2	+++ src/utils/Config.java
3	@@ -509,6 +509,7 @@ public class Config {	3	@@ -562,6 +562,7 @@ public class Config {
4	} else {	4	} else {
5	file_locations.add("/etc/opentsdb.conf");	5	file_locations.add("/etc/opentsdb.conf");
6	file_locations.add("/etc/opentsdb/opentsdb.conf");	6	file_locations.add("/etc/opentsdb/opentsdb.conf");
7	+ file_locations.add("%%PREFIX%%/etc/opentsdb/opentsdb.conf");	7	+ file_locations.add("/usr/local/etc/opentsdb/opentsdb.conf");
8	file_locations.add("/opt/opentsdb/opentsdb.conf");	8	file_locations.add("/opt/opentsdb/opentsdb.conf");
9	}	9	}
10		10




%%DATADIR%%/bin/mygnuplot.sh
%%DATADIR%%/bin/tsdb
%%DATADIR%%/lib/async-1.4.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/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.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/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/gwt/standard/images/vborder_ie6.png
%%DATADIR%%/static/gwt/standard/standard.css
%%DATADIR%%/static/gwt/standard/standard_rtl.css
%%DATADIR%%/static/hosted.html
%%DATADIR%%/static/queryui.nocache.js
%%DATADIR%%/tools/check_tsd

Return to bug 207292

Lines 1-19 Link Here

(-)files/patch-Makefile.in (-15 / +2 lines)
1	--- Makefile.in.orig 2015-11-11 20:54:56 UTC	1	--- Makefile.in.orig 2016-02-17 17:48:38 UTC
2	+++ Makefile.in	2	+++ Makefile.in
3	@@ -1313,9 +1313,11 @@ printdeps:	3	@@ -1562,7 +1562,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='$(sysconfigdir)/etc/opentsdb'; \
8	+ script=tsdb; pkgdatadir='$(pkgdatadir)'; configdir='$(sysconfdir)/opentsdb'; \
9	abs_srcdir=''; abs_builddir=''; $(edit_tsdb_script)
10	+ chmod u+w "$(DESTDIR)$(bindir)/tsdb"
11	cat tsdb.tmp >"$(DESTDIR)$(bindir)/tsdb"
12	+ chmod u-w "$(DESTDIR)$(bindir)/tsdb"
13	rm -f tsdb.tmp
14
15	$(builddata_SRC): .git/HEAD $(tsdb_SRC) $(top_srcdir)/build-aux/gen_build_data.sh
16	@@ -1366,7 +1368,7 @@ gwttsd: staticroot
17	# 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
18	# know ahead of time what the file names are.	5	# know ahead of time what the file names are.
19	install-data-local: staticroot install-data-lib install-data-tools \	6	install-data-local: staticroot install-data-lib install-data-tools \

Lines 3-9 Link Here

(-)pkg-plist (-18 / +17 lines)
3	%%DATADIR%%/bin/mygnuplot.sh	3	%%DATADIR%%/bin/mygnuplot.sh
4	%%DATADIR%%/bin/tsdb	4	%%DATADIR%%/bin/tsdb
5	%%DATADIR%%/lib/async-1.4.0.jar	5	%%DATADIR%%/lib/async-1.4.0.jar
6	%%DATADIR%%/lib/asynchbase-1.6.0.jar	6	%%DATADIR%%/lib/asynchbase-1.7.1.jar
		7	%%DATADIR%%/lib/commons-math3-3.4.1.jar
7	%%DATADIR%%/lib/guava-18.0.jar	8	%%DATADIR%%/lib/guava-18.0.jar
8	%%DATADIR%%/lib/jackson-annotations-2.4.3.jar	9	%%DATADIR%%/lib/jackson-annotations-2.4.3.jar
9	%%DATADIR%%/lib/jackson-core-2.4.3.jar	10	%%DATADIR%%/lib/jackson-core-2.4.3.jar
Lines 14-38 Link Here
14	%%DATADIR%%/lib/netty-3.9.4.Final.jar	15	%%DATADIR%%/lib/netty-3.9.4.Final.jar
15	%%DATADIR%%/lib/protobuf-java-2.5.0.jar	16	%%DATADIR%%/lib/protobuf-java-2.5.0.jar
16	%%DATADIR%%/lib/slf4j-api-1.7.7.jar	17	%%DATADIR%%/lib/slf4j-api-1.7.7.jar
17	%%DATADIR%%/lib/tsdb-2.1.3.jar	18	%%DATADIR%%/lib/tsdb-2.2.0.jar
18	%%DATADIR%%/lib/zookeeper-3.3.6.jar	19	%%DATADIR%%/lib/zookeeper-3.4.5.jar
19	%%DATADIR%%/static/clear.cache.gif	20	%%DATADIR%%/static/clear.cache.gif
		21	%%DATADIR%%/static/opentsdb_header.jpg
20	%%DATADIR%%/static/favicon.ico	22	%%DATADIR%%/static/favicon.ico
21	%%DATADIR%%/static/gwt/standard/images/corner.png	23	%%DATADIR%%/static/gwt/opentsdb/images/corner.png
22	%%DATADIR%%/static/gwt/standard/images/corner_ie6.png	24	%%DATADIR%%/static/gwt/opentsdb/images/hborder.png
23	%%DATADIR%%/static/gwt/standard/images/hborder.png	25	%%DATADIR%%/static/gwt/opentsdb/images/ie6/corner_dialog_topleft.png
24	%%DATADIR%%/static/gwt/standard/images/hborder_ie6.png	26	%%DATADIR%%/static/gwt/opentsdb/images/ie6/corner_dialog_topright.png
25	%%DATADIR%%/static/gwt/standard/images/ie6/corner_dialog_topleft.png	27	%%DATADIR%%/static/gwt/opentsdb/images/ie6/hborder_blue_shadow.png
26	%%DATADIR%%/static/gwt/standard/images/ie6/corner_dialog_topright.png	28	%%DATADIR%%/static/gwt/opentsdb/images/ie6/hborder_gray_shadow.png
27	%%DATADIR%%/static/gwt/standard/images/ie6/hborder_blue_shadow.png	29	%%DATADIR%%/static/gwt/opentsdb/images/ie6/vborder_blue_shadow.png
28	%%DATADIR%%/static/gwt/standard/images/ie6/hborder_gray_shadow.png	30	%%DATADIR%%/static/gwt/opentsdb/images/ie6/vborder_gray_shadow.png
29	%%DATADIR%%/static/gwt/standard/images/ie6/vborder_blue_shadow.png	31	%%DATADIR%%/static/gwt/opentsdb/images/splitPanelThumb.png
30	%%DATADIR%%/static/gwt/standard/images/ie6/vborder_gray_shadow.png	32	%%DATADIR%%/static/gwt/opentsdb/images/vborder.png
31	%%DATADIR%%/static/gwt/standard/images/splitPanelThumb.png	33	%%DATADIR%%/static/gwt/opentsdb/opentsdb.css
32	%%DATADIR%%/static/gwt/standard/images/vborder.png	34	%%DATADIR%%/static/gwt/opentsdb/opentsdb_rtl.css
33	%%DATADIR%%/static/gwt/standard/images/vborder_ie6.png
34	%%DATADIR%%/static/gwt/standard/standard.css
35	%%DATADIR%%/static/gwt/standard/standard_rtl.css
36	%%DATADIR%%/static/hosted.html	35	%%DATADIR%%/static/hosted.html
37	%%DATADIR%%/static/queryui.nocache.js	36	%%DATADIR%%/static/queryui.nocache.js
38	%%DATADIR%%/tools/check_tsd	37	%%DATADIR%%/tools/check_tsd