Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 7 Feb 2016 01:55:37 +0000 (UTC)
From:      Steve Wills <swills@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r408342 - in head/www/py-graphite-web: . files
Message-ID:  <201602070155.u171tbfF068038@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: swills
Date: Sun Feb  7 01:55:37 2016
New Revision: 408342
URL: https://svnweb.freebsd.org/changeset/ports/408342

Log:
  www/py-graphite-web: update to 0.9.15
  
  PR:		206534
  Submitted by:	Michael Zhilin <mizhka@gmail.com>

Deleted:
  head/www/py-graphite-web/files/patch-setup.cfg
  head/www/py-graphite-web/files/patch-webapp__graphite__account__urls.py
  head/www/py-graphite-web/files/patch-webapp__graphite__browser__urls.py
  head/www/py-graphite-web/files/patch-webapp__graphite__browser__views.py
  head/www/py-graphite-web/files/patch-webapp__graphite__cli__urls.py
  head/www/py-graphite-web/files/patch-webapp__graphite__cli__views.py
  head/www/py-graphite-web/files/patch-webapp__graphite__composer__urls.py
  head/www/py-graphite-web/files/patch-webapp__graphite__dashboard__urls.py
  head/www/py-graphite-web/files/patch-webapp__graphite__dashboard__views.py
  head/www/py-graphite-web/files/patch-webapp__graphite__events__urls.py
  head/www/py-graphite-web/files/patch-webapp__graphite__events__views.py
  head/www/py-graphite-web/files/patch-webapp__graphite__graphlot__urls.py
  head/www/py-graphite-web/files/patch-webapp__graphite__graphlot__views.py
  head/www/py-graphite-web/files/patch-webapp__graphite__metrics__urls.py
  head/www/py-graphite-web/files/patch-webapp__graphite__metrics__views.py
  head/www/py-graphite-web/files/patch-webapp__graphite__render__urls.py
  head/www/py-graphite-web/files/patch-webapp__graphite__render__views.py
  head/www/py-graphite-web/files/patch-webapp__graphite__urls.py
  head/www/py-graphite-web/files/patch-webapp__graphite__version__urls.py
  head/www/py-graphite-web/files/patch-webapp__graphite__whitelist__urls.py
  head/www/py-graphite-web/files/patch-webapp__graphite__whitelist__views.py
Modified:
  head/www/py-graphite-web/Makefile
  head/www/py-graphite-web/distinfo
  head/www/py-graphite-web/files/patch-conf__graphite.wsgi.example
  head/www/py-graphite-web/files/patch-setup.py
  head/www/py-graphite-web/files/patch-webapp__graphite__local_settings.py.example
  head/www/py-graphite-web/files/pkg-message.in
  head/www/py-graphite-web/pkg-plist

Modified: head/www/py-graphite-web/Makefile
==============================================================================
--- head/www/py-graphite-web/Makefile	Sun Feb  7 01:12:19 2016	(r408341)
+++ head/www/py-graphite-web/Makefile	Sun Feb  7 01:55:37 2016	(r408342)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	graphite-web
-PORTVERSION=	0.9.12
-PORTREVISION=	3
+PORTVERSION=	0.9.15
 CATEGORIES=	www python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
@@ -16,6 +15,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cair
 		${PYTHON_PKGNAMEPREFIX}carbon>=${PORTVERSION}:${PORTSDIR}/databases/py-carbon \
 		${PYTHON_PKGNAMEPREFIX}django18>=1.4:${PORTSDIR}/www/py-django18 \
 		${PYTHON_PKGNAMEPREFIX}django-tagging>=0.3.1:${PORTSDIR}/www/py-django-tagging \
+		${PYTHON_PKGNAMEPREFIX}pytz>0:${PORTSDIR}/devel/py-pytz \
 		xorg-fonts-truetype>=0:${PORTSDIR}/x11-fonts/xorg-fonts-truetype
 
 FETCH_ARGS=	-o ${DISTNAME}${EXTRACT_SUFX}

Modified: head/www/py-graphite-web/distinfo
==============================================================================
--- head/www/py-graphite-web/distinfo	Sun Feb  7 01:12:19 2016	(r408341)
+++ head/www/py-graphite-web/distinfo	Sun Feb  7 01:55:37 2016	(r408342)
@@ -1,2 +1,2 @@
-SHA256 (graphite-project-graphite-web-0.9.12_GH0.tar.gz) = 03a4403fdb36e5707d3dbd6a71d9be1e80b1adbbe49e3e0989a15829d02f23d2
-SIZE (graphite-project-graphite-web-0.9.12_GH0.tar.gz) = 2334147
+SHA256 (graphite-project-graphite-web-0.9.15_GH0.tar.gz) = 75c53e9de089738280f1ed1084b6b4df79b9f94cb99a20c479645046c80ca677
+SIZE (graphite-project-graphite-web-0.9.15_GH0.tar.gz) = 2434438

Modified: head/www/py-graphite-web/files/patch-conf__graphite.wsgi.example
==============================================================================
--- head/www/py-graphite-web/files/patch-conf__graphite.wsgi.example	Sun Feb  7 01:12:19 2016	(r408341)
+++ head/www/py-graphite-web/files/patch-conf__graphite.wsgi.example	Sun Feb  7 01:55:37 2016	(r408342)
@@ -1,14 +1,10 @@
---- conf/graphite.wsgi.example.orig	2013-08-21 17:11:04.000000000 +0000
-+++ conf/graphite.wsgi.example	2014-09-14 03:30:45.456594225 +0000
-@@ -1,8 +1,10 @@
- import os, sys
+--- conf/graphite.wsgi.example.orig	2015-11-27 18:37:16 UTC
++++ conf/graphite.wsgi.example
+@@ -1,6 +1,6 @@
+ import os
+ import sys
 -sys.path.append('/opt/graphite/webapp')
 +sys.path.append('%%PREFIX%%/graphite/webapp')
- os.environ['DJANGO_SETTINGS_MODULE'] = 'graphite.settings'
- 
-+import django
- import django.core.handlers.wsgi
-+django.setup()
- 
- application = django.core.handlers.wsgi.WSGIHandler()
  
+ try:
+     from importlib import import_module

Modified: head/www/py-graphite-web/files/patch-setup.py
==============================================================================
--- head/www/py-graphite-web/files/patch-setup.py	Sun Feb  7 01:12:19 2016	(r408341)
+++ head/www/py-graphite-web/files/patch-setup.py	Sun Feb  7 01:55:37 2016	(r408342)
@@ -1,6 +1,15 @@
---- setup.py.orig	2013-08-21 17:11:04.000000000 +0000
-+++ setup.py	2014-02-14 04:44:44.290189349 +0000
-@@ -15,11 +15,11 @@
+--- setup.py.orig	2015-11-27 18:37:16 UTC
++++ setup.py
+@@ -23,8 +23,6 @@ else:
+         cf.add_section('install')
+     except ConfigParser.DuplicateSectionError:
+         pass
+-    cf.set('install', 'prefix', '/opt/graphite')
+-    cf.set('install', 'install-lib', '%(prefix)s/webapp')
+ 
+ with open('setup.cfg', 'wb') as f:
+     cf.write(f)
+@@ -41,11 +39,11 @@ else:
  storage_dirs = []
  
  for subdir in ('whisper', 'rrd', 'log', 'log/webapp'):
@@ -14,20 +23,21 @@
    for filename in files:
      filepath = os.path.join(root, filename)
  
-@@ -29,7 +29,7 @@
+@@ -55,7 +53,7 @@ for root, dirs, files in os.walk('webapp
      webapp_content[root].append(filepath)
  
  
 -conf_files = [ ('conf', glob('conf/*.example')) ]
-+conf_files = [ ('/usr/local/etc/graphite', glob('conf/*.example')) ]
++conf_files = [ ('%%PREFIX%%/etc/graphite', glob('conf/*.example')) ]
  examples = [ ('examples', glob('examples/example-*')) ]
  
- setup(
-@@ -60,6 +60,6 @@
-   package_data={'graphite' :
-     ['templates/*', 'local_settings.py.example']},
-   scripts=glob('bin/*'),
--  data_files=webapp_content.items() + storage_dirs + conf_files + examples,
-+  data_files=conf_files,
-   **setup_kwargs
- )
+ try:
+@@ -87,7 +85,7 @@ try:
+       package_data={'graphite' :
+         ['templates/*', 'local_settings.py.example']},
+       scripts=glob('bin/*'),
+-      data_files=webapp_content.items() + storage_dirs + conf_files + examples,
++      data_files=conf_files,
+       **setup_kwargs
+     )
+ finally:

Modified: head/www/py-graphite-web/files/patch-webapp__graphite__local_settings.py.example
==============================================================================
--- head/www/py-graphite-web/files/patch-webapp__graphite__local_settings.py.example	Sun Feb  7 01:12:19 2016	(r408341)
+++ head/www/py-graphite-web/files/patch-webapp__graphite__local_settings.py.example	Sun Feb  7 01:55:37 2016	(r408342)
@@ -1,12 +1,12 @@
---- webapp/graphite/local_settings.py.example.orig	2013-08-21 17:11:04.000000000 +0000
-+++ webapp/graphite/local_settings.py.example	2014-02-14 05:02:05.550117395 +0000
+--- webapp/graphite/local_settings.py.example.orig	2015-11-27 18:37:16 UTC
++++ webapp/graphite/local_settings.py.example
 @@ -62,6 +62,9 @@
  #CONF_DIR = '/opt/graphite/conf'
  #STORAGE_DIR = '/opt/graphite/storage'
  #CONTENT_DIR = '/opt/graphite/webapp/content'
 +CONF_DIR = '%%PREFIX%%/etc/graphite'
 +STORAGE_DIR = '/var/db/carbon'
-+CONTENT_DIR = '%%DATADIR%%/content'
++CONTENT_DIR = '%%PREFIX%%/share/graphite-web/content'
  
  # To further or fully customize the paths, modify the following. Note that the
  # default settings for each of these are relative to CONF_DIR and STORAGE_DIR

Modified: head/www/py-graphite-web/files/pkg-message.in
==============================================================================
--- head/www/py-graphite-web/files/pkg-message.in	Sun Feb  7 01:12:19 2016	(r408341)
+++ head/www/py-graphite-web/files/pkg-message.in	Sun Feb  7 01:55:37 2016	(r408342)
@@ -58,6 +58,7 @@ Setup Apache by creating a vhost similar
 	<Directory "%%PYTHON_SITELIBDIR%%/django/contrib/admin/static/">
 		Order deny,allow
 		Allow from all
+		Require all granted
 	</Directory>
 
 	# The graphite.wsgi file has to be accessible by apache. It won't
@@ -65,11 +66,13 @@ Setup Apache by creating a vhost similar
 	<Directory %%PREFIX%%/etc/graphite/>
 		Order deny,allow
 		Allow from all
+		Require all granted
 	</Directory>
 
 	<Directory %%DATADIR%%/content/>
 		Order deny,allow
 		Allow from all
+		Require all granted
 	</Directory>
 
 </VirtualHost>

Modified: head/www/py-graphite-web/pkg-plist
==============================================================================
--- head/www/py-graphite-web/pkg-plist	Sun Feb  7 01:12:19 2016	(r408341)
+++ head/www/py-graphite-web/pkg-plist	Sun Feb  7 01:55:37 2016	(r408342)
@@ -47,36 +47,26 @@ etc/graphite/local_settings.py.example
 %%DATADIR%%/content/css/default/top_left.gif
 %%DATADIR%%/content/css/default/top_mid.gif
 %%DATADIR%%/content/css/default/top_right.gif
-%%DATADIR%%/content/css/jquery.autocomplete.css
 %%DATADIR%%/content/css/table.css
 %%DATADIR%%/content/html/completerHelp.html
 %%DATADIR%%/content/html/searchHelp.html
 %%DATADIR%%/content/html/timeHelp.html
-%%DATADIR%%/content/img/I.gif
-%%DATADIR%%/content/img/L.gif
-%%DATADIR%%/content/img/Lminus.gif
-%%DATADIR%%/content/img/Lplus.gif
-%%DATADIR%%/content/img/T.gif
-%%DATADIR%%/content/img/Tminus.gif
-%%DATADIR%%/content/img/Tplus.gif
-%%DATADIR%%/content/img/arrow1.gif
 %%DATADIR%%/content/img/blank.gif
-%%DATADIR%%/content/img/calBt.gif
+%%DATADIR%%/content/img/calendar.png
 %%DATADIR%%/content/img/carbon-fiber.png
+%%DATADIR%%/content/img/clock.png
 %%DATADIR%%/content/img/clock_16.png
-%%DATADIR%%/content/img/delete.gif
-%%DATADIR%%/content/img/error.png
-%%DATADIR%%/content/img/folder.png
 %%DATADIR%%/content/img/graphite.png
 %%DATADIR%%/content/img/graphite_short.png
-%%DATADIR%%/content/img/indicator.png
 %%DATADIR%%/content/img/leaf.gif
-%%DATADIR%%/content/img/line_chart.png
 %%DATADIR%%/content/img/mini-bottom2.gif
 %%DATADIR%%/content/img/mini-top2.gif
-%%DATADIR%%/content/img/save.gif
-%%DATADIR%%/content/img/searching.gif
-%%DATADIR%%/content/img/updateGraph.gif
+%%DATADIR%%/content/img/overview.png
+%%DATADIR%%/content/img/refresh.png
+%%DATADIR%%/content/img/save.png
+%%DATADIR%%/content/img/share.png
+%%DATADIR%%/content/img/trash.png
+%%DATADIR%%/content/img/upload.png
 %%DATADIR%%/content/js/ace/ace.js
 %%DATADIR%%/content/js/ace/keybinding-vim.js
 %%DATADIR%%/content/js/ace/mode-c_cpp.js
@@ -544,12 +534,6 @@ etc/graphite/local_settings.py.example
 %%DATADIR%%/content/js/ext/resources/images/default/window/top-bottom.png
 %%DATADIR%%/content/js/ext/resources/images/default/window/top-bottom.psd
 %%DATADIR%%/content/js/ext/ux/DataViewTransition.js
-%%DATADIR%%/content/js/jquery.autocomplete.js
-%%DATADIR%%/content/js/jquery.flot.crosshair.js
-%%DATADIR%%/content/js/jquery.flot.js
-%%DATADIR%%/content/js/jquery.flot.selection.js
-%%DATADIR%%/content/js/jquery.graphite.js
-%%DATADIR%%/content/js/jquery.js
 %%DATADIR%%/content/js/scriptaculous/builder.js
 %%DATADIR%%/content/js/scriptaculous/controls.js
 %%DATADIR%%/content/js/scriptaculous/dragdrop.js
@@ -650,15 +634,6 @@ etc/graphite/local_settings.py.example
 %%PYTHON_SITELIBDIR%%/graphite/events/views.py
 %%PYTHON_SITELIBDIR%%/graphite/events/views.pyc
 %%PYTHON_SITELIBDIR%%/graphite/events/views.pyo
-%%PYTHON_SITELIBDIR%%/graphite/graphlot/__init__.py
-%%PYTHON_SITELIBDIR%%/graphite/graphlot/__init__.pyc
-%%PYTHON_SITELIBDIR%%/graphite/graphlot/__init__.pyo
-%%PYTHON_SITELIBDIR%%/graphite/graphlot/urls.py
-%%PYTHON_SITELIBDIR%%/graphite/graphlot/urls.pyc
-%%PYTHON_SITELIBDIR%%/graphite/graphlot/urls.pyo
-%%PYTHON_SITELIBDIR%%/graphite/graphlot/views.py
-%%PYTHON_SITELIBDIR%%/graphite/graphlot/views.pyc
-%%PYTHON_SITELIBDIR%%/graphite/graphlot/views.pyo
 %%PYTHON_SITELIBDIR%%/graphite/local_settings.py.example
 %%PYTHON_SITELIBDIR%%/graphite/local_settings.py
 %%PYTHON_SITELIBDIR%%/graphite/logger.py
@@ -731,7 +706,6 @@ etc/graphite/local_settings.py.example
 %%PYTHON_SITELIBDIR%%/graphite/templates/editProfile.html
 %%PYTHON_SITELIBDIR%%/graphite/templates/event.html
 %%PYTHON_SITELIBDIR%%/graphite/templates/events.html
-%%PYTHON_SITELIBDIR%%/graphite/templates/graphlot.html
 %%PYTHON_SITELIBDIR%%/graphite/templates/login.html
 %%PYTHON_SITELIBDIR%%/graphite/templates/version.html
 %%PYTHON_SITELIBDIR%%/graphite/thirdparty/__init__.py
@@ -758,6 +732,18 @@ etc/graphite/local_settings.py.example
 %%PYTHON_SITELIBDIR%%/graphite/urls.py
 %%PYTHON_SITELIBDIR%%/graphite/urls.pyc
 %%PYTHON_SITELIBDIR%%/graphite/urls.pyo
+%%PYTHON_SITELIBDIR%%/graphite/url_shortener/__init__.py
+%%PYTHON_SITELIBDIR%%/graphite/url_shortener/__init__.pyc
+%%PYTHON_SITELIBDIR%%/graphite/url_shortener/__init__.pyo
+%%PYTHON_SITELIBDIR%%/graphite/url_shortener/baseconv.py
+%%PYTHON_SITELIBDIR%%/graphite/url_shortener/baseconv.pyc
+%%PYTHON_SITELIBDIR%%/graphite/url_shortener/baseconv.pyo
+%%PYTHON_SITELIBDIR%%/graphite/url_shortener/models.py
+%%PYTHON_SITELIBDIR%%/graphite/url_shortener/models.pyc
+%%PYTHON_SITELIBDIR%%/graphite/url_shortener/models.pyo
+%%PYTHON_SITELIBDIR%%/graphite/url_shortener/views.py
+%%PYTHON_SITELIBDIR%%/graphite/url_shortener/views.pyc
+%%PYTHON_SITELIBDIR%%/graphite/url_shortener/views.pyo
 %%PYTHON_SITELIBDIR%%/graphite/util.py
 %%PYTHON_SITELIBDIR%%/graphite/util.pyc
 %%PYTHON_SITELIBDIR%%/graphite/util.pyo



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201602070155.u171tbfF068038>