3 files changed, 49 insertions, 28 deletions

diff --git a/databases/py-pysqlite20/Makefile b/databases/py-pysqlite20/Makefile
index f9fbc1abec0e..fd06c507999d 100644
--- a/databases/py-pysqlite20/Makefile
+++ b/databases/py-pysqlite20/Makefile
@@ -5,38 +5,43 @@
 # $FreeBSD$
 #
 
-PORTNAME=		PySQLite
-PORTVERSION=		1.1.6
+PORTNAME=		pysqlite
+PORTVERSION=		2.0.0
 CATEGORIES=		databases python
-MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	pysqlite
+MASTER_SITES=		http://initd.org/pub/software/pysqlite/releases/2.0/2.0.0/
 PKGNAMEPREFIX=		${PYTHON_PKGNAMEPREFIX}
-DISTNAME=		pysqlite-${PORTVERSION}
 
 MAINTAINER=		marcus@corp.grupos.com.br
 COMMENT=		A DB-API v2 Python library for the SQLite 3 embedded SQL engine
 
 LIB_DEPENDS=		sqlite3.8:${PORTSDIR}/databases/sqlite3
 
-LATEST_LINK=		${PYTHON_PKGNAMEPREFIX}${PORTNAME}11
+LATEST_LINK=		${PYTHON_PKGNAMEPREFIX}${PORTNAME}2
 
-CONFLICTS=		py*-PySQLite-1.0*
-
-WRKSRC=			${WRKDIR}/pysqlite
-USE_PYTHON=		yes
+USE_REINPLACE=		yes
+USE_PYTHON=		2.3+
 USE_PYDISTUTILS=	yes
+PYDISTUTILS_BUILDARGS=	build_ext -I${LOCALBASE}/include -L${LOCALBASE}/lib
+DOCSBASE=		share/doc/py-${PORTNAME}2
+DOCSDIR=		${PREFIX}/${DOCSBASE}
 
 .if !defined(NOPORTDOCS)
 PORTDOCS=		*
 .endif
 
+pre-configure:
+	@${REINPLACE_CMD} -e "s|/usr/local|${PREFIX}|" ${WRKSRC}/setup.cfg
+.if !defined(NOPORTDOCS)
+	@${REINPLACE_CMD} -e "s|pysqlite2-doc|${DOCSBASE}|" ${WRKSRC}/setup.py
+.else
+	@${REINPLACE_CMD} -e "s|data_files = data_files,||" ${WRKSRC}/setup.py
+.endif
+
 post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/doc/rest/manual.txt ${DOCSDIR}
-	@${MKDIR} ${EXAMPLESDIR}
-	@${INSTALL_DATA} ${WRKSRC}/examples/*.py ${EXAMPLESDIR}
+	@${MKDIR} ${DOCSDIR}/code
+	@${INSTALL_DATA} ${WRKSRC}/LICENSE ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/databases/py-pysqlite20/distinfo b/databases/py-pysqlite20/distinfo
index dd8df5fc1877..4f9d3c4d79a6 100644
--- a/databases/py-pysqlite20/distinfo
+++ b/databases/py-pysqlite20/distinfo
@@ -1,2 +1,2 @@
-MD5 (pysqlite-1.1.6.tar.gz) = cc936312beff1bd7ab6e4f46d745237c
-SIZE (pysqlite-1.1.6.tar.gz) = 42479
+MD5 (pysqlite-2.0.0.tar.gz) = 8cf906cd82ef2e383a804a318c49bb21
+SIZE (pysqlite-2.0.0.tar.gz) = 56874
diff --git a/databases/py-pysqlite20/pkg-plist b/databases/py-pysqlite20/pkg-plist
index 952724adbfd0..f20edff0ce0e 100644
--- a/databases/py-pysqlite20/pkg-plist
+++ b/databases/py-pysqlite20/pkg-plist
@@ -1,12 +1,28 @@
-%%PYTHON_SITELIBDIR%%/sqlite/__init__.py
-%%PYTHON_SITELIBDIR%%/sqlite/__init__.pyc
-%%PYTHON_SITELIBDIR%%/sqlite/__init__.pyo
-%%PYTHON_SITELIBDIR%%/sqlite/main.py
-%%PYTHON_SITELIBDIR%%/sqlite/main.pyc
-%%PYTHON_SITELIBDIR%%/sqlite/main.pyo
-%%PYTHON_SITELIBDIR%%/_sqlite.so
-@dirrm %%PYTHON_SITELIBDIR%%/sqlite
-%%PORTDOCS%%%%EXAMPLESDIR%%/converters.py
-%%PORTDOCS%%%%EXAMPLESDIR%%/dbapi_transactions.py
-%%PORTDOCS%%%%EXAMPLESDIR%%/manual_transactions.py
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
+bin/test-pysqlite
+%%PYTHON_SITELIBDIR%%/pysqlite2/__init__.py
+%%PYTHON_SITELIBDIR%%/pysqlite2/__init__.pyc
+%%PYTHON_SITELIBDIR%%/pysqlite2/__init__.pyo
+%%PYTHON_SITELIBDIR%%/pysqlite2/_sqlite.so
+%%PYTHON_SITELIBDIR%%/pysqlite2/dbapi2.py
+%%PYTHON_SITELIBDIR%%/pysqlite2/dbapi2.pyc
+%%PYTHON_SITELIBDIR%%/pysqlite2/dbapi2.pyo
+%%PYTHON_SITELIBDIR%%/pysqlite2/test/__init__.py
+%%PYTHON_SITELIBDIR%%/pysqlite2/test/__init__.pyc
+%%PYTHON_SITELIBDIR%%/pysqlite2/test/__init__.pyo
+%%PYTHON_SITELIBDIR%%/pysqlite2/test/dbapi.py
+%%PYTHON_SITELIBDIR%%/pysqlite2/test/dbapi.pyc
+%%PYTHON_SITELIBDIR%%/pysqlite2/test/dbapi.pyo
+%%PYTHON_SITELIBDIR%%/pysqlite2/test/factory.py
+%%PYTHON_SITELIBDIR%%/pysqlite2/test/factory.pyc
+%%PYTHON_SITELIBDIR%%/pysqlite2/test/factory.pyo
+%%PYTHON_SITELIBDIR%%/pysqlite2/test/transactions.py
+%%PYTHON_SITELIBDIR%%/pysqlite2/test/transactions.pyc
+%%PYTHON_SITELIBDIR%%/pysqlite2/test/transactions.pyo
+%%PYTHON_SITELIBDIR%%/pysqlite2/test/types.py
+%%PYTHON_SITELIBDIR%%/pysqlite2/test/types.pyc
+%%PYTHON_SITELIBDIR%%/pysqlite2/test/types.pyo
+%%PYTHON_SITELIBDIR%%/pysqlite2/test/userfunctions.py
+%%PYTHON_SITELIBDIR%%/pysqlite2/test/userfunctions.pyc
+%%PYTHON_SITELIBDIR%%/pysqlite2/test/userfunctions.pyo
+@dirrm %%PYTHON_SITELIBDIR%%/pysqlite2/test
+@dirrm %%PYTHON_SITELIBDIR%%/pysqlite2