Index: Makefile
===================================================================
RCS file: /cvs/ports/www/py-django/Makefile,v
retrieving revision 1.28
diff -u -p -u -r1.28 Makefile
--- Makefile	13 May 2013 08:59:22 -0000	1.28
+++ Makefile	19 Sep 2013 05:00:01 -0000
@@ -2,7 +2,7 @@
 
 COMMENT =	high-level Python web framework
 
-MODPY_EGG_VERSION =	1.5.1
+MODPY_EGG_VERSION =	1.5.4
 LNAME =			django
 DISTNAME =		Django-${MODPY_EGG_VERSION}
 PKGNAME =		py-${LNAME}-${MODPY_EGG_VERSION}
Index: distinfo
===================================================================
RCS file: /cvs/ports/www/py-django/distinfo,v
retrieving revision 1.17
diff -u -p -u -r1.17 distinfo
--- distinfo	13 May 2013 08:59:22 -0000	1.17
+++ distinfo	19 Sep 2013 05:00:01 -0000
@@ -1,2 +1,2 @@
-SHA256 (Django-1.5.1.tar.gz) = iF+ty7iWPAzNpdnSzKeSlwsCibTmYkBrLeK3Nv9GEj0=
-SIZE (Django-1.5.1.tar.gz) = 8028963
+SHA256 (Django-1.5.4.tar.gz) = Qo3v4/1RXfyGEwObsKgGIqE/tLmIxb5I2wfsCY6hcE4=
+SIZE (Django-1.5.4.tar.gz) = 8050758
Index: patches/patch-django_core_servers_basehttp_py
===================================================================
RCS file: /cvs/ports/www/py-django/patches/patch-django_core_servers_basehttp_py,v
retrieving revision 1.3
diff -u -p -u -r1.3 patch-django_core_servers_basehttp_py
--- patches/patch-django_core_servers_basehttp_py	10 May 2012 20:04:48 -0000	1.3
+++ patches/patch-django_core_servers_basehttp_py	19 Sep 2013 05:00:01 -0000
@@ -1,20 +1,20 @@
 $OpenBSD: patch-django_core_servers_basehttp_py,v 1.3 2012/05/10 20:04:48 rpointel Exp $
---- django/core/servers/basehttp.py.orig	Fri Mar 23 17:59:19 2012
-+++ django/core/servers/basehttp.py	Thu May 10 09:30:20 2012
-@@ -8,6 +8,7 @@ been reviewed for security issues. DON'T USE IT FOR PR
- """
+--- django/core/servers/basehttp.py.orig	Sat Aug 31 20:17:28 2013
++++ django/core/servers/basehttp.py	Sat Aug 31 20:26:35 2013
+@@ -10,6 +10,7 @@ been reviewed for security issues. DON'T USE IT FOR PR
+ from __future__ import unicode_literals
  
  import os
 +import select
  import socket
  import sys
  import traceback
-@@ -250,4 +251,11 @@ def run(addr, port, wsgi_handler, ipv6=False, threadin
+@@ -190,4 +191,11 @@ def run(addr, port, wsgi_handler, ipv6=False, threadin
          httpd_cls = WSGIServer
      httpd = httpd_cls(server_address, WSGIRequestHandler, ipv6=ipv6)
      httpd.set_app(wsgi_handler)
 -    httpd.serve_forever()
-+    try:
++    try:    
 +        httpd.serve_forever()
 +    except select.error as (errno, msg):
 +        # catch Interrupted system call exceptions
Index: patches/patch-tests_regressiontests_utils_simplelazyobject_py
===================================================================
RCS file: patches/patch-tests_regressiontests_utils_simplelazyobject_py
diff -N patches/patch-tests_regressiontests_utils_simplelazyobject_py
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ patches/patch-tests_regressiontests_utils_simplelazyobject_py	19 Sep 2013 05:00:01 -0000
@@ -0,0 +1,25 @@
+$OpenBSD$
+--- tests/regressiontests/utils/simplelazyobject.py.orig	Sat Sep 14 23:28:02 2013
++++ tests/regressiontests/utils/simplelazyobject.py	Wed Sep 18 13:56:34 2013
+@@ -3,6 +3,8 @@ from __future__ import unicode_literals
+ import copy
+ import pickle
+ 
++from django.contrib.auth.models import User
++from django.test import TestCase as DjangoTestCase
+ from django.test.utils import str_prefix
+ from django.utils import six
+ from django.utils.unittest import TestCase
+@@ -122,9 +124,10 @@ class TestUtilsSimpleLazyObject(TestCase):
+         self.assertEqual(six.text_type(unpickled), six.text_type(x))
+         self.assertEqual(unpickled.name, x.name)
+ 
+-    def test_pickle_py2_regression(self):
+-        from django.contrib.auth.models import User
+ 
++class TestUtilsSimpleLazyObjectDjangoTestCase(DjangoTestCase):
++
++    def test_pickle_py2_regression(self):
+         # See ticket #20212
+         user = User.objects.create_user('johndoe', 'john@example.com', 'pass')
+         x = SimpleLazyObject(lambda: user)
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/www/py-django/pkg/PLIST,v
retrieving revision 1.18
diff -u -p -u -r1.18 PLIST
--- pkg/PLIST	13 May 2013 08:59:25 -0000	1.18
+++ pkg/PLIST	19 Sep 2013 05:00:02 -0000
@@ -5,8 +5,6 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/${LNAME}/__init__.py
 lib/python${MODPY_VERSION}/site-packages/${LNAME}/__init__.pyc
 lib/python${MODPY_VERSION}/site-packages/${LNAME}/bin/
-lib/python${MODPY_VERSION}/site-packages/${LNAME}/bin/__init__.py
-lib/python${MODPY_VERSION}/site-packages/${LNAME}/bin/__init__.pyc
 lib/python${MODPY_VERSION}/site-packages/${LNAME}/bin/daily_cleanup.py
 lib/python${MODPY_VERSION}/site-packages/${LNAME}/bin/daily_cleanup.pyc
 lib/python${MODPY_VERSION}/site-packages/${LNAME}/bin/${LNAME}-2to3.py
@@ -605,6 +603,7 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/${LNAME}/conf/locale/zh_TW/formats.pyc
 lib/python${MODPY_VERSION}/site-packages/${LNAME}/conf/project_template/
 lib/python${MODPY_VERSION}/site-packages/${LNAME}/conf/project_template/manage.py
+lib/python${MODPY_VERSION}/site-packages/${LNAME}/conf/project_template/manage.pyc
 lib/python${MODPY_VERSION}/site-packages/${LNAME}/conf/project_template/project_name/
 lib/python${MODPY_VERSION}/site-packages/${LNAME}/conf/project_template/project_name/__init__.py
 lib/python${MODPY_VERSION}/site-packages/${LNAME}/conf/project_template/project_name/__init__.pyc
@@ -635,6 +634,7 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/${LNAME}/contrib/admin/actions.pyc
 lib/python${MODPY_VERSION}/site-packages/${LNAME}/contrib/admin/bin/
 lib/python${MODPY_VERSION}/site-packages/${LNAME}/contrib/admin/bin/compress.py
+lib/python${MODPY_VERSION}/site-packages/${LNAME}/contrib/admin/bin/compress.pyc
 lib/python${MODPY_VERSION}/site-packages/${LNAME}/contrib/admin/filters.py
 lib/python${MODPY_VERSION}/site-packages/${LNAME}/contrib/admin/filters.pyc
 lib/python${MODPY_VERSION}/site-packages/${LNAME}/contrib/admin/forms.py
@@ -6008,6 +6008,8 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/${LNAME}/contrib/sessions/middleware.pyc
 lib/python${MODPY_VERSION}/site-packages/${LNAME}/contrib/sessions/models.py
 lib/python${MODPY_VERSION}/site-packages/${LNAME}/contrib/sessions/models.pyc
+lib/python${MODPY_VERSION}/site-packages/${LNAME}/contrib/sessions/serializers.py
+lib/python${MODPY_VERSION}/site-packages/${LNAME}/contrib/sessions/serializers.pyc
 lib/python${MODPY_VERSION}/site-packages/${LNAME}/contrib/sessions/tests.py
 lib/python${MODPY_VERSION}/site-packages/${LNAME}/contrib/sessions/tests.pyc
 lib/python${MODPY_VERSION}/site-packages/${LNAME}/contrib/sitemaps/
@@ -7074,7 +7076,10 @@ share/doc/${LNAME}/howto/jython.txt
 share/doc/${LNAME}/howto/legacy-databases.txt
 share/doc/${LNAME}/howto/outputting-csv.txt
 share/doc/${LNAME}/howto/outputting-pdf.txt
-share/doc/${LNAME}/howto/static-files.txt
+share/doc/${LNAME}/howto/static-files/
+share/doc/${LNAME}/howto/static-files/deployment.txt
+share/doc/${LNAME}/howto/static-files/index.txt
+share/doc/${LNAME}/howto/upgrade-version.txt
 share/doc/${LNAME}/index.txt
 share/doc/${LNAME}/internals/
 share/doc/${LNAME}/internals/_images/
@@ -7136,6 +7141,7 @@ share/doc/${LNAME}/intro/tutorial02.txt
 share/doc/${LNAME}/intro/tutorial03.txt
 share/doc/${LNAME}/intro/tutorial04.txt
 share/doc/${LNAME}/intro/tutorial05.txt
+share/doc/${LNAME}/intro/tutorial06.txt
 share/doc/${LNAME}/intro/whatsnext.txt
 share/doc/${LNAME}/make.bat
 share/doc/${LNAME}/man/
@@ -7268,6 +7274,7 @@ share/doc/${LNAME}/ref/urlresolvers.txt
 share/doc/${LNAME}/ref/urls.txt
 share/doc/${LNAME}/ref/utils.txt
 share/doc/${LNAME}/ref/validators.txt
+share/doc/${LNAME}/ref/views.txt
 share/doc/${LNAME}/releases/
 share/doc/${LNAME}/releases/0.95.txt
 share/doc/${LNAME}/releases/0.96.txt
@@ -7301,14 +7308,28 @@ share/doc/${LNAME}/releases/1.3-alpha-1.
 share/doc/${LNAME}/releases/1.3-beta-1.txt
 share/doc/${LNAME}/releases/1.3.1.txt
 share/doc/${LNAME}/releases/1.3.2.txt
+share/doc/${LNAME}/releases/1.3.3.txt
+share/doc/${LNAME}/releases/1.3.4.txt
+share/doc/${LNAME}/releases/1.3.5.txt
+share/doc/${LNAME}/releases/1.3.6.txt
+share/doc/${LNAME}/releases/1.3.7.txt
 share/doc/${LNAME}/releases/1.3.txt
 share/doc/${LNAME}/releases/1.4-alpha-1.txt
 share/doc/${LNAME}/releases/1.4-beta-1.txt
 share/doc/${LNAME}/releases/1.4.1.txt
 share/doc/${LNAME}/releases/1.4.2.txt
+share/doc/${LNAME}/releases/1.4.3.txt
+share/doc/${LNAME}/releases/1.4.4.txt
+share/doc/${LNAME}/releases/1.4.5.txt
+share/doc/${LNAME}/releases/1.4.6.txt
+share/doc/${LNAME}/releases/1.4.7.txt
+share/doc/${LNAME}/releases/1.4.8.txt
 share/doc/${LNAME}/releases/1.4.txt
 share/doc/${LNAME}/releases/1.5-alpha-1.txt
 share/doc/${LNAME}/releases/1.5-beta-1.txt
+share/doc/${LNAME}/releases/1.5.1.txt
+share/doc/${LNAME}/releases/1.5.2.txt
+share/doc/${LNAME}/releases/1.5.3.txt
 share/doc/${LNAME}/releases/${MODPY_EGG_VERSION}.txt
 share/doc/${LNAME}/releases/1.5.txt
 share/doc/${LNAME}/releases/index.txt