diff options
| author | feld <feld@FreeBSD.org> | 2015-11-08 22:05:21 +0800 |
|---|---|---|
| committer | feld <feld@FreeBSD.org> | 2015-11-08 22:05:21 +0800 |
| commit | e33e38f7aeea60a2cc2a620dd8dba9c1f6b3694f (patch) | |
| tree | 14cfe30e8b206894813f5505cdf3229a81861d0a /databases | |
| parent | a18fcbe973580c9b50530c677e7a991c5c1c8360 (diff) | |
| download | freebsd-ports-graphics-e33e38f7aeea60a2cc2a620dd8dba9c1f6b3694f.tar.gz freebsd-ports-graphics-e33e38f7aeea60a2cc2a620dd8dba9c1f6b3694f.tar.zst freebsd-ports-graphics-e33e38f7aeea60a2cc2a620dd8dba9c1f6b3694f.zip | |
databases/opentsdb: Fix STAGE, missing UID and GID
Staging was broken due to touching /root/.java during build
UID and GID was lost in old copy of the review
While here, also fix hardcoded path to ETCDIR
Pointyhat: me
Differential Revision: https://reviews.freebsd.org/D4083
Diffstat (limited to 'databases')
| -rw-r--r-- | databases/opentsdb/files/patch-Makefile.in | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/databases/opentsdb/files/patch-Makefile.in b/databases/opentsdb/files/patch-Makefile.in index 35542639b5d..4d71c200db5 100644 --- a/databases/opentsdb/files/patch-Makefile.in +++ b/databases/opentsdb/files/patch-Makefile.in @@ -5,10 +5,19 @@ # in the script before it gets installed... install-exec-hook: - script=tsdb; pkgdatadir='$(pkgdatadir)'; configdir='$(pkgdatadir)/etc/opentsdb'; \ -+ script=tsdb; pkgdatadir='$(pkgdatadir)'; configdir='/usr/local/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. |