3 files changed, 11 insertions, 148 deletions

diff --git a/databases/py-psycopg2/Makefile b/databases/py-psycopg2/Makefile
index 759e883cde05..f9737778bc94 100644
--- a/databases/py-psycopg2/Makefile
+++ b/databases/py-psycopg2/Makefile
@@ -1,4 +1,4 @@
-# Created by: Martin Wilke 	<miwi@FreeBSD.org>
+# Created by: Martin Wilke <miwi@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	psycopg2
@@ -9,35 +9,28 @@ MASTER_SITES=	http://initd.org/psycopg/tarballs/PSYCOPG-2-5/ \
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	miwi@FreeBSD.org
-COMMENT=	The high performance Python adapter for PostgreSQL
+COMMENT=	High performance Python adapter for PostgreSQL
 
-USE_PGSQL=	yes
-# Python3 ready
-USE_PYTHON=	yes
+USE_PGSQL=		yes
+USE_PYTHON=		yes
 USE_PYDISTUTILS=	yes
+PYDISTUTILS_AUTOPLIST=	yes
 
 DOCSDIR=	${PREFIX}/share/doc/py-psycopg2
 EXAMPLESDIR=	${PREFIX}/share/examples/py-psycopg2
 
-EXAMPLES=	binary.py copy_from.py copy_to.py cursor.py dialtone.py \
+PORTEXAMPLES=	binary.py copy_from.py copy_to.py cursor.py dialtone.py \
 		dict.py dt.py encoding.py fetch.py lastrowid.py lobject.py \
 		mogrify.py myfirstrecipe.py notify.py simple.py somehackers.jpg \
 		threads.py typecast.py tz.py usercast.py whereareyou.jpg
 
-DOCS=		AUTHORS INSTALL README NEWS PKG-INFO
+PORTDOCS=	AUTHORS INSTALL README NEWS PKG-INFO
 
 post-install:
-.if !defined(NOPORTEXAMPLES)
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
-.for f in ${EXAMPLES}
-	@${INSTALL_DATA} ${WRKSRC}/examples/${f} ${STAGEDIR}${EXAMPLESDIR}
-.endfor
-.endif
-.if !defined(NOPORTDOCS)
+	${INSTALL_DATA} ${PORTEXAMPLES:S,^,${WRKSRC}/examples/,} ${STAGEDIR}${EXAMPLESDIR}
+
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-.for f in ${DOCS}
-	@${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
-.endfor
-.endif
+	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/databases/py-psycopg2/pkg-descr b/databases/py-psycopg2/pkg-descr
index 75a4c558baa7..c9ae9c09adbd 100644
--- a/databases/py-psycopg2/pkg-descr
+++ b/databases/py-psycopg2/pkg-descr
@@ -11,4 +11,4 @@ be opened; instead one of the unused connections from the pool is used. That
 makes psycopg very fast in typical client-server applications that create a
 servicing thread every time a client request arrives.
 
-WWW:	http://initd.org/psycopg
+WWW: http://initd.org/psycopg/
diff --git a/databases/py-psycopg2/pkg-plist b/databases/py-psycopg2/pkg-plist
deleted file mode 100644
index 85ec5588b3df..000000000000
--- a/databases/py-psycopg2/pkg-plist
+++ /dev/null
@@ -1,130 +0,0 @@
-%%PYTHON_SITELIBDIR%%/psycopg2/__init__.py
-%%PYTHON_SITELIBDIR%%/psycopg2/__init__.pyc
-%%PYTHON_SITELIBDIR%%/psycopg2/__init__.pyo
-%%PYTHON_SITELIBDIR%%/psycopg2/_psycopg.so
-%%PYTHON_SITELIBDIR%%/psycopg2/errorcodes.py
-%%PYTHON_SITELIBDIR%%/psycopg2/errorcodes.pyc
-%%PYTHON_SITELIBDIR%%/psycopg2/errorcodes.pyo
-%%PYTHON_SITELIBDIR%%/psycopg2/extensions.py
-%%PYTHON_SITELIBDIR%%/psycopg2/extensions.pyc
-%%PYTHON_SITELIBDIR%%/psycopg2/extensions.pyo
-%%PYTHON_SITELIBDIR%%/psycopg2/extras.py
-%%PYTHON_SITELIBDIR%%/psycopg2/extras.pyc
-%%PYTHON_SITELIBDIR%%/psycopg2/extras.pyo
-%%PYTHON_SITELIBDIR%%/psycopg2/_json.py
-%%PYTHON_SITELIBDIR%%/psycopg2/_json.pyc
-%%PYTHON_SITELIBDIR%%/psycopg2/_json.pyo
-%%PYTHON_SITELIBDIR%%/psycopg2/pool.py
-%%PYTHON_SITELIBDIR%%/psycopg2/pool.pyc
-%%PYTHON_SITELIBDIR%%/psycopg2/pool.pyo
-%%PYTHON_SITELIBDIR%%/psycopg2/_range.py
-%%PYTHON_SITELIBDIR%%/psycopg2/_range.pyc
-%%PYTHON_SITELIBDIR%%/psycopg2/_range.pyo
-%%PYTHON_SITELIBDIR%%/psycopg2/psycopg1.py
-%%PYTHON_SITELIBDIR%%/psycopg2/psycopg1.pyc
-%%PYTHON_SITELIBDIR%%/psycopg2/psycopg1.pyo
-%%PYTHON_SITELIBDIR%%/psycopg2/tests/__init__.py
-%%PYTHON_SITELIBDIR%%/psycopg2/tests/__init__.pyc
-%%PYTHON_SITELIBDIR%%/psycopg2/tests/__init__.pyo
-%%PYTHON_SITELIBDIR%%/psycopg2/tests/dbapi20.py
-%%PYTHON_SITELIBDIR%%/psycopg2/tests/dbapi20.pyc
-%%PYTHON_SITELIBDIR%%/psycopg2/tests/dbapi20.pyo
-%%PYTHON_SITELIBDIR%%/psycopg2/tests/dbapi20_tpc.py
-%%PYTHON_SITELIBDIR%%/psycopg2/tests/dbapi20_tpc.pyc
-%%PYTHON_SITELIBDIR%%/psycopg2/tests/dbapi20_tpc.pyo
-%%PYTHON_SITELIBDIR%%/psycopg2/tests/test_async.py
-%%PYTHON_SITELIBDIR%%/psycopg2/tests/test_async.pyc
-%%PYTHON_SITELIBDIR%%/psycopg2/tests/test_async.pyo
-%%PYTHON_SITELIBDIR%%/psycopg2/tests/test_bugX000.py
-%%PYTHON_SITELIBDIR%%/psycopg2/tests/test_bugX000.pyc
-%%PYTHON_SITELIBDIR%%/psycopg2/tests/test_bugX000.pyo
-%%PYTHON_SITELIBDIR%%/psycopg2/tests/test_bug_gc.py
-%%PYTHON_SITELIBDIR%%/psycopg2/tests/test_bug_gc.pyc
-%%PYTHON_SITELIBDIR%%/psycopg2/tests/test_bug_gc.pyo
-%%PYTHON_SITELIBDIR%%/psycopg2/tests/test_cancel.py
-%%PYTHON_SITELIBDIR%%/psycopg2/tests/test_cancel.pyc
-%%PYTHON_SITELIBDIR%%/psycopg2/tests/test_cancel.pyo
-%%PYTHON_SITELIBDIR%%/psycopg2/tests/test_connection.py
-%%PYTHON_SITELIBDIR%%/psycopg2/tests/test_connection.pyc
-%%PYTHON_SITELIBDIR%%/psycopg2/tests/test_connection.pyo
-%%PYTHON_SITELIBDIR%%/psycopg2/tests/test_copy.py
-%%PYTHON_SITELIBDIR%%/psycopg2/tests/test_copy.pyc
-%%PYTHON_SITELIBDIR%%/psycopg2/tests/test_copy.pyo
-%%PYTHON_SITELIBDIR%%/psycopg2/tests/test_cursor.py
-%%PYTHON_SITELIBDIR%%/psycopg2/tests/test_cursor.pyc
-%%PYTHON_SITELIBDIR%%/psycopg2/tests/test_cursor.pyo
-%%PYTHON_SITELIBDIR%%/psycopg2/tests/test_dates.py
-%%PYTHON_SITELIBDIR%%/psycopg2/tests/test_dates.pyc
-%%PYTHON_SITELIBDIR%%/psycopg2/tests/test_dates.pyo
-%%PYTHON_SITELIBDIR%%/psycopg2/tests/test_extras_dictcursor.py
-%%PYTHON_SITELIBDIR%%/psycopg2/tests/test_extras_dictcursor.pyc
-%%PYTHON_SITELIBDIR%%/psycopg2/tests/test_extras_dictcursor.pyo
-%%PYTHON_SITELIBDIR%%/psycopg2/tests/test_green.py
-%%PYTHON_SITELIBDIR%%/psycopg2/tests/test_green.pyc
-%%PYTHON_SITELIBDIR%%/psycopg2/tests/test_green.pyo
-%%PYTHON_SITELIBDIR%%/psycopg2/tests/test_lobject.py
-%%PYTHON_SITELIBDIR%%/psycopg2/tests/test_lobject.pyc
-%%PYTHON_SITELIBDIR%%/psycopg2/tests/test_lobject.pyo
-%%PYTHON_SITELIBDIR%%/psycopg2/tests/test_module.py
-%%PYTHON_SITELIBDIR%%/psycopg2/tests/test_module.pyc
-%%PYTHON_SITELIBDIR%%/psycopg2/tests/test_module.pyo
-%%PYTHON_SITELIBDIR%%/psycopg2/tests/test_notify.py
-%%PYTHON_SITELIBDIR%%/psycopg2/tests/test_notify.pyc
-%%PYTHON_SITELIBDIR%%/psycopg2/tests/test_notify.pyo
-%%PYTHON_SITELIBDIR%%/psycopg2/tests/test_psycopg2_dbapi20.py
-%%PYTHON_SITELIBDIR%%/psycopg2/tests/test_psycopg2_dbapi20.pyc
-%%PYTHON_SITELIBDIR%%/psycopg2/tests/test_psycopg2_dbapi20.pyo
-%%PYTHON_SITELIBDIR%%/psycopg2/tests/test_quote.py
-%%PYTHON_SITELIBDIR%%/psycopg2/tests/test_quote.pyc
-%%PYTHON_SITELIBDIR%%/psycopg2/tests/test_quote.pyo
-%%PYTHON_SITELIBDIR%%/psycopg2/tests/test_transaction.py
-%%PYTHON_SITELIBDIR%%/psycopg2/tests/test_transaction.pyc
-%%PYTHON_SITELIBDIR%%/psycopg2/tests/test_transaction.pyo
-%%PYTHON_SITELIBDIR%%/psycopg2/tests/test_types_basic.py
-%%PYTHON_SITELIBDIR%%/psycopg2/tests/test_types_basic.pyc
-%%PYTHON_SITELIBDIR%%/psycopg2/tests/test_types_basic.pyo
-%%PYTHON_SITELIBDIR%%/psycopg2/tests/test_types_extras.py
-%%PYTHON_SITELIBDIR%%/psycopg2/tests/test_types_extras.pyc
-%%PYTHON_SITELIBDIR%%/psycopg2/tests/test_types_extras.pyo
-%%PYTHON_SITELIBDIR%%/psycopg2/tests/test_with.py
-%%PYTHON_SITELIBDIR%%/psycopg2/tests/test_with.pyc
-%%PYTHON_SITELIBDIR%%/psycopg2/tests/test_with.pyo
-%%PYTHON_SITELIBDIR%%/psycopg2/tests/testconfig.py
-%%PYTHON_SITELIBDIR%%/psycopg2/tests/testconfig.pyc
-%%PYTHON_SITELIBDIR%%/psycopg2/tests/testconfig.pyo
-%%PYTHON_SITELIBDIR%%/psycopg2/tests/testutils.py
-%%PYTHON_SITELIBDIR%%/psycopg2/tests/testutils.pyc
-%%PYTHON_SITELIBDIR%%/psycopg2/tests/testutils.pyo
-%%PYTHON_SITELIBDIR%%/psycopg2/tz.py
-%%PYTHON_SITELIBDIR%%/psycopg2/tz.pyc
-%%PYTHON_SITELIBDIR%%/psycopg2/tz.pyo
-%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL
-%%PORTDOCS%%%%DOCSDIR%%/NEWS
-%%PORTDOCS%%%%DOCSDIR%%/PKG-INFO
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/binary.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/copy_from.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/copy_to.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cursor.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dialtone.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dict.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dt.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/encoding.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fetch.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/lastrowid.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/lobject.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/mogrify.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/myfirstrecipe.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/notify.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/simple.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/somehackers.jpg
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/threads.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/typecast.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tz.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/usercast.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/whereareyou.jpg
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm %%PYTHON_SITELIBDIR%%/psycopg2/tests
-@dirrm %%PYTHON_SITELIBDIR%%/psycopg2