diff options
| author | joerg <joerg@pkgsrc.org> | 2009-04-14 09:14:24 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2009-04-14 09:14:24 +0000 |
| commit | e9ff075e3ead6937f0708a3c72e7be6899302ea2 (patch) | |
| tree | 61b99b88656799b87d8a1321b0e8710eaa5f3bd1 /www/py-django | |
| parent | d7dfb17863607262adf7e322417c47f7ee82f0dc (diff) | |
| download | pkgsrc-e9ff075e3ead6937f0708a3c72e7be6899302ea2.tar.gz | |
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 (limited to 'www/py-django')
| -rw-r--r-- | www/py-django/Makefile | 6 | ||||
| -rw-r--r-- | www/py-django/distinfo | 3 | ||||
| -rw-r--r-- | www/py-django/patches/patch-ab | 25 |
3 files changed, 30 insertions, 4 deletions
diff --git a/www/py-django/Makefile b/www/py-django/Makefile index 36fb7de93ef..18579f4340a 100644 --- a/www/py-django/Makefile +++ b/www/py-django/Makefile @@ -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 @@ DEPENDS+= ${PYPKGPREFIX}-flup-[0-9]*:../../www/py-flup .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 --git a/www/py-django/distinfo b/www/py-django/distinfo index 0005bc519ee..42db961c7da 100644 --- a/www/py-django/distinfo +++ b/www/py-django/distinfo @@ -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 --git a/www/py-django/patches/patch-ab b/www/py-django/patches/patch-ab new file mode 100644 index 00000000000..840dd09497a --- /dev/null +++ b/www/py-django/patches/patch-ab @@ -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: |