3 files changed, 96 insertions, 32 deletions

diff --git a/databases/py-psycopg2/Makefile b/databases/py-psycopg2/Makefile
index 8050d4d1b54f..b7b7628cb838 100644
--- a/databases/py-psycopg2/Makefile
+++ b/databases/py-psycopg2/Makefile
@@ -6,35 +6,27 @@
 #
 
 PORTNAME=	psycopg2
-PORTVERSION=	2.2.2
+PORTVERSION=	2.3.2
 CATEGORIES=	databases python
 MASTER_SITES=	http://initd.org/psycopg/tarballs/ \
 		${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	miwi
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-DISTNAME=	psycopg2-${PORTVERSION}
 
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	The high performance Python adapter for PostgreSQL
 
 USE_PGSQL=	yes
-USE_GMAKE=	yes
 USE_PYTHON=	2.4+
 USE_PYDISTUTILS=	yes
 
-do-build:
-	@(cd ${WRKSRC}; ${PYTHON_CMD} setup.py build)
-
-do-install:
-	@(cd ${WRKSRC}; ${PYTHON_CMD} setup.py install)
-
 DOCSDIR=	${PREFIX}/share/doc/py-psycopg2
 EXAMPLESDIR=	${PREFIX}/share/examples/py-psycopg2
 
-EXAMPLES=	binary.py cursor.py dt.py lastrowid.py notify.py threads.py \
-		whereareyou.jpg copy_from.py dialtone.py encoding.py \
-		mogrify.py simple.py tz.py copy_to.py dict.py fetch.py \
-		myfirstrecipe.py somehackers.jpg usercast.py
+EXAMPLES=	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 ChangeLog INSTALL README PKG-INFO
 
diff --git a/databases/py-psycopg2/distinfo b/databases/py-psycopg2/distinfo
index fe349792e6c6..472d413ce5ba 100644
--- a/databases/py-psycopg2/distinfo
+++ b/databases/py-psycopg2/distinfo
@@ -1,3 +1,2 @@
-MD5 (psycopg2-2.2.2.tar.gz) = 571af2ad9dfeb522ee5f8553278a4c38
-SHA256 (psycopg2-2.2.2.tar.gz) = 21a33d5b2609103512748098a06249492cc294790e07638fadc68cf06eeac39d
-SIZE (psycopg2-2.2.2.tar.gz) = 530021
+SHA256 (psycopg2-2.3.2.tar.gz) = 7da36f7b04e58c6f80665b715fe2b1d7ab307c3019390a27f2363a7c3acaf429
+SIZE (psycopg2-2.3.2.tar.gz) = 587987
diff --git a/databases/py-psycopg2/pkg-plist b/databases/py-psycopg2/pkg-plist
index cd0d20cd7771..33a802439851 100644
--- a/databases/py-psycopg2/pkg-plist
+++ b/databases/py-psycopg2/pkg-plist
@@ -1,19 +1,88 @@
-lib/%%PYTHON_VERSION%%/site-packages/psycopg2/__init__.py
-lib/%%PYTHON_VERSION%%/site-packages/psycopg2/__init__.pyc
-lib/%%PYTHON_VERSION%%/site-packages/psycopg2/_psycopg.so
-lib/%%PYTHON_VERSION%%/site-packages/psycopg2/extensions.py
-lib/%%PYTHON_VERSION%%/site-packages/psycopg2/extensions.pyc
-lib/%%PYTHON_VERSION%%/site-packages/psycopg2/errorcodes.py
-lib/%%PYTHON_VERSION%%/site-packages/psycopg2/errorcodes.pyc
-lib/%%PYTHON_VERSION%%/site-packages/psycopg2/extras.py
-lib/%%PYTHON_VERSION%%/site-packages/psycopg2/extras.pyc
-lib/%%PYTHON_VERSION%%/site-packages/psycopg2/pool.py
-lib/%%PYTHON_VERSION%%/site-packages/psycopg2/pool.pyc
-lib/%%PYTHON_VERSION%%/site-packages/psycopg2/psycopg1.py
-lib/%%PYTHON_VERSION%%/site-packages/psycopg2/psycopg1.pyc
-lib/%%PYTHON_VERSION%%/site-packages/psycopg2/tz.py
-lib/%%PYTHON_VERSION%%/site-packages/psycopg2/tz.pyc
-@dirrm lib/%%PYTHON_VERSION%%/site-packages/psycopg2
+%%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/pool.py
+%%PYTHON_SITELIBDIR%%/psycopg2/pool.pyc
+%%PYTHON_SITELIBDIR%%/psycopg2/pool.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/bugX000.py
+%%PYTHON_SITELIBDIR%%/psycopg2/tests/bugX000.pyc
+%%PYTHON_SITELIBDIR%%/psycopg2/tests/bugX000.pyo
+%%PYTHON_SITELIBDIR%%/psycopg2/tests/bug_gc.py
+%%PYTHON_SITELIBDIR%%/psycopg2/tests/bug_gc.pyc
+%%PYTHON_SITELIBDIR%%/psycopg2/tests/bug_gc.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/extras_dictcursor.py
+%%PYTHON_SITELIBDIR%%/psycopg2/tests/extras_dictcursor.pyc
+%%PYTHON_SITELIBDIR%%/psycopg2/tests/extras_dictcursor.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_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_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_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/testutils.py
+%%PYTHON_SITELIBDIR%%/psycopg2/tests/testutils.pyc
+%%PYTHON_SITELIBDIR%%/psycopg2/tests/testutils.pyo
+%%PYTHON_SITELIBDIR%%/psycopg2/tests/types_basic.py
+%%PYTHON_SITELIBDIR%%/psycopg2/tests/types_basic.pyc
+%%PYTHON_SITELIBDIR%%/psycopg2/tests/types_basic.pyo
+%%PYTHON_SITELIBDIR%%/psycopg2/tests/types_extras.py
+%%PYTHON_SITELIBDIR%%/psycopg2/tests/types_extras.pyc
+%%PYTHON_SITELIBDIR%%/psycopg2/tests/types_extras.pyo
+%%PYTHON_SITELIBDIR%%/psycopg2/tz.py
+%%PYTHON_SITELIBDIR%%/psycopg2/tz.pyc
+%%PYTHON_SITELIBDIR%%/psycopg2/tz.pyo
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL
@@ -29,14 +98,18 @@ lib/%%PYTHON_VERSION%%/site-packages/psycopg2/tz.pyc
 %%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