4 files changed, 37 insertions, 40 deletions

diff --git a/databases/py-psycopg2/Makefile b/databases/py-psycopg2/Makefile
index 78886776b774..e17ca858f5b7 100644
--- a/databases/py-psycopg2/Makefile
+++ b/databases/py-psycopg2/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	psycopg2
-PORTVERSION=	2.0.5.1
-PORTREVISION=	1
+PORTVERSION=	2.0.6
 CATEGORIES=	databases python
 MASTER_SITES=	http://initd.org/pub/software/psycopg/ \
 		${MASTER_SITE_LOCAL}
@@ -22,21 +21,15 @@ RUN_DEPENDS=	${PYTHON_SITELIBDIR}/mx/DateTime:${PORTSDIR}/lang/py-mx-base
 
 USE_PGSQL=	yes
 USE_GMAKE=	yes
-USE_PYTHON=	yes
+USE_PYTHON=	2.4+
 USE_PYDISTUTILS=	yes
 
-.include <bsd.port.pre.mk>
-
 do-build:
 	@(cd ${WRKSRC}; ${PYTHON_CMD} setup.py build)
 
 do-install:
 	@(cd ${WRKSRC}; ${PYTHON_CMD} setup.py install)
 
-.if ${OSVERSION} < 500000
-BROKEN=		Does not compile on 4.x
-.endif
-
 DOCSDIR=	${TARGETDIR}/share/doc/py-psycopg2
 EXAMPLESDIR=	${TARGETDIR}/share/examples/py-psycopg2
 
@@ -48,15 +41,17 @@ EXAMPLES=	binary.py cursor.py dt.py lastrowid.py notify.py threads.py \
 DOCS=		AUTHORS ChangeLog INSTALL README PKG-INFO
 
 post-install:
-.if !defined(NOPORTDOCS)
+.if !defined(NOPORTEXAMPLES)
 	@${MKDIR} ${EXAMPLESDIR}
 .for f in ${EXAMPLES}
 	@${INSTALL_DATA} ${WRKSRC}/examples/${f} ${EXAMPLESDIR}
 .endfor
+.endif
+.if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 .for f in ${DOCS}
-	@${INSTALL_MAN} ${WRKSRC}/${f} ${DOCSDIR}
+	@${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
 .endfor
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/databases/py-psycopg2/distinfo b/databases/py-psycopg2/distinfo
index a14945acd370..7763f942d930 100644
--- a/databases/py-psycopg2/distinfo
+++ b/databases/py-psycopg2/distinfo
@@ -1,3 +1,3 @@
-MD5 (psycopg2-2.0.5.1.tar.gz) = 052e4b97dab47708fdcdc36ffb25af66
-SHA256 (psycopg2-2.0.5.1.tar.gz) = aaf1e73dbc4c758246145e8e8291c5b22fd5bc209eade707e61e7b729f27e9cc
-SIZE (psycopg2-2.0.5.1.tar.gz) = 280775
+MD5 (psycopg2-2.0.6.tar.gz) = e22a478b8eac5af5111ce8c697abaaa8
+SHA256 (psycopg2-2.0.6.tar.gz) = 0810ea79a5013c8620dfe5af7092963b636ae63dc72b458a13c6d7bc5e1e5694
+SIZE (psycopg2-2.0.6.tar.gz) = 228129
diff --git a/databases/py-psycopg2/files/patch-psycopg-config.h b/databases/py-psycopg2/files/patch-psycopg-config.h
index d9e427220507..9d1f5bf84193 100644
--- a/databases/py-psycopg2/files/patch-psycopg-config.h
+++ b/databases/py-psycopg2/files/patch-psycopg-config.h
@@ -1,11 +1,11 @@
---- psycopg/config.h.orig	Thu Jan 18 01:23:39 2007
-+++ psycopg/config.h	Thu Jan 18 01:24:57 2007
-@@ -102,7 +102,7 @@
+--- psycopg/config.h.orig	2007-04-11 12:12:37.000000000 +0000
++++ psycopg/config.h	2007-07-02 14:41:35.000000000 +0000
+@@ -113,7 +113,7 @@
  #define inline
  #endif
  
--#if defined(__FreeBSD__) || defined(_WIN32) || defined(__sun__)
-+#if defined(_WIN32) || defined(__sun__)
+-#if defined(__FreeBSD__) || (defined(_WIN32) && !defined(__GNUC__)) || defined(__sun__)
++#if (defined(_WIN32) && !defined(__GNUC__)) || defined(__sun__)
  /* what's this, we have no round function either? */
  static double round(double num)
  {
diff --git a/databases/py-psycopg2/pkg-plist b/databases/py-psycopg2/pkg-plist
index 3728164e99f7..cd0d20cd7771 100644
--- a/databases/py-psycopg2/pkg-plist
+++ b/databases/py-psycopg2/pkg-plist
@@ -3,6 +3,8 @@ 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
@@ -17,24 +19,24 @@ lib/%%PYTHON_VERSION%%/site-packages/psycopg2/tz.pyc
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL
 %%PORTDOCS%%%%DOCSDIR%%/PKG-INFO
 %%PORTDOCS%%%%DOCSDIR%%/README
-%%EXAMPLESDIR%%/binary.py
-%%EXAMPLESDIR%%/copy_from.py
-%%EXAMPLESDIR%%/copy_to.py
-%%EXAMPLESDIR%%/cursor.py
-%%EXAMPLESDIR%%/dialtone.py
-%%EXAMPLESDIR%%/dict.py
-%%EXAMPLESDIR%%/dt.py
-%%EXAMPLESDIR%%/encoding.py
-%%EXAMPLESDIR%%/fetch.py
-%%EXAMPLESDIR%%/lastrowid.py
-%%EXAMPLESDIR%%/mogrify.py
-%%EXAMPLESDIR%%/myfirstrecipe.py
-%%EXAMPLESDIR%%/notify.py
-%%EXAMPLESDIR%%/simple.py
-%%EXAMPLESDIR%%/somehackers.jpg
-%%EXAMPLESDIR%%/threads.py
-%%EXAMPLESDIR%%/tz.py
-%%EXAMPLESDIR%%/usercast.py
-%%EXAMPLESDIR%%/whereareyou.jpg
-@dirrm %%EXAMPLESDIR%%
+%%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%%/mogrify.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/myfirstrecipe.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/notify.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/simple.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/somehackers.jpg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/threads.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tz.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/usercast.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/whereareyou.jpg
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%