From owner-svn-ports-head@freebsd.org Mon Jan 30 14:41:19 2017 Return-Path: Delivered-To: svn-ports-head@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 AEFCECC8C2F; Mon, 30 Jan 2017 14:41:19 +0000 (UTC) (envelope-from brd@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 668711040; Mon, 30 Jan 2017 14:41:19 +0000 (UTC) (envelope-from brd@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v0UEfIXK009073; Mon, 30 Jan 2017 14:41:18 GMT (envelope-from brd@FreeBSD.org) Received: (from brd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0UEfIle009071; Mon, 30 Jan 2017 14:41:18 GMT (envelope-from brd@FreeBSD.org) Message-Id: <201701301441.v0UEfIle009071@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brd set sender to brd@FreeBSD.org using -f From: Brad Davis Date: Mon, 30 Jan 2017 14:41:18 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r432848 - head/www/grafana3 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Jan 2017 14:41:19 -0000 Author: brd Date: Mon Jan 30 14:41:18 2017 New Revision: 432848 URL: https://svnweb.freebsd.org/changeset/ports/432848 Log: Fix www/grafana3 to use the right phantomjs binaries. PR: 215468 Submitted by: brd Approved by: maintainer timeout, bdrewery (implicit) Modified: head/www/grafana3/Makefile head/www/grafana3/pkg-plist Modified: head/www/grafana3/Makefile ============================================================================== --- head/www/grafana3/Makefile Mon Jan 30 14:30:12 2017 (r432847) +++ head/www/grafana3/Makefile Mon Jan 30 14:41:18 2017 (r432848) @@ -3,7 +3,7 @@ PORTNAME= grafana PORTVERSION= 3.1.1 DISTVERSIONPREFIX= v -PORTREVISION= 2 +PORTREVISION= 3 PKGNAMESUFFIX= 3 CATEGORIES= www @@ -14,6 +14,9 @@ LICENSE= APACHE20 BUILD_DEPENDS= ${LOCALBASE}/bin/go:lang/go +RUN_DEPENDS= ${LOCALBASE}/bin/phantomjs:lang/phantomjs \ + webfonts>=0:x11-fonts/webfonts + ONLY_FOR_ARCHS= i386 amd64 USE_RC_SUBR= grafana3 @@ -140,6 +143,10 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/src/github.com/grafana/grafana/conf/defaults.ini \ ${STAGEDIR}${GRAFANAHOMEDIR}/conf/defaults.ini ${INSTALL_DATA} ${WRKDIR}/grafana3.conf ${STAGEDIR}${PREFIX}/etc/grafana3.conf.sample + ${MKDIR} ${STAGEDIR}${GRAFANAHOMEDIR}/vendor/phantomjs/ + ${INSTALL_DATA} ${WRKSRC}/src/github.com/grafana/grafana/vendor/phantomjs/render.js \ + ${STAGEDIR}${GRAFANAHOMEDIR}/vendor/phantomjs/ + ${LN} -s /usr/local/bin/phantomjs ${STAGEDIR}${GRAFANAHOMEDIR}/vendor/phantomjs/phantomjs .include Modified: head/www/grafana3/pkg-plist ============================================================================== --- head/www/grafana3/pkg-plist Mon Jan 30 14:30:12 2017 (r432847) +++ head/www/grafana3/pkg-plist Mon Jan 30 14:41:18 2017 (r432848) @@ -42868,6 +42868,8 @@ share/grafana/public_gen/vendor/zero_cli share/grafana/public_gen/vendor/zero_clipboard.swf share/grafana/public_gen/views/500.html share/grafana/public_gen/views/index.html +share/grafana/vendor/phantomjs/render.js +share/grafana/vendor/phantomjs/phantomjs @dir share/grafana/data/log @dir /var/db/grafana3/dashboards @dir /var/db/grafana3/plugins