2 files changed, 16 insertions, 66 deletions

diff --git a/www/py-django12/Makefile b/www/py-django12/Makefile
index 96c7d3160e5c..6b6aba2d0d03 100644
--- a/www/py-django12/Makefile
+++ b/www/py-django12/Makefile
@@ -22,6 +22,7 @@ USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
 PYDISTUTILS_PKGNAME=	Django
 PYDISTUTILS_PKGVERSION=	1.0_final
+PYDISTUTILS_EGGINFO=	Django-${PORTVERSION}_final-${PYTHON_VERSION:S/thon//}.egg-info
 
 CONFLICTS=	py2[0-9]-django-devel-[0-9]*
 
diff --git a/www/py-django12/pkg-plist b/www/py-django12/pkg-plist
index 9785f07732f3..e6626a95f90d 100644
--- a/www/py-django12/pkg-plist
+++ b/www/py-django12/pkg-plist
@@ -121,6 +121,10 @@ bin/django-admin.py
 %%PYTHON_SITELIBDIR%%/django/conf/locale/he/LC_MESSAGES/django.po
 %%PYTHON_SITELIBDIR%%/django/conf/locale/he/LC_MESSAGES/djangojs.mo
 %%PYTHON_SITELIBDIR%%/django/conf/locale/he/LC_MESSAGES/djangojs.po
+%%PYTHON_SITELIBDIR%%/django/conf/locale/hi/LC_MESSAGES/django.mo
+%%PYTHON_SITELIBDIR%%/django/conf/locale/hi/LC_MESSAGES/django.po
+%%PYTHON_SITELIBDIR%%/django/conf/locale/hi/LC_MESSAGES/djangojs.mo
+%%PYTHON_SITELIBDIR%%/django/conf/locale/hi/LC_MESSAGES/djangojs.po
 %%PYTHON_SITELIBDIR%%/django/conf/locale/hr/LC_MESSAGES/django.mo
 %%PYTHON_SITELIBDIR%%/django/conf/locale/hr/LC_MESSAGES/django.po
 %%PYTHON_SITELIBDIR%%/django/conf/locale/hr/LC_MESSAGES/djangojs.mo
@@ -221,6 +225,10 @@ bin/django-admin.py
 %%PYTHON_SITELIBDIR%%/django/conf/locale/te/LC_MESSAGES/django.po
 %%PYTHON_SITELIBDIR%%/django/conf/locale/te/LC_MESSAGES/djangojs.mo
 %%PYTHON_SITELIBDIR%%/django/conf/locale/te/LC_MESSAGES/djangojs.po
+%%PYTHON_SITELIBDIR%%/django/conf/locale/th/LC_MESSAGES/django.mo
+%%PYTHON_SITELIBDIR%%/django/conf/locale/th/LC_MESSAGES/django.po
+%%PYTHON_SITELIBDIR%%/django/conf/locale/th/LC_MESSAGES/djangojs.mo
+%%PYTHON_SITELIBDIR%%/django/conf/locale/th/LC_MESSAGES/djangojs.po
 %%PYTHON_SITELIBDIR%%/django/conf/locale/tr/LC_MESSAGES/django.mo
 %%PYTHON_SITELIBDIR%%/django/conf/locale/tr/LC_MESSAGES/django.po
 %%PYTHON_SITELIBDIR%%/django/conf/locale/tr/LC_MESSAGES/djangojs.mo
@@ -457,7 +465,6 @@ bin/django-admin.py
 %%PYTHON_SITELIBDIR%%/django/contrib/auth/decorators.py
 %%PYTHON_SITELIBDIR%%/django/contrib/auth/decorators.pyc
 %%PYTHON_SITELIBDIR%%/django/contrib/auth/decorators.pyo
-%%PYTHON_SITELIBDIR%%/django/contrib/auth/fixtures/authtestdata.json
 %%PYTHON_SITELIBDIR%%/django/contrib/auth/forms.py
 %%PYTHON_SITELIBDIR%%/django/contrib/auth/forms.pyc
 %%PYTHON_SITELIBDIR%%/django/contrib/auth/forms.pyo
@@ -491,7 +498,6 @@ bin/django-admin.py
 %%PYTHON_SITELIBDIR%%/django/contrib/auth/tests/forms.py
 %%PYTHON_SITELIBDIR%%/django/contrib/auth/tests/forms.pyc
 %%PYTHON_SITELIBDIR%%/django/contrib/auth/tests/forms.pyo
-%%PYTHON_SITELIBDIR%%/django/contrib/auth/tests/templates/registration/login.html
 %%PYTHON_SITELIBDIR%%/django/contrib/auth/tests/tokens.py
 %%PYTHON_SITELIBDIR%%/django/contrib/auth/tests/tokens.pyc
 %%PYTHON_SITELIBDIR%%/django/contrib/auth/tests/tokens.pyo
@@ -540,8 +546,6 @@ bin/django-admin.py
 %%PYTHON_SITELIBDIR%%/django/contrib/comments/templates/comments/moderation_queue.html
 %%PYTHON_SITELIBDIR%%/django/contrib/comments/templates/comments/posted.html
 %%PYTHON_SITELIBDIR%%/django/contrib/comments/templates/comments/preview.html
-%%PYTHON_SITELIBDIR%%/django/contrib/comments/templates/comments/reply.html
-%%PYTHON_SITELIBDIR%%/django/contrib/comments/templates/comments/reply_preview.html
 %%PYTHON_SITELIBDIR%%/django/contrib/comments/templatetags/__init__.py
 %%PYTHON_SITELIBDIR%%/django/contrib/comments/templatetags/__init__.pyc
 %%PYTHON_SITELIBDIR%%/django/contrib/comments/templatetags/__init__.pyo
@@ -578,6 +582,9 @@ bin/django-admin.py
 %%PYTHON_SITELIBDIR%%/django/contrib/contenttypes/tests.py
 %%PYTHON_SITELIBDIR%%/django/contrib/contenttypes/tests.pyc
 %%PYTHON_SITELIBDIR%%/django/contrib/contenttypes/tests.pyo
+%%PYTHON_SITELIBDIR%%/django/contrib/contenttypes/views.py
+%%PYTHON_SITELIBDIR%%/django/contrib/contenttypes/views.pyc
+%%PYTHON_SITELIBDIR%%/django/contrib/contenttypes/views.pyo
 %%PYTHON_SITELIBDIR%%/django/contrib/csrf/__init__.py
 %%PYTHON_SITELIBDIR%%/django/contrib/csrf/__init__.pyc
 %%PYTHON_SITELIBDIR%%/django/contrib/csrf/__init__.pyo
@@ -653,8 +660,6 @@ bin/django-admin.py
 %%PYTHON_SITELIBDIR%%/django/contrib/formtools/preview.py
 %%PYTHON_SITELIBDIR%%/django/contrib/formtools/preview.pyc
 %%PYTHON_SITELIBDIR%%/django/contrib/formtools/preview.pyo
-%%PYTHON_SITELIBDIR%%/django/contrib/formtools/templates/formtools/form.html
-%%PYTHON_SITELIBDIR%%/django/contrib/formtools/templates/formtools/preview.html
 %%PYTHON_SITELIBDIR%%/django/contrib/formtools/test_urls.py
 %%PYTHON_SITELIBDIR%%/django/contrib/formtools/test_urls.pyc
 %%PYTHON_SITELIBDIR%%/django/contrib/formtools/test_urls.pyo
@@ -931,27 +936,9 @@ bin/django-admin.py
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/sitemaps/views.py
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/sitemaps/views.pyc
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/sitemaps/views.pyo
-%%PYTHON_SITELIBDIR%%/django/contrib/gis/templates/gis/admin/openlayers.html
-%%PYTHON_SITELIBDIR%%/django/contrib/gis/templates/gis/admin/openlayers.js
-%%PYTHON_SITELIBDIR%%/django/contrib/gis/templates/gis/admin/osm.html
-%%PYTHON_SITELIBDIR%%/django/contrib/gis/templates/gis/admin/osm.js
-%%PYTHON_SITELIBDIR%%/django/contrib/gis/templates/gis/google/js/google-map.js
-%%PYTHON_SITELIBDIR%%/django/contrib/gis/templates/gis/kml/base.kml
-%%PYTHON_SITELIBDIR%%/django/contrib/gis/templates/gis/kml/placemarks.kml
-%%PYTHON_SITELIBDIR%%/django/contrib/gis/templates/gis/sitemaps/geo_sitemap.xml
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/__init__.py
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/__init__.pyc
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/__init__.pyo
-%%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/data/test_point/test_point.dbf
-%%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/data/test_point/test_point.prj
-%%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/data/test_point/test_point.shp
-%%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/data/test_point/test_point.shx
-%%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/data/test_poly/test_poly.dbf
-%%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/data/test_poly/test_poly.prj
-%%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/data/test_poly/test_poly.shp
-%%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/data/test_poly/test_poly.shx
-%%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/data/test_vrt/test_vrt.csv
-%%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/data/test_vrt/test_vrt.vrt
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/distapp/__init__.py
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/distapp/__init__.pyc
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/distapp/__init__.pyo
@@ -976,17 +963,6 @@ bin/django-admin.py
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/geoapp/sitemaps.py
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/geoapp/sitemaps.pyc
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/geoapp/sitemaps.pyo
-%%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/geoapp/sql/city.mysql.sql
-%%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/geoapp/sql/city.oracle.sql
-%%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/geoapp/sql/city.postgresql_psycopg2.sql
-%%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/geoapp/sql/co.wkt
-%%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/geoapp/sql/country.mysql.sql
-%%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/geoapp/sql/country.postgresql_psycopg2.sql
-%%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/geoapp/sql/ks.wkt
-%%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/geoapp/sql/nz.wkt
-%%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/geoapp/sql/state.mysql.sql
-%%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/geoapp/sql/state.postgresql_psycopg2.sql
-%%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/geoapp/sql/tx.wkt
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/geoapp/test_feeds.py
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/geoapp/test_feeds.pyc
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/geoapp/test_feeds.pyo
@@ -1008,17 +984,6 @@ bin/django-admin.py
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/layermap/__init__.py
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/layermap/__init__.pyc
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/layermap/__init__.pyo
-%%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/layermap/cities/cities.dbf
-%%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/layermap/cities/cities.prj
-%%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/layermap/cities/cities.shp
-%%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/layermap/cities/cities.shx
-%%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/layermap/counties/counties.dbf
-%%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/layermap/counties/counties.shp
-%%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/layermap/counties/counties.shx
-%%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/layermap/interstates/interstates.dbf
-%%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/layermap/interstates/interstates.prj
-%%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/layermap/interstates/interstates.shp
-%%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/layermap/interstates/interstates.shx
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/layermap/models.py
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/layermap/models.pyc
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/layermap/models.pyo
@@ -2238,25 +2203,10 @@ bin/django-admin.py
 @dirrm %%PYTHON_SITELIBDIR%%/django/contrib/humanize
 @dirrm %%PYTHON_SITELIBDIR%%/django/contrib/gis/utils
 @dirrm %%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/relatedapp
-@dirrm %%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/layermap/interstates
-@dirrm %%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/layermap/counties
-@dirrm %%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/layermap/cities
 @dirrm %%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/layermap
-@dirrm %%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/geoapp/sql
 @dirrm %%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/geoapp
 @dirrm %%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/distapp
-@dirrm %%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/data/test_vrt
-@dirrm %%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/data/test_poly
-@dirrm %%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/data/test_point
-@dirrm %%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/data
 @dirrm %%PYTHON_SITELIBDIR%%/django/contrib/gis/tests
-@dirrm %%PYTHON_SITELIBDIR%%/django/contrib/gis/templates/gis/sitemaps
-@dirrm %%PYTHON_SITELIBDIR%%/django/contrib/gis/templates/gis/kml
-@dirrm %%PYTHON_SITELIBDIR%%/django/contrib/gis/templates/gis/google/js
-@dirrm %%PYTHON_SITELIBDIR%%/django/contrib/gis/templates/gis/google
-@dirrm %%PYTHON_SITELIBDIR%%/django/contrib/gis/templates/gis/admin
-@dirrm %%PYTHON_SITELIBDIR%%/django/contrib/gis/templates/gis
-@dirrm %%PYTHON_SITELIBDIR%%/django/contrib/gis/templates
 @dirrm %%PYTHON_SITELIBDIR%%/django/contrib/gis/sitemaps
 @dirrm %%PYTHON_SITELIBDIR%%/django/contrib/gis/maps/openlayers
 @dirrm %%PYTHON_SITELIBDIR%%/django/contrib/gis/maps/google
@@ -2278,8 +2228,6 @@ bin/django-admin.py
 @dirrm %%PYTHON_SITELIBDIR%%/django/contrib/gis/db
 @dirrm %%PYTHON_SITELIBDIR%%/django/contrib/gis/admin
 @dirrm %%PYTHON_SITELIBDIR%%/django/contrib/gis
-@dirrm %%PYTHON_SITELIBDIR%%/django/contrib/formtools/templates/formtools
-@dirrm %%PYTHON_SITELIBDIR%%/django/contrib/formtools/templates
 @dirrm %%PYTHON_SITELIBDIR%%/django/contrib/formtools
 @dirrm %%PYTHON_SITELIBDIR%%/django/contrib/flatpages
 @dirrm %%PYTHON_SITELIBDIR%%/django/contrib/databrowse/templates/databrowse
@@ -2293,13 +2241,10 @@ bin/django-admin.py
 @dirrm %%PYTHON_SITELIBDIR%%/django/contrib/comments/templates/comments
 @dirrm %%PYTHON_SITELIBDIR%%/django/contrib/comments/templates
 @dirrm %%PYTHON_SITELIBDIR%%/django/contrib/comments
-@dirrm %%PYTHON_SITELIBDIR%%/django/contrib/auth/tests/templates/registration
-@dirrm %%PYTHON_SITELIBDIR%%/django/contrib/auth/tests/templates
 @dirrm %%PYTHON_SITELIBDIR%%/django/contrib/auth/tests
 @dirrm %%PYTHON_SITELIBDIR%%/django/contrib/auth/management/commands
 @dirrm %%PYTHON_SITELIBDIR%%/django/contrib/auth/management
 @dirrm %%PYTHON_SITELIBDIR%%/django/contrib/auth/handlers
-@dirrm %%PYTHON_SITELIBDIR%%/django/contrib/auth/fixtures
 @dirrm %%PYTHON_SITELIBDIR%%/django/contrib/auth
 @dirrm %%PYTHON_SITELIBDIR%%/django/contrib/admindocs/templates/admin_doc
 @dirrm %%PYTHON_SITELIBDIR%%/django/contrib/admindocs/templates
@@ -2332,6 +2277,8 @@ bin/django-admin.py
 @dirrm %%PYTHON_SITELIBDIR%%/django/conf/locale/uk
 @dirrm %%PYTHON_SITELIBDIR%%/django/conf/locale/tr/LC_MESSAGES
 @dirrm %%PYTHON_SITELIBDIR%%/django/conf/locale/tr
+@dirrm %%PYTHON_SITELIBDIR%%/django/conf/locale/th/LC_MESSAGES
+@dirrm %%PYTHON_SITELIBDIR%%/django/conf/locale/th
 @dirrm %%PYTHON_SITELIBDIR%%/django/conf/locale/te/LC_MESSAGES
 @dirrm %%PYTHON_SITELIBDIR%%/django/conf/locale/te
 @dirrm %%PYTHON_SITELIBDIR%%/django/conf/locale/ta/LC_MESSAGES
@@ -2382,6 +2329,8 @@ bin/django-admin.py
 @dirrm %%PYTHON_SITELIBDIR%%/django/conf/locale/hu
 @dirrm %%PYTHON_SITELIBDIR%%/django/conf/locale/hr/LC_MESSAGES
 @dirrm %%PYTHON_SITELIBDIR%%/django/conf/locale/hr
+@dirrm %%PYTHON_SITELIBDIR%%/django/conf/locale/hi/LC_MESSAGES
+@dirrm %%PYTHON_SITELIBDIR%%/django/conf/locale/hi
 @dirrm %%PYTHON_SITELIBDIR%%/django/conf/locale/he/LC_MESSAGES
 @dirrm %%PYTHON_SITELIBDIR%%/django/conf/locale/he
 @dirrm %%PYTHON_SITELIBDIR%%/django/conf/locale/gl/LC_MESSAGES