Update to Django 1.1:

- Support for aggregates and query expression in the ORM
- Suport for unamanged models and proxy models
- Support for deffered fields
- Mark individual fields as editable in the admin; support for custom
actions
- Better support for Last-Modified/ETag
- Improved GIS support
- {% for %} now has an {% empty %} to simplify handling empty lists
- Various smaller improvements

4 files changed, 185 insertions, 77 deletions

diff --git a/www/py-django/Makefile b/www/py-django/Makefile
index 57777fc9114..4415cdd912f 100644
--- a/www/py-django/Makefile
+++ b/www/py-django/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.20 2009/10/13 18:19:23 joerg Exp $
+# $NetBSD: Makefile,v 1.21 2009/10/19 11:31:05 joerg Exp $
 
-DJANGOVERS=	1.0.4
+DJANGOVERS=	1.1.1
 DISTNAME=	Django-${DJANGOVERS}
 PKGNAME=	${PYPKGPREFIX}-django-${DJANGOVERS}
 CATEGORIES=	www python
@@ -10,10 +10,11 @@ MAINTAINER=	joerg@NetBSD.org
 HOMEPAGE=	http://www.djangoproject.com/
 COMMENT=	Django, a high-level Python Web framework
 
+LICENSE=	modified-bsd
+
 PREV_PKGPATH=	www/py-django-devel
 
 PYDISTUTILSPKG=	# yes
-PYTHON_VERSIONS_ACCEPTED=	25 24
 PLIST_SUBST+=	PYVERSSUFFIX=${PYVERSSUFFIX:Q}
 
 PKG_DESTDIR_SUPPORT=	user-destdir
diff --git a/www/py-django/PLIST b/www/py-django/PLIST
index 744d2effedf..0fe4a6041b4 100644
--- a/www/py-django/PLIST
+++ b/www/py-django/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2009/07/29 11:02:08 joerg Exp $
+@comment $NetBSD: PLIST,v 1.12 2009/10/19 11:31:05 joerg Exp $
 bin/django-admin.py
 ${PYSITELIB}/django/__init__.py
 ${PYSITELIB}/django/__init__.pyc
@@ -36,6 +36,9 @@ ${PYSITELIB}/django/conf/app_template/__init__.pyo
 ${PYSITELIB}/django/conf/app_template/models.py
 ${PYSITELIB}/django/conf/app_template/models.pyc
 ${PYSITELIB}/django/conf/app_template/models.pyo
+${PYSITELIB}/django/conf/app_template/tests.py
+${PYSITELIB}/django/conf/app_template/tests.pyc
+${PYSITELIB}/django/conf/app_template/tests.pyo
 ${PYSITELIB}/django/conf/app_template/views.py
 ${PYSITELIB}/django/conf/app_template/views.pyc
 ${PYSITELIB}/django/conf/app_template/views.pyo
@@ -214,6 +217,10 @@ ${PYSITELIB}/django/conf/locale/sr/LC_MESSAGES/django.mo
 ${PYSITELIB}/django/conf/locale/sr/LC_MESSAGES/django.po
 ${PYSITELIB}/django/conf/locale/sr/LC_MESSAGES/djangojs.mo
 ${PYSITELIB}/django/conf/locale/sr/LC_MESSAGES/djangojs.po
+${PYSITELIB}/django/conf/locale/sr_Latn/LC_MESSAGES/django.mo
+${PYSITELIB}/django/conf/locale/sr_Latn/LC_MESSAGES/django.po
+${PYSITELIB}/django/conf/locale/sr_Latn/LC_MESSAGES/djangojs.mo
+${PYSITELIB}/django/conf/locale/sr_Latn/LC_MESSAGES/djangojs.po
 ${PYSITELIB}/django/conf/locale/sv/LC_MESSAGES/django.mo
 ${PYSITELIB}/django/conf/locale/sv/LC_MESSAGES/django.po
 ${PYSITELIB}/django/conf/locale/sv/LC_MESSAGES/djangojs.mo
@@ -276,6 +283,9 @@ ${PYSITELIB}/django/contrib/__init__.pyo
 ${PYSITELIB}/django/contrib/admin/__init__.py
 ${PYSITELIB}/django/contrib/admin/__init__.pyc
 ${PYSITELIB}/django/contrib/admin/__init__.pyo
+${PYSITELIB}/django/contrib/admin/actions.py
+${PYSITELIB}/django/contrib/admin/actions.pyc
+${PYSITELIB}/django/contrib/admin/actions.pyo
 ${PYSITELIB}/django/contrib/admin/filterspecs.py
 ${PYSITELIB}/django/contrib/admin/filterspecs.pyc
 ${PYSITELIB}/django/contrib/admin/filterspecs.pyo
@@ -286,11 +296,8 @@ ${PYSITELIB}/django/contrib/admin/media/css/base.css
 ${PYSITELIB}/django/contrib/admin/media/css/changelists.css
 ${PYSITELIB}/django/contrib/admin/media/css/dashboard.css
 ${PYSITELIB}/django/contrib/admin/media/css/forms.css
-${PYSITELIB}/django/contrib/admin/media/css/global.css
-${PYSITELIB}/django/contrib/admin/media/css/layout.css
+${PYSITELIB}/django/contrib/admin/media/css/ie.css
 ${PYSITELIB}/django/contrib/admin/media/css/login.css
-${PYSITELIB}/django/contrib/admin/media/css/null.css
-${PYSITELIB}/django/contrib/admin/media/css/patch-iewin.css
 ${PYSITELIB}/django/contrib/admin/media/css/rtl.css
 ${PYSITELIB}/django/contrib/admin/media/css/widgets.css
 ${PYSITELIB}/django/contrib/admin/media/img/admin/arrow-down.gif
@@ -341,6 +348,7 @@ ${PYSITELIB}/django/contrib/admin/media/img/gis/move_vertex_off.png
 ${PYSITELIB}/django/contrib/admin/media/img/gis/move_vertex_on.png
 ${PYSITELIB}/django/contrib/admin/media/js/SelectBox.js
 ${PYSITELIB}/django/contrib/admin/media/js/SelectFilter2.js
+${PYSITELIB}/django/contrib/admin/media/js/actions.js
 ${PYSITELIB}/django/contrib/admin/media/js/admin/CollapsedFieldsets.js
 ${PYSITELIB}/django/contrib/admin/media/js/admin/DateTimeShortcuts.js
 ${PYSITELIB}/django/contrib/admin/media/js/admin/RelatedObjectLookups.js
@@ -362,6 +370,7 @@ ${PYSITELIB}/django/contrib/admin/sites.pyc
 ${PYSITELIB}/django/contrib/admin/sites.pyo
 ${PYSITELIB}/django/contrib/admin/templates/admin/404.html
 ${PYSITELIB}/django/contrib/admin/templates/admin/500.html
+${PYSITELIB}/django/contrib/admin/templates/admin/actions.html
 ${PYSITELIB}/django/contrib/admin/templates/admin/app_index.html
 ${PYSITELIB}/django/contrib/admin/templates/admin/auth/user/add_form.html
 ${PYSITELIB}/django/contrib/admin/templates/admin/auth/user/change_password.html
@@ -372,6 +381,7 @@ ${PYSITELIB}/django/contrib/admin/templates/admin/change_list.html
 ${PYSITELIB}/django/contrib/admin/templates/admin/change_list_results.html
 ${PYSITELIB}/django/contrib/admin/templates/admin/date_hierarchy.html
 ${PYSITELIB}/django/contrib/admin/templates/admin/delete_confirmation.html
+${PYSITELIB}/django/contrib/admin/templates/admin/delete_selected_confirmation.html
 ${PYSITELIB}/django/contrib/admin/templates/admin/edit_inline/stacked.html
 ${PYSITELIB}/django/contrib/admin/templates/admin/edit_inline/tabular.html
 ${PYSITELIB}/django/contrib/admin/templates/admin/filter.html
@@ -500,10 +510,16 @@ ${PYSITELIB}/django/contrib/auth/tests/basic.pyo
 ${PYSITELIB}/django/contrib/auth/tests/forms.py
 ${PYSITELIB}/django/contrib/auth/tests/forms.pyc
 ${PYSITELIB}/django/contrib/auth/tests/forms.pyo
+${PYSITELIB}/django/contrib/auth/tests/remote_user.py
+${PYSITELIB}/django/contrib/auth/tests/remote_user.pyc
+${PYSITELIB}/django/contrib/auth/tests/remote_user.pyo
 ${PYSITELIB}/django/contrib/auth/tests/templates/registration/login.html
 ${PYSITELIB}/django/contrib/auth/tests/tokens.py
 ${PYSITELIB}/django/contrib/auth/tests/tokens.pyc
 ${PYSITELIB}/django/contrib/auth/tests/tokens.pyo
+${PYSITELIB}/django/contrib/auth/tests/urls.py
+${PYSITELIB}/django/contrib/auth/tests/urls.pyc
+${PYSITELIB}/django/contrib/auth/tests/urls.pyo
 ${PYSITELIB}/django/contrib/auth/tests/views.py
 ${PYSITELIB}/django/contrib/auth/tests/views.pyc
 ${PYSITELIB}/django/contrib/auth/tests/views.pyo
@@ -534,6 +550,9 @@ ${PYSITELIB}/django/contrib/comments/managers.pyo
 ${PYSITELIB}/django/contrib/comments/models.py
 ${PYSITELIB}/django/contrib/comments/models.pyc
 ${PYSITELIB}/django/contrib/comments/models.pyo
+${PYSITELIB}/django/contrib/comments/moderation.py
+${PYSITELIB}/django/contrib/comments/moderation.pyc
+${PYSITELIB}/django/contrib/comments/moderation.pyo
 ${PYSITELIB}/django/contrib/comments/signals.py
 ${PYSITELIB}/django/contrib/comments/signals.pyc
 ${PYSITELIB}/django/contrib/comments/signals.pyo
@@ -594,6 +613,12 @@ ${PYSITELIB}/django/contrib/csrf/__init__.pyo
 ${PYSITELIB}/django/contrib/csrf/middleware.py
 ${PYSITELIB}/django/contrib/csrf/middleware.pyc
 ${PYSITELIB}/django/contrib/csrf/middleware.pyo
+${PYSITELIB}/django/contrib/csrf/models.py
+${PYSITELIB}/django/contrib/csrf/models.pyc
+${PYSITELIB}/django/contrib/csrf/models.pyo
+${PYSITELIB}/django/contrib/csrf/tests.py
+${PYSITELIB}/django/contrib/csrf/tests.pyc
+${PYSITELIB}/django/contrib/csrf/tests.pyo
 ${PYSITELIB}/django/contrib/databrowse/__init__.py
 ${PYSITELIB}/django/contrib/databrowse/__init__.pyc
 ${PYSITELIB}/django/contrib/databrowse/__init__.pyo
@@ -752,21 +777,39 @@ ${PYSITELIB}/django/contrib/gis/db/backend/postgis/models.pyo
 ${PYSITELIB}/django/contrib/gis/db/backend/postgis/query.py
 ${PYSITELIB}/django/contrib/gis/db/backend/postgis/query.pyc
 ${PYSITELIB}/django/contrib/gis/db/backend/postgis/query.pyo
+${PYSITELIB}/django/contrib/gis/db/backend/spatialite/__init__.py
+${PYSITELIB}/django/contrib/gis/db/backend/spatialite/__init__.pyc
+${PYSITELIB}/django/contrib/gis/db/backend/spatialite/__init__.pyo
+${PYSITELIB}/django/contrib/gis/db/backend/spatialite/adaptor.py
+${PYSITELIB}/django/contrib/gis/db/backend/spatialite/adaptor.pyc
+${PYSITELIB}/django/contrib/gis/db/backend/spatialite/adaptor.pyo
+${PYSITELIB}/django/contrib/gis/db/backend/spatialite/creation.py
+${PYSITELIB}/django/contrib/gis/db/backend/spatialite/creation.pyc
+${PYSITELIB}/django/contrib/gis/db/backend/spatialite/creation.pyo
+${PYSITELIB}/django/contrib/gis/db/backend/spatialite/field.py
+${PYSITELIB}/django/contrib/gis/db/backend/spatialite/field.pyc
+${PYSITELIB}/django/contrib/gis/db/backend/spatialite/field.pyo
+${PYSITELIB}/django/contrib/gis/db/backend/spatialite/models.py
+${PYSITELIB}/django/contrib/gis/db/backend/spatialite/models.pyc
+${PYSITELIB}/django/contrib/gis/db/backend/spatialite/models.pyo
+${PYSITELIB}/django/contrib/gis/db/backend/spatialite/query.py
+${PYSITELIB}/django/contrib/gis/db/backend/spatialite/query.pyc
+${PYSITELIB}/django/contrib/gis/db/backend/spatialite/query.pyo
 ${PYSITELIB}/django/contrib/gis/db/backend/util.py
 ${PYSITELIB}/django/contrib/gis/db/backend/util.pyc
 ${PYSITELIB}/django/contrib/gis/db/backend/util.pyo
 ${PYSITELIB}/django/contrib/gis/db/models/__init__.py
 ${PYSITELIB}/django/contrib/gis/db/models/__init__.pyc
 ${PYSITELIB}/django/contrib/gis/db/models/__init__.pyo
+${PYSITELIB}/django/contrib/gis/db/models/aggregates.py
+${PYSITELIB}/django/contrib/gis/db/models/aggregates.pyc
+${PYSITELIB}/django/contrib/gis/db/models/aggregates.pyo
 ${PYSITELIB}/django/contrib/gis/db/models/fields/__init__.py
 ${PYSITELIB}/django/contrib/gis/db/models/fields/__init__.pyc
 ${PYSITELIB}/django/contrib/gis/db/models/fields/__init__.pyo
 ${PYSITELIB}/django/contrib/gis/db/models/manager.py
 ${PYSITELIB}/django/contrib/gis/db/models/manager.pyc
 ${PYSITELIB}/django/contrib/gis/db/models/manager.pyo
-${PYSITELIB}/django/contrib/gis/db/models/mixin.py
-${PYSITELIB}/django/contrib/gis/db/models/mixin.pyc
-${PYSITELIB}/django/contrib/gis/db/models/mixin.pyo
 ${PYSITELIB}/django/contrib/gis/db/models/proxy.py
 ${PYSITELIB}/django/contrib/gis/db/models/proxy.pyc
 ${PYSITELIB}/django/contrib/gis/db/models/proxy.pyo
@@ -776,6 +819,12 @@ ${PYSITELIB}/django/contrib/gis/db/models/query.pyo
 ${PYSITELIB}/django/contrib/gis/db/models/sql/__init__.py
 ${PYSITELIB}/django/contrib/gis/db/models/sql/__init__.pyc
 ${PYSITELIB}/django/contrib/gis/db/models/sql/__init__.pyo
+${PYSITELIB}/django/contrib/gis/db/models/sql/aggregates.py
+${PYSITELIB}/django/contrib/gis/db/models/sql/aggregates.pyc
+${PYSITELIB}/django/contrib/gis/db/models/sql/aggregates.pyo
+${PYSITELIB}/django/contrib/gis/db/models/sql/conversion.py
+${PYSITELIB}/django/contrib/gis/db/models/sql/conversion.pyc
+${PYSITELIB}/django/contrib/gis/db/models/sql/conversion.pyo
 ${PYSITELIB}/django/contrib/gis/db/models/sql/query.py
 ${PYSITELIB}/django/contrib/gis/db/models/sql/query.pyc
 ${PYSITELIB}/django/contrib/gis/db/models/sql/query.pyo
@@ -797,6 +846,9 @@ ${PYSITELIB}/django/contrib/gis/forms/fields.pyo
 ${PYSITELIB}/django/contrib/gis/gdal/__init__.py
 ${PYSITELIB}/django/contrib/gis/gdal/__init__.pyc
 ${PYSITELIB}/django/contrib/gis/gdal/__init__.pyo
+${PYSITELIB}/django/contrib/gis/gdal/base.py
+${PYSITELIB}/django/contrib/gis/gdal/base.pyc
+${PYSITELIB}/django/contrib/gis/gdal/base.pyo
 ${PYSITELIB}/django/contrib/gis/gdal/datasource.py
 ${PYSITELIB}/django/contrib/gis/gdal/datasource.pyc
 ${PYSITELIB}/django/contrib/gis/gdal/datasource.pyo
@@ -848,6 +900,24 @@ ${PYSITELIB}/django/contrib/gis/gdal/prototypes/srs.pyo
 ${PYSITELIB}/django/contrib/gis/gdal/srs.py
 ${PYSITELIB}/django/contrib/gis/gdal/srs.pyc
 ${PYSITELIB}/django/contrib/gis/gdal/srs.pyo
+${PYSITELIB}/django/contrib/gis/gdal/tests/__init__.py
+${PYSITELIB}/django/contrib/gis/gdal/tests/__init__.pyc
+${PYSITELIB}/django/contrib/gis/gdal/tests/__init__.pyo
+${PYSITELIB}/django/contrib/gis/gdal/tests/test_driver.py
+${PYSITELIB}/django/contrib/gis/gdal/tests/test_driver.pyc
+${PYSITELIB}/django/contrib/gis/gdal/tests/test_driver.pyo
+${PYSITELIB}/django/contrib/gis/gdal/tests/test_ds.py
+${PYSITELIB}/django/contrib/gis/gdal/tests/test_ds.pyc
+${PYSITELIB}/django/contrib/gis/gdal/tests/test_ds.pyo
+${PYSITELIB}/django/contrib/gis/gdal/tests/test_envelope.py
+${PYSITELIB}/django/contrib/gis/gdal/tests/test_envelope.pyc
+${PYSITELIB}/django/contrib/gis/gdal/tests/test_envelope.pyo
+${PYSITELIB}/django/contrib/gis/gdal/tests/test_geom.py
+${PYSITELIB}/django/contrib/gis/gdal/tests/test_geom.pyc
+${PYSITELIB}/django/contrib/gis/gdal/tests/test_geom.pyo
+${PYSITELIB}/django/contrib/gis/gdal/tests/test_srs.py
+${PYSITELIB}/django/contrib/gis/gdal/tests/test_srs.pyc
+${PYSITELIB}/django/contrib/gis/gdal/tests/test_srs.pyo
 ${PYSITELIB}/django/contrib/gis/geos/__init__.py
 ${PYSITELIB}/django/contrib/gis/geos/__init__.pyc
 ${PYSITELIB}/django/contrib/gis/geos/__init__.pyo
@@ -863,12 +933,33 @@ ${PYSITELIB}/django/contrib/gis/geos/coordseq.pyo
 ${PYSITELIB}/django/contrib/gis/geos/error.py
 ${PYSITELIB}/django/contrib/gis/geos/error.pyc
 ${PYSITELIB}/django/contrib/gis/geos/error.pyo
-${PYSITELIB}/django/contrib/gis/geos/geometries.py
-${PYSITELIB}/django/contrib/gis/geos/geometries.pyc
-${PYSITELIB}/django/contrib/gis/geos/geometries.pyo
+${PYSITELIB}/django/contrib/gis/geos/factory.py
+${PYSITELIB}/django/contrib/gis/geos/factory.pyc
+${PYSITELIB}/django/contrib/gis/geos/factory.pyo
+${PYSITELIB}/django/contrib/gis/geos/geometry.py
+${PYSITELIB}/django/contrib/gis/geos/geometry.pyc
+${PYSITELIB}/django/contrib/gis/geos/geometry.pyo
+${PYSITELIB}/django/contrib/gis/geos/io.py
+${PYSITELIB}/django/contrib/gis/geos/io.pyc
+${PYSITELIB}/django/contrib/gis/geos/io.pyo
 ${PYSITELIB}/django/contrib/gis/geos/libgeos.py
 ${PYSITELIB}/django/contrib/gis/geos/libgeos.pyc
 ${PYSITELIB}/django/contrib/gis/geos/libgeos.pyo
+${PYSITELIB}/django/contrib/gis/geos/linestring.py
+${PYSITELIB}/django/contrib/gis/geos/linestring.pyc
+${PYSITELIB}/django/contrib/gis/geos/linestring.pyo
+${PYSITELIB}/django/contrib/gis/geos/mutable_list.py
+${PYSITELIB}/django/contrib/gis/geos/mutable_list.pyc
+${PYSITELIB}/django/contrib/gis/geos/mutable_list.pyo
+${PYSITELIB}/django/contrib/gis/geos/point.py
+${PYSITELIB}/django/contrib/gis/geos/point.pyc
+${PYSITELIB}/django/contrib/gis/geos/point.pyo
+${PYSITELIB}/django/contrib/gis/geos/polygon.py
+${PYSITELIB}/django/contrib/gis/geos/polygon.pyc
+${PYSITELIB}/django/contrib/gis/geos/polygon.pyo
+${PYSITELIB}/django/contrib/gis/geos/prepared.py
+${PYSITELIB}/django/contrib/gis/geos/prepared.pyc
+${PYSITELIB}/django/contrib/gis/geos/prepared.pyo
 ${PYSITELIB}/django/contrib/gis/geos/prototypes/__init__.py
 ${PYSITELIB}/django/contrib/gis/geos/prototypes/__init__.pyc
 ${PYSITELIB}/django/contrib/gis/geos/prototypes/__init__.pyo
@@ -881,15 +972,36 @@ ${PYSITELIB}/django/contrib/gis/geos/prototypes/errcheck.pyo
 ${PYSITELIB}/django/contrib/gis/geos/prototypes/geom.py
 ${PYSITELIB}/django/contrib/gis/geos/prototypes/geom.pyc
 ${PYSITELIB}/django/contrib/gis/geos/prototypes/geom.pyo
+${PYSITELIB}/django/contrib/gis/geos/prototypes/io.py
+${PYSITELIB}/django/contrib/gis/geos/prototypes/io.pyc
+${PYSITELIB}/django/contrib/gis/geos/prototypes/io.pyo
 ${PYSITELIB}/django/contrib/gis/geos/prototypes/misc.py
 ${PYSITELIB}/django/contrib/gis/geos/prototypes/misc.pyc
 ${PYSITELIB}/django/contrib/gis/geos/prototypes/misc.pyo
 ${PYSITELIB}/django/contrib/gis/geos/prototypes/predicates.py
 ${PYSITELIB}/django/contrib/gis/geos/prototypes/predicates.pyc
 ${PYSITELIB}/django/contrib/gis/geos/prototypes/predicates.pyo
+${PYSITELIB}/django/contrib/gis/geos/prototypes/prepared.py
+${PYSITELIB}/django/contrib/gis/geos/prototypes/prepared.pyc
+${PYSITELIB}/django/contrib/gis/geos/prototypes/prepared.pyo
 ${PYSITELIB}/django/contrib/gis/geos/prototypes/topology.py
 ${PYSITELIB}/django/contrib/gis/geos/prototypes/topology.pyc
 ${PYSITELIB}/django/contrib/gis/geos/prototypes/topology.pyo
+${PYSITELIB}/django/contrib/gis/geos/tests/__init__.py
+${PYSITELIB}/django/contrib/gis/geos/tests/__init__.pyc
+${PYSITELIB}/django/contrib/gis/geos/tests/__init__.pyo
+${PYSITELIB}/django/contrib/gis/geos/tests/test_geos.py
+${PYSITELIB}/django/contrib/gis/geos/tests/test_geos.pyc
+${PYSITELIB}/django/contrib/gis/geos/tests/test_geos.pyo
+${PYSITELIB}/django/contrib/gis/geos/tests/test_geos_mutation.py
+${PYSITELIB}/django/contrib/gis/geos/tests/test_geos_mutation.pyc
+${PYSITELIB}/django/contrib/gis/geos/tests/test_geos_mutation.pyo
+${PYSITELIB}/django/contrib/gis/geos/tests/test_io.py
+${PYSITELIB}/django/contrib/gis/geos/tests/test_io.pyc
+${PYSITELIB}/django/contrib/gis/geos/tests/test_io.pyo
+${PYSITELIB}/django/contrib/gis/geos/tests/test_mutable_list.py
+${PYSITELIB}/django/contrib/gis/geos/tests/test_mutable_list.pyc
+${PYSITELIB}/django/contrib/gis/geos/tests/test_mutable_list.pyo
 ${PYSITELIB}/django/contrib/gis/management/__init__.py
 ${PYSITELIB}/django/contrib/gis/management/__init__.pyc
 ${PYSITELIB}/django/contrib/gis/management/__init__.pyo
@@ -948,13 +1060,27 @@ ${PYSITELIB}/django/contrib/gis/templates/gis/admin/openlayers.html
 ${PYSITELIB}/django/contrib/gis/templates/gis/admin/openlayers.js
 ${PYSITELIB}/django/contrib/gis/templates/gis/admin/osm.html
 ${PYSITELIB}/django/contrib/gis/templates/gis/admin/osm.js
-${PYSITELIB}/django/contrib/gis/templates/gis/google/js/google-map.js
+${PYSITELIB}/django/contrib/gis/templates/gis/google/google-map.html
+${PYSITELIB}/django/contrib/gis/templates/gis/google/google-map.js
+${PYSITELIB}/django/contrib/gis/templates/gis/google/google-multi.js
+${PYSITELIB}/django/contrib/gis/templates/gis/google/google-single.js
 ${PYSITELIB}/django/contrib/gis/templates/gis/kml/base.kml
 ${PYSITELIB}/django/contrib/gis/templates/gis/kml/placemarks.kml
 ${PYSITELIB}/django/contrib/gis/templates/gis/sitemaps/geo_sitemap.xml
 ${PYSITELIB}/django/contrib/gis/tests/__init__.py
 ${PYSITELIB}/django/contrib/gis/tests/__init__.pyc
 ${PYSITELIB}/django/contrib/gis/tests/__init__.pyo
+${PYSITELIB}/django/contrib/gis/tests/data/cities/cities.dbf
+${PYSITELIB}/django/contrib/gis/tests/data/cities/cities.prj
+${PYSITELIB}/django/contrib/gis/tests/data/cities/cities.shp
+${PYSITELIB}/django/contrib/gis/tests/data/cities/cities.shx
+${PYSITELIB}/django/contrib/gis/tests/data/counties/counties.dbf
+${PYSITELIB}/django/contrib/gis/tests/data/counties/counties.shp
+${PYSITELIB}/django/contrib/gis/tests/data/counties/counties.shx
+${PYSITELIB}/django/contrib/gis/tests/data/interstates/interstates.dbf
+${PYSITELIB}/django/contrib/gis/tests/data/interstates/interstates.prj
+${PYSITELIB}/django/contrib/gis/tests/data/interstates/interstates.shp
+${PYSITELIB}/django/contrib/gis/tests/data/interstates/interstates.shx
 ${PYSITELIB}/django/contrib/gis/tests/data/test_point/test_point.dbf
 ${PYSITELIB}/django/contrib/gis/tests/data/test_point/test_point.prj
 ${PYSITELIB}/django/contrib/gis/tests/data/test_point/test_point.shp
@@ -992,13 +1118,16 @@ ${PYSITELIB}/django/contrib/gis/tests/geoapp/sitemaps.pyo
 ${PYSITELIB}/django/contrib/gis/tests/geoapp/sql/city.mysql.sql
 ${PYSITELIB}/django/contrib/gis/tests/geoapp/sql/city.oracle.sql
 ${PYSITELIB}/django/contrib/gis/tests/geoapp/sql/city.postgresql_psycopg2.sql
+${PYSITELIB}/django/contrib/gis/tests/geoapp/sql/city.sqlite3.sql
 ${PYSITELIB}/django/contrib/gis/tests/geoapp/sql/co.wkt
 ${PYSITELIB}/django/contrib/gis/tests/geoapp/sql/country.mysql.sql
 ${PYSITELIB}/django/contrib/gis/tests/geoapp/sql/country.postgresql_psycopg2.sql
+${PYSITELIB}/django/contrib/gis/tests/geoapp/sql/country.sqlite3.sql
 ${PYSITELIB}/django/contrib/gis/tests/geoapp/sql/ks.wkt
 ${PYSITELIB}/django/contrib/gis/tests/geoapp/sql/nz.wkt
 ${PYSITELIB}/django/contrib/gis/tests/geoapp/sql/state.mysql.sql
 ${PYSITELIB}/django/contrib/gis/tests/geoapp/sql/state.postgresql_psycopg2.sql
+${PYSITELIB}/django/contrib/gis/tests/geoapp/sql/state.sqlite3.sql
 ${PYSITELIB}/django/contrib/gis/tests/geoapp/sql/tx.wkt
 ${PYSITELIB}/django/contrib/gis/tests/geoapp/test_feeds.py
 ${PYSITELIB}/django/contrib/gis/tests/geoapp/test_feeds.pyc
@@ -1024,17 +1153,6 @@ ${PYSITELIB}/django/contrib/gis/tests/geometries.pyo
 ${PYSITELIB}/django/contrib/gis/tests/layermap/__init__.py
 ${PYSITELIB}/django/contrib/gis/tests/layermap/__init__.pyc
 ${PYSITELIB}/django/contrib/gis/tests/layermap/__init__.pyo
-${PYSITELIB}/django/contrib/gis/tests/layermap/cities/cities.dbf
-${PYSITELIB}/django/contrib/gis/tests/layermap/cities/cities.prj
-${PYSITELIB}/django/contrib/gis/tests/layermap/cities/cities.shp
-${PYSITELIB}/django/contrib/gis/tests/layermap/cities/cities.shx
-${PYSITELIB}/django/contrib/gis/tests/layermap/counties/counties.dbf
-${PYSITELIB}/django/contrib/gis/tests/layermap/counties/counties.shp
-${PYSITELIB}/django/contrib/gis/tests/layermap/counties/counties.shx
-${PYSITELIB}/django/contrib/gis/tests/layermap/interstates/interstates.dbf
-${PYSITELIB}/django/contrib/gis/tests/layermap/interstates/interstates.prj
-${PYSITELIB}/django/contrib/gis/tests/layermap/interstates/interstates.shp
-${PYSITELIB}/django/contrib/gis/tests/layermap/interstates/interstates.shx
 ${PYSITELIB}/django/contrib/gis/tests/layermap/models.py
 ${PYSITELIB}/django/contrib/gis/tests/layermap/models.pyc
 ${PYSITELIB}/django/contrib/gis/tests/layermap/models.pyo
@@ -1056,30 +1174,12 @@ ${PYSITELIB}/django/contrib/gis/tests/relatedapp/tests.pyo
 ${PYSITELIB}/django/contrib/gis/tests/relatedapp/tests_mysql.py
 ${PYSITELIB}/django/contrib/gis/tests/relatedapp/tests_mysql.pyc
 ${PYSITELIB}/django/contrib/gis/tests/relatedapp/tests_mysql.pyo
-${PYSITELIB}/django/contrib/gis/tests/test_gdal.py
-${PYSITELIB}/django/contrib/gis/tests/test_gdal.pyc
-${PYSITELIB}/django/contrib/gis/tests/test_gdal.pyo
-${PYSITELIB}/django/contrib/gis/tests/test_gdal_driver.py
-${PYSITELIB}/django/contrib/gis/tests/test_gdal_driver.pyc
-${PYSITELIB}/django/contrib/gis/tests/test_gdal_driver.pyo
-${PYSITELIB}/django/contrib/gis/tests/test_gdal_ds.py
-${PYSITELIB}/django/contrib/gis/tests/test_gdal_ds.pyc
-${PYSITELIB}/django/contrib/gis/tests/test_gdal_ds.pyo
-${PYSITELIB}/django/contrib/gis/tests/test_gdal_envelope.py
-${PYSITELIB}/django/contrib/gis/tests/test_gdal_envelope.pyc
-${PYSITELIB}/django/contrib/gis/tests/test_gdal_envelope.pyo
-${PYSITELIB}/django/contrib/gis/tests/test_gdal_geom.py
-${PYSITELIB}/django/contrib/gis/tests/test_gdal_geom.pyc
-${PYSITELIB}/django/contrib/gis/tests/test_gdal_geom.pyo
-${PYSITELIB}/django/contrib/gis/tests/test_gdal_srs.py
-${PYSITELIB}/django/contrib/gis/tests/test_gdal_srs.pyc
-${PYSITELIB}/django/contrib/gis/tests/test_gdal_srs.pyo
+${PYSITELIB}/django/contrib/gis/tests/test_geoforms.py
+${PYSITELIB}/django/contrib/gis/tests/test_geoforms.pyc
+${PYSITELIB}/django/contrib/gis/tests/test_geoforms.pyo
 ${PYSITELIB}/django/contrib/gis/tests/test_geoip.py
 ${PYSITELIB}/django/contrib/gis/tests/test_geoip.pyc
 ${PYSITELIB}/django/contrib/gis/tests/test_geoip.pyo
-${PYSITELIB}/django/contrib/gis/tests/test_geos.py
-${PYSITELIB}/django/contrib/gis/tests/test_geos.pyc
-${PYSITELIB}/django/contrib/gis/tests/test_geos.pyo
 ${PYSITELIB}/django/contrib/gis/tests/test_measure.py
 ${PYSITELIB}/django/contrib/gis/tests/test_measure.pyc
 ${PYSITELIB}/django/contrib/gis/tests/test_measure.pyo
@@ -1188,6 +1288,15 @@ ${PYSITELIB}/django/contrib/localflavor/cl/cl_regions.pyo
 ${PYSITELIB}/django/contrib/localflavor/cl/forms.py
 ${PYSITELIB}/django/contrib/localflavor/cl/forms.pyc
 ${PYSITELIB}/django/contrib/localflavor/cl/forms.pyo
+${PYSITELIB}/django/contrib/localflavor/cz/__init__.py
+${PYSITELIB}/django/contrib/localflavor/cz/__init__.pyc
+${PYSITELIB}/django/contrib/localflavor/cz/__init__.pyo
+${PYSITELIB}/django/contrib/localflavor/cz/cz_regions.py
+${PYSITELIB}/django/contrib/localflavor/cz/cz_regions.pyc
+${PYSITELIB}/django/contrib/localflavor/cz/cz_regions.pyo
+${PYSITELIB}/django/contrib/localflavor/cz/forms.py
+${PYSITELIB}/django/contrib/localflavor/cz/forms.pyc
+${PYSITELIB}/django/contrib/localflavor/cz/forms.pyo
 ${PYSITELIB}/django/contrib/localflavor/de/__init__.py
 ${PYSITELIB}/django/contrib/localflavor/de/__init__.pyc
 ${PYSITELIB}/django/contrib/localflavor/de/__init__.pyo
@@ -1413,6 +1522,9 @@ ${PYSITELIB}/django/contrib/sessions/backends/base.pyo
 ${PYSITELIB}/django/contrib/sessions/backends/cache.py
 ${PYSITELIB}/django/contrib/sessions/backends/cache.pyc
 ${PYSITELIB}/django/contrib/sessions/backends/cache.pyo
+${PYSITELIB}/django/contrib/sessions/backends/cached_db.py
+${PYSITELIB}/django/contrib/sessions/backends/cached_db.pyc
+${PYSITELIB}/django/contrib/sessions/backends/cached_db.pyo
 ${PYSITELIB}/django/contrib/sessions/backends/db.py
 ${PYSITELIB}/django/contrib/sessions/backends/db.pyc
 ${PYSITELIB}/django/contrib/sessions/backends/db.pyo
@@ -1550,6 +1662,9 @@ ${PYSITELIB}/django/core/files/uploadedfile.pyo
 ${PYSITELIB}/django/core/files/uploadhandler.py
 ${PYSITELIB}/django/core/files/uploadhandler.pyc
 ${PYSITELIB}/django/core/files/uploadhandler.pyo
+${PYSITELIB}/django/core/files/utils.py
+${PYSITELIB}/django/core/files/utils.pyc
+${PYSITELIB}/django/core/files/utils.pyo
 ${PYSITELIB}/django/core/handlers/__init__.py
 ${PYSITELIB}/django/core/handlers/__init__.pyc
 ${PYSITELIB}/django/core/handlers/__init__.pyo
@@ -1793,15 +1908,24 @@ ${PLIST.sqlite}${PYSITELIB}/django/db/backends/sqlite3/creation.pyo
 ${PLIST.sqlite}${PYSITELIB}/django/db/backends/sqlite3/introspection.py
 ${PLIST.sqlite}${PYSITELIB}/django/db/backends/sqlite3/introspection.pyc
 ${PLIST.sqlite}${PYSITELIB}/django/db/backends/sqlite3/introspection.pyo
+${PYSITELIB}/django/db/backends/signals.py
+${PYSITELIB}/django/db/backends/signals.pyc
+${PYSITELIB}/django/db/backends/signals.pyo
 ${PYSITELIB}/django/db/backends/util.py
 ${PYSITELIB}/django/db/backends/util.pyc
 ${PYSITELIB}/django/db/backends/util.pyo
 ${PYSITELIB}/django/db/models/__init__.py
 ${PYSITELIB}/django/db/models/__init__.pyc
 ${PYSITELIB}/django/db/models/__init__.pyo
+${PYSITELIB}/django/db/models/aggregates.py
+${PYSITELIB}/django/db/models/aggregates.pyc
+${PYSITELIB}/django/db/models/aggregates.pyo
 ${PYSITELIB}/django/db/models/base.py
 ${PYSITELIB}/django/db/models/base.pyc
 ${PYSITELIB}/django/db/models/base.pyo
+${PYSITELIB}/django/db/models/expressions.py
+${PYSITELIB}/django/db/models/expressions.pyc
+${PYSITELIB}/django/db/models/expressions.pyo
 ${PYSITELIB}/django/db/models/fields/__init__.py
 ${PYSITELIB}/django/db/models/fields/__init__.pyc
 ${PYSITELIB}/django/db/models/fields/__init__.pyo
@@ -1841,12 +1965,18 @@ ${PYSITELIB}/django/db/models/signals.pyo
 ${PYSITELIB}/django/db/models/sql/__init__.py
 ${PYSITELIB}/django/db/models/sql/__init__.pyc
 ${PYSITELIB}/django/db/models/sql/__init__.pyo
+${PYSITELIB}/django/db/models/sql/aggregates.py
+${PYSITELIB}/django/db/models/sql/aggregates.pyc
+${PYSITELIB}/django/db/models/sql/aggregates.pyo
 ${PYSITELIB}/django/db/models/sql/constants.py
 ${PYSITELIB}/django/db/models/sql/constants.pyc
 ${PYSITELIB}/django/db/models/sql/constants.pyo
 ${PYSITELIB}/django/db/models/sql/datastructures.py
 ${PYSITELIB}/django/db/models/sql/datastructures.pyc
 ${PYSITELIB}/django/db/models/sql/datastructures.pyo
+${PYSITELIB}/django/db/models/sql/expressions.py
+${PYSITELIB}/django/db/models/sql/expressions.pyc
+${PYSITELIB}/django/db/models/sql/expressions.pyo
 ${PYSITELIB}/django/db/models/sql/query.py
 ${PYSITELIB}/django/db/models/sql/query.pyc
 ${PYSITELIB}/django/db/models/sql/query.pyo
@@ -2051,6 +2181,9 @@ ${PYSITELIB}/django/utils/html.pyo
 ${PYSITELIB}/django/utils/http.py
 ${PYSITELIB}/django/utils/http.pyc
 ${PYSITELIB}/django/utils/http.pyo
+${PYSITELIB}/django/utils/importlib.py
+${PYSITELIB}/django/utils/importlib.pyc
+${PYSITELIB}/django/utils/importlib.pyo
 ${PYSITELIB}/django/utils/itercompat.py
 ${PYSITELIB}/django/utils/itercompat.pyc
 ${PYSITELIB}/django/utils/itercompat.pyo
diff --git a/www/py-django/distinfo b/www/py-django/distinfo
index ba744c70525..353f2414af7 100644
--- a/www/py-django/distinfo
+++ b/www/py-django/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.11 2009/10/13 18:19:24 joerg Exp $
+$NetBSD: distinfo,v 1.12 2009/10/19 11:31:05 joerg Exp $
 
-SHA1 (Django-1.0.4.tar.gz) = a8b9f33adb007146b8b57f22f0f38467f0d2693a
-RMD160 (Django-1.0.4.tar.gz) = 9f61455bc4cc0277ddfe4a957863d5995f8c23f3
-Size (Django-1.0.4.tar.gz) = 5088869 bytes
-SHA1 (patch-ab) = dc7f9f0d5f66148c495534d96f7131a67b4b0ecc
+SHA1 (Django-1.1.1.tar.gz) = 441c54f0e90730bf4a55432b64519169b1e6ef20
+RMD160 (Django-1.1.1.tar.gz) = bf42e548ff86fc587086eaffc53d9397e2a8c871
+Size (Django-1.1.1.tar.gz) = 5614106 bytes
diff --git a/www/py-django/patches/patch-ab b/www/py-django/patches/patch-ab
deleted file mode 100644
index 90ee114ae17..00000000000
--- a/www/py-django/patches/patch-ab
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2009/07/29 11:02:08 joerg Exp $
-
---- django/db/backends/sqlite3/base.py.orig	2009-04-11 22:01:24.000000000 +0200
-+++ django/db/backends/sqlite3/base.py
-@@ -13,18 +13,11 @@ from django.db.backends.sqlite3.introspe
- from django.utils.safestring import SafeString                                                           
- 
- try:
--    try:
--        from sqlite3 import dbapi2 as Database
--    except ImportError, e1:
--        from pysqlite2 import dbapi2 as Database
-+    from pysqlite2 import dbapi2 as Database
- except ImportError, exc:
-     import sys
-     from django.core.exceptions import ImproperlyConfigured
--    if sys.version_info < (2, 5, 0):
--        module = 'pysqlite2'
--    else:
--        module = 'sqlite3'
--        exc = e1
-+    module = 'pysqlite2'
-     raise ImproperlyConfigured, "Error loading %s module: %s" % (module, exc)
- 
- try: