update to 2.3.2

This is a major update (since 2.0.7), involving an API rework

add a bl3 file

5 files changed, 75 insertions, 20 deletions

diff --git a/databases/py-sqlite2/Makefile b/databases/py-sqlite2/Makefile
index 5c20632ebd7..f8706f4591b 100644
--- a/databases/py-sqlite2/Makefile
+++ b/databases/py-sqlite2/Makefile
@@ -1,26 +1,16 @@
-# $NetBSD: Makefile,v 1.2 2006/11/14 13:39:17 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2007/01/10 10:39:18 drochner Exp $
 
-DISTNAME=	pysqlite-2.0.7
-PKGNAME=	${PYPKGPREFIX}-sqlite2-2.0.7
+DISTNAME=	pysqlite-2.3.2
+PKGNAME=	${PYPKGPREFIX}-sqlite2-2.3.2
 CATEGORIES=	databases python
-MASTER_SITES=	http://initd.org/pub/software/pysqlite/releases/2.0/2.0.7/
+MASTER_SITES=	http://initd.org/pub/software/pysqlite/releases/2.3/2.3.2/
 
 MAINTAINER=	tsarna@NetBSD.org
 HOMEPAGE=	http://initd.org/tracker/pysqlite
 COMMENT=	SQLite database adapter for Python
 
 PYDISTUTILSPKG=	yes
-# XXX version specific setuptools, should add something to extension.mk
-PYTHON_VERSIONS_ACCEPTED= 24
-DEPENDS+=	${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools
-
-TESTCMD=	from lib import test; \
-		test.test()
-
-do-test:
-	cd ${WRKSRC} && ${PYTHONBIN} -c ${TESTCMD:Q}
 
 .include "../../databases/sqlite3/buildlink3.mk"
 .include "../../lang/python/extension.mk"
-.include "../../time/py-mxDateTime/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/py-sqlite2/PLIST b/databases/py-sqlite2/PLIST
index 8759c80b08c..f1bb5055b7f 100644
--- a/databases/py-sqlite2/PLIST
+++ b/databases/py-sqlite2/PLIST
@@ -1,2 +1,34 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2006/03/14 20:17:59 drochner Exp $
-${PYSITELIB}/pysqlite-${PKGVERSION}-py2.4-${LOWER_OPSYS}-${OS_VERSION}-${MACHINE_ARCH}.egg
+@comment $NetBSD: PLIST,v 1.2 2007/01/10 10:39:18 drochner Exp $
+${PYSITELIB}/pysqlite2/__init__.py
+${PYSITELIB}/pysqlite2/__init__.pyc
+${PYSITELIB}/pysqlite2/__init__.pyo
+${PYSITELIB}/pysqlite2/_sqlite.so
+${PYSITELIB}/pysqlite2/dbapi2.py
+${PYSITELIB}/pysqlite2/dbapi2.pyc
+${PYSITELIB}/pysqlite2/dbapi2.pyo
+${PYSITELIB}/pysqlite2/test/__init__.py
+${PYSITELIB}/pysqlite2/test/__init__.pyc
+${PYSITELIB}/pysqlite2/test/__init__.pyo
+${PYSITELIB}/pysqlite2/test/dbapi.py
+${PYSITELIB}/pysqlite2/test/dbapi.pyc
+${PYSITELIB}/pysqlite2/test/dbapi.pyo
+${PYSITELIB}/pysqlite2/test/factory.py
+${PYSITELIB}/pysqlite2/test/factory.pyc
+${PYSITELIB}/pysqlite2/test/factory.pyo
+${PYSITELIB}/pysqlite2/test/hooks.py
+${PYSITELIB}/pysqlite2/test/hooks.pyc
+${PYSITELIB}/pysqlite2/test/hooks.pyo
+${PYSITELIB}/pysqlite2/test/regression.py
+${PYSITELIB}/pysqlite2/test/regression.pyc
+${PYSITELIB}/pysqlite2/test/regression.pyo
+${PYSITELIB}/pysqlite2/test/transactions.py
+${PYSITELIB}/pysqlite2/test/transactions.pyc
+${PYSITELIB}/pysqlite2/test/transactions.pyo
+${PYSITELIB}/pysqlite2/test/types.py
+${PYSITELIB}/pysqlite2/test/types.pyc
+${PYSITELIB}/pysqlite2/test/types.pyo
+${PYSITELIB}/pysqlite2/test/userfunctions.py
+${PYSITELIB}/pysqlite2/test/userfunctions.pyc
+${PYSITELIB}/pysqlite2/test/userfunctions.pyo
+@dirrm ${PYSITELIB}/pysqlite2/test
+@dirrm ${PYSITELIB}/pysqlite2
diff --git a/databases/py-sqlite2/buildlink3.mk b/databases/py-sqlite2/buildlink3.mk
new file mode 100644
index 00000000000..40cd37725b9
--- /dev/null
+++ b/databases/py-sqlite2/buildlink3.mk
@@ -0,0 +1,19 @@
+# $NetBSD: buildlink3.mk,v 1.1 2007/01/10 10:39:18 drochner Exp $
+
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
+PY_SQLITE2_BUILDLINK3_MK:=	${PY_SQLITE2_BUILDLINK3_MK}+
+
+.if ${BUILDLINK_DEPTH} == "+"
+BUILDLINK_DEPENDS+=	py-sqlite2
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npy-sqlite2}
+BUILDLINK_PACKAGES+=	py-sqlite2
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}py-sqlite2
+
+.if ${PY_SQLITE2_BUILDLINK3_MK} == "+"
+BUILDLINK_API_DEPENDS.py-sqlite2+=	${PYPKGPREFIX}-sqlite2>=2.3.2
+BUILDLINK_PKGSRCDIR.py-sqlite2?=	../../databases/py-sqlite2
+.endif	# PY_SQLITE2_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
diff --git a/databases/py-sqlite2/distinfo b/databases/py-sqlite2/distinfo
index a85032c350c..497dbf8c927 100644
--- a/databases/py-sqlite2/distinfo
+++ b/databases/py-sqlite2/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.1.1.1 2006/03/14 20:17:59 drochner Exp $
+$NetBSD: distinfo,v 1.2 2007/01/10 10:39:18 drochner Exp $
 
-SHA1 (pysqlite-2.0.7.tar.gz) = 9ed79839cd0a7cd359d3ccb7c41837422173438f
-RMD160 (pysqlite-2.0.7.tar.gz) = c15d222468a204168e1c6899c63d9ea287467978
-Size (pysqlite-2.0.7.tar.gz) = 216605 bytes
+SHA1 (pysqlite-2.3.2.tar.gz) = eca24c09bfc644a4285eee4f914d55fdbf605cfb
+RMD160 (pysqlite-2.3.2.tar.gz) = 50be93e9df482699e71696ad5c76ae0dc50c92f9
+Size (pysqlite-2.3.2.tar.gz) = 79532 bytes
+SHA1 (patch-aa) = b9804c6a35f591b0f7b3f72efccbe9e3327469d1
diff --git a/databases/py-sqlite2/patches/patch-aa b/databases/py-sqlite2/patches/patch-aa
new file mode 100644
index 00000000000..29b6e50acd5
--- /dev/null
+++ b/databases/py-sqlite2/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.1 2007/01/10 10:39:18 drochner Exp $
+
+--- setup.py.orig	2007-01-08 15:44:40.000000000 +0100
++++ setup.py
+@@ -127,7 +127,7 @@ def get_setup_args():
+             package_dir = {"pysqlite2": "pysqlite2"},
+             packages = ["pysqlite2", "pysqlite2.test"],
+             scripts=[],
+-            data_files = data_files,
++#            data_files = data_files,
+ 
+             ext_modules = [Extension( name="pysqlite2._sqlite",
+                                       sources=sources,