ports/184969: [PATCH] www/py-graphite-web: Fix with django 1.5 and 1.6
Steve Wills
swills at freebsd.org
Wed Dec 18 16:31:03 UTC 2013
>Number: 184969
>Category: ports
>Synopsis: [PATCH] www/py-graphite-web: Fix with django 1.5 and 1.6
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Wed Dec 18 16:31:02 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator: Steve Wills
>Release: FreeBSD 11.0-CURRENT amd64
>Organization:
>Environment:
System: FreeBSD meatwad.mouf.net 11.0-CURRENT FreeBSD 11.0-CURRENT #3 r258961M: Sun Dec 8 15:52:57
>Description:
- Fix running with Django 1.5 and 1.6
Obtained from: upstream (https://github.com/graphite-project/graphite-web/commit/fc3f018544c19b90cc63797d18970a4cc27ef2ad)
Port maintainer (bsdports at wayfair.com) is cc'd.
Generated with FreeBSD Port Tools 0.99_11 (mode: change, diff: SVN)
>How-To-Repeat:
>Fix:
--- py27-graphite-web-0.9.12_1.patch begins here ---
Index: Makefile
===================================================================
--- Makefile (revision 336845)
+++ Makefile (working copy)
@@ -3,6 +3,7 @@
PORTNAME= graphite-web
PORTVERSION= 0.9.12
+PORTREVISION= 1
CATEGORIES= www python
MASTER_SITES= https://github.com/graphite-project/${PORTNAME}/archive/${PORTVERSION}.tar.gz?dummy=
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
Index: files/patch-django15
===================================================================
--- files/patch-django15 (revision 0)
+++ files/patch-django15 (working copy)
@@ -0,0 +1,143 @@
+--- webapp/graphite/account/urls.py
++++ webapp/graphite/account/urls.py
+@@ -12,7 +12,7 @@
+ See the License for the specific language governing permissions and
+ limitations under the License."""
+
+-from django.conf.urls.defaults import *
++from django.conf.urls import *
+
+ urlpatterns = patterns('graphite.account.views',
+ ('^login/?$', 'loginView'),
+--- webapp/graphite/browser/urls.py
++++ webapp/graphite/browser/urls.py
+@@ -12,7 +12,7 @@
+ See the License for the specific language governing permissions and
+ limitations under the License."""
+
+-from django.conf.urls.defaults import *
++from django.conf.urls import *
+
+ urlpatterns = patterns('graphite.browser.views',
+ ('^header/?$', 'header'),
+--- webapp/graphite/cli/urls.py
++++ webapp/graphite/cli/urls.py
+@@ -12,7 +12,7 @@
+ See the License for the specific language governing permissions and
+ limitations under the License."""
+
+-from django.conf.urls.defaults import *
++from django.conf.urls import *
+
+ urlpatterns = patterns('graphite.cli.views',
+ (r'^autocomplete/?$', 'autocomplete'),
+--- webapp/graphite/composer/urls.py
++++ webapp/graphite/composer/urls.py
+@@ -12,7 +12,7 @@
+ See the License for the specific language governing permissions and
+ limitations under the License."""
+
+-from django.conf.urls.defaults import *
++from django.conf.urls import *
+
+ urlpatterns = patterns('graphite.composer.views',
+ ('send_email','send_email'),
+--- webapp/graphite/dashboard/urls.py
++++ webapp/graphite/dashboard/urls.py
+@@ -1,4 +1,4 @@
+-from django.conf.urls.defaults import *
++from django.conf.urls import *
+
+ urlpatterns = patterns('graphite.dashboard.views',
+ ('^save/(?P<name>[^/]+)', 'save'),
+--- webapp/graphite/events/urls.py
++++ webapp/graphite/events/urls.py
+@@ -12,7 +12,7 @@
+ See the License for the specific language governing permissions and
+ limitations under the License."""
+
+-from django.conf.urls.defaults import *
++from django.conf.urls import *
+
+ urlpatterns = patterns('graphite.events.views',
+ ('^get_data?$', 'get_data'),
+--- webapp/graphite/graphlot/urls.py
++++ webapp/graphite/graphlot/urls.py
+@@ -12,7 +12,7 @@
+ See the License for the specific language governing permissions and
+ limitations under the License."""
+
+-from django.conf.urls.defaults import *
++from django.conf.urls import *
+
+ urlpatterns = patterns('graphite.graphlot.views',
+ ('^rawdata/?$', 'get_data'),
+--- webapp/graphite/manage.py
++++ webapp/graphite/manage.py
+@@ -7,5 +7,7 @@
+ sys.stderr.write("Error: Can't find the file 'settings.py' in the directory containing %r. It appears you've customized things.\nYou'll have to run django-admin.py, passing it your settings module.\n(If the file settings.py does indeed exist, it's causing an ImportError somehow.)\n" % __file__)
+ sys.exit(1)
+
++import os
+ if __name__ == "__main__":
+- execute_manager(settings)
++ os.environ.setdefault("DJANGO_SETTINGS_MODULE", "settings")
++ execute_from_command_line()
+--- webapp/graphite/metrics/urls.py
++++ webapp/graphite/metrics/urls.py
+@@ -12,7 +12,7 @@
+ See the License for the specific language governing permissions and
+ limitations under the License."""
+
+-from django.conf.urls.defaults import *
++from django.conf.urls import *
+
+ urlpatterns = patterns('graphite.metrics.views',
+ ('^index\.json$', 'index_json'),
+--- webapp/graphite/render/urls.py
++++ webapp/graphite/render/urls.py
+@@ -12,7 +12,7 @@
+ See the License for the specific language governing permissions and
+ limitations under the License."""
+
+-from django.conf.urls.defaults import *
++from django.conf.urls import *
+
+ urlpatterns = patterns('graphite.render.views',
+ ('local/?$','renderLocalView'),
+--- webapp/graphite/urls.py
++++ webapp/graphite/urls.py
+@@ -12,7 +12,7 @@
+ See the License for the specific language governing permissions and
+ limitations under the License."""
+
+-from django.conf.urls.defaults import *
++from django.conf.urls import *
+ from django.conf import settings
+ from django.contrib import admin
+
+--- webapp/graphite/version/urls.py
++++ webapp/graphite/version/urls.py
+@@ -12,7 +12,7 @@
+ See the License for the specific language governing permissions and
+ limitations under the License."""
+
+-from django.conf.urls.defaults import *
++from django.conf.urls import *
+
+ urlpatterns = patterns('graphite.version.views',
+ ('', 'index'),
+--- webapp/graphite/whitelist/urls.py
++++ webapp/graphite/whitelist/urls.py
+@@ -12,7 +12,7 @@
+ See the License for the specific language governing permissions and
+ limitations under the License."""
+
+-from django.conf.urls.defaults import *
++from django.conf.urls import *
+
+ urlpatterns = patterns('graphite.whitelist.views',
+ ('add','add'),
+--
+1.8.5.1
+
Property changes on: files/patch-django15
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: pkg-plist
===================================================================
--- pkg-plist (revision 336845)
+++ pkg-plist (working copy)
@@ -656,8 +656,6 @@
%%PYTHON_SITELIBDIR%%/graphite/logger.pyc
%%PYTHON_SITELIBDIR%%/graphite/logger.pyo
%%PYTHON_SITELIBDIR%%/graphite/manage.py
-%%PYTHON_SITELIBDIR%%/graphite/manage.pyc
-%%PYTHON_SITELIBDIR%%/graphite/manage.pyo
%%PYTHON_SITELIBDIR%%/graphite/metrics/__init__.py
%%PYTHON_SITELIBDIR%%/graphite/metrics/__init__.pyc
%%PYTHON_SITELIBDIR%%/graphite/metrics/__init__.pyo
--- py27-graphite-web-0.9.12_1.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list