svn commit: r409369 - in head/databases/opentsdb: . files

[Mathieu Arnold]

Author: mat
Date: Mon Feb 22 20:13:01 2016
New Revision: 409369
URL: https://svnweb.freebsd.org/changeset/ports/409369

Log:
  Fix build as a user. Again.
  
  While there, make the port prefix safe, again.
  
  Sponsored by:	Absolight

Modified:
  head/databases/opentsdb/Makefile
  head/databases/opentsdb/files/patch-Makefile.in
  head/databases/opentsdb/files/patch-src_utils_Config.java

Modified: head/databases/opentsdb/Makefile
==============================================================================
--- head/databases/opentsdb/Makefile	Mon Feb 22 20:04:37 2016	(r409368)
+++ head/databases/opentsdb/Makefile	Mon Feb 22 20:13:01 2016	(r409369)
@@ -3,6 +3,7 @@
 
 PORTNAME=	opentsdb
 PORTVERSION=	2.2.0
+PORTREVISION=	1
 CATEGORIES=	databases java
 MASTER_SITES=	https://github.com/OpenTSDB/opentsdb/releases/download/v${PORTVERSION}/
 

Modified: head/databases/opentsdb/files/patch-Makefile.in
==============================================================================
--- head/databases/opentsdb/files/patch-Makefile.in	Mon Feb 22 20:04:37 2016	(r409368)
+++ head/databases/opentsdb/files/patch-Makefile.in	Mon Feb 22 20:13:01 2016	(r409369)
@@ -1,6 +1,19 @@
---- Makefile.in.orig	2016-02-17 17:48:38 UTC
+The first hunk is to allow building as a user.
+Do not remove it unless it really builds as a user.
+
+--- Makefile.in.orig	2016-02-15 22:38:55 UTC
 +++ Makefile.in
-@@ -1562,7 +1562,7 @@ gwttsd: staticroot
+@@ -1511,7 +1511,9 @@ printdeps:
+ install-exec-hook:
+ 	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"
++	chmod u-w "$(DESTDIR)$(bindir)/tsdb"
+ 	rm -f tsdb.tmp
+ 
+ $(builddata_SRC): .git/HEAD $(tsdb_SRC) $(top_srcdir)/build-aux/gen_build_data.sh
+@@ -1562,7 +1564,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/files/patch-src_utils_Config.java
==============================================================================
--- head/databases/opentsdb/files/patch-src_utils_Config.java	Mon Feb 22 20:04:37 2016	(r409368)
+++ head/databases/opentsdb/files/patch-src_utils_Config.java	Mon Feb 22 20:13:01 2016	(r409369)
@@ -4,7 +4,7 @@
      } else {
        file_locations.add("/etc/opentsdb.conf");
        file_locations.add("/etc/opentsdb/opentsdb.conf");
-+      file_locations.add("/usr/local/etc/opentsdb/opentsdb.conf");
++      file_locations.add("%%PREFIX%%/etc/opentsdb/opentsdb.conf");
        file_locations.add("/opt/opentsdb/opentsdb.conf");
      }