Hi, Here is the revised diff. wen
diff -urN py-psycopg2/Makefile py-psycopg2.new/Makefile --- py-psycopg2/Makefile Wed Dec 1 16:49:50 2010 +++ py-psycopg2.new/Makefile Thu Apr 7 22:10:32 2011 @@ -4,7 +4,7 @@ COMMENT = PostgreSQL database adapter for Python -MODPY_EGG_VERSION = 2.2.2 +MODPY_EGG_VERSION = 2.4 DISTNAME = psycopg2-${MODPY_EGG_VERSION} PKGNAME = py-${DISTNAME} CATEGORIES = databases @@ -19,7 +19,8 @@ PERMIT_DISTFILES_FTP = Yes PERMIT_DISTFILES_CDROM = Yes -MASTER_SITES = http://initd.org/pub/software/psycopg/ +MASTER_SITES = ${MASTER_SITE_PYPI:=p/psycopg2/} \ + http://initd.org/psycopg/tarballs/PSYCOPG-2-4/ MODULES = lang/python LIB_DEPENDS = databases/postgresql diff -urN py-psycopg2/distinfo py-psycopg2.new/distinfo --- py-psycopg2/distinfo Wed Dec 1 16:49:50 2010 +++ py-psycopg2.new/distinfo Thu Apr 7 22:09:11 2011 @@ -1,5 +1,5 @@ -MD5 (psycopg2-2.2.2.tar.gz) = VxryrZ3+tSLuX4VTJ4pMOA== -RMD160 (psycopg2-2.2.2.tar.gz) = 31HWv+gaYDz6xUr+LF6wfeFlwKs= -SHA1 (psycopg2-2.2.2.tar.gz) = hQ9r+iv5hjdrReSTNLfxU6M+SWA= -SHA256 (psycopg2-2.2.2.tar.gz) = IaM9WyYJEDUSdICYoGJJSSzClHkOB2OPrcaM8G7qw50= -SIZE (psycopg2-2.2.2.tar.gz) = 530021 +MD5 (psycopg2-2.4.tar.gz) = JPQ2jiz9waKwMoLd2oFBYA== +RMD160 (psycopg2-2.4.tar.gz) = PjvDO4Tz1Fo7tps9pavYjeBqCbM= +SHA1 (psycopg2-2.4.tar.gz) = dHaCykRdn1h87PxS6uKbhOcOUkw= +SHA256 (psycopg2-2.4.tar.gz) = 9BYjxBMoPxAbYbojVvkswYkLADCK6pcBJOvWF4rFw6U= +SIZE (psycopg2-2.4.tar.gz) = 607925 diff -urN py-psycopg2/pkg/PLIST py-psycopg2.new/pkg/PLIST --- py-psycopg2/pkg/PLIST Tue May 18 23:44:21 2010 +++ py-psycopg2.new/pkg/PLIST Wed Apr 6 20:52:51 2011 @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.5 2010/05/18 15:44:21 pea Exp $ +@comment $OpenBSD$ lib/python${MODPY_VERSION}/site-packages/psycopg2/ lib/python${MODPY_VERSION}/site-packages/psycopg2-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info lib/python${MODPY_VERSION}/site-packages/psycopg2/__init__.py @@ -14,6 +14,51 @@ lib/python${MODPY_VERSION}/site-packages/psycopg2/pool.pyc lib/python${MODPY_VERSION}/site-packages/psycopg2/psycopg1.py lib/python${MODPY_VERSION}/site-packages/psycopg2/psycopg1.pyc +lib/python${MODPY_VERSION}/site-packages/psycopg2/tests/ +lib/python${MODPY_VERSION}/site-packages/psycopg2/tests/__init__.py +lib/python${MODPY_VERSION}/site-packages/psycopg2/tests/__init__.pyc +lib/python${MODPY_VERSION}/site-packages/psycopg2/tests/bugX000.py +lib/python${MODPY_VERSION}/site-packages/psycopg2/tests/bugX000.pyc +lib/python${MODPY_VERSION}/site-packages/psycopg2/tests/bug_gc.py +lib/python${MODPY_VERSION}/site-packages/psycopg2/tests/bug_gc.pyc +lib/python${MODPY_VERSION}/site-packages/psycopg2/tests/dbapi20.py +lib/python${MODPY_VERSION}/site-packages/psycopg2/tests/dbapi20.pyc +lib/python${MODPY_VERSION}/site-packages/psycopg2/tests/dbapi20_tpc.py +lib/python${MODPY_VERSION}/site-packages/psycopg2/tests/dbapi20_tpc.pyc +lib/python${MODPY_VERSION}/site-packages/psycopg2/tests/extras_dictcursor.py +lib/python${MODPY_VERSION}/site-packages/psycopg2/tests/extras_dictcursor.pyc +lib/python${MODPY_VERSION}/site-packages/psycopg2/tests/test_async.py +lib/python${MODPY_VERSION}/site-packages/psycopg2/tests/test_async.pyc +lib/python${MODPY_VERSION}/site-packages/psycopg2/tests/test_cancel.py +lib/python${MODPY_VERSION}/site-packages/psycopg2/tests/test_cancel.pyc +lib/python${MODPY_VERSION}/site-packages/psycopg2/tests/test_connection.py +lib/python${MODPY_VERSION}/site-packages/psycopg2/tests/test_connection.pyc +lib/python${MODPY_VERSION}/site-packages/psycopg2/tests/test_copy.py +lib/python${MODPY_VERSION}/site-packages/psycopg2/tests/test_copy.pyc +lib/python${MODPY_VERSION}/site-packages/psycopg2/tests/test_cursor.py +lib/python${MODPY_VERSION}/site-packages/psycopg2/tests/test_cursor.pyc +lib/python${MODPY_VERSION}/site-packages/psycopg2/tests/test_dates.py +lib/python${MODPY_VERSION}/site-packages/psycopg2/tests/test_dates.pyc +lib/python${MODPY_VERSION}/site-packages/psycopg2/tests/test_green.py +lib/python${MODPY_VERSION}/site-packages/psycopg2/tests/test_green.pyc +lib/python${MODPY_VERSION}/site-packages/psycopg2/tests/test_lobject.py +lib/python${MODPY_VERSION}/site-packages/psycopg2/tests/test_lobject.pyc +lib/python${MODPY_VERSION}/site-packages/psycopg2/tests/test_notify.py +lib/python${MODPY_VERSION}/site-packages/psycopg2/tests/test_notify.pyc +lib/python${MODPY_VERSION}/site-packages/psycopg2/tests/test_psycopg2_dbapi20.py +lib/python${MODPY_VERSION}/site-packages/psycopg2/tests/test_psycopg2_dbapi20.pyc +lib/python${MODPY_VERSION}/site-packages/psycopg2/tests/test_quote.py +lib/python${MODPY_VERSION}/site-packages/psycopg2/tests/test_quote.pyc +lib/python${MODPY_VERSION}/site-packages/psycopg2/tests/test_transaction.py +lib/python${MODPY_VERSION}/site-packages/psycopg2/tests/test_transaction.pyc +lib/python${MODPY_VERSION}/site-packages/psycopg2/tests/testconfig.py +lib/python${MODPY_VERSION}/site-packages/psycopg2/tests/testconfig.pyc +lib/python${MODPY_VERSION}/site-packages/psycopg2/tests/testutils.py +lib/python${MODPY_VERSION}/site-packages/psycopg2/tests/testutils.pyc +lib/python${MODPY_VERSION}/site-packages/psycopg2/tests/types_basic.py +lib/python${MODPY_VERSION}/site-packages/psycopg2/tests/types_basic.pyc +lib/python${MODPY_VERSION}/site-packages/psycopg2/tests/types_extras.py +lib/python${MODPY_VERSION}/site-packages/psycopg2/tests/types_extras.pyc lib/python${MODPY_VERSION}/site-packages/psycopg2/tz.py lib/python${MODPY_VERSION}/site-packages/psycopg2/tz.pyc share/doc/py-psycopg2/ @@ -50,6 +95,8 @@ share/doc/py-psycopg2/html/_static/psycopg.css share/doc/py-psycopg2/html/_static/pygments.css share/doc/py-psycopg2/html/_static/searchtools.js +share/doc/py-psycopg2/html/_static/sidebar.js +share/doc/py-psycopg2/html/_static/underscore.js share/doc/py-psycopg2/html/advanced.html share/doc/py-psycopg2/html/connection.html share/doc/py-psycopg2/html/cursor.html @@ -59,10 +106,10 @@ share/doc/py-psycopg2/html/faq.html share/doc/py-psycopg2/html/genindex.html share/doc/py-psycopg2/html/index.html -share/doc/py-psycopg2/html/modindex.html share/doc/py-psycopg2/html/module.html share/doc/py-psycopg2/html/objects.inv share/doc/py-psycopg2/html/pool.html +share/doc/py-psycopg2/html/py-modindex.html share/doc/py-psycopg2/html/search.html share/doc/py-psycopg2/html/searchindex.js share/doc/py-psycopg2/html/tz.html