From owner-svn-ports-all@freebsd.org Sun Nov 8 14:05:23 2015 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2A5C0A29DCB; Sun, 8 Nov 2015 14:05:23 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D91521D5F; Sun, 8 Nov 2015 14:05:22 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tA8E5LMZ080773; Sun, 8 Nov 2015 14:05:21 GMT (envelope-from feld@FreeBSD.org) Received: (from feld@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tA8E5L9a080770; Sun, 8 Nov 2015 14:05:21 GMT (envelope-from feld@FreeBSD.org) Message-Id: <201511081405.tA8E5L9a080770@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: feld set sender to feld@FreeBSD.org using -f From: Mark Felder Date: Sun, 8 Nov 2015 14:05:21 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r401060 - in head: . databases/opentsdb/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Nov 2015 14:05:23 -0000 Author: feld Date: Sun Nov 8 14:05:21 2015 New Revision: 401060 URL: https://svnweb.freebsd.org/changeset/ports/401060 Log: 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 Modified: head/GIDs head/UIDs head/databases/opentsdb/files/patch-Makefile.in Modified: head/GIDs ============================================================================== --- head/GIDs Sun Nov 8 13:25:31 2015 (r401059) +++ head/GIDs Sun Nov 8 14:05:21 2015 (r401060) @@ -243,6 +243,7 @@ sogod:*:846: fossy:*:901:www scanlogd:*:902: _ocserv:*:903: +opentsdb:*:906: influxd:*:907: riemann:*:908: proxy65:*:909: Modified: head/UIDs ============================================================================== --- head/UIDs Sun Nov 8 13:25:31 2015 (r401059) +++ head/UIDs Sun Nov 8 14:05:21 2015 (r401060) @@ -251,6 +251,7 @@ sogod:*:846:846::0:0:SOGo groupware:/non fossy:*:901:901::0:0:FOSSology user:/usr/local/share/fossology:/usr/local/bin/bash scanlogd:*:902:902::0:0:scanlogd user:/nonexistent:/usr/sbin/nologin _ocserv:*:903:903::0:0:ocserv user:/nonexistent:/usr/sbin/nologin +opentsdb:*:906:906::0:0:OpenTSDB Daemon:/var/empty:/usr/sbin/nologin influxd:*:907:907::0:0:InfluxDB Daemon:/var/empty:/usr/sbin/nologin riemann:*:908:908::0:0:Riemann User:/var/empty:/usr/sbin/nologin proxy65:*:909:909::0:0:Proxy65 Daemon:/nonexistent:/usr/sbin/nologin Modified: head/databases/opentsdb/files/patch-Makefile.in ============================================================================== --- head/databases/opentsdb/files/patch-Makefile.in Sun Nov 8 13:25:31 2015 (r401059) +++ head/databases/opentsdb/files/patch-Makefile.in Sun Nov 8 14:05:21 2015 (r401060) @@ -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.