- Update py-PySQLite11 (repocopied from py-PySQLite) to 1.1.6.

- Move py-PySQLite to py-PySQLite10.
- Update py-PySQLite10 to 1.0.1.
- Remove obsolete dependencies.
- Assign maintainership to submitter.

PR:		ports/78508
Submitted by:	Marcus Grando <marcus@corp.grupos.com.br>
Repocopy by:	marcus

26 files changed, 177 insertions, 279 deletions

diff --git a/databases/Makefile b/databases/Makefile
index b9a671f1ec8b..88e9e8ce5dcb 100644
--- a/databases/Makefile
+++ b/databases/Makefile
@@ -281,7 +281,8 @@
     SUBDIR += py-MySQLdb
     SUBDIR += py-MySQLdb-devel
     SUBDIR += py-PyGreSQL
-    SUBDIR += py-PySQLite
+    SUBDIR += py-PySQLite10
+    SUBDIR += py-PySQLite11
     SUBDIR += py-SQLDict
     SUBDIR += py-bsddb
     SUBDIR += py-bsddb3
diff --git a/databases/py-PySQLite/Makefile b/databases/py-PySQLite/Makefile
deleted file mode 100644
index c556b75512f4..000000000000
--- a/databases/py-PySQLite/Makefile
+++ /dev/null
@@ -1,44 +0,0 @@
-# New ports collection makefile for:   py-PySQLite
-# Date created:                        02 Oct 2002
-# Whom:                                Gerhard Haering <gerhard.haering@gmx.de>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	PySQLite
-PORTVERSION=	1.0
-PORTREVISION=	1
-CATEGORIES=	databases python
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	pysqlite
-PKGNAMEPREFIX=	py-
-DISTNAME=	pysqlite-${PORTVERSION}
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A DB-API v2 Python library for the SQLite embedded SQL engine
-
-RUN_DEPENDS=	${DATETIME_DEP}:${PORTSDIR}/lang/py-mx-base
-LIB_DEPENDS=	sqlite.2:${PORTSDIR}/databases/sqlite2
-
-WRKSRC=		${WRKDIR}/pysqlite
-EXAMPLESDIR=	${PREFIX}/share/examples/${PKGNAMEPREFIX}${PORTNAME}
-USE_PYTHON=	yes
-USE_PYDISTUTILS=	yes
-
-PORTDOCS=	README
-
-DATETIME_DEP=	${PYTHON_SITELIBDIR}/mx/DateTime/__init__.py
-
-DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
-
-.if !defined(NOPORTDOCS)
-post-install:
-	@${MKDIR} ${DOCSDIR}
-.for file in ${PORTDOCS}
-	@${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
-.endfor
-	@${MKDIR} ${EXAMPLESDIR}
-	${CP} ${WRKSRC}/examples/*.py ${EXAMPLESDIR}
-.endif
-
-.include <bsd.port.mk>
diff --git a/databases/py-PySQLite/distinfo b/databases/py-PySQLite/distinfo
deleted file mode 100644
index 00fcda776e29..000000000000
--- a/databases/py-PySQLite/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (pysqlite-1.0.tar.gz) = f21b19ff048f6bafbbfc3edb86b4c4e4
-SIZE (pysqlite-1.0.tar.gz) = 40547
diff --git a/databases/py-PySQLite/pkg-descr b/databases/py-PySQLite/pkg-descr
deleted file mode 100644
index 44a7521cf1cf..000000000000
--- a/databases/py-PySQLite/pkg-descr
+++ /dev/null
@@ -1,10 +0,0 @@
-The goal of the PySQLite project is to develop a Python extension for SQLite
-that conforms to the Python Database API Specification 2.0. SQLite is a
-powerful embedded relational database management system in a compact C library.
-It offers support for a large subset of SQL92, multiple tables, indices,
-transactions and triggers.
-
-WWW: http://pysqlite.sourceforge.net/
-developed by Gerhard Haering and Michael Owens
-
-- Gerhard Haering <gh@ghaering.de>
diff --git a/databases/py-PySQLite/pkg-plist b/databases/py-PySQLite/pkg-plist
deleted file mode 100644
index 952724adbfd0..000000000000
--- a/databases/py-PySQLite/pkg-plist
+++ /dev/null
@@ -1,12 +0,0 @@
-%%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%%
diff --git a/databases/py-PySQLite10/Makefile b/databases/py-PySQLite10/Makefile
index c556b75512f4..47a239efe443 100644
--- a/databases/py-PySQLite10/Makefile
+++ b/databases/py-PySQLite10/Makefile
@@ -5,40 +5,36 @@
 # $FreeBSD$
 #
 
-PORTNAME=	PySQLite
-PORTVERSION=	1.0
-PORTREVISION=	1
-CATEGORIES=	databases python
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+PORTNAME=		PySQLite
+PORTVERSION=		1.0.1
+CATEGORIES=		databases python
+MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	pysqlite
-PKGNAMEPREFIX=	py-
-DISTNAME=	pysqlite-${PORTVERSION}
+PKGNAMEPREFIX=		${PYTHON_PKGNAMEPREFIX}
+DISTNAME=		pysqlite-${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A DB-API v2 Python library for the SQLite embedded SQL engine
+MAINTAINER=		marcus@corp.grupos.com.br
+COMMENT=		A DB-API v2 Python library for the SQLite 2 embedded SQL engine
 
-RUN_DEPENDS=	${DATETIME_DEP}:${PORTSDIR}/lang/py-mx-base
-LIB_DEPENDS=	sqlite.2:${PORTSDIR}/databases/sqlite2
+LIB_DEPENDS=		sqlite.2:${PORTSDIR}/databases/sqlite2
 
-WRKSRC=		${WRKDIR}/pysqlite
-EXAMPLESDIR=	${PREFIX}/share/examples/${PKGNAMEPREFIX}${PORTNAME}
-USE_PYTHON=	yes
-USE_PYDISTUTILS=	yes
-
-PORTDOCS=	README
+CONFLICTS=		py*-PySQLite-1.1*
 
-DATETIME_DEP=	${PYTHON_SITELIBDIR}/mx/DateTime/__init__.py
-
-DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
+WRKSRC=			${WRKDIR}/pysqlite
+USE_PYTHON=		yes
+USE_PYDISTUTILS=	yes
 
 .if !defined(NOPORTDOCS)
+PORTDOCS=		*
+.endif
+
 post-install:
+.if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-.for file in ${PORTDOCS}
-	@${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
-.endfor
+	@${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
+	@${INSTALL_DATA} ${WRKSRC}/doc/rest/manual.txt ${DOCSDIR}
 	@${MKDIR} ${EXAMPLESDIR}
-	${CP} ${WRKSRC}/examples/*.py ${EXAMPLESDIR}
+	@${INSTALL_DATA} ${WRKSRC}/examples/*.py ${EXAMPLESDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/databases/py-PySQLite10/distinfo b/databases/py-PySQLite10/distinfo
index 00fcda776e29..987513996834 100644
--- a/databases/py-PySQLite10/distinfo
+++ b/databases/py-PySQLite10/distinfo
@@ -1,2 +1,2 @@
-MD5 (pysqlite-1.0.tar.gz) = f21b19ff048f6bafbbfc3edb86b4c4e4
-SIZE (pysqlite-1.0.tar.gz) = 40547
+MD5 (pysqlite-1.0.1.tar.gz) = 4797b5ea7a3d96b87333e6b5af7b9979
+SIZE (pysqlite-1.0.1.tar.gz) = 41099
diff --git a/databases/py-PySQLite10/pkg-descr b/databases/py-PySQLite10/pkg-descr
index 44a7521cf1cf..cd108d34f726 100644
--- a/databases/py-PySQLite10/pkg-descr
+++ b/databases/py-PySQLite10/pkg-descr
@@ -1,10 +1,9 @@
-The goal of the PySQLite project is to develop a Python extension for SQLite
+The goal of the PySQLite project is to develop a Python extension for SQLite 2
 that conforms to the Python Database API Specification 2.0. SQLite is a
 powerful embedded relational database management system in a compact C library.
 It offers support for a large subset of SQL92, multiple tables, indices,
 transactions and triggers.
 
-WWW: http://pysqlite.sourceforge.net/
-developed by Gerhard Haering and Michael Owens
+WWW: http://sourceforge.net/projects/pysqlite
 
-- Gerhard Haering <gh@ghaering.de>
+Marcus Grando <marcus@corp.grupos.com.br>
diff --git a/databases/py-PySQLite11/Makefile b/databases/py-PySQLite11/Makefile
index c556b75512f4..dc1b3ca7e17a 100644
--- a/databases/py-PySQLite11/Makefile
+++ b/databases/py-PySQLite11/Makefile
@@ -5,40 +5,36 @@
 # $FreeBSD$
 #
 
-PORTNAME=	PySQLite
-PORTVERSION=	1.0
-PORTREVISION=	1
-CATEGORIES=	databases python
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+PORTNAME=		PySQLite
+PORTVERSION=		1.1.6
+CATEGORIES=		databases python
+MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	pysqlite
-PKGNAMEPREFIX=	py-
-DISTNAME=	pysqlite-${PORTVERSION}
+PKGNAMEPREFIX=		${PYTHON_PKGNAMEPREFIX}
+DISTNAME=		pysqlite-${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A DB-API v2 Python library for the SQLite embedded SQL engine
+MAINTAINER=		marcus@corp.grupos.com.br
+COMMENT=		A DB-API v2 Python library for the SQLite 3 embedded SQL engine
 
-RUN_DEPENDS=	${DATETIME_DEP}:${PORTSDIR}/lang/py-mx-base
-LIB_DEPENDS=	sqlite.2:${PORTSDIR}/databases/sqlite2
+LIB_DEPENDS=		sqlite3.8:${PORTSDIR}/databases/sqlite3
 
-WRKSRC=		${WRKDIR}/pysqlite
-EXAMPLESDIR=	${PREFIX}/share/examples/${PKGNAMEPREFIX}${PORTNAME}
-USE_PYTHON=	yes
-USE_PYDISTUTILS=	yes
-
-PORTDOCS=	README
+CONFLICTS=		py*-PySQLite-1.0*
 
-DATETIME_DEP=	${PYTHON_SITELIBDIR}/mx/DateTime/__init__.py
-
-DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
+WRKSRC=			${WRKDIR}/pysqlite
+USE_PYTHON=		yes
+USE_PYDISTUTILS=	yes
 
 .if !defined(NOPORTDOCS)
+PORTDOCS=		*
+.endif
+
 post-install:
+.if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-.for file in ${PORTDOCS}
-	@${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
-.endfor
+	@${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
+	@${INSTALL_DATA} ${WRKSRC}/doc/rest/manual.txt ${DOCSDIR}
 	@${MKDIR} ${EXAMPLESDIR}
-	${CP} ${WRKSRC}/examples/*.py ${EXAMPLESDIR}
+	@${INSTALL_DATA} ${WRKSRC}/examples/*.py ${EXAMPLESDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/databases/py-PySQLite11/distinfo b/databases/py-PySQLite11/distinfo
index 00fcda776e29..dd8df5fc1877 100644
--- a/databases/py-PySQLite11/distinfo
+++ b/databases/py-PySQLite11/distinfo
@@ -1,2 +1,2 @@
-MD5 (pysqlite-1.0.tar.gz) = f21b19ff048f6bafbbfc3edb86b4c4e4
-SIZE (pysqlite-1.0.tar.gz) = 40547
+MD5 (pysqlite-1.1.6.tar.gz) = cc936312beff1bd7ab6e4f46d745237c
+SIZE (pysqlite-1.1.6.tar.gz) = 42479
diff --git a/databases/py-PySQLite11/pkg-descr b/databases/py-PySQLite11/pkg-descr
index 44a7521cf1cf..a8c45061da4c 100644
--- a/databases/py-PySQLite11/pkg-descr
+++ b/databases/py-PySQLite11/pkg-descr
@@ -1,10 +1,9 @@
-The goal of the PySQLite project is to develop a Python extension for SQLite
+The goal of the PySQLite project is to develop a Python extension for SQLite 3
 that conforms to the Python Database API Specification 2.0. SQLite is a
 powerful embedded relational database management system in a compact C library.
 It offers support for a large subset of SQL92, multiple tables, indices,
 transactions and triggers.
 
-WWW: http://pysqlite.sourceforge.net/
-developed by Gerhard Haering and Michael Owens
+WWW: http://sourceforge.net/projects/pysqlite
 
-- Gerhard Haering <gh@ghaering.de>
+Marcus Grando <marcus@corp.grupos.com.br>
diff --git a/databases/py-PySQLite2/Makefile b/databases/py-PySQLite2/Makefile
index c556b75512f4..dc1b3ca7e17a 100644
--- a/databases/py-PySQLite2/Makefile
+++ b/databases/py-PySQLite2/Makefile
@@ -5,40 +5,36 @@
 # $FreeBSD$
 #
 
-PORTNAME=	PySQLite
-PORTVERSION=	1.0
-PORTREVISION=	1
-CATEGORIES=	databases python
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+PORTNAME=		PySQLite
+PORTVERSION=		1.1.6
+CATEGORIES=		databases python
+MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	pysqlite
-PKGNAMEPREFIX=	py-
-DISTNAME=	pysqlite-${PORTVERSION}
+PKGNAMEPREFIX=		${PYTHON_PKGNAMEPREFIX}
+DISTNAME=		pysqlite-${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A DB-API v2 Python library for the SQLite embedded SQL engine
+MAINTAINER=		marcus@corp.grupos.com.br
+COMMENT=		A DB-API v2 Python library for the SQLite 3 embedded SQL engine
 
-RUN_DEPENDS=	${DATETIME_DEP}:${PORTSDIR}/lang/py-mx-base
-LIB_DEPENDS=	sqlite.2:${PORTSDIR}/databases/sqlite2
+LIB_DEPENDS=		sqlite3.8:${PORTSDIR}/databases/sqlite3
 
-WRKSRC=		${WRKDIR}/pysqlite
-EXAMPLESDIR=	${PREFIX}/share/examples/${PKGNAMEPREFIX}${PORTNAME}
-USE_PYTHON=	yes
-USE_PYDISTUTILS=	yes
-
-PORTDOCS=	README
+CONFLICTS=		py*-PySQLite-1.0*
 
-DATETIME_DEP=	${PYTHON_SITELIBDIR}/mx/DateTime/__init__.py
-
-DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
+WRKSRC=			${WRKDIR}/pysqlite
+USE_PYTHON=		yes
+USE_PYDISTUTILS=	yes
 
 .if !defined(NOPORTDOCS)
+PORTDOCS=		*
+.endif
+
 post-install:
+.if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-.for file in ${PORTDOCS}
-	@${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
-.endfor
+	@${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
+	@${INSTALL_DATA} ${WRKSRC}/doc/rest/manual.txt ${DOCSDIR}
 	@${MKDIR} ${EXAMPLESDIR}
-	${CP} ${WRKSRC}/examples/*.py ${EXAMPLESDIR}
+	@${INSTALL_DATA} ${WRKSRC}/examples/*.py ${EXAMPLESDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/databases/py-PySQLite2/distinfo b/databases/py-PySQLite2/distinfo
index 00fcda776e29..dd8df5fc1877 100644
--- a/databases/py-PySQLite2/distinfo
+++ b/databases/py-PySQLite2/distinfo
@@ -1,2 +1,2 @@
-MD5 (pysqlite-1.0.tar.gz) = f21b19ff048f6bafbbfc3edb86b4c4e4
-SIZE (pysqlite-1.0.tar.gz) = 40547
+MD5 (pysqlite-1.1.6.tar.gz) = cc936312beff1bd7ab6e4f46d745237c
+SIZE (pysqlite-1.1.6.tar.gz) = 42479
diff --git a/databases/py-PySQLite2/pkg-descr b/databases/py-PySQLite2/pkg-descr
index 44a7521cf1cf..a8c45061da4c 100644
--- a/databases/py-PySQLite2/pkg-descr
+++ b/databases/py-PySQLite2/pkg-descr
@@ -1,10 +1,9 @@
-The goal of the PySQLite project is to develop a Python extension for SQLite
+The goal of the PySQLite project is to develop a Python extension for SQLite 3
 that conforms to the Python Database API Specification 2.0. SQLite is a
 powerful embedded relational database management system in a compact C library.
 It offers support for a large subset of SQL92, multiple tables, indices,
 transactions and triggers.
 
-WWW: http://pysqlite.sourceforge.net/
-developed by Gerhard Haering and Michael Owens
+WWW: http://sourceforge.net/projects/pysqlite
 
-- Gerhard Haering <gh@ghaering.de>
+Marcus Grando <marcus@corp.grupos.com.br>
diff --git a/databases/py-pysqlite20/Makefile b/databases/py-pysqlite20/Makefile
index c556b75512f4..dc1b3ca7e17a 100644
--- a/databases/py-pysqlite20/Makefile
+++ b/databases/py-pysqlite20/Makefile
@@ -5,40 +5,36 @@
 # $FreeBSD$
 #
 
-PORTNAME=	PySQLite
-PORTVERSION=	1.0
-PORTREVISION=	1
-CATEGORIES=	databases python
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+PORTNAME=		PySQLite
+PORTVERSION=		1.1.6
+CATEGORIES=		databases python
+MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	pysqlite
-PKGNAMEPREFIX=	py-
-DISTNAME=	pysqlite-${PORTVERSION}
+PKGNAMEPREFIX=		${PYTHON_PKGNAMEPREFIX}
+DISTNAME=		pysqlite-${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A DB-API v2 Python library for the SQLite embedded SQL engine
+MAINTAINER=		marcus@corp.grupos.com.br
+COMMENT=		A DB-API v2 Python library for the SQLite 3 embedded SQL engine
 
-RUN_DEPENDS=	${DATETIME_DEP}:${PORTSDIR}/lang/py-mx-base
-LIB_DEPENDS=	sqlite.2:${PORTSDIR}/databases/sqlite2
+LIB_DEPENDS=		sqlite3.8:${PORTSDIR}/databases/sqlite3
 
-WRKSRC=		${WRKDIR}/pysqlite
-EXAMPLESDIR=	${PREFIX}/share/examples/${PKGNAMEPREFIX}${PORTNAME}
-USE_PYTHON=	yes
-USE_PYDISTUTILS=	yes
-
-PORTDOCS=	README
+CONFLICTS=		py*-PySQLite-1.0*
 
-DATETIME_DEP=	${PYTHON_SITELIBDIR}/mx/DateTime/__init__.py
-
-DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
+WRKSRC=			${WRKDIR}/pysqlite
+USE_PYTHON=		yes
+USE_PYDISTUTILS=	yes
 
 .if !defined(NOPORTDOCS)
+PORTDOCS=		*
+.endif
+
 post-install:
+.if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-.for file in ${PORTDOCS}
-	@${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
-.endfor
+	@${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
+	@${INSTALL_DATA} ${WRKSRC}/doc/rest/manual.txt ${DOCSDIR}
 	@${MKDIR} ${EXAMPLESDIR}
-	${CP} ${WRKSRC}/examples/*.py ${EXAMPLESDIR}
+	@${INSTALL_DATA} ${WRKSRC}/examples/*.py ${EXAMPLESDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/databases/py-pysqlite20/distinfo b/databases/py-pysqlite20/distinfo
index 00fcda776e29..dd8df5fc1877 100644
--- a/databases/py-pysqlite20/distinfo
+++ b/databases/py-pysqlite20/distinfo
@@ -1,2 +1,2 @@
-MD5 (pysqlite-1.0.tar.gz) = f21b19ff048f6bafbbfc3edb86b4c4e4
-SIZE (pysqlite-1.0.tar.gz) = 40547
+MD5 (pysqlite-1.1.6.tar.gz) = cc936312beff1bd7ab6e4f46d745237c
+SIZE (pysqlite-1.1.6.tar.gz) = 42479
diff --git a/databases/py-pysqlite20/pkg-descr b/databases/py-pysqlite20/pkg-descr
index 44a7521cf1cf..a8c45061da4c 100644
--- a/databases/py-pysqlite20/pkg-descr
+++ b/databases/py-pysqlite20/pkg-descr
@@ -1,10 +1,9 @@
-The goal of the PySQLite project is to develop a Python extension for SQLite
+The goal of the PySQLite project is to develop a Python extension for SQLite 3
 that conforms to the Python Database API Specification 2.0. SQLite is a
 powerful embedded relational database management system in a compact C library.
 It offers support for a large subset of SQL92, multiple tables, indices,
 transactions and triggers.
 
-WWW: http://pysqlite.sourceforge.net/
-developed by Gerhard Haering and Michael Owens
+WWW: http://sourceforge.net/projects/pysqlite
 
-- Gerhard Haering <gh@ghaering.de>
+Marcus Grando <marcus@corp.grupos.com.br>
diff --git a/databases/py-pysqlite21/Makefile b/databases/py-pysqlite21/Makefile
index c556b75512f4..dc1b3ca7e17a 100644
--- a/databases/py-pysqlite21/Makefile
+++ b/databases/py-pysqlite21/Makefile
@@ -5,40 +5,36 @@
 # $FreeBSD$
 #
 
-PORTNAME=	PySQLite
-PORTVERSION=	1.0
-PORTREVISION=	1
-CATEGORIES=	databases python
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+PORTNAME=		PySQLite
+PORTVERSION=		1.1.6
+CATEGORIES=		databases python
+MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	pysqlite
-PKGNAMEPREFIX=	py-
-DISTNAME=	pysqlite-${PORTVERSION}
+PKGNAMEPREFIX=		${PYTHON_PKGNAMEPREFIX}
+DISTNAME=		pysqlite-${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A DB-API v2 Python library for the SQLite embedded SQL engine
+MAINTAINER=		marcus@corp.grupos.com.br
+COMMENT=		A DB-API v2 Python library for the SQLite 3 embedded SQL engine
 
-RUN_DEPENDS=	${DATETIME_DEP}:${PORTSDIR}/lang/py-mx-base
-LIB_DEPENDS=	sqlite.2:${PORTSDIR}/databases/sqlite2
+LIB_DEPENDS=		sqlite3.8:${PORTSDIR}/databases/sqlite3
 
-WRKSRC=		${WRKDIR}/pysqlite
-EXAMPLESDIR=	${PREFIX}/share/examples/${PKGNAMEPREFIX}${PORTNAME}
-USE_PYTHON=	yes
-USE_PYDISTUTILS=	yes
-
-PORTDOCS=	README
+CONFLICTS=		py*-PySQLite-1.0*
 
-DATETIME_DEP=	${PYTHON_SITELIBDIR}/mx/DateTime/__init__.py
-
-DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
+WRKSRC=			${WRKDIR}/pysqlite
+USE_PYTHON=		yes
+USE_PYDISTUTILS=	yes
 
 .if !defined(NOPORTDOCS)
+PORTDOCS=		*
+.endif
+
 post-install:
+.if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-.for file in ${PORTDOCS}
-	@${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
-.endfor
+	@${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
+	@${INSTALL_DATA} ${WRKSRC}/doc/rest/manual.txt ${DOCSDIR}
 	@${MKDIR} ${EXAMPLESDIR}
-	${CP} ${WRKSRC}/examples/*.py ${EXAMPLESDIR}
+	@${INSTALL_DATA} ${WRKSRC}/examples/*.py ${EXAMPLESDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/databases/py-pysqlite21/distinfo b/databases/py-pysqlite21/distinfo
index 00fcda776e29..dd8df5fc1877 100644
--- a/databases/py-pysqlite21/distinfo
+++ b/databases/py-pysqlite21/distinfo
@@ -1,2 +1,2 @@
-MD5 (pysqlite-1.0.tar.gz) = f21b19ff048f6bafbbfc3edb86b4c4e4
-SIZE (pysqlite-1.0.tar.gz) = 40547
+MD5 (pysqlite-1.1.6.tar.gz) = cc936312beff1bd7ab6e4f46d745237c
+SIZE (pysqlite-1.1.6.tar.gz) = 42479
diff --git a/databases/py-pysqlite21/pkg-descr b/databases/py-pysqlite21/pkg-descr
index 44a7521cf1cf..a8c45061da4c 100644
--- a/databases/py-pysqlite21/pkg-descr
+++ b/databases/py-pysqlite21/pkg-descr
@@ -1,10 +1,9 @@
-The goal of the PySQLite project is to develop a Python extension for SQLite
+The goal of the PySQLite project is to develop a Python extension for SQLite 3
 that conforms to the Python Database API Specification 2.0. SQLite is a
 powerful embedded relational database management system in a compact C library.
 It offers support for a large subset of SQL92, multiple tables, indices,
 transactions and triggers.
 
-WWW: http://pysqlite.sourceforge.net/
-developed by Gerhard Haering and Michael Owens
+WWW: http://sourceforge.net/projects/pysqlite
 
-- Gerhard Haering <gh@ghaering.de>
+Marcus Grando <marcus@corp.grupos.com.br>
diff --git a/databases/py-pysqlite22/Makefile b/databases/py-pysqlite22/Makefile
index c556b75512f4..dc1b3ca7e17a 100644
--- a/databases/py-pysqlite22/Makefile
+++ b/databases/py-pysqlite22/Makefile
@@ -5,40 +5,36 @@
 # $FreeBSD$
 #
 
-PORTNAME=	PySQLite
-PORTVERSION=	1.0
-PORTREVISION=	1
-CATEGORIES=	databases python
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+PORTNAME=		PySQLite
+PORTVERSION=		1.1.6
+CATEGORIES=		databases python
+MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	pysqlite
-PKGNAMEPREFIX=	py-
-DISTNAME=	pysqlite-${PORTVERSION}
+PKGNAMEPREFIX=		${PYTHON_PKGNAMEPREFIX}
+DISTNAME=		pysqlite-${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A DB-API v2 Python library for the SQLite embedded SQL engine
+MAINTAINER=		marcus@corp.grupos.com.br
+COMMENT=		A DB-API v2 Python library for the SQLite 3 embedded SQL engine
 
-RUN_DEPENDS=	${DATETIME_DEP}:${PORTSDIR}/lang/py-mx-base
-LIB_DEPENDS=	sqlite.2:${PORTSDIR}/databases/sqlite2
+LIB_DEPENDS=		sqlite3.8:${PORTSDIR}/databases/sqlite3
 
-WRKSRC=		${WRKDIR}/pysqlite
-EXAMPLESDIR=	${PREFIX}/share/examples/${PKGNAMEPREFIX}${PORTNAME}
-USE_PYTHON=	yes
-USE_PYDISTUTILS=	yes
-
-PORTDOCS=	README
+CONFLICTS=		py*-PySQLite-1.0*
 
-DATETIME_DEP=	${PYTHON_SITELIBDIR}/mx/DateTime/__init__.py
-
-DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
+WRKSRC=			${WRKDIR}/pysqlite
+USE_PYTHON=		yes
+USE_PYDISTUTILS=	yes
 
 .if !defined(NOPORTDOCS)
+PORTDOCS=		*
+.endif
+
 post-install:
+.if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-.for file in ${PORTDOCS}
-	@${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
-.endfor
+	@${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
+	@${INSTALL_DATA} ${WRKSRC}/doc/rest/manual.txt ${DOCSDIR}
 	@${MKDIR} ${EXAMPLESDIR}
-	${CP} ${WRKSRC}/examples/*.py ${EXAMPLESDIR}
+	@${INSTALL_DATA} ${WRKSRC}/examples/*.py ${EXAMPLESDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/databases/py-pysqlite22/distinfo b/databases/py-pysqlite22/distinfo
index 00fcda776e29..dd8df5fc1877 100644
--- a/databases/py-pysqlite22/distinfo
+++ b/databases/py-pysqlite22/distinfo
@@ -1,2 +1,2 @@
-MD5 (pysqlite-1.0.tar.gz) = f21b19ff048f6bafbbfc3edb86b4c4e4
-SIZE (pysqlite-1.0.tar.gz) = 40547
+MD5 (pysqlite-1.1.6.tar.gz) = cc936312beff1bd7ab6e4f46d745237c
+SIZE (pysqlite-1.1.6.tar.gz) = 42479
diff --git a/databases/py-pysqlite22/pkg-descr b/databases/py-pysqlite22/pkg-descr
index 44a7521cf1cf..a8c45061da4c 100644
--- a/databases/py-pysqlite22/pkg-descr
+++ b/databases/py-pysqlite22/pkg-descr
@@ -1,10 +1,9 @@
-The goal of the PySQLite project is to develop a Python extension for SQLite
+The goal of the PySQLite project is to develop a Python extension for SQLite 3
 that conforms to the Python Database API Specification 2.0. SQLite is a
 powerful embedded relational database management system in a compact C library.
 It offers support for a large subset of SQL92, multiple tables, indices,
 transactions and triggers.
 
-WWW: http://pysqlite.sourceforge.net/
-developed by Gerhard Haering and Michael Owens
+WWW: http://sourceforge.net/projects/pysqlite
 
-- Gerhard Haering <gh@ghaering.de>
+Marcus Grando <marcus@corp.grupos.com.br>
diff --git a/databases/py-pysqlite23/Makefile b/databases/py-pysqlite23/Makefile
index c556b75512f4..dc1b3ca7e17a 100644
--- a/databases/py-pysqlite23/Makefile
+++ b/databases/py-pysqlite23/Makefile
@@ -5,40 +5,36 @@
 # $FreeBSD$
 #
 
-PORTNAME=	PySQLite
-PORTVERSION=	1.0
-PORTREVISION=	1
-CATEGORIES=	databases python
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+PORTNAME=		PySQLite
+PORTVERSION=		1.1.6
+CATEGORIES=		databases python
+MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	pysqlite
-PKGNAMEPREFIX=	py-
-DISTNAME=	pysqlite-${PORTVERSION}
+PKGNAMEPREFIX=		${PYTHON_PKGNAMEPREFIX}
+DISTNAME=		pysqlite-${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A DB-API v2 Python library for the SQLite embedded SQL engine
+MAINTAINER=		marcus@corp.grupos.com.br
+COMMENT=		A DB-API v2 Python library for the SQLite 3 embedded SQL engine
 
-RUN_DEPENDS=	${DATETIME_DEP}:${PORTSDIR}/lang/py-mx-base
-LIB_DEPENDS=	sqlite.2:${PORTSDIR}/databases/sqlite2
+LIB_DEPENDS=		sqlite3.8:${PORTSDIR}/databases/sqlite3
 
-WRKSRC=		${WRKDIR}/pysqlite
-EXAMPLESDIR=	${PREFIX}/share/examples/${PKGNAMEPREFIX}${PORTNAME}
-USE_PYTHON=	yes
-USE_PYDISTUTILS=	yes
-
-PORTDOCS=	README
+CONFLICTS=		py*-PySQLite-1.0*
 
-DATETIME_DEP=	${PYTHON_SITELIBDIR}/mx/DateTime/__init__.py
-
-DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
+WRKSRC=			${WRKDIR}/pysqlite
+USE_PYTHON=		yes
+USE_PYDISTUTILS=	yes
 
 .if !defined(NOPORTDOCS)
+PORTDOCS=		*
+.endif
+
 post-install:
+.if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-.for file in ${PORTDOCS}
-	@${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
-.endfor
+	@${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
+	@${INSTALL_DATA} ${WRKSRC}/doc/rest/manual.txt ${DOCSDIR}
 	@${MKDIR} ${EXAMPLESDIR}
-	${CP} ${WRKSRC}/examples/*.py ${EXAMPLESDIR}
+	@${INSTALL_DATA} ${WRKSRC}/examples/*.py ${EXAMPLESDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/databases/py-pysqlite23/distinfo b/databases/py-pysqlite23/distinfo
index 00fcda776e29..dd8df5fc1877 100644
--- a/databases/py-pysqlite23/distinfo
+++ b/databases/py-pysqlite23/distinfo
@@ -1,2 +1,2 @@
-MD5 (pysqlite-1.0.tar.gz) = f21b19ff048f6bafbbfc3edb86b4c4e4
-SIZE (pysqlite-1.0.tar.gz) = 40547
+MD5 (pysqlite-1.1.6.tar.gz) = cc936312beff1bd7ab6e4f46d745237c
+SIZE (pysqlite-1.1.6.tar.gz) = 42479
diff --git a/databases/py-pysqlite23/pkg-descr b/databases/py-pysqlite23/pkg-descr
index 44a7521cf1cf..a8c45061da4c 100644
--- a/databases/py-pysqlite23/pkg-descr
+++ b/databases/py-pysqlite23/pkg-descr
@@ -1,10 +1,9 @@
-The goal of the PySQLite project is to develop a Python extension for SQLite
+The goal of the PySQLite project is to develop a Python extension for SQLite 3
 that conforms to the Python Database API Specification 2.0. SQLite is a
 powerful embedded relational database management system in a compact C library.
 It offers support for a large subset of SQL92, multiple tables, indices,
 transactions and triggers.
 
-WWW: http://pysqlite.sourceforge.net/
-developed by Gerhard Haering and Michael Owens
+WWW: http://sourceforge.net/projects/pysqlite
 
-- Gerhard Haering <gh@ghaering.de>
+Marcus Grando <marcus@corp.grupos.com.br>