From owner-svn-ports-all@freebsd.org Sat Apr 8 15:02:43 2017 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 C3270D348ED; Sat, 8 Apr 2017 15:02:43 +0000 (UTC) (envelope-from swills@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 93C401B83; Sat, 8 Apr 2017 15:02:43 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v38F2ghK008340; Sat, 8 Apr 2017 15:02:42 GMT (envelope-from swills@FreeBSD.org) Received: (from swills@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v38F2gxw008337; Sat, 8 Apr 2017 15:02:42 GMT (envelope-from swills@FreeBSD.org) Message-Id: <201704081502.v38F2gxw008337@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: swills set sender to swills@FreeBSD.org using -f From: Steve Wills Date: Sat, 8 Apr 2017 15:02:42 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r438046 - in head/www/grafana4: . 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.23 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: Sat, 08 Apr 2017 15:02:43 -0000 Author: swills Date: Sat Apr 8 15:02:42 2017 New Revision: 438046 URL: https://svnweb.freebsd.org/changeset/ports/438046 Log: www/grafana4: update to 4.2.0 Deleted: head/www/grafana4/files/patch-7410 Modified: head/www/grafana4/Makefile head/www/grafana4/distinfo head/www/grafana4/pkg-plist Modified: head/www/grafana4/Makefile ============================================================================== --- head/www/grafana4/Makefile Sat Apr 8 14:50:12 2017 (r438045) +++ head/www/grafana4/Makefile Sat Apr 8 15:02:42 2017 (r438046) @@ -1,12 +1,12 @@ # $FreeBSD$ PORTNAME= grafana -PORTVERSION= 4.1.2 +PORTVERSION= 4.2.0 DISTVERSIONPREFIX= v CATEGORIES= www -MASTER_SITES+= https://grafanarel.s3.amazonaws.com/builds/:public +MASTER_SITES+= https://s3-us-west-2.amazonaws.com/:public PKGNAMESUFFIX= ${PORTVERSION:C/([0-9]).*/\1/1} -DISTFILES= grafana-${PORTVERSION}-${GRAFANA_TIMESTAMP}.linux-x64${EXTRACT_SUFX}:public +DISTFILES= grafana-releases/release/grafana-${PORTVERSION}.linux-x64${EXTRACT_SUFX}:public MAINTAINER= swills@FreeBSD.org COMMENT= Dashboard and graph editor for Graphite, InfluxDB & OpenTSDB @@ -19,8 +19,6 @@ ONLY_FOR_ARCHS= i386 amd64 USE_RC_SUBR= grafana4 -GRAFANA_TIMESTAMP= 1486989747 - USES= compiler PLIST_SUB= PORTVERSION_MAJOR="${PORTVERSION:C/([0-9]).*/\1/1}" @@ -52,20 +50,18 @@ SUB_LIST+= GRAFANA_USER=${GRAFANA_USER} PLIST_SUB+= GRAFANAHOMEDIR=${GRAFANAHOMEDIR} -STRIP= # stripping can break go binaries - post-extract: @${MV} ${WRKSRC}/vendor/ ${WRKSRC}/src/ @${MKDIR} ${WRKSRC}/src/github.com/grafana/grafana .for src in CHANGELOG.md Gruntfile.js LICENSE.md Makefile NOTICE.md README.md \ bower.json build.go circle.yml conf docker docs emails examples \ - karma.conf.js latest.json package.json packaging pkg public scripts \ - tasks tests tsconfig.json tslint.json yarn.lock + karma.conf.js latest.json package.json packaging pkg scripts tasks \ + tests tsconfig.json tslint.json yarn.lock @${MV} ${WRKSRC}/${src} \ ${WRKSRC}/src/github.com/grafana/grafana .endfor ${RM} -r ${WRKSRC}/src/github.com/grafana/grafana/public - ${MV} ${WRKDIR}/grafana-${PORTVERSION}-${GRAFANA_TIMESTAMP}/public ${WRKSRC}/src/github.com/grafana/grafana/public + ${MV} ${WRKDIR}/grafana-${PORTVERSION}/public ${WRKSRC}/src/github.com/grafana/grafana/public do-build: cd ${WRKSRC}/src/github.com/${GH_ACCOUNT}/grafana; \ Modified: head/www/grafana4/distinfo ============================================================================== --- head/www/grafana4/distinfo Sat Apr 8 14:50:12 2017 (r438045) +++ head/www/grafana4/distinfo Sat Apr 8 15:02:42 2017 (r438046) @@ -1,5 +1,5 @@ -TIMESTAMP = 1487354876 -SHA256 (grafana-4.1.2-1486989747.linux-x64.tar.gz) = b8111cd014e9c202dd1b168b924731a140161e9e43e32f3ca7ae18db850af6c4 -SIZE (grafana-4.1.2-1486989747.linux-x64.tar.gz) = 45024995 -SHA256 (grafana-grafana-v4.1.2_GH0.tar.gz) = 714ad24374a8e23d09613b910e5e9989c42f851e84596e85ab9c3603575abcb5 -SIZE (grafana-grafana-v4.1.2_GH0.tar.gz) = 8403558 +TIMESTAMP = 1491660293 +SHA256 (grafana-releases/release/grafana-4.2.0.linux-x64.tar.gz) = e9927baaaf6cbcab64892dedd11ccf509e4edea54670db4250b9e7568466ec61 +SIZE (grafana-releases/release/grafana-4.2.0.linux-x64.tar.gz) = 45741731 +SHA256 (grafana-grafana-v4.2.0_GH0.tar.gz) = 87c9f123b2511dd57a6ff14c7b67dc3def678eefd9d22fd27e8fbb907a8e076a +SIZE (grafana-grafana-v4.2.0_GH0.tar.gz) = 8463603 Modified: head/www/grafana4/pkg-plist ============================================================================== --- head/www/grafana4/pkg-plist Sat Apr 8 14:50:12 2017 (r438045) +++ head/www/grafana4/pkg-plist Sat Apr 8 15:02:42 2017 (r438046) @@ -7,7 +7,7 @@ bin/grafana-server %%DATADIR%%/public/app/app.js.map %%DATADIR%%/public/app/app.ts %%DATADIR%%/public/app/app_bundle.js -%%DATADIR%%/public/app/boot.6d63bd8b.js +%%DATADIR%%/public/app/boot.5ee7468a.js %%DATADIR%%/public/app/boot.js %%DATADIR%%/public/app/core/app_events.d.ts %%DATADIR%%/public/app/core/app_events.js @@ -417,12 +417,19 @@ bin/grafana-server %%DATADIR%%/public/app/features/dashboard/specs/row_model_specs.js %%DATADIR%%/public/app/features/dashboard/specs/row_model_specs.js.map %%DATADIR%%/public/app/features/dashboard/specs/row_model_specs.ts +%%DATADIR%%/public/app/features/dashboard/specs/time_srv_specs.d.ts +%%DATADIR%%/public/app/features/dashboard/specs/time_srv_specs.js +%%DATADIR%%/public/app/features/dashboard/specs/time_srv_specs.js.map +%%DATADIR%%/public/app/features/dashboard/specs/time_srv_specs.ts %%DATADIR%%/public/app/features/dashboard/submenu/submenu.d.ts %%DATADIR%%/public/app/features/dashboard/submenu/submenu.html %%DATADIR%%/public/app/features/dashboard/submenu/submenu.js %%DATADIR%%/public/app/features/dashboard/submenu/submenu.js.map %%DATADIR%%/public/app/features/dashboard/submenu/submenu.ts -%%DATADIR%%/public/app/features/dashboard/timeSrv.js +%%DATADIR%%/public/app/features/dashboard/time_srv.d.ts +%%DATADIR%%/public/app/features/dashboard/time_srv.js +%%DATADIR%%/public/app/features/dashboard/time_srv.js.map +%%DATADIR%%/public/app/features/dashboard/time_srv.ts %%DATADIR%%/public/app/features/dashboard/timepicker/dropdown.html %%DATADIR%%/public/app/features/dashboard/timepicker/input_date.d.ts %%DATADIR%%/public/app/features/dashboard/timepicker/input_date.js @@ -451,6 +458,7 @@ bin/grafana-server %%DATADIR%%/public/app/features/org/org_users_ctrl.js %%DATADIR%%/public/app/features/org/org_users_ctrl.js.map %%DATADIR%%/public/app/features/org/org_users_ctrl.ts +%%DATADIR%%/public/app/features/org/partials/add_user.html %%DATADIR%%/public/app/features/org/partials/apikeyModal.html %%DATADIR%%/public/app/features/org/partials/change_password.html %%DATADIR%%/public/app/features/org/partials/invite.html @@ -729,7 +737,7 @@ bin/grafana-server %%DATADIR%%/public/app/plugins/datasource/elasticsearch/datasource.js %%DATADIR%%/public/app/plugins/datasource/elasticsearch/elastic_response.d.ts %%DATADIR%%/public/app/plugins/datasource/elasticsearch/elastic_response.js -%%DATADIR%%/public/app/plugins/datasource/elasticsearch/img/logo_large.png +%%DATADIR%%/public/app/plugins/datasource/elasticsearch/img/elasticsearch.svg %%DATADIR%%/public/app/plugins/datasource/elasticsearch/index_pattern.d.ts %%DATADIR%%/public/app/plugins/datasource/elasticsearch/index_pattern.js %%DATADIR%%/public/app/plugins/datasource/elasticsearch/metric_agg.js @@ -782,7 +790,6 @@ bin/grafana-server %%DATADIR%%/public/app/plugins/datasource/grafana-live/module.js.map %%DATADIR%%/public/app/plugins/datasource/grafana-live/module.ts %%DATADIR%%/public/app/plugins/datasource/grafana-live/partials/query.editor.html -%%DATADIR%%/public/app/plugins/datasource/grafana-live/plugin.json %%DATADIR%%/public/app/plugins/datasource/grafana/README.md %%DATADIR%%/public/app/plugins/datasource/grafana/datasource.d.ts %%DATADIR%%/public/app/plugins/datasource/grafana/datasource.js @@ -1141,14 +1148,14 @@ bin/grafana-server %%DATADIR%%/public/css/fonts.min.css.map %%DATADIR%%/public/css/grafana.dark.css %%DATADIR%%/public/css/grafana.dark.css.map -%%DATADIR%%/public/css/grafana.dark.min.b4255f90.css -%%DATADIR%%/public/css/grafana.dark.min.b4255f90.css.map %%DATADIR%%/public/css/grafana.dark.min.css %%DATADIR%%/public/css/grafana.dark.min.css.map +%%DATADIR%%/public/css/grafana.dark.min.fc104690.css +%%DATADIR%%/public/css/grafana.dark.min.fc104690.css.map %%DATADIR%%/public/css/grafana.light.css %%DATADIR%%/public/css/grafana.light.css.map -%%DATADIR%%/public/css/grafana.light.min.1422e32f.css -%%DATADIR%%/public/css/grafana.light.min.1422e32f.css.map +%%DATADIR%%/public/css/grafana.light.min.2def29fc.css +%%DATADIR%%/public/css/grafana.light.min.2def29fc.css.map %%DATADIR%%/public/css/grafana.light.min.css %%DATADIR%%/public/css/grafana.light.min.css.map %%DATADIR%%/public/dashboards/default.json @@ -1231,9 +1238,11 @@ bin/grafana-server %%DATADIR%%/public/img/grafana_icon.svg %%DATADIR%%/public/img/grafana_net_logo.svg %%DATADIR%%/public/img/icn-app.svg +%%DATADIR%%/public/img/icn-dashboard-tiny.svg %%DATADIR%%/public/img/icn-dashboard.svg %%DATADIR%%/public/img/icn-datasource.svg %%DATADIR%%/public/img/icn-panel.svg +%%DATADIR%%/public/img/icn-plugins-tiny.svg %%DATADIR%%/public/img/kibana.png %%DATADIR%%/public/img/light.png %%DATADIR%%/public/img/load.gif @@ -1252,6 +1261,7 @@ bin/grafana-server %%DATADIR%%/public/img/warn-tiny.svg %%DATADIR%%/public/img/warn.svg %%DATADIR%%/public/robots.txt +%%DATADIR%%/public/sass/.sass-lint.yml %%DATADIR%%/public/sass/_grafana.scss %%DATADIR%%/public/sass/_old_responsive.scss %%DATADIR%%/public/sass/_variables.dark.scss @@ -1339,6 +1349,7 @@ bin/grafana-server %%DATADIR%%/public/sass/utils/_utils.scss %%DATADIR%%/public/sass/utils/_validation.scss %%DATADIR%%/public/sass/utils/_widths.scss +%%DATADIR%%/public/test/.jshintrc %%DATADIR%%/public/test/core/table_model_specs.ts %%DATADIR%%/public/test/core/time_series_specs.js %%DATADIR%%/public/test/core/utils/datemath_specs.ts @@ -1359,16 +1370,17 @@ bin/grafana-server %%DATADIR%%/public/test/specs/linkSrv-specs.js %%DATADIR%%/public/test/specs/seriesOverridesCtrl-specs.js %%DATADIR%%/public/test/specs/shareModalCtrl-specs.js -%%DATADIR%%/public/test/specs/time_srv_specs.js %%DATADIR%%/public/test/specs/unsavedChangesSrv-specs.js %%DATADIR%%/public/test/specs/value_select_dropdown_specs.js %%DATADIR%%/public/test/test-main.js +%%DATADIR%%/public/vendor/angular-bindonce/.bower.json %%DATADIR%%/public/vendor/angular-bindonce/CHANGELOG.md %%DATADIR%%/public/vendor/angular-bindonce/README.md %%DATADIR%%/public/vendor/angular-bindonce/bindonce.js %%DATADIR%%/public/vendor/angular-bindonce/bindonce.min.js %%DATADIR%%/public/vendor/angular-bindonce/bower.json %%DATADIR%%/public/vendor/angular-bindonce/package.json +%%DATADIR%%/public/vendor/angular-mocks/.bower.json %%DATADIR%%/public/vendor/angular-mocks/LICENSE.md %%DATADIR%%/public/vendor/angular-mocks/README.md %%DATADIR%%/public/vendor/angular-mocks/angular-mocks.js @@ -1377,6 +1389,7 @@ bin/grafana-server %%DATADIR%%/public/vendor/angular-mocks/ngMock.js %%DATADIR%%/public/vendor/angular-mocks/ngMockE2E.js %%DATADIR%%/public/vendor/angular-mocks/package.json +%%DATADIR%%/public/vendor/angular-native-dragdrop/.bower.json %%DATADIR%%/public/vendor/angular-native-dragdrop/Gulpfile.js %%DATADIR%%/public/vendor/angular-native-dragdrop/LICENSE %%DATADIR%%/public/vendor/angular-native-dragdrop/README.md @@ -1395,6 +1408,7 @@ bin/grafana-server %%DATADIR%%/public/vendor/angular-other/angular-strap.js %%DATADIR%%/public/vendor/angular-other/datepicker.js %%DATADIR%%/public/vendor/angular-other/timepicker.js +%%DATADIR%%/public/vendor/angular-route/.bower.json %%DATADIR%%/public/vendor/angular-route/LICENSE.md %%DATADIR%%/public/vendor/angular-route/README.md %%DATADIR%%/public/vendor/angular-route/angular-route.js @@ -1403,6 +1417,7 @@ bin/grafana-server %%DATADIR%%/public/vendor/angular-route/bower.json %%DATADIR%%/public/vendor/angular-route/index.js %%DATADIR%%/public/vendor/angular-route/package.json +%%DATADIR%%/public/vendor/angular-sanitize/.bower.json %%DATADIR%%/public/vendor/angular-sanitize/LICENSE.md %%DATADIR%%/public/vendor/angular-sanitize/README.md %%DATADIR%%/public/vendor/angular-sanitize/angular-sanitize.js @@ -1412,6 +1427,7 @@ bin/grafana-server %%DATADIR%%/public/vendor/angular-sanitize/index.js %%DATADIR%%/public/vendor/angular-sanitize/package.json %%DATADIR%%/public/vendor/angular-ui/ui-bootstrap-tpls.js +%%DATADIR%%/public/vendor/angular/.bower.json %%DATADIR%%/public/vendor/angular/LICENSE.md %%DATADIR%%/public/vendor/angular/README.md %%DATADIR%%/public/vendor/angular/angular-csp.css @@ -1423,6 +1439,14 @@ bin/grafana-server %%DATADIR%%/public/vendor/angular/index.js %%DATADIR%%/public/vendor/angular/package.json %%DATADIR%%/public/vendor/bootstrap/bootstrap.js +%%DATADIR%%/public/vendor/clipboard/.bower.json +%%DATADIR%%/public/vendor/clipboard/bower.json +%%DATADIR%%/public/vendor/clipboard/contributing.md +%%DATADIR%%/public/vendor/clipboard/dist/clipboard.js +%%DATADIR%%/public/vendor/clipboard/dist/clipboard.min.js +%%DATADIR%%/public/vendor/clipboard/package.js +%%DATADIR%%/public/vendor/clipboard/package.json +%%DATADIR%%/public/vendor/clipboard/readme.md %%DATADIR%%/public/vendor/crypto.min.js %%DATADIR%%/public/vendor/css/spectrum.css %%DATADIR%%/public/vendor/css/timepicker.css @@ -1437,6 +1461,7 @@ bin/grafana-server %%DATADIR%%/public/vendor/flot/jquery.flot.stack.js %%DATADIR%%/public/vendor/flot/jquery.flot.stackpercent.js %%DATADIR%%/public/vendor/flot/jquery.flot.time.js +%%DATADIR%%/public/vendor/jquery/.bower.json %%DATADIR%%/public/vendor/jquery/AUTHORS.txt %%DATADIR%%/public/vendor/jquery/LICENSE.txt %%DATADIR%%/public/vendor/jquery/README.md @@ -1452,6 +1477,7 @@ bin/grafana-server %%DATADIR%%/public/vendor/jquery/external/sizzle/dist/sizzle.js %%DATADIR%%/public/vendor/jquery/external/sizzle/dist/sizzle.min.js %%DATADIR%%/public/vendor/jquery/external/sizzle/dist/sizzle.min.map +%%DATADIR%%/public/vendor/jquery/src/.eslintrc %%DATADIR%%/public/vendor/jquery/src/ajax.js %%DATADIR%%/public/vendor/jquery/src/ajax/jsonp.js %%DATADIR%%/public/vendor/jquery/src/ajax/load.js @@ -1553,6 +1579,12 @@ bin/grafana-server %%DATADIR%%/public/vendor/jquery/src/var/toString.js %%DATADIR%%/public/vendor/jquery/src/wrap.js %%DATADIR%%/public/vendor/license.json +%%DATADIR%%/public/vendor/lodash/.bower.json +%%DATADIR%%/public/vendor/lodash/.editorconfig +%%DATADIR%%/public/vendor/lodash/.github/CONTRIBUTING.md +%%DATADIR%%/public/vendor/lodash/.jscsrc +%%DATADIR%%/public/vendor/lodash/.markdown-doctest-setup.js +%%DATADIR%%/public/vendor/lodash/.travis.yml %%DATADIR%%/public/vendor/lodash/LICENSE %%DATADIR%%/public/vendor/lodash/README.md %%DATADIR%%/public/vendor/lodash/dist/lodash.core.js @@ -3292,8 +3324,6 @@ bin/grafana-server %%DATADIR%%/public/vendor/plugin-text/text.js %%DATADIR%%/public/vendor/spectrum.js %%DATADIR%%/public/vendor/tagsinput/bootstrap-tagsinput.js -%%DATADIR%%/public/vendor/zero_clipboard.js -%%DATADIR%%/public/vendor/zero_clipboard.swf %%DATADIR%%/public/views/407.html %%DATADIR%%/public/views/500.html %%DATADIR%%/public/views/index.html