Hi,
This diff updates py-psycopg2 to the latest release.
Tested on amd64. Take maintainer.
Comments ? OK ?
--
Alexandr Shadchin
Index: Makefile
===================================================================
RCS file: /cvs/ports/databases/py-psycopg2/Makefile,v
retrieving revision 1.26
diff -u -p -r1.26 Makefile
--- Makefile 20 Mar 2016 16:12:23 -0000 1.26
+++ Makefile 17 Apr 2016 09:12:56 -0000
@@ -2,15 +2,16 @@
COMMENT = PostgreSQL database adapter for Python
-MODPY_EGG_VERSION = 2.5.2
-REVISION = 2
+MODPY_EGG_VERSION = 2.6.1
DISTNAME = psycopg2-${MODPY_EGG_VERSION}
PKGNAME = py-${DISTNAME}
CATEGORIES = databases
HOMEPAGE = http://initd.org/projects/psycopg2
-# GPLv2+
+MAINTAINER = Alexandr Shadchin <[email protected]>
+
+# LGPLv3
PERMIT_PACKAGE_CDROM = Yes
WANTLIB += ${MODPY_WANTLIB}
@@ -21,6 +22,8 @@ MODPY_PI = Yes
MODULES = lang/python
LIB_DEPENDS = databases/postgresql
RUN_DEPENDS = databases/postgresql
+BUILD_DEPENDS = textproc/py-pygments${MODPY_FLAVOR} \
+ textproc/py-sphinx${MODPY_FLAVOR}
TEST_DEPENDS = ${RUN_DEPENDS}
FLAVORS = python3
@@ -46,17 +49,18 @@ TEST_ENV = PSYCOPG2_TESTDB=${PSYCOPG2_TE
PYTHON=python${MODPY_VERSION} \
PYTHONPATH=./lib.openbsd-`uname -r`-${ARCH}-${MODPY_VERSION}
+post-build:
+ cd ${WRKSRC}/doc/src && PYTHONPATH=${WRKSRC}/lib.openbsd-`uname
-r`-${ARCH}-${MODPY_VERSION} \
+ ${LOCALBASE}/bin/sphinx-build${MODPY_BIN_SUFFIX} -N .
_build/html
+
post-install:
- ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/py-psycopg2
-.if ${FLAVOR:Mpython3}
- mv ${PREFIX}/share/doc/py-psycopg2
${PREFIX}/share/doc/${MODPY_PY_PREFIX}psycopg2
-.endif
- cd ${WRKSRC}/doc && pax -rw *
${PREFIX}/share/doc/${MODPY_PY_PREFIX}psycopg2
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/${MODPY_PY_PREFIX}psycopg2
+ cd ${WRKSRC}/doc/src/_build/html && pax -rw *
${PREFIX}/share/doc/${MODPY_PY_PREFIX}psycopg2
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/${MODPY_PY_PREFIX}psycopg2
${INSTALL_DATA} ${WRKSRC}/examples/* \
${PREFIX}/share/examples/${MODPY_PY_PREFIX}psycopg2/
-do-test: fake
+do-test:
cd ${WRKSRC} && ${SETENV} ${TEST_ENV} gmake check
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/databases/py-psycopg2/distinfo,v
retrieving revision 1.9
diff -u -p -r1.9 distinfo
--- distinfo 11 May 2014 05:17:22 -0000 1.9
+++ distinfo 17 Apr 2016 09:12:56 -0000
@@ -1,2 +1,2 @@
-SHA256 (psycopg2-2.5.2.tar.gz) = UDgthwOhbDxhXzKMJnbwAnhwlZJcmfCvsSWlmWKlvS4=
-SIZE (psycopg2-2.5.2.tar.gz) = 685762
+SHA256 (psycopg2-2.6.1.tar.gz) = as+au751fvddwuzZ2RunSVR5Qauv++af8ghqnjfUkEw=
+SIZE (psycopg2-2.6.1.tar.gz) = 371373
Index: patches/patch-doc_src_conf_py
===================================================================
RCS file: patches/patch-doc_src_conf_py
diff -N patches/patch-doc_src_conf_py
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-doc_src_conf_py 17 Apr 2016 09:12:56 -0000
@@ -0,0 +1,15 @@
+$OpenBSD$
+
+Prevent build from calling out to the internet.
+
+--- doc/src/conf.py.orig Sun Apr 17 12:22:00 2016
++++ doc/src/conf.py Sun Apr 17 12:22:24 2016
+@@ -23,7 +23,7 @@ sys.path.append(os.path.abspath('tools/lib'))
+ # Add any Sphinx extension module names here, as strings. They can be
extensions
+ # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
+ extensions = ['sphinx.ext.autodoc', 'sphinx.ext.todo', 'sphinx.ext.ifconfig',
+- 'sphinx.ext.doctest', 'sphinx.ext.intersphinx' ]
++ 'sphinx.ext.doctest']
+
+ # Specific extensions for Psycopg documentation.
+ extensions += [ 'dbapi_extension', 'sql_role', 'ticket_role' ]
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/databases/py-psycopg2/pkg/PLIST,v
retrieving revision 1.8
diff -u -p -r1.8 PLIST
--- pkg/PLIST 11 May 2014 05:17:22 -0000 1.8
+++ pkg/PLIST 17 Apr 2016 09:12:56 -0000
@@ -72,95 +72,63 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/psycopg2/tests/testutils.py
lib/python${MODPY_VERSION}/site-packages/psycopg2/tz.py
share/doc/${MODPY_PY_PREFIX}psycopg2/
-share/doc/${MODPY_PY_PREFIX}psycopg2/COPYING
-share/doc/${MODPY_PY_PREFIX}psycopg2/COPYING.LESSER
-share/doc/${MODPY_PY_PREFIX}psycopg2/HACKING
-share/doc/${MODPY_PY_PREFIX}psycopg2/Makefile
-share/doc/${MODPY_PY_PREFIX}psycopg2/README
-share/doc/${MODPY_PY_PREFIX}psycopg2/SUCCESS
-share/doc/${MODPY_PY_PREFIX}psycopg2/html/
-share/doc/${MODPY_PY_PREFIX}psycopg2/html/_sources/
-share/doc/${MODPY_PY_PREFIX}psycopg2/html/_sources/advanced.txt
-share/doc/${MODPY_PY_PREFIX}psycopg2/html/_sources/connection.txt
-share/doc/${MODPY_PY_PREFIX}psycopg2/html/_sources/cursor.txt
-share/doc/${MODPY_PY_PREFIX}psycopg2/html/_sources/errorcodes.txt
-share/doc/${MODPY_PY_PREFIX}psycopg2/html/_sources/extensions.txt
-share/doc/${MODPY_PY_PREFIX}psycopg2/html/_sources/extras.txt
-share/doc/${MODPY_PY_PREFIX}psycopg2/html/_sources/faq.txt
-share/doc/${MODPY_PY_PREFIX}psycopg2/html/_sources/index.txt
-share/doc/${MODPY_PY_PREFIX}psycopg2/html/_sources/install.txt
-share/doc/${MODPY_PY_PREFIX}psycopg2/html/_sources/module.txt
-share/doc/${MODPY_PY_PREFIX}psycopg2/html/_sources/news.txt
-share/doc/${MODPY_PY_PREFIX}psycopg2/html/_sources/pool.txt
-share/doc/${MODPY_PY_PREFIX}psycopg2/html/_sources/tz.txt
-share/doc/${MODPY_PY_PREFIX}psycopg2/html/_sources/usage.txt
-share/doc/${MODPY_PY_PREFIX}psycopg2/html/_static/
-share/doc/${MODPY_PY_PREFIX}psycopg2/html/_static/ajax-loader.gif
-share/doc/${MODPY_PY_PREFIX}psycopg2/html/_static/basic.css
-share/doc/${MODPY_PY_PREFIX}psycopg2/html/_static/comment-bright.png
-share/doc/${MODPY_PY_PREFIX}psycopg2/html/_static/comment-close.png
-share/doc/${MODPY_PY_PREFIX}psycopg2/html/_static/comment.png
-share/doc/${MODPY_PY_PREFIX}psycopg2/html/_static/default.css
-share/doc/${MODPY_PY_PREFIX}psycopg2/html/_static/doctools.js
-share/doc/${MODPY_PY_PREFIX}psycopg2/html/_static/down-pressed.png
-share/doc/${MODPY_PY_PREFIX}psycopg2/html/_static/down.png
-share/doc/${MODPY_PY_PREFIX}psycopg2/html/_static/file.png
-share/doc/${MODPY_PY_PREFIX}psycopg2/html/_static/jquery.js
-share/doc/${MODPY_PY_PREFIX}psycopg2/html/_static/minus.png
-share/doc/${MODPY_PY_PREFIX}psycopg2/html/_static/plus.png
-share/doc/${MODPY_PY_PREFIX}psycopg2/html/_static/psycopg.css
-share/doc/${MODPY_PY_PREFIX}psycopg2/html/_static/pygments.css
-share/doc/${MODPY_PY_PREFIX}psycopg2/html/_static/searchtools.js
-share/doc/${MODPY_PY_PREFIX}psycopg2/html/_static/sidebar.js
-share/doc/${MODPY_PY_PREFIX}psycopg2/html/_static/underscore.js
-share/doc/${MODPY_PY_PREFIX}psycopg2/html/_static/up-pressed.png
-share/doc/${MODPY_PY_PREFIX}psycopg2/html/_static/up.png
-share/doc/${MODPY_PY_PREFIX}psycopg2/html/_static/websupport.js
-share/doc/${MODPY_PY_PREFIX}psycopg2/html/advanced.html
-share/doc/${MODPY_PY_PREFIX}psycopg2/html/connection.html
-share/doc/${MODPY_PY_PREFIX}psycopg2/html/cursor.html
-share/doc/${MODPY_PY_PREFIX}psycopg2/html/errorcodes.html
-share/doc/${MODPY_PY_PREFIX}psycopg2/html/extensions.html
-share/doc/${MODPY_PY_PREFIX}psycopg2/html/extras.html
-share/doc/${MODPY_PY_PREFIX}psycopg2/html/faq.html
-share/doc/${MODPY_PY_PREFIX}psycopg2/html/genindex.html
-share/doc/${MODPY_PY_PREFIX}psycopg2/html/index.html
-share/doc/${MODPY_PY_PREFIX}psycopg2/html/install.html
-share/doc/${MODPY_PY_PREFIX}psycopg2/html/module.html
-share/doc/${MODPY_PY_PREFIX}psycopg2/html/news.html
-share/doc/${MODPY_PY_PREFIX}psycopg2/html/pool.html
-share/doc/${MODPY_PY_PREFIX}psycopg2/html/py-modindex.html
-share/doc/${MODPY_PY_PREFIX}psycopg2/html/search.html
-share/doc/${MODPY_PY_PREFIX}psycopg2/html/searchindex.js
-share/doc/${MODPY_PY_PREFIX}psycopg2/html/tz.html
-share/doc/${MODPY_PY_PREFIX}psycopg2/html/usage.html
-share/doc/${MODPY_PY_PREFIX}psycopg2/pep-0249.txt
-share/doc/${MODPY_PY_PREFIX}psycopg2/psycopg2.txt
-share/doc/${MODPY_PY_PREFIX}psycopg2/src/
-share/doc/${MODPY_PY_PREFIX}psycopg2/src/Makefile
-share/doc/${MODPY_PY_PREFIX}psycopg2/src/_static/
-share/doc/${MODPY_PY_PREFIX}psycopg2/src/_static/psycopg.css
-share/doc/${MODPY_PY_PREFIX}psycopg2/src/advanced.rst
-share/doc/${MODPY_PY_PREFIX}psycopg2/src/conf.py
-share/doc/${MODPY_PY_PREFIX}psycopg2/src/connection.rst
-share/doc/${MODPY_PY_PREFIX}psycopg2/src/cursor.rst
-share/doc/${MODPY_PY_PREFIX}psycopg2/src/errorcodes.rst
-share/doc/${MODPY_PY_PREFIX}psycopg2/src/extensions.rst
-share/doc/${MODPY_PY_PREFIX}psycopg2/src/extras.rst
-share/doc/${MODPY_PY_PREFIX}psycopg2/src/faq.rst
-share/doc/${MODPY_PY_PREFIX}psycopg2/src/index.rst
-share/doc/${MODPY_PY_PREFIX}psycopg2/src/install.rst
-share/doc/${MODPY_PY_PREFIX}psycopg2/src/module.rst
-share/doc/${MODPY_PY_PREFIX}psycopg2/src/news.rst
-share/doc/${MODPY_PY_PREFIX}psycopg2/src/pool.rst
-share/doc/${MODPY_PY_PREFIX}psycopg2/src/tools/
-share/doc/${MODPY_PY_PREFIX}psycopg2/src/tools/lib/
-share/doc/${MODPY_PY_PREFIX}psycopg2/src/tools/lib/dbapi_extension.py
-share/doc/${MODPY_PY_PREFIX}psycopg2/src/tools/lib/sql_role.py
-share/doc/${MODPY_PY_PREFIX}psycopg2/src/tools/lib/ticket_role.py
-share/doc/${MODPY_PY_PREFIX}psycopg2/src/tools/stitch_text.py
-share/doc/${MODPY_PY_PREFIX}psycopg2/src/tz.rst
-share/doc/${MODPY_PY_PREFIX}psycopg2/src/usage.rst
+share/doc/${MODPY_PY_PREFIX}psycopg2/_sources/
+share/doc/${MODPY_PY_PREFIX}psycopg2/_sources/advanced.txt
+share/doc/${MODPY_PY_PREFIX}psycopg2/_sources/connection.txt
+share/doc/${MODPY_PY_PREFIX}psycopg2/_sources/cursor.txt
+share/doc/${MODPY_PY_PREFIX}psycopg2/_sources/errorcodes.txt
+share/doc/${MODPY_PY_PREFIX}psycopg2/_sources/extensions.txt
+share/doc/${MODPY_PY_PREFIX}psycopg2/_sources/extras.txt
+share/doc/${MODPY_PY_PREFIX}psycopg2/_sources/faq.txt
+share/doc/${MODPY_PY_PREFIX}psycopg2/_sources/index.txt
+share/doc/${MODPY_PY_PREFIX}psycopg2/_sources/install.txt
+share/doc/${MODPY_PY_PREFIX}psycopg2/_sources/module.txt
+share/doc/${MODPY_PY_PREFIX}psycopg2/_sources/news.txt
+share/doc/${MODPY_PY_PREFIX}psycopg2/_sources/pool.txt
+share/doc/${MODPY_PY_PREFIX}psycopg2/_sources/tz.txt
+share/doc/${MODPY_PY_PREFIX}psycopg2/_sources/usage.txt
+share/doc/${MODPY_PY_PREFIX}psycopg2/_static/
+share/doc/${MODPY_PY_PREFIX}psycopg2/_static/ajax-loader.gif
+share/doc/${MODPY_PY_PREFIX}psycopg2/_static/basic.css
+share/doc/${MODPY_PY_PREFIX}psycopg2/_static/classic.css
+share/doc/${MODPY_PY_PREFIX}psycopg2/_static/comment-bright.png
+share/doc/${MODPY_PY_PREFIX}psycopg2/_static/comment-close.png
+share/doc/${MODPY_PY_PREFIX}psycopg2/_static/comment.png
+share/doc/${MODPY_PY_PREFIX}psycopg2/_static/default.css
+share/doc/${MODPY_PY_PREFIX}psycopg2/_static/doctools.js
+share/doc/${MODPY_PY_PREFIX}psycopg2/_static/down-pressed.png
+share/doc/${MODPY_PY_PREFIX}psycopg2/_static/down.png
+share/doc/${MODPY_PY_PREFIX}psycopg2/_static/file.png
+share/doc/${MODPY_PY_PREFIX}psycopg2/_static/jquery.js
+share/doc/${MODPY_PY_PREFIX}psycopg2/_static/minus.png
+share/doc/${MODPY_PY_PREFIX}psycopg2/_static/plus.png
+share/doc/${MODPY_PY_PREFIX}psycopg2/_static/psycopg.css
+share/doc/${MODPY_PY_PREFIX}psycopg2/_static/pygments.css
+share/doc/${MODPY_PY_PREFIX}psycopg2/_static/searchtools.js
+share/doc/${MODPY_PY_PREFIX}psycopg2/_static/sidebar.js
+share/doc/${MODPY_PY_PREFIX}psycopg2/_static/underscore.js
+share/doc/${MODPY_PY_PREFIX}psycopg2/_static/up-pressed.png
+share/doc/${MODPY_PY_PREFIX}psycopg2/_static/up.png
+share/doc/${MODPY_PY_PREFIX}psycopg2/_static/websupport.js
+share/doc/${MODPY_PY_PREFIX}psycopg2/advanced.html
+share/doc/${MODPY_PY_PREFIX}psycopg2/connection.html
+share/doc/${MODPY_PY_PREFIX}psycopg2/cursor.html
+share/doc/${MODPY_PY_PREFIX}psycopg2/errorcodes.html
+share/doc/${MODPY_PY_PREFIX}psycopg2/extensions.html
+share/doc/${MODPY_PY_PREFIX}psycopg2/extras.html
+share/doc/${MODPY_PY_PREFIX}psycopg2/faq.html
+share/doc/${MODPY_PY_PREFIX}psycopg2/genindex.html
+share/doc/${MODPY_PY_PREFIX}psycopg2/index.html
+share/doc/${MODPY_PY_PREFIX}psycopg2/install.html
+share/doc/${MODPY_PY_PREFIX}psycopg2/module.html
+share/doc/${MODPY_PY_PREFIX}psycopg2/news.html
+share/doc/${MODPY_PY_PREFIX}psycopg2/objects.inv
+share/doc/${MODPY_PY_PREFIX}psycopg2/pool.html
+share/doc/${MODPY_PY_PREFIX}psycopg2/py-modindex.html
+share/doc/${MODPY_PY_PREFIX}psycopg2/search.html
+share/doc/${MODPY_PY_PREFIX}psycopg2/searchindex.js
+share/doc/${MODPY_PY_PREFIX}psycopg2/tz.html
+share/doc/${MODPY_PY_PREFIX}psycopg2/usage.html
share/examples/${MODPY_PY_PREFIX}psycopg2/
share/examples/${MODPY_PY_PREFIX}psycopg2/binary.py
share/examples/${MODPY_PY_PREFIX}psycopg2/copy_from.py
