3 files changed, 14 insertions, 58 deletions

diff --git a/www/py-dojango/Makefile b/www/py-dojango/Makefile
index 55a75b184be6..5cbcbe64be96 100644
--- a/www/py-dojango/Makefile
+++ b/www/py-dojango/Makefile
@@ -6,12 +6,10 @@
 #
 
 PORTNAME=	dojango
-PORTVERSION=	0.5.2
-PORTREVISION=	1
+PORTVERSION=	0.5.5
 CATEGORIES=	www python java
-MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
-MASTER_SITE_SUBDIR=	""
-PKGNAMEPREFIX=  ${PYTHON_PKGNAMEPREFIX}
+MASTER_SITES=	CHEESESHOP
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	jpaetzel@FreeBSD.org
 COMMENT=	A django application for building dojo
diff --git a/www/py-dojango/files/patch-dojango__forms__fields.py b/www/py-dojango/files/patch-dojango__forms__fields.py
deleted file mode 100644
index 5764f2db0735..000000000000
--- a/www/py-dojango/files/patch-dojango__forms__fields.py
+++ /dev/null
@@ -1,51 +0,0 @@
---- ./dojango/forms/fields.py.orig	2011-04-14 15:25:02.000000000 -0700
-+++ ./dojango/forms/fields.py	2011-09-26 17:14:30.353122595 -0700
-@@ -6,8 +6,7 @@
- from dojango.util import json_encode
- 
- __all__ = (
--    'Field', 'DEFAULT_DATE_INPUT_FORMATS', 'DEFAULT_TIME_INPUT_FORMATS', # original django classes
--    'DEFAULT_DATETIME_INPUT_FORMATS', 'MultiValueField', 'ComboField', # original django classes
-+    'Field', 'MultiValueField', 'ComboField', # original django classes
-     'DojoFieldMixin', 'CharField', 'ChoiceField', 'TypedChoiceField',
-     'IntegerField', 'BooleanField', 'FileField', 'ImageField',
-     'DateField', 'TimeField', 'DateTimeField', 'SplitDateTimeField',
-@@ -74,26 +73,30 @@
- class ImageField(DojoFieldMixin, fields.ImageField):
-     widget = widgets.FileInput
- 
-+# also support dojo's default date-string
-+dj_settings.DATE_INPUT_FORMATS = tuple(list(dj_settings.DATE_INPUT_FORMATS) + [
-+        '%Y-%m-%dT%H:%M', '%Y-%m-%dT%H:%M:%S'
-+        ])
-+
- class DateField(DojoFieldMixin, fields.DateField):
-     widget = widgets.DateInput
-     
-     def __init__(self, input_formats=None, min_value=None, max_value=None, *args, **kwargs):
--        kwargs['input_formats'] = input_formats or \
--            tuple(list(formats.get_format('DATE_INPUT_FORMATS')) + [
--                '%Y-%m-%dT%H:%M', '%Y-%m-%dT%H:%M:%S' # also support dojo's default date-strings
--            ])
-+        kwargs['input_formats'] = input_formats or formats.get_format('DATE_INPUT_FORMATS')
-         self.max_value = max_value
-         self.min_value = min_value
-         super(DateField, self).__init__(*args, **kwargs)
- 
-+# also support dojo's default date-string
-+dj_settings.TIME_INPUT_FORMATS = tuple(list(dj_settings.TIME_INPUT_FORMATS) + [
-+        '%Y-%m-%dT%H:%M', '%Y-%m-%dT%H:%M:%S', 'T%H:%M:%S', 'T%H:%M'
-+        ])
-+
- class TimeField(DojoFieldMixin, fields.TimeField):
-     widget = widgets.TimeInput
-     
-     def __init__(self, input_formats=None, min_value=None, max_value=None, *args, **kwargs):
--        kwargs['input_formats'] = input_formats or \
--            tuple(list(formats.get_format('TIME_INPUT_FORMATS')) + [
--                '%Y-%m-%dT%H:%M', '%Y-%m-%dT%H:%M:%S', 'T%H:%M:%S', 'T%H:%M' # also support dojo's default time-strings
--            ])
-+        kwargs['input_formats'] = input_formats or formats.get_format('TIME_INPUT_FORMATS')
-         self.max_value = max_value
-         self.min_value = min_value
-         super(TimeField, self).__init__(*args, **kwargs)
diff --git a/www/py-dojango/pkg-plist b/www/py-dojango/pkg-plist
index 48849f3e0c81..ecdcd2baa4fd 100644
--- a/www/py-dojango/pkg-plist
+++ b/www/py-dojango/pkg-plist
@@ -17,6 +17,15 @@
 %%PYTHON_SITELIBDIR%%/dojango/conf/settings.py
 %%PYTHON_SITELIBDIR%%/dojango/conf/settings.pyc
 %%PYTHON_SITELIBDIR%%/dojango/conf/settings.pyo
+%%PYTHON_SITELIBDIR%%/dojango/contrib/__init__.py
+%%PYTHON_SITELIBDIR%%/dojango/contrib/__init__.pyc
+%%PYTHON_SITELIBDIR%%/dojango/contrib/__init__.pyo
+%%PYTHON_SITELIBDIR%%/dojango/contrib/auth/__init__.py
+%%PYTHON_SITELIBDIR%%/dojango/contrib/auth/__init__.pyc
+%%PYTHON_SITELIBDIR%%/dojango/contrib/auth/__init__.pyo
+%%PYTHON_SITELIBDIR%%/dojango/contrib/auth/forms.py
+%%PYTHON_SITELIBDIR%%/dojango/contrib/auth/forms.pyc
+%%PYTHON_SITELIBDIR%%/dojango/contrib/auth/forms.pyo
 %%PYTHON_SITELIBDIR%%/dojango/context_processors.py
 %%PYTHON_SITELIBDIR%%/dojango/context_processors.pyc
 %%PYTHON_SITELIBDIR%%/dojango/context_processors.pyo
@@ -67,7 +76,6 @@
 %%PYTHON_SITELIBDIR%%/dojango/dojo-media/dojango/widget/ThumbnailPicker.js
 %%PYTHON_SITELIBDIR%%/dojango/dojo-media/dojango/widget/plugins/InsertImage.js
 %%PYTHON_SITELIBDIR%%/dojango/dojo-media/dojango/widget/resources/ThumbnailPicker.css
-%%PYTHON_SITELIBDIR%%/dojango/dojo-media/src/README
 %%PYTHON_SITELIBDIR%%/dojango/decorators.py
 %%PYTHON_SITELIBDIR%%/dojango/decorators.pyc
 %%PYTHON_SITELIBDIR%%/dojango/decorators.pyo
@@ -156,7 +164,6 @@
 @dirrm %%PYTHON_SITELIBDIR%%/dojango/management/commands
 @dirrm %%PYTHON_SITELIBDIR%%/dojango/management
 @dirrm %%PYTHON_SITELIBDIR%%/dojango/forms
-@dirrm %%PYTHON_SITELIBDIR%%/dojango/dojo-media/src
 @dirrm %%PYTHON_SITELIBDIR%%/dojango/dojo-media/dojango/widget/resources
 @dirrm %%PYTHON_SITELIBDIR%%/dojango/dojo-media/dojango/widget/plugins
 @dirrm %%PYTHON_SITELIBDIR%%/dojango/dojo-media/dojango/widget
@@ -167,6 +174,8 @@
 @dirrm %%PYTHON_SITELIBDIR%%/dojango/data/piston
 @dirrm %%PYTHON_SITELIBDIR%%/dojango/data/modelstore
 @dirrm %%PYTHON_SITELIBDIR%%/dojango/data
+@dirrm %%PYTHON_SITELIBDIR%%/dojango/contrib/auth
+@dirrm %%PYTHON_SITELIBDIR%%/dojango/contrib
 @dirrm %%PYTHON_SITELIBDIR%%/dojango/conf
 @dirrm %%PYTHON_SITELIBDIR%%/dojango/bin
 @dirrm %%PYTHON_SITELIBDIR%%/dojango/appengine