* Makefile

- Add databases/py-pysqlite22 entry

* databases/py-pysqlite22

- Update to 2.2.2 (new port)

* databases/py-pysqlite21

- Fix LATEST_LINK

* databases/py-pysqlite20

- Define LATEST_LINK

PR:		96635
Submitted by:	Edwin Groothuis <edwin___mavetju.org>
Repocopy by:	marcus

11 files changed, 26 insertions, 41 deletions

diff --git a/databases/Makefile b/databases/Makefile
index d7ec1871652b..746b7e489f70 100644
--- a/databases/Makefile
+++ b/databases/Makefile
@@ -359,6 +359,7 @@
     SUBDIR += py-PySQLite11
     SUBDIR += py-pysqlite20
     SUBDIR += py-pysqlite21
+    SUBDIR += py-pysqlite22
     SUBDIR += py-SQLDict
     SUBDIR += py-axiom
     SUBDIR += py-bsddb
diff --git a/databases/py-pysqlite20/Makefile b/databases/py-pysqlite20/Makefile
index 0c5ce47733dd..db7cfdd3352f 100644
--- a/databases/py-pysqlite20/Makefile
+++ b/databases/py-pysqlite20/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS=	sqlite3.8:${PORTSDIR}/databases/sqlite3
 
 CONFLICTS=	py*-pysqlite-2.1*
 
-NO_LATEST_LINK=	yes
+LATEST_LINK=	${PKGNAMEPREFIX}${PORTNAME}20${PKGNAMESUFFIX}
 
 USE_PYTHON=	2.3+
 USE_PYDISTUTILS=	yes
diff --git a/databases/py-pysqlite21/Makefile b/databases/py-pysqlite21/Makefile
index a72560e1a742..1a6e35068a2b 100644
--- a/databases/py-pysqlite21/Makefile
+++ b/databases/py-pysqlite21/Makefile
@@ -21,6 +21,8 @@ LIB_DEPENDS=	sqlite3.8:${PORTSDIR}/databases/sqlite3
 
 CONFLICTS=	py*-pysqlite-2.0*
 
+LATEST_LINK=	${PKGNAMEPREFIX}${PORTNAME}21${PKGNAMESUFFIX}
+
 USE_PYTHON=	2.3+
 USE_PYDISTUTILS=	yes
 PYDISTUTILS_BUILDARGS=	build_ext -I${LOCALBASE}/include -L${LOCALBASE}/lib
diff --git a/databases/py-pysqlite22/Makefile b/databases/py-pysqlite22/Makefile
index a72560e1a742..fed2213ff8f7 100644
--- a/databases/py-pysqlite22/Makefile
+++ b/databases/py-pysqlite22/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	pysqlite
-PORTVERSION=	2.1.3
-PORTREVISION=	1
+PORTVERSION=	2.2.2
 CATEGORIES=	databases python
 MASTER_SITES=	http://initd.org/pub/software/pysqlite/releases/${PORTVERSION:C/\.[0-9]$//}/${PORTVERSION}/ \
 		${MASTER_SITE_GENTOO}
@@ -47,7 +46,7 @@ post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	@${MKDIR} ${DOCSDIR}/code
-	@${INSTALL_DATA} ${WRKSRC}/LICENSE ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/LICENSE ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/databases/py-pysqlite22/distinfo b/databases/py-pysqlite22/distinfo
index 996ccf2d54fc..efc5dc47942c 100644
--- a/databases/py-pysqlite22/distinfo
+++ b/databases/py-pysqlite22/distinfo
@@ -1,3 +1,3 @@
-MD5 (pysqlite-2.1.3.tar.gz) = 55ef66a963ddff5540b117db0a6c085b
-SHA256 (pysqlite-2.1.3.tar.gz) = 73c6e489579fb7531afebf903b657f379ee91e8fb361fbb7996ccefe024e9edc
-SIZE (pysqlite-2.1.3.tar.gz) = 241978
+MD5 (pysqlite-2.2.2.tar.gz) = 3260547d3f11c85613b2de8ed529a4fc
+SHA256 (pysqlite-2.2.2.tar.gz) = 76a82a6a45ae9c12c0409427765ae56c06d8dbb03321f21b8c4d7da48c7cd2b3
+SIZE (pysqlite-2.2.2.tar.gz) = 75176
diff --git a/databases/py-pysqlite22/files/patch-setup.py b/databases/py-pysqlite22/files/patch-setup.py
deleted file mode 100644
index ef2d74fbc889..000000000000
--- a/databases/py-pysqlite22/files/patch-setup.py
+++ /dev/null
@@ -1,14 +0,0 @@
---- ./setup.py.orig	Fri Jan 27 17:35:03 2006
-+++ ./setup.py	Fri Jan 27 17:35:26 2006
-@@ -23,10 +23,7 @@
- 
- import glob, os, sys
- 
--from ez_setup import use_setuptools
--use_setuptools()
--
--from setuptools import setup, Extension, Command
-+from distutils.core import setup, Extension, Command
- 
- # If you need to change anything, it should be enough to change setup.cfg.
- 
diff --git a/databases/py-pysqlite22/pkg-plist b/databases/py-pysqlite22/pkg-plist
index e90efff688e3..120ac2ac5b51 100644
--- a/databases/py-pysqlite22/pkg-plist
+++ b/databases/py-pysqlite22/pkg-plist
@@ -14,6 +14,12 @@
 %%PYTHON_SITELIBDIR%%/pysqlite2/test/factory.py
 %%PYTHON_SITELIBDIR%%/pysqlite2/test/factory.pyc
 %%PYTHON_SITELIBDIR%%/pysqlite2/test/factory.pyo
+%%PYTHON_SITELIBDIR%%/pysqlite2/test/hooks.py
+%%PYTHON_SITELIBDIR%%/pysqlite2/test/hooks.pyc
+%%PYTHON_SITELIBDIR%%/pysqlite2/test/hooks.pyo
+%%PYTHON_SITELIBDIR%%/pysqlite2/test/regression.py
+%%PYTHON_SITELIBDIR%%/pysqlite2/test/regression.pyc
+%%PYTHON_SITELIBDIR%%/pysqlite2/test/regression.pyo
 %%PYTHON_SITELIBDIR%%/pysqlite2/test/transactions.py
 %%PYTHON_SITELIBDIR%%/pysqlite2/test/transactions.pyc
 %%PYTHON_SITELIBDIR%%/pysqlite2/test/transactions.pyo
diff --git a/databases/py-pysqlite23/Makefile b/databases/py-pysqlite23/Makefile
index a72560e1a742..fed2213ff8f7 100644
--- a/databases/py-pysqlite23/Makefile
+++ b/databases/py-pysqlite23/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	pysqlite
-PORTVERSION=	2.1.3
-PORTREVISION=	1
+PORTVERSION=	2.2.2
 CATEGORIES=	databases python
 MASTER_SITES=	http://initd.org/pub/software/pysqlite/releases/${PORTVERSION:C/\.[0-9]$//}/${PORTVERSION}/ \
 		${MASTER_SITE_GENTOO}
@@ -47,7 +46,7 @@ post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	@${MKDIR} ${DOCSDIR}/code
-	@${INSTALL_DATA} ${WRKSRC}/LICENSE ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/LICENSE ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/databases/py-pysqlite23/distinfo b/databases/py-pysqlite23/distinfo
index 996ccf2d54fc..efc5dc47942c 100644
--- a/databases/py-pysqlite23/distinfo
+++ b/databases/py-pysqlite23/distinfo
@@ -1,3 +1,3 @@
-MD5 (pysqlite-2.1.3.tar.gz) = 55ef66a963ddff5540b117db0a6c085b
-SHA256 (pysqlite-2.1.3.tar.gz) = 73c6e489579fb7531afebf903b657f379ee91e8fb361fbb7996ccefe024e9edc
-SIZE (pysqlite-2.1.3.tar.gz) = 241978
+MD5 (pysqlite-2.2.2.tar.gz) = 3260547d3f11c85613b2de8ed529a4fc
+SHA256 (pysqlite-2.2.2.tar.gz) = 76a82a6a45ae9c12c0409427765ae56c06d8dbb03321f21b8c4d7da48c7cd2b3
+SIZE (pysqlite-2.2.2.tar.gz) = 75176
diff --git a/databases/py-pysqlite23/files/patch-setup.py b/databases/py-pysqlite23/files/patch-setup.py
deleted file mode 100644
index ef2d74fbc889..000000000000
--- a/databases/py-pysqlite23/files/patch-setup.py
+++ /dev/null
@@ -1,14 +0,0 @@
---- ./setup.py.orig	Fri Jan 27 17:35:03 2006
-+++ ./setup.py	Fri Jan 27 17:35:26 2006
-@@ -23,10 +23,7 @@
- 
- import glob, os, sys
- 
--from ez_setup import use_setuptools
--use_setuptools()
--
--from setuptools import setup, Extension, Command
-+from distutils.core import setup, Extension, Command
- 
- # If you need to change anything, it should be enough to change setup.cfg.
- 
diff --git a/databases/py-pysqlite23/pkg-plist b/databases/py-pysqlite23/pkg-plist
index e90efff688e3..120ac2ac5b51 100644
--- a/databases/py-pysqlite23/pkg-plist
+++ b/databases/py-pysqlite23/pkg-plist
@@ -14,6 +14,12 @@
 %%PYTHON_SITELIBDIR%%/pysqlite2/test/factory.py
 %%PYTHON_SITELIBDIR%%/pysqlite2/test/factory.pyc
 %%PYTHON_SITELIBDIR%%/pysqlite2/test/factory.pyo
+%%PYTHON_SITELIBDIR%%/pysqlite2/test/hooks.py
+%%PYTHON_SITELIBDIR%%/pysqlite2/test/hooks.pyc
+%%PYTHON_SITELIBDIR%%/pysqlite2/test/hooks.pyo
+%%PYTHON_SITELIBDIR%%/pysqlite2/test/regression.py
+%%PYTHON_SITELIBDIR%%/pysqlite2/test/regression.pyc
+%%PYTHON_SITELIBDIR%%/pysqlite2/test/regression.pyo
 %%PYTHON_SITELIBDIR%%/pysqlite2/test/transactions.py
 %%PYTHON_SITELIBDIR%%/pysqlite2/test/transactions.pyc
 %%PYTHON_SITELIBDIR%%/pysqlite2/test/transactions.pyo