diff -ruN py-psycopg2.orig/Makefile py-psycopg2/Makefile
--- py-psycopg2.orig/Makefile	2010-03-14 11:33:45.000000000 +0100
+++ py-psycopg2/Makefile	2010-05-21 16:35:59.186323071 +0200
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	psycopg2
-PORTVERSION=	2.0.14
+PORTVERSION=	2.2.1
 CATEGORIES=	databases python
 MASTER_SITES=	http://initd.org/pub/software/psycopg/ \
 		${MASTER_SITE_LOCAL}
diff -ruN py-psycopg2.orig/distinfo py-psycopg2/distinfo
--- py-psycopg2.orig/distinfo	2010-03-14 11:33:45.000000000 +0100
+++ py-psycopg2/distinfo	2010-05-21 16:37:02.426085556 +0200
@@ -1,3 +1,3 @@
-MD5 (psycopg2-2.0.14.tar.gz) = 30136c7753acc9cbdc36cc5c2448fdee
-SHA256 (psycopg2-2.0.14.tar.gz) = 902607cdbe1195a00694d2b477eed8429eda433caaa0eb6ff7f80883e1c17ac7
-SIZE (psycopg2-2.0.14.tar.gz) = 491362
+MD5 (psycopg2-2.2.1.tar.gz) = 70b50773aefe5fb371ff4a018382012f
+SHA256 (psycopg2-2.2.1.tar.gz) = b0eca4e8438025dc57cacbea4e8ca2f5dc0554d41b1cdcc177757a5fc413f3d1
+SIZE (psycopg2-2.2.1.tar.gz) = 529408
diff -ruN py-psycopg2.orig/files/patch-psycopg-config.h py-psycopg2/files/patch-psycopg-config.h
--- py-psycopg2.orig/files/patch-psycopg-config.h	2009-03-01 14:32:52.000000000 +0100
+++ py-psycopg2/files/patch-psycopg-config.h	1970-01-01 01:00:00.000000000 +0100
@@ -1,11 +0,0 @@
---- psycopg/config.h.orig	2009-02-16 09:57:03.000000000 +0100
-+++ psycopg/config.h	2009-03-01 10:59:26.000000000 +0100
-@@ -129,7 +129,7 @@
- #define inline
- #endif
- 
--#if (defined(__FreeBSD__) && __FreeBSD_version < 503000) || (defined(_WIN32) && !defined(__GNUC__)) || defined(__sun__) || defined(sun)
-+#if (defined(_WIN32) && !defined(__GNUC__)) || defined(__sun__) || defined(sun)
- /* what's this, we have no round function either? */
- static double round(double num)
- {