Update to django 1.2.3 to fix problems of the 1.2.2 security fix:

- Properly deal with non-ASCII responses in the CSRF code
- Restore compatibility with certain forms like the user-editing form in
  admin

Reduce maintainance overhead in pkgsrc by providing PLIST print magic.

3 files changed, 20 insertions, 7 deletions

diff --git a/www/py-django/Makefile b/www/py-django/Makefile
index b024a17d23a..530634a4985 100644
--- a/www/py-django/Makefile
+++ b/www/py-django/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.26 2010/09/09 13:34:04 adam Exp $
+# $NetBSD: Makefile,v 1.27 2010/09/13 16:51:05 joerg Exp $
 
-DJANGOVERS=	1.2.2
+DJANGOVERS=	1.2.3
 DISTNAME=	Django-${DJANGOVERS}
 PKGNAME=	${PYPKGPREFIX}-django-${DJANGOVERS}
 CATEGORIES=	www python
@@ -40,5 +40,14 @@ pre-configure:
 	rm -r ${WRKSRC}/django/db/backends/sqlite3
 .endif
 
+BACKEND_PATH=		${PYSITELIB}/django/db/backends
+BACKEND_PATH_PLIST=	$${PYSITELIB}/django/db/backends
+
+PRINT_PLIST_AWK+=        { gsub("^${BACKEND_PATH}/mysql/", "$${PLIST.mysql}${BACKEND_PATH_PLIST}/mysql/") }
+PRINT_PLIST_AWK+=        { gsub("^${BACKEND_PATH}/oracle/", "$${PLIST.oracle}${BACKEND_PATH_PLIST}/oracle/") }
+PRINT_PLIST_AWK+=        { gsub("^${BACKEND_PATH}/postgresql/", "$${PLIST.pgsql}${BACKEND_PATH_PLIST}/postgresql/") }
+PRINT_PLIST_AWK+=        { gsub("^${BACKEND_PATH}/postgresql_psycopg2/", "$${PLIST.pgsql}${BACKEND_PATH_PLIST}/postgresql_psycopg2/") }
+PRINT_PLIST_AWK+=        { gsub("^${BACKEND_PATH}/sqlite3/", "$${PLIST.sqlite}${BACKEND_PATH_PLIST}/sqlite3/") }
+
 .include "../../lang/python/extension.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/py-django/PLIST b/www/py-django/PLIST
index f5556f77294..84730958dfa 100644
--- a/www/py-django/PLIST
+++ b/www/py-django/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.17 2010/09/09 13:34:04 adam Exp $
+@comment $NetBSD: PLIST,v 1.18 2010/09/13 16:51:05 joerg Exp $
 bin/django-admin.py
 ${PYSITELIB}/django/__init__.py
 ${PYSITELIB}/django/__init__.pyc
@@ -1114,6 +1114,7 @@ ${PYSITELIB}/django/contrib/flatpages/__init__.pyo
 ${PYSITELIB}/django/contrib/flatpages/admin.py
 ${PYSITELIB}/django/contrib/flatpages/admin.pyc
 ${PYSITELIB}/django/contrib/flatpages/admin.pyo
+${PYSITELIB}/django/contrib/flatpages/fixtures/sample_flatpages.json
 ${PYSITELIB}/django/contrib/flatpages/middleware.py
 ${PYSITELIB}/django/contrib/flatpages/middleware.pyc
 ${PYSITELIB}/django/contrib/flatpages/middleware.pyo
@@ -1129,6 +1130,9 @@ ${PYSITELIB}/django/contrib/flatpages/tests/csrf.pyo
 ${PYSITELIB}/django/contrib/flatpages/tests/middleware.py
 ${PYSITELIB}/django/contrib/flatpages/tests/middleware.pyc
 ${PYSITELIB}/django/contrib/flatpages/tests/middleware.pyo
+${PYSITELIB}/django/contrib/flatpages/tests/templates/404.html
+${PYSITELIB}/django/contrib/flatpages/tests/templates/flatpages/default.html
+${PYSITELIB}/django/contrib/flatpages/tests/templates/registration/login.html
 ${PYSITELIB}/django/contrib/flatpages/tests/urls.py
 ${PYSITELIB}/django/contrib/flatpages/tests/urls.pyc
 ${PYSITELIB}/django/contrib/flatpages/tests/urls.pyo
diff --git a/www/py-django/distinfo b/www/py-django/distinfo
index aa951b71469..d52194c535a 100644
--- a/www/py-django/distinfo
+++ b/www/py-django/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.14 2010/09/09 13:34:05 adam Exp $
+$NetBSD: distinfo,v 1.15 2010/09/13 16:51:05 joerg Exp $
 
-SHA1 (Django-1.2.2.tar.gz) = f83f5c6d84a82637769996d16f183adb1c182b30
-RMD160 (Django-1.2.2.tar.gz) = 535a0bc9c6ba7ab6cbdc9c70bcc0b19df1e67716
-Size (Django-1.2.2.tar.gz) = 6304356 bytes
+SHA1 (Django-1.2.3.tar.gz) = f65146218ab61bf5efe715db3fc3a177a24fba0d
+RMD160 (Django-1.2.3.tar.gz) = f412f42c1ab6c4829a7768b988e2db1adc9adb5c
+Size (Django-1.2.3.tar.gz) = 6306760 bytes