3 files changed, 104 insertions, 104 deletions

diff --git a/databases/py-dbutils/Makefile b/databases/py-dbutils/Makefile
index 50415da52583..f51820d3a6c9 100644
--- a/databases/py-dbutils/Makefile
+++ b/databases/py-dbutils/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	dbutils
 PORTVERSION=	1.1
+PORTREVISION=	1
 CATEGORIES=	databases python
 MASTER_SITES=	http://www.w4py.org/downloads/DBUtils/ \
 		CHEESESHOP
@@ -16,16 +17,8 @@ DISTNAME=	DBUtils-${PORTVERSION}
 MAINTAINER=	python@FreeBSD.org
 COMMENT=	Providing solid, persistent and pooled connections to a database
 
-USE_PYTHON=	yes
-USE_PYDISTUTILS=yes
+USE_PYTHON=	-2.7
+USE_PYDISTUTILS=easy_install
 PYDISTUTILS_PKGNAME=	DBUtils
 
-DOCSDIR=	${PREFIX}/share/doc/py-${PORTNAME}
-
-post-install:
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-	${CP} -R ${WRKSRC}/DBUtils/Docs/ ${DOCSDIR}
-.endif
-
 .include <bsd.port.mk>
diff --git a/databases/py-dbutils/pkg-descr b/databases/py-dbutils/pkg-descr
index f86f03c7d472..c5535d9285d0 100644
--- a/databases/py-dbutils/pkg-descr
+++ b/databases/py-dbutils/pkg-descr
@@ -3,4 +3,4 @@ to a database that can be used in all kinds of multi-threaded environments like
 Webware for Python or other web application servers. The suite supports DB-API 2
 compliant database interfaces and the classic PyGreSQL interface.
 
-WWW:   http://www.webwareforpython.org/DBUtils
+WWW:	http://www.webwareforpython.org/DBUtils
diff --git a/databases/py-dbutils/pkg-plist b/databases/py-dbutils/pkg-plist
index d53a69e76780..6dbc508faf0b 100644
--- a/databases/py-dbutils/pkg-plist
+++ b/databases/py-dbutils/pkg-plist
@@ -1,93 +1,100 @@
-%%PYTHON_SITELIBDIR%%/DBUtils/Examples/DBUtilsExample.py
-%%PYTHON_SITELIBDIR%%/DBUtils/Examples/DBUtilsExample.pyc
-%%PYTHON_SITELIBDIR%%/DBUtils/Examples/DBUtilsExample.pyo
-%%PYTHON_SITELIBDIR%%/DBUtils/Examples/Main.py
-%%PYTHON_SITELIBDIR%%/DBUtils/Examples/Main.pyc
-%%PYTHON_SITELIBDIR%%/DBUtils/Examples/Main.pyo
-%%PYTHON_SITELIBDIR%%/DBUtils/Examples/__init__.py
-%%PYTHON_SITELIBDIR%%/DBUtils/Examples/__init__.pyc
-%%PYTHON_SITELIBDIR%%/DBUtils/Examples/__init__.pyo
-%%PYTHON_SITELIBDIR%%/DBUtils/PersistentDB.py
-%%PYTHON_SITELIBDIR%%/DBUtils/PersistentDB.pyc
-%%PYTHON_SITELIBDIR%%/DBUtils/PersistentDB.pyo
-%%PYTHON_SITELIBDIR%%/DBUtils/PersistentPg.py
-%%PYTHON_SITELIBDIR%%/DBUtils/PersistentPg.pyc
-%%PYTHON_SITELIBDIR%%/DBUtils/PersistentPg.pyo
-%%PYTHON_SITELIBDIR%%/DBUtils/PooledDB.py
-%%PYTHON_SITELIBDIR%%/DBUtils/PooledDB.pyc
-%%PYTHON_SITELIBDIR%%/DBUtils/PooledDB.pyo
-%%PYTHON_SITELIBDIR%%/DBUtils/PooledPg.py
-%%PYTHON_SITELIBDIR%%/DBUtils/PooledPg.pyc
-%%PYTHON_SITELIBDIR%%/DBUtils/PooledPg.pyo
-%%PYTHON_SITELIBDIR%%/DBUtils/Properties.py
-%%PYTHON_SITELIBDIR%%/DBUtils/Properties.pyc
-%%PYTHON_SITELIBDIR%%/DBUtils/Properties.pyo
-%%PYTHON_SITELIBDIR%%/DBUtils/SimplePooledDB.py
-%%PYTHON_SITELIBDIR%%/DBUtils/SimplePooledDB.pyc
-%%PYTHON_SITELIBDIR%%/DBUtils/SimplePooledDB.pyo
-%%PYTHON_SITELIBDIR%%/DBUtils/SimplePooledPg.py
-%%PYTHON_SITELIBDIR%%/DBUtils/SimplePooledPg.pyc
-%%PYTHON_SITELIBDIR%%/DBUtils/SimplePooledPg.pyo
-%%PYTHON_SITELIBDIR%%/DBUtils/SteadyDB.py
-%%PYTHON_SITELIBDIR%%/DBUtils/SteadyDB.pyc
-%%PYTHON_SITELIBDIR%%/DBUtils/SteadyDB.pyo
-%%PYTHON_SITELIBDIR%%/DBUtils/SteadyPg.py
-%%PYTHON_SITELIBDIR%%/DBUtils/SteadyPg.pyc
-%%PYTHON_SITELIBDIR%%/DBUtils/SteadyPg.pyo
-%%PYTHON_SITELIBDIR%%/DBUtils/Tests/TestPersistentDB.py
-%%PYTHON_SITELIBDIR%%/DBUtils/Tests/TestPersistentDB.pyc
-%%PYTHON_SITELIBDIR%%/DBUtils/Tests/TestPersistentDB.pyo
-%%PYTHON_SITELIBDIR%%/DBUtils/Tests/TestPersistentPg.py
-%%PYTHON_SITELIBDIR%%/DBUtils/Tests/TestPersistentPg.pyc
-%%PYTHON_SITELIBDIR%%/DBUtils/Tests/TestPersistentPg.pyo
-%%PYTHON_SITELIBDIR%%/DBUtils/Tests/TestPooledDB.py
-%%PYTHON_SITELIBDIR%%/DBUtils/Tests/TestPooledDB.pyc
-%%PYTHON_SITELIBDIR%%/DBUtils/Tests/TestPooledDB.pyo
-%%PYTHON_SITELIBDIR%%/DBUtils/Tests/TestPooledPg.py
-%%PYTHON_SITELIBDIR%%/DBUtils/Tests/TestPooledPg.pyc
-%%PYTHON_SITELIBDIR%%/DBUtils/Tests/TestPooledPg.pyo
-%%PYTHON_SITELIBDIR%%/DBUtils/Tests/TestSimplePooledDB.py
-%%PYTHON_SITELIBDIR%%/DBUtils/Tests/TestSimplePooledDB.pyc
-%%PYTHON_SITELIBDIR%%/DBUtils/Tests/TestSimplePooledDB.pyo
-%%PYTHON_SITELIBDIR%%/DBUtils/Tests/TestSimplePooledPg.py
-%%PYTHON_SITELIBDIR%%/DBUtils/Tests/TestSimplePooledPg.pyc
-%%PYTHON_SITELIBDIR%%/DBUtils/Tests/TestSimplePooledPg.pyo
-%%PYTHON_SITELIBDIR%%/DBUtils/Tests/TestSteadyDB.py
-%%PYTHON_SITELIBDIR%%/DBUtils/Tests/TestSteadyDB.pyc
-%%PYTHON_SITELIBDIR%%/DBUtils/Tests/TestSteadyDB.pyo
-%%PYTHON_SITELIBDIR%%/DBUtils/Tests/TestSteadyPg.py
-%%PYTHON_SITELIBDIR%%/DBUtils/Tests/TestSteadyPg.pyc
-%%PYTHON_SITELIBDIR%%/DBUtils/Tests/TestSteadyPg.pyo
-%%PYTHON_SITELIBDIR%%/DBUtils/Tests/TestThreadingLocal.py
-%%PYTHON_SITELIBDIR%%/DBUtils/Tests/TestThreadingLocal.pyc
-%%PYTHON_SITELIBDIR%%/DBUtils/Tests/TestThreadingLocal.pyo
-%%PYTHON_SITELIBDIR%%/DBUtils/Tests/__init__.py
-%%PYTHON_SITELIBDIR%%/DBUtils/Tests/__init__.pyc
-%%PYTHON_SITELIBDIR%%/DBUtils/Tests/__init__.pyo
-%%PYTHON_SITELIBDIR%%/DBUtils/ThreadingLocal.py
-%%PYTHON_SITELIBDIR%%/DBUtils/ThreadingLocal.pyc
-%%PYTHON_SITELIBDIR%%/DBUtils/ThreadingLocal.pyo
-%%PYTHON_SITELIBDIR%%/DBUtils/__init__.py
-%%PYTHON_SITELIBDIR%%/DBUtils/__init__.pyc
-%%PYTHON_SITELIBDIR%%/DBUtils/__init__.pyo
-%%PORTDOCS%%%%DOCSDIR%%/Doc.css
-%%PORTDOCS%%%%DOCSDIR%%/DocUtils.css
-%%PORTDOCS%%%%DOCSDIR%%/RelNotes-0.8.1.html
-%%PORTDOCS%%%%DOCSDIR%%/RelNotes-0.9.1.html
-%%PORTDOCS%%%%DOCSDIR%%/RelNotes-0.9.2.html
-%%PORTDOCS%%%%DOCSDIR%%/RelNotes-0.9.3.html
-%%PORTDOCS%%%%DOCSDIR%%/RelNotes-0.9.4.html
-%%PORTDOCS%%%%DOCSDIR%%/RelNotes-1.0.html
-%%PORTDOCS%%%%DOCSDIR%%/RelNotes-1.1.html
-%%PORTDOCS%%%%DOCSDIR%%/UsersGuide.de.html
-%%PORTDOCS%%%%DOCSDIR%%/UsersGuide.de.txt
-%%PORTDOCS%%%%DOCSDIR%%/UsersGuide.html
-%%PORTDOCS%%%%DOCSDIR%%/UsersGuide.txt
-%%PORTDOCS%%%%DOCSDIR%%/dbdep.gif
-%%PORTDOCS%%%%DOCSDIR%%/persist.gif
-%%PORTDOCS%%%%DOCSDIR%%/pgdep.gif
-%%PORTDOCS%%%%DOCSDIR%%/pool.gif
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm %%PYTHON_SITELIBDIR%%/DBUtils/Tests
-@dirrm %%PYTHON_SITELIBDIR%%/DBUtils/Examples
-@dirrm %%PYTHON_SITELIBDIR%%/DBUtils
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/DBUtils/Docs/Doc.css
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/DBUtils/Docs/DocUtils.css
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/DBUtils/Docs/RelNotes-0.8.1.html
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/DBUtils/Docs/RelNotes-0.9.1.html
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/DBUtils/Docs/RelNotes-0.9.2.html
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/DBUtils/Docs/RelNotes-0.9.3.html
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/DBUtils/Docs/RelNotes-0.9.4.html
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/DBUtils/Docs/RelNotes-1.0.html
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/DBUtils/Docs/RelNotes-1.1.html
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/DBUtils/Docs/UsersGuide.de.html
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/DBUtils/Docs/UsersGuide.de.txt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/DBUtils/Docs/UsersGuide.html
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/DBUtils/Docs/UsersGuide.txt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/DBUtils/Docs/dbdep.gif
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/DBUtils/Docs/persist.gif
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/DBUtils/Docs/pgdep.gif
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/DBUtils/Docs/pool.gif
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/DBUtils/Examples/DBUtilsExample.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/DBUtils/Examples/DBUtilsExample.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/DBUtils/Examples/DBUtilsExample.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/DBUtils/Examples/Main.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/DBUtils/Examples/Main.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/DBUtils/Examples/Main.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/DBUtils/Examples/__init__.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/DBUtils/Examples/__init__.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/DBUtils/Examples/__init__.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/DBUtils/PersistentDB.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/DBUtils/PersistentDB.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/DBUtils/PersistentDB.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/DBUtils/PersistentPg.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/DBUtils/PersistentPg.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/DBUtils/PersistentPg.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/DBUtils/PooledDB.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/DBUtils/PooledDB.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/DBUtils/PooledDB.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/DBUtils/PooledPg.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/DBUtils/PooledPg.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/DBUtils/PooledPg.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/DBUtils/Properties.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/DBUtils/Properties.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/DBUtils/Properties.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/DBUtils/SimplePooledDB.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/DBUtils/SimplePooledDB.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/DBUtils/SimplePooledDB.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/DBUtils/SimplePooledPg.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/DBUtils/SimplePooledPg.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/DBUtils/SimplePooledPg.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/DBUtils/SteadyDB.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/DBUtils/SteadyDB.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/DBUtils/SteadyDB.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/DBUtils/SteadyPg.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/DBUtils/SteadyPg.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/DBUtils/SteadyPg.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/DBUtils/Tests/TestPersistentDB.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/DBUtils/Tests/TestPersistentDB.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/DBUtils/Tests/TestPersistentDB.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/DBUtils/Tests/TestPersistentPg.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/DBUtils/Tests/TestPersistentPg.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/DBUtils/Tests/TestPersistentPg.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/DBUtils/Tests/TestPooledDB.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/DBUtils/Tests/TestPooledDB.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/DBUtils/Tests/TestPooledDB.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/DBUtils/Tests/TestPooledPg.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/DBUtils/Tests/TestPooledPg.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/DBUtils/Tests/TestPooledPg.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/DBUtils/Tests/TestSimplePooledDB.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/DBUtils/Tests/TestSimplePooledDB.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/DBUtils/Tests/TestSimplePooledDB.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/DBUtils/Tests/TestSimplePooledPg.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/DBUtils/Tests/TestSimplePooledPg.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/DBUtils/Tests/TestSimplePooledPg.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/DBUtils/Tests/TestSteadyDB.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/DBUtils/Tests/TestSteadyDB.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/DBUtils/Tests/TestSteadyDB.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/DBUtils/Tests/TestSteadyPg.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/DBUtils/Tests/TestSteadyPg.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/DBUtils/Tests/TestSteadyPg.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/DBUtils/Tests/TestThreadingLocal.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/DBUtils/Tests/TestThreadingLocal.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/DBUtils/Tests/TestThreadingLocal.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/DBUtils/Tests/__init__.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/DBUtils/Tests/__init__.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/DBUtils/Tests/__init__.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/DBUtils/ThreadingLocal.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/DBUtils/ThreadingLocal.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/DBUtils/ThreadingLocal.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/DBUtils/__init__.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/DBUtils/__init__.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/DBUtils/__init__.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/PKG-INFO
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/SOURCES.txt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/dependency_links.txt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/not-zip-safe
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/top_level.txt
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/DBUtils/Tests
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/DBUtils/Examples
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/DBUtils/Docs
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/DBUtils
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%