[pkgsrc/trunk]: pkgsrc/www/py-django Fix sqlite option for Python 2.5 and hig...

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/4f8cf46dbe26
branches:  trunk
changeset: 557373:4f8cf46dbe26
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Tue Apr 14 09:14:24 2009 +0000

description:
Fix sqlite option for Python 2.5 and higher, we always want to use the
newer external py-sqlite package for that. Bump revision.

diffstat:

 www/py-django/Makefile         |   6 +++---
 www/py-django/distinfo         |   3 ++-
 www/py-django/patches/patch-ab |  25 +++++++++++++++++++++++++
 3 files changed, 30 insertions(+), 4 deletions(-)

diffs (65 lines):

diff -r 0f73b5e092b0 -r 4f8cf46dbe26 www/py-django/Makefile
--- a/www/py-django/Makefile    Tue Apr 14 07:48:59 2009 +0000
+++ b/www/py-django/Makefile    Tue Apr 14 09:14:24 2009 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.15 2009/01/29 09:35:54 joerg Exp $
+# $NetBSD: Makefile,v 1.16 2009/04/14 09:14:24 joerg Exp $
 
 DJANGOVERS=    1.0.2
 DISTNAME=      Django-${DJANGOVERS}-final
 PKGNAME=       ${PYPKGPREFIX}-django-${DJANGOVERS}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    www python
 MASTER_SITES=  http://media.djangoproject.com/releases/${DJANGOVERS}/
 
@@ -21,7 +21,7 @@
 
 .include "options.mk"
 
-post-extract:
+pre-configure:
        rm -r ${WRKSRC}/django/db/backends/oracle
 .if empty(PKG_OPTIONS:Mmysql)
        rm -r ${WRKSRC}/django/db/backends/mysql
diff -r 0f73b5e092b0 -r 4f8cf46dbe26 www/py-django/distinfo
--- a/www/py-django/distinfo    Tue Apr 14 07:48:59 2009 +0000
+++ b/www/py-django/distinfo    Tue Apr 14 09:14:24 2009 +0000
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.8 2008/12/17 19:55:38 joerg Exp $
+$NetBSD: distinfo,v 1.9 2009/04/14 09:14:24 joerg Exp $
 
 SHA1 (Django-1.0.2-final.tar.gz) = f2d9088f17aff47ea17e5767740cab67b2a73b6b
 RMD160 (Django-1.0.2-final.tar.gz) = 0cfea620df0831310da4ef51ef6ee4ef1b65974e
 Size (Django-1.0.2-final.tar.gz) = 4649433 bytes
 SHA1 (patch-aa) = 54a532d9c6761f80a10c633bb6192faccb5ab64b
+SHA1 (patch-ab) = 620e958ab3b4c3cf7ceb507b52ac64b522a6e4a8
diff -r 0f73b5e092b0 -r 4f8cf46dbe26 www/py-django/patches/patch-ab
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/www/py-django/patches/patch-ab    Tue Apr 14 09:14:24 2009 +0000
@@ -0,0 +1,25 @@
+$NetBSD: patch-ab,v 1.1 2009/04/14 09:14:25 joerg Exp $
+
+--- django/db/backends/sqlite3/base.py.orig    2009-04-11 22:01:24.000000000 +0200
++++ django/db/backends/sqlite3/base.py
+@@ -12,18 +12,11 @@ from django.db.backends.sqlite3.creation
+ from django.db.backends.sqlite3.introspection import DatabaseIntrospection
+ 
+ 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: