svn commit: r468109 - in head/www/py-graphite-web: . files

[Steve Wills]

Author: swills
Date: Mon Apr 23 17:30:01 2018
New Revision: 468109
URL: https://svnweb.freebsd.org/changeset/ports/468109

Log:
  www/py-graphite-web: update to 1.1.3

Modified:
  head/www/py-graphite-web/Makefile   (contents, props changed)
  head/www/py-graphite-web/distinfo   (contents, props changed)
  head/www/py-graphite-web/files/patch-bin__build-index.sh   (contents, props changed)
  head/www/py-graphite-web/files/patch-conf__graphite.wsgi.example   (contents, props changed)
  head/www/py-graphite-web/files/patch-setup.py   (contents, props changed)

Modified: head/www/py-graphite-web/Makefile
==============================================================================
--- head/www/py-graphite-web/Makefile	Mon Apr 23 17:20:59 2018	(r468108)
+++ head/www/py-graphite-web/Makefile	Mon Apr 23 17:30:01 2018	(r468109)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	graphite-web
-PORTVERSION=	1.1.2
-PORTREVISION=	1
+PORTVERSION=	1.1.3
 CATEGORIES=	www python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 

Modified: head/www/py-graphite-web/distinfo
==============================================================================
--- head/www/py-graphite-web/distinfo	Mon Apr 23 17:20:59 2018	(r468108)
+++ head/www/py-graphite-web/distinfo	Mon Apr 23 17:30:01 2018	(r468109)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1521721030
-SHA256 (graphite-project-graphite-web-1.1.2_GH0.tar.gz) = 8a36221db5a17d9cbee11e85be5c346024a6229d28e9d8c2417d1660bf9cfe8e
-SIZE (graphite-project-graphite-web-1.1.2_GH0.tar.gz) = 1431547
+TIMESTAMP = 1524503513
+SHA256 (graphite-project-graphite-web-1.1.3_GH0.tar.gz) = 34cff860d11b111d7fe1b00b5ade047ecc6a4b1e8025cb2247a22a0c7b422b60
+SIZE (graphite-project-graphite-web-1.1.3_GH0.tar.gz) = 1433061

Modified: head/www/py-graphite-web/files/patch-bin__build-index.sh
==============================================================================
--- head/www/py-graphite-web/files/patch-bin__build-index.sh	Mon Apr 23 17:20:59 2018	(r468108)
+++ head/www/py-graphite-web/files/patch-bin__build-index.sh	Mon Apr 23 17:30:01 2018	(r468109)
@@ -1,7 +1,7 @@
---- bin/build-index.sh.orig	2018-02-13 06:01:34.000000000 -0500
-+++ bin/build-index.sh	2018-03-22 08:58:11.785051000 -0400
+--- bin/build-index.sh.orig	2018-04-23 17:11:55 UTC
++++ bin/build-index.sh
 @@ -1,5 +1,5 @@
- #!/bin/bash
+ #!/usr/local/bin/bash
 -export PYTHONPATH="/opt/graphite/webapp/:$PYTHONPATH"
 +export PYTHONPATH="%%PREFIX%%/graphite/webapp/:$PYTHONPATH"
  BINDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"

Modified: head/www/py-graphite-web/files/patch-conf__graphite.wsgi.example
==============================================================================
--- head/www/py-graphite-web/files/patch-conf__graphite.wsgi.example	Mon Apr 23 17:20:59 2018	(r468108)
+++ head/www/py-graphite-web/files/patch-conf__graphite.wsgi.example	Mon Apr 23 17:30:01 2018	(r468109)
@@ -1,5 +1,5 @@
---- conf/graphite.wsgi.example.orig	2018-02-13 06:01:34.000000000 -0500
-+++ conf/graphite.wsgi.example	2018-03-22 09:01:22.942401000 -0400
+--- conf/graphite.wsgi.example.orig	2018-04-04 07:58:36 UTC
++++ conf/graphite.wsgi.example
 @@ -1,4 +1,4 @@
  import sys
 -sys.path.append('/opt/graphite/webapp')

Modified: head/www/py-graphite-web/files/patch-setup.py
==============================================================================
--- head/www/py-graphite-web/files/patch-setup.py	Mon Apr 23 17:20:59 2018	(r468108)
+++ head/www/py-graphite-web/files/patch-setup.py	Mon Apr 23 17:30:01 2018	(r468109)
@@ -1,6 +1,6 @@
---- setup.py.orig	2018-02-13 06:01:34.000000000 -0500
-+++ setup.py	2018-03-22 09:16:21.606146000 -0400
-@@ -39,10 +39,6 @@
+--- setup.py.orig	2018-04-04 07:58:36 UTC
++++ setup.py
+@@ -39,10 +39,6 @@ else:
          cf.add_section('install')
      except DuplicateSectionError:
          pass
@@ -11,11 +11,13 @@
  
  with open('setup.cfg', 'w') as f:
      cf.write(f)
-@@ -59,16 +55,16 @@
+@@ -58,17 +54,17 @@ else:
+ 
  storage_dirs = []
  
- for subdir in ('whisper', 'ceres', 'rrd', 'log', 'log/webapp'):
+-for subdir in ('whisper/dummy.txt', 'ceres/dummy.txt', 'rrd/dummy.txt', 'log/dummy.txt', 'log/webapp/dummy.txt'):
 -  storage_dirs.append( ('storage/%s' % subdir, []) )
++for subdir in ('whisper', 'ceres', 'rrd', 'log', 'log/webapp'):
 +  storage_dirs.append( ('graphite/storage/%s' % subdir, []) )
  
  webapp_content = defaultdict(list)
@@ -27,11 +29,11 @@
      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-*')) ]
  
  try:
-@@ -108,7 +104,7 @@
+@@ -108,7 +104,7 @@ try:
        package_data={'graphite' :
          ['templates/*', 'local_settings.py.example']},
        scripts=glob('bin/*'),