View | Details | Raw Unified | Return to bug 206534 | Differences between
and this patch

Collapse All | Expand All

(-)www/py-graphite-web/Makefile (-2 / +1 lines)
Lines 2-9 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	graphite-web
4
PORTNAME=	graphite-web
5
PORTVERSION=	0.9.12
5
PORTVERSION=	0.9.15
6
PORTREVISION=	3
7
CATEGORIES=	www python
6
CATEGORIES=	www python
8
PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
7
PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
9
8
(-)www/py-graphite-web/distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
SHA256 (graphite-project-graphite-web-0.9.12_GH0.tar.gz) = 03a4403fdb36e5707d3dbd6a71d9be1e80b1adbbe49e3e0989a15829d02f23d2
1
SHA256 (graphite-project-graphite-web-0.9.15_GH0.tar.gz) = 75c53e9de089738280f1ed1084b6b4df79b9f94cb99a20c479645046c80ca677
2
SIZE (graphite-project-graphite-web-0.9.12_GH0.tar.gz) = 2334147
2
SIZE (graphite-project-graphite-web-0.9.15_GH0.tar.gz) = 2434438
(-)www/py-graphite-web/files/patch-bin__build-index.sh (-3 / +3 lines)
Lines 1-5 Link Here
1
--- bin/build-index.sh.orig	2014-02-14 15:05:38.180621787 +0000
1
--- bin/build-index.sh.orig	2015-11-27 18:37:16 UTC
2
+++ bin/build-index.sh	2014-02-14 15:31:54.580513137 +0000
2
+++ bin/build-index.sh
3
@@ -1,17 +1,19 @@
3
@@ -1,17 +1,19 @@
4
-#!/bin/bash
4
-#!/bin/bash
5
+#!/bin/sh
5
+#!/bin/sh
Lines 25-31 Link Here
25
 
25
 
26
 if [ ! -d "$WHISPER_DIR" ]
26
 if [ ! -d "$WHISPER_DIR" ]
27
 then
27
 then
28
@@ -19,13 +21,17 @@
28
@@ -19,13 +21,17 @@ then
29
   exit 1
29
   exit 1
30
 fi
30
 fi
31
 
31
 
(-)www/py-graphite-web/files/patch-conf__graphite.wsgi.example (-11 / +7 lines)
Lines 1-14 Link Here
1
--- conf/graphite.wsgi.example.orig	2013-08-21 17:11:04.000000000 +0000
1
--- conf/graphite.wsgi.example.orig	2015-11-27 18:37:16 UTC
2
+++ conf/graphite.wsgi.example	2014-09-14 03:30:45.456594225 +0000
2
+++ conf/graphite.wsgi.example
3
@@ -1,8 +1,10 @@
3
@@ -1,6 +1,6 @@
4
 import os, sys
4
 import os
5
 import sys
5
-sys.path.append('/opt/graphite/webapp')
6
-sys.path.append('/opt/graphite/webapp')
6
+sys.path.append('%%PREFIX%%/graphite/webapp')
7
+sys.path.append('%%PREFIX%%/graphite/webapp')
7
 os.environ['DJANGO_SETTINGS_MODULE'] = 'graphite.settings'
8
 
8
 
9
+import django
9
 try:
10
 import django.core.handlers.wsgi
10
     from importlib import import_module
11
+django.setup()
12
 
13
 application = django.core.handlers.wsgi.WSGIHandler()
14
 
(-)www/py-graphite-web/files/patch-setup.py (-14 / +24 lines)
Lines 1-6 Link Here
1
--- setup.py.orig	2013-08-21 17:11:04.000000000 +0000
1
--- setup.py.orig	2015-11-27 18:37:16 UTC
2
+++ setup.py	2014-02-14 04:44:44.290189349 +0000
2
+++ setup.py
3
@@ -15,11 +15,11 @@
3
@@ -23,8 +23,6 @@ else:
4
         cf.add_section('install')
5
     except ConfigParser.DuplicateSectionError:
6
         pass
7
-    cf.set('install', 'prefix', '/opt/graphite')
8
-    cf.set('install', 'install-lib', '%(prefix)s/webapp')
9
 
10
 with open('setup.cfg', 'wb') as f:
11
     cf.write(f)
12
@@ -41,11 +39,11 @@ else:
4
 storage_dirs = []
13
 storage_dirs = []
5
 
14
 
6
 for subdir in ('whisper', 'rrd', 'log', 'log/webapp'):
15
 for subdir in ('whisper', 'rrd', 'log', 'log/webapp'):
Lines 14-33 Link Here
14
   for filename in files:
23
   for filename in files:
15
     filepath = os.path.join(root, filename)
24
     filepath = os.path.join(root, filename)
16
 
25
 
17
@@ -29,7 +29,7 @@
26
@@ -55,7 +53,7 @@ for root, dirs, files in os.walk('webapp
18
     webapp_content[root].append(filepath)
27
     webapp_content[root].append(filepath)
19
 
28
 
20
 
29
 
21
-conf_files = [ ('conf', glob('conf/*.example')) ]
30
-conf_files = [ ('conf', glob('conf/*.example')) ]
22
+conf_files = [ ('/usr/local/etc/graphite', glob('conf/*.example')) ]
31
+conf_files = [ ('%%PREFIX%%/etc/graphite', glob('conf/*.example')) ]
23
 examples = [ ('examples', glob('examples/example-*')) ]
32
 examples = [ ('examples', glob('examples/example-*')) ]
24
 
33
 
25
 setup(
34
 try:
26
@@ -60,6 +60,6 @@
35
@@ -87,7 +85,7 @@ try:
27
   package_data={'graphite' :
36
       package_data={'graphite' :
28
     ['templates/*', 'local_settings.py.example']},
37
         ['templates/*', 'local_settings.py.example']},
29
   scripts=glob('bin/*'),
38
       scripts=glob('bin/*'),
30
-  data_files=webapp_content.items() + storage_dirs + conf_files + examples,
39
-      data_files=webapp_content.items() + storage_dirs + conf_files + examples,
31
+  data_files=conf_files,
40
+      data_files=conf_files,
32
   **setup_kwargs
41
       **setup_kwargs
33
 )
42
     )
43
 finally:
(-)www/py-graphite-web/files/patch-webapp__graphite__local_settings.py.example (-3 / +3 lines)
Lines 1-5 Link Here
1
--- webapp/graphite/local_settings.py.example.orig	2013-08-21 17:11:04.000000000 +0000
1
--- webapp/graphite/local_settings.py.example.orig	2015-11-27 18:37:16 UTC
2
+++ webapp/graphite/local_settings.py.example	2014-02-14 05:02:05.550117395 +0000
2
+++ webapp/graphite/local_settings.py.example
3
@@ -62,6 +62,9 @@
3
@@ -62,6 +62,9 @@
4
 #CONF_DIR = '/opt/graphite/conf'
4
 #CONF_DIR = '/opt/graphite/conf'
5
 #STORAGE_DIR = '/opt/graphite/storage'
5
 #STORAGE_DIR = '/opt/graphite/storage'
Lines 6-12 Link Here
6
 #CONTENT_DIR = '/opt/graphite/webapp/content'
6
 #CONTENT_DIR = '/opt/graphite/webapp/content'
7
+CONF_DIR = '%%PREFIX%%/etc/graphite'
7
+CONF_DIR = '%%PREFIX%%/etc/graphite'
8
+STORAGE_DIR = '/var/db/carbon'
8
+STORAGE_DIR = '/var/db/carbon'
9
+CONTENT_DIR = '%%DATADIR%%/content'
9
+CONTENT_DIR = '%%PREFIX%%/share/graphite-web/content'
10
 
10
 
11
 # To further or fully customize the paths, modify the following. Note that the
11
 # To further or fully customize the paths, modify the following. Note that the
12
 # default settings for each of these are relative to CONF_DIR and STORAGE_DIR
12
 # default settings for each of these are relative to CONF_DIR and STORAGE_DIR
(-)www/py-graphite-web/files/pkg-message.in (+3 lines)
Lines 58-63 Link Here
58
	<Directory "%%PYTHON_SITELIBDIR%%/django/contrib/admin/static/">
58
	<Directory "%%PYTHON_SITELIBDIR%%/django/contrib/admin/static/">
59
		Order deny,allow
59
		Order deny,allow
60
		Allow from all
60
		Allow from all
61
		Require all granted
61
	</Directory>
62
	</Directory>
62
63
63
	# The graphite.wsgi file has to be accessible by apache. It won't
64
	# The graphite.wsgi file has to be accessible by apache. It won't
Lines 65-75 Link Here
65
	<Directory %%PREFIX%%/etc/graphite/>
66
	<Directory %%PREFIX%%/etc/graphite/>
66
		Order deny,allow
67
		Order deny,allow
67
		Allow from all
68
		Allow from all
69
		Require all granted
68
	</Directory>
70
	</Directory>
69
71
70
	<Directory %%DATADIR%%/content/>
72
	<Directory %%DATADIR%%/content/>
71
		Order deny,allow
73
		Order deny,allow
72
		Allow from all
74
		Allow from all
75
		Require all granted
73
	</Directory>
76
	</Directory>
74
77
75
</VirtualHost>
78
</VirtualHost>
(-)www/py-graphite-web/pkg-plist (-34 / +20 lines)
Lines 47-82 Link Here
47
%%DATADIR%%/content/css/default/top_left.gif
47
%%DATADIR%%/content/css/default/top_left.gif
48
%%DATADIR%%/content/css/default/top_mid.gif
48
%%DATADIR%%/content/css/default/top_mid.gif
49
%%DATADIR%%/content/css/default/top_right.gif
49
%%DATADIR%%/content/css/default/top_right.gif
50
%%DATADIR%%/content/css/jquery.autocomplete.css
51
%%DATADIR%%/content/css/table.css
50
%%DATADIR%%/content/css/table.css
52
%%DATADIR%%/content/html/completerHelp.html
51
%%DATADIR%%/content/html/completerHelp.html
53
%%DATADIR%%/content/html/searchHelp.html
52
%%DATADIR%%/content/html/searchHelp.html
54
%%DATADIR%%/content/html/timeHelp.html
53
%%DATADIR%%/content/html/timeHelp.html
55
%%DATADIR%%/content/img/I.gif
56
%%DATADIR%%/content/img/L.gif
57
%%DATADIR%%/content/img/Lminus.gif
58
%%DATADIR%%/content/img/Lplus.gif
59
%%DATADIR%%/content/img/T.gif
60
%%DATADIR%%/content/img/Tminus.gif
61
%%DATADIR%%/content/img/Tplus.gif
62
%%DATADIR%%/content/img/arrow1.gif
63
%%DATADIR%%/content/img/blank.gif
54
%%DATADIR%%/content/img/blank.gif
64
%%DATADIR%%/content/img/calBt.gif
55
%%DATADIR%%/content/img/calendar.png
65
%%DATADIR%%/content/img/carbon-fiber.png
56
%%DATADIR%%/content/img/carbon-fiber.png
57
%%DATADIR%%/content/img/clock.png
66
%%DATADIR%%/content/img/clock_16.png
58
%%DATADIR%%/content/img/clock_16.png
67
%%DATADIR%%/content/img/delete.gif
68
%%DATADIR%%/content/img/error.png
69
%%DATADIR%%/content/img/folder.png
70
%%DATADIR%%/content/img/graphite.png
59
%%DATADIR%%/content/img/graphite.png
71
%%DATADIR%%/content/img/graphite_short.png
60
%%DATADIR%%/content/img/graphite_short.png
72
%%DATADIR%%/content/img/indicator.png
73
%%DATADIR%%/content/img/leaf.gif
61
%%DATADIR%%/content/img/leaf.gif
74
%%DATADIR%%/content/img/line_chart.png
75
%%DATADIR%%/content/img/mini-bottom2.gif
62
%%DATADIR%%/content/img/mini-bottom2.gif
76
%%DATADIR%%/content/img/mini-top2.gif
63
%%DATADIR%%/content/img/mini-top2.gif
77
%%DATADIR%%/content/img/save.gif
64
%%DATADIR%%/content/img/overview.png
78
%%DATADIR%%/content/img/searching.gif
65
%%DATADIR%%/content/img/refresh.png
79
%%DATADIR%%/content/img/updateGraph.gif
66
%%DATADIR%%/content/img/save.png
67
%%DATADIR%%/content/img/share.png
68
%%DATADIR%%/content/img/trash.png
69
%%DATADIR%%/content/img/upload.png
80
%%DATADIR%%/content/js/ace/ace.js
70
%%DATADIR%%/content/js/ace/ace.js
81
%%DATADIR%%/content/js/ace/keybinding-vim.js
71
%%DATADIR%%/content/js/ace/keybinding-vim.js
82
%%DATADIR%%/content/js/ace/mode-c_cpp.js
72
%%DATADIR%%/content/js/ace/mode-c_cpp.js
Lines 544-555 Link Here
544
%%DATADIR%%/content/js/ext/resources/images/default/window/top-bottom.png
534
%%DATADIR%%/content/js/ext/resources/images/default/window/top-bottom.png
545
%%DATADIR%%/content/js/ext/resources/images/default/window/top-bottom.psd
535
%%DATADIR%%/content/js/ext/resources/images/default/window/top-bottom.psd
546
%%DATADIR%%/content/js/ext/ux/DataViewTransition.js
536
%%DATADIR%%/content/js/ext/ux/DataViewTransition.js
547
%%DATADIR%%/content/js/jquery.autocomplete.js
548
%%DATADIR%%/content/js/jquery.flot.crosshair.js
549
%%DATADIR%%/content/js/jquery.flot.js
550
%%DATADIR%%/content/js/jquery.flot.selection.js
551
%%DATADIR%%/content/js/jquery.graphite.js
552
%%DATADIR%%/content/js/jquery.js
553
%%DATADIR%%/content/js/scriptaculous/builder.js
537
%%DATADIR%%/content/js/scriptaculous/builder.js
554
%%DATADIR%%/content/js/scriptaculous/controls.js
538
%%DATADIR%%/content/js/scriptaculous/controls.js
555
%%DATADIR%%/content/js/scriptaculous/dragdrop.js
539
%%DATADIR%%/content/js/scriptaculous/dragdrop.js
Lines 650-664 Link Here
650
%%PYTHON_SITELIBDIR%%/graphite/events/views.py
634
%%PYTHON_SITELIBDIR%%/graphite/events/views.py
651
%%PYTHON_SITELIBDIR%%/graphite/events/views.pyc
635
%%PYTHON_SITELIBDIR%%/graphite/events/views.pyc
652
%%PYTHON_SITELIBDIR%%/graphite/events/views.pyo
636
%%PYTHON_SITELIBDIR%%/graphite/events/views.pyo
653
%%PYTHON_SITELIBDIR%%/graphite/graphlot/__init__.py
654
%%PYTHON_SITELIBDIR%%/graphite/graphlot/__init__.pyc
655
%%PYTHON_SITELIBDIR%%/graphite/graphlot/__init__.pyo
656
%%PYTHON_SITELIBDIR%%/graphite/graphlot/urls.py
657
%%PYTHON_SITELIBDIR%%/graphite/graphlot/urls.pyc
658
%%PYTHON_SITELIBDIR%%/graphite/graphlot/urls.pyo
659
%%PYTHON_SITELIBDIR%%/graphite/graphlot/views.py
660
%%PYTHON_SITELIBDIR%%/graphite/graphlot/views.pyc
661
%%PYTHON_SITELIBDIR%%/graphite/graphlot/views.pyo
662
%%PYTHON_SITELIBDIR%%/graphite/local_settings.py.example
637
%%PYTHON_SITELIBDIR%%/graphite/local_settings.py.example
663
%%PYTHON_SITELIBDIR%%/graphite/local_settings.py
638
%%PYTHON_SITELIBDIR%%/graphite/local_settings.py
664
%%PYTHON_SITELIBDIR%%/graphite/logger.py
639
%%PYTHON_SITELIBDIR%%/graphite/logger.py
Lines 731-737 Link Here
731
%%PYTHON_SITELIBDIR%%/graphite/templates/editProfile.html
706
%%PYTHON_SITELIBDIR%%/graphite/templates/editProfile.html
732
%%PYTHON_SITELIBDIR%%/graphite/templates/event.html
707
%%PYTHON_SITELIBDIR%%/graphite/templates/event.html
733
%%PYTHON_SITELIBDIR%%/graphite/templates/events.html
708
%%PYTHON_SITELIBDIR%%/graphite/templates/events.html
734
%%PYTHON_SITELIBDIR%%/graphite/templates/graphlot.html
735
%%PYTHON_SITELIBDIR%%/graphite/templates/login.html
709
%%PYTHON_SITELIBDIR%%/graphite/templates/login.html
736
%%PYTHON_SITELIBDIR%%/graphite/templates/version.html
710
%%PYTHON_SITELIBDIR%%/graphite/templates/version.html
737
%%PYTHON_SITELIBDIR%%/graphite/thirdparty/__init__.py
711
%%PYTHON_SITELIBDIR%%/graphite/thirdparty/__init__.py
Lines 758-763 Link Here
758
%%PYTHON_SITELIBDIR%%/graphite/urls.py
732
%%PYTHON_SITELIBDIR%%/graphite/urls.py
759
%%PYTHON_SITELIBDIR%%/graphite/urls.pyc
733
%%PYTHON_SITELIBDIR%%/graphite/urls.pyc
760
%%PYTHON_SITELIBDIR%%/graphite/urls.pyo
734
%%PYTHON_SITELIBDIR%%/graphite/urls.pyo
735
%%PYTHON_SITELIBDIR%%/graphite/url_shortener/__init__.py
736
%%PYTHON_SITELIBDIR%%/graphite/url_shortener/__init__.pyc
737
%%PYTHON_SITELIBDIR%%/graphite/url_shortener/__init__.pyo
738
%%PYTHON_SITELIBDIR%%/graphite/url_shortener/baseconv.py
739
%%PYTHON_SITELIBDIR%%/graphite/url_shortener/baseconv.pyc
740
%%PYTHON_SITELIBDIR%%/graphite/url_shortener/baseconv.pyo
741
%%PYTHON_SITELIBDIR%%/graphite/url_shortener/models.py
742
%%PYTHON_SITELIBDIR%%/graphite/url_shortener/models.pyc
743
%%PYTHON_SITELIBDIR%%/graphite/url_shortener/models.pyo
744
%%PYTHON_SITELIBDIR%%/graphite/url_shortener/views.py
745
%%PYTHON_SITELIBDIR%%/graphite/url_shortener/views.pyc
746
%%PYTHON_SITELIBDIR%%/graphite/url_shortener/views.pyo
761
%%PYTHON_SITELIBDIR%%/graphite/util.py
747
%%PYTHON_SITELIBDIR%%/graphite/util.py
762
%%PYTHON_SITELIBDIR%%/graphite/util.pyc
748
%%PYTHON_SITELIBDIR%%/graphite/util.pyc
763
%%PYTHON_SITELIBDIR%%/graphite/util.pyo
749
%%PYTHON_SITELIBDIR%%/graphite/util.pyo

Return to bug 206534