Changes 2.6.0:

No release notes available.

4 files changed, 22 insertions, 29 deletions

diff --git a/databases/py-sqlite2/Makefile b/databases/py-sqlite2/Makefile
index 0401dbf7bdb..f9bf80bfcb5 100644
--- a/databases/py-sqlite2/Makefile
+++ b/databases/py-sqlite2/Makefile
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.19 2009/07/09 19:02:58 drochner Exp $
+# $NetBSD: Makefile,v 1.20 2010/09/16 11:31:16 adam Exp $
 
-DISTNAME=	pysqlite-2.5.5
-PKGNAME=	${PYPKGPREFIX}-sqlite2-2.5.5
+DISTNAME=	pysqlite-2.6.0
+PKGNAME=	${PYPKGPREFIX}-sqlite2-2.6.0
 CATEGORIES=	databases python
-MASTER_SITES=	http://oss.itsystementwicklung.de/download/pysqlite/2.5/2.5.5/
+MASTER_SITES=	http://pysqlite.googlecode.com/files/
 
 MAINTAINER=	tsarna@NetBSD.org
-HOMEPAGE=	http://pysqlite.org/
+HOMEPAGE=	http://pysqlite.googlecode.com/
 COMMENT=	SQLite database adapter for Python
 
 PKG_DESTDIR_SUPPORT=	user-destdir
@@ -15,16 +15,6 @@ PYDISTUTILSPKG=	yes
 
 .include "../../lang/python/extension.mk"
 
-.if defined(PYPACKAGE) && \
-    (${PYPACKAGE} == "python23" || ${PYPACKAGE} == "python24")
-pre-configure:
-	rm ${WRKSRC}/pysqlite2/test/py25tests.py
-.else
-PLIST.python25=	yes
-.endif
-
-PLIST_VARS+=	python25
-
 do-postinstall-test: .PHONY
 	cd ${WRKDIR} && ${PYTHONBIN} -c "from pysqlite2 import test;test.test()"
 
diff --git a/databases/py-sqlite2/PLIST b/databases/py-sqlite2/PLIST
index 0a4aab3497d..c550532296e 100644
--- a/databases/py-sqlite2/PLIST
+++ b/databases/py-sqlite2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2009/06/14 17:43:23 joerg Exp $
+@comment $NetBSD: PLIST,v 1.7 2010/09/16 11:31:16 adam Exp $
 ${PYSITELIB}/pysqlite2/__init__.py
 ${PYSITELIB}/pysqlite2/__init__.pyc
 ${PYSITELIB}/pysqlite2/__init__.pyo
@@ -24,9 +24,12 @@ ${PYSITELIB}/pysqlite2/test/factory.pyo
 ${PYSITELIB}/pysqlite2/test/hooks.py
 ${PYSITELIB}/pysqlite2/test/hooks.pyc
 ${PYSITELIB}/pysqlite2/test/hooks.pyo
-${PLIST.python25}${PYSITELIB}/pysqlite2/test/py25tests.py
-${PLIST.python25}${PYSITELIB}/pysqlite2/test/py25tests.pyc
-${PLIST.python25}${PYSITELIB}/pysqlite2/test/py25tests.pyo
+${PYSITELIB}/pysqlite2/test/py25/__init__.py
+${PYSITELIB}/pysqlite2/test/py25/__init__.pyc
+${PYSITELIB}/pysqlite2/test/py25/__init__.pyo
+${PYSITELIB}/pysqlite2/test/py25/py25tests.py
+${PYSITELIB}/pysqlite2/test/py25/py25tests.pyc
+${PYSITELIB}/pysqlite2/test/py25/py25tests.pyo
 ${PYSITELIB}/pysqlite2/test/regression.py
 ${PYSITELIB}/pysqlite2/test/regression.pyc
 ${PYSITELIB}/pysqlite2/test/regression.pyo
diff --git a/databases/py-sqlite2/distinfo b/databases/py-sqlite2/distinfo
index a1fc6c45079..89810631186 100644
--- a/databases/py-sqlite2/distinfo
+++ b/databases/py-sqlite2/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.8 2009/07/09 19:02:58 drochner Exp $
+$NetBSD: distinfo,v 1.9 2010/09/16 11:31:16 adam Exp $
 
-SHA1 (pysqlite-2.5.5.tar.gz) = 28ea27ada86cd7ec6105f82617ea6cf1a09444d3
-RMD160 (pysqlite-2.5.5.tar.gz) = c420169cf4893b79a8638313f3327f37bc8986aa
-Size (pysqlite-2.5.5.tar.gz) = 73068 bytes
-SHA1 (patch-aa) = b9804c6a35f591b0f7b3f72efccbe9e3327469d1
+SHA1 (pysqlite-2.6.0.tar.gz) = bba2a700f98f979fdf7b224db34d95ff94c2a5d7
+RMD160 (pysqlite-2.6.0.tar.gz) = 654ac5b914dfe6f990277b5d95e1ec592e5c2ee0
+Size (pysqlite-2.6.0.tar.gz) = 74453 bytes
+SHA1 (patch-aa) = 634805bef4fc0c18c9087d3417c9d6235d8df4d8
diff --git a/databases/py-sqlite2/patches/patch-aa b/databases/py-sqlite2/patches/patch-aa
index 29b6e50acd5..6175b0192a5 100644
--- a/databases/py-sqlite2/patches/patch-aa
+++ b/databases/py-sqlite2/patches/patch-aa
@@ -1,10 +1,10 @@
-$NetBSD: patch-aa,v 1.1 2007/01/10 10:39:18 drochner Exp $
+$NetBSD: patch-aa,v 1.2 2010/09/16 11:31:16 adam Exp $
 
---- setup.py.orig	2007-01-08 15:44:40.000000000 +0100
+--- setup.py.orig	2010-09-16 10:49:08.000000000 +0000
 +++ setup.py
-@@ -127,7 +127,7 @@ def get_setup_args():
-             package_dir = {"pysqlite2": "pysqlite2"},
-             packages = ["pysqlite2", "pysqlite2.test"],
+@@ -175,7 +175,7 @@ def get_setup_args():
+             packages = ["pysqlite2", "pysqlite2.test"] +
+                        (["pysqlite2.test.py25"], [])[sys.version_info < (2, 5)],
              scripts=[],
 -            data_files = data_files,
 +#            data_files = data_files,