Hi, Small bugfixes update to the latest version of skytools. Tested on @amd64 with PostgreSQL 9.2.1. Comments, ok ?
Regards, -- Pierre-Emmanuel André <pea at raveland.org> GPG key: 0x7AE329DC
Index: Makefile =================================================================== RCS file: /cvs/ports/databases/skytools/Makefile,v retrieving revision 1.17 diff -u -p -r1.17 Makefile --- Makefile 24 Sep 2012 19:38:46 -0000 1.17 +++ Makefile 17 Oct 2012 14:04:36 -0000 @@ -2,7 +2,7 @@ COMMENT= PostgreSQL tools from Skype -MODPY_EGG_VERSION= 3.1 +MODPY_EGG_VERSION= 3.1.1 DISTNAME= skytools-${MODPY_EGG_VERSION} CATEGORIES= databases @@ -19,7 +19,7 @@ PERMIT_DISTFILES_CDROM= Yes WANTLIB= c ${MODPY_WANTLIB} -MASTER_SITES= http://pgfoundry.org/frs/download.php/3321/ +MASTER_SITES= https://github.com/downloads/markokr/skytools/ MODULES= lang/python Index: distinfo =================================================================== RCS file: /cvs/ports/databases/skytools/distinfo,v retrieving revision 1.8 diff -u -p -r1.8 distinfo --- distinfo 24 Sep 2012 19:38:46 -0000 1.8 +++ distinfo 17 Oct 2012 14:04:36 -0000 @@ -1,2 +1,2 @@ -SHA256 (skytools-3.1.tar.gz) = uSo4eKcRwlekTdci2q4l3uUEGwS1nlGtihCy2Z9STpc= -SIZE (skytools-3.1.tar.gz) = 620850 +SHA256 (skytools-3.1.1.tar.gz) = Elpb0XPfYKFPqtHGQ8RtJoVMv3UWwAWoc0GiDdQivA0= +SIZE (skytools-3.1.1.tar.gz) = 651345 Index: patches/patch-doc_Makefile =================================================================== RCS file: /cvs/ports/databases/skytools/patches/patch-doc_Makefile,v retrieving revision 1.3 diff -u -p -r1.3 patch-doc_Makefile --- patches/patch-doc_Makefile 24 Sep 2012 19:38:46 -0000 1.3 +++ patches/patch-doc_Makefile 17 Oct 2012 14:04:36 -0000 @@ -1,12 +1,12 @@ $OpenBSD: patch-doc_Makefile,v 1.3 2012/09/24 19:38:46 pea Exp $ ---- doc/Makefile.orig Thu Jul 19 13:27:01 2012 -+++ doc/Makefile Wed Sep 12 13:56:46 2012 -@@ -34,8 +34,8 @@ FQMAN = $(FQMAN1) $(FQMAN1_SFX) $(FQMAN5) +--- doc/Makefile.orig Tue Oct 9 12:36:51 2012 ++++ doc/Makefile Wed Oct 17 16:00:07 2012 +@@ -35,8 +35,8 @@ FQMAN = $(FQMAN1) $(FQMAN1_SFX) $(FQMAN5) COMMON = common.switches.txt common.config.txt --GETATTRS = python ../misc/getattrs.py --FIXMAN = python ../misc/fixman.py +-GETATTRS = $(PYTHON) ../misc/getattrs.py +-FIXMAN = $(PYTHON) ../misc/fixman.py +GETATTRS = ${MODPY_BIN} ../misc/getattrs.py +FIXMAN = ${MODPY_BIN} ../misc/fixman.py Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/databases/skytools/pkg/PLIST,v retrieving revision 1.5 diff -u -p -r1.5 PLIST --- pkg/PLIST 24 Sep 2012 19:38:46 -0000 1.5 +++ pkg/PLIST 17 Oct 2012 14:04:36 -0000 @@ -14,8 +14,6 @@ lib/postgresql/pgq_triggers.so lib/python${MODPY_VERSION}/site-packages/londiste/ lib/python${MODPY_VERSION}/site-packages/londiste/__init__.py lib/python${MODPY_VERSION}/site-packages/londiste/__init__.pyc -lib/python${MODPY_VERSION}/site-packages/londiste/bublin.py -lib/python${MODPY_VERSION}/site-packages/londiste/bublin.pyc lib/python${MODPY_VERSION}/site-packages/londiste/compare.py lib/python${MODPY_VERSION}/site-packages/londiste/compare.pyc lib/python${MODPY_VERSION}/site-packages/londiste/exec_attrs.py @@ -49,6 +47,8 @@ lib/python${MODPY_VERSION}/site-packages lib/python${MODPY_VERSION}/site-packages/londiste/syncer.pyc lib/python${MODPY_VERSION}/site-packages/londiste/table_copy.py lib/python${MODPY_VERSION}/site-packages/londiste/table_copy.pyc +lib/python${MODPY_VERSION}/site-packages/londiste/util.py +lib/python${MODPY_VERSION}/site-packages/londiste/util.pyc lib/python${MODPY_VERSION}/site-packages/pgq/ lib/python${MODPY_VERSION}/site-packages/pgq/__init__.py lib/python${MODPY_VERSION}/site-packages/pgq/__init__.pyc @@ -85,7 +85,7 @@ lib/python${MODPY_VERSION}/site-packages lib/python${MODPY_VERSION}/site-packages/pkgloader.py lib/python${MODPY_VERSION}/site-packages/pkgloader.pyc lib/python${MODPY_VERSION}/site-packages/skytools/ -lib/python${MODPY_VERSION}/site-packages/skytools-3.1-py${MODPY_VERSION}.egg-info +lib/python${MODPY_VERSION}/site-packages/skytools-3.1.1-py${MODPY_VERSION}.egg-info lib/python${MODPY_VERSION}/site-packages/skytools/__init__.py lib/python${MODPY_VERSION}/site-packages/skytools/__init__.pyc lib/python${MODPY_VERSION}/site-packages/skytools/_cquoting.so @@ -134,16 +134,16 @@ lib/python${MODPY_VERSION}/site-packages lib/python${MODPY_VERSION}/site-packages/skytools/timeutil.pyc lib/python${MODPY_VERSION}/site-packages/skytools/utf8.py lib/python${MODPY_VERSION}/site-packages/skytools/utf8.pyc -@man man/man1/londiste${MODPY_EGG_VERSION} +@man man/man1/londiste3.1 @man man/man1/pgqd.1 @man man/man1/qadmin.1 -@man man/man1/queue_mover${MODPY_EGG_VERSION} -@man man/man1/queue_splitter${MODPY_EGG_VERSION} -@man man/man1/scriptmgr${MODPY_EGG_VERSION} -@man man/man1/simple_consumer${MODPY_EGG_VERSION} -@man man/man1/simple_local_consumer${MODPY_EGG_VERSION} -@man man/man1/skytools_upgrade${MODPY_EGG_VERSION} -@man man/man1/walmgr${MODPY_EGG_VERSION} +@man man/man1/queue_mover3.1 +@man man/man1/queue_splitter3.1 +@man man/man1/scriptmgr3.1 +@man man/man1/simple_consumer3.1 +@man man/man1/simple_local_consumer3.1 +@man man/man1/skytools_upgrade3.1 +@man man/man1/walmgr3.1 share/doc/postgresql/ share/doc/postgresql/extension/ share/doc/postgresql/extension/README.pgq @@ -179,20 +179,23 @@ share/postgresql/contrib/pgq_triggers.sq share/postgresql/contrib/txid.sql share/postgresql/contrib/uninstall_pgq.sql share/postgresql/extension/ +share/postgresql/extension/londiste--3.1--${MODPY_EGG_VERSION}.sql share/postgresql/extension/londiste--${MODPY_EGG_VERSION}.sql share/postgresql/extension/londiste--unpackaged--${MODPY_EGG_VERSION}.sql share/postgresql/extension/londiste.control +share/postgresql/extension/pgq--3.1--${MODPY_EGG_VERSION}.sql share/postgresql/extension/pgq--${MODPY_EGG_VERSION}.sql share/postgresql/extension/pgq--unpackaged--${MODPY_EGG_VERSION}.sql share/postgresql/extension/pgq.control +share/postgresql/extension/pgq_coop--3.1--${MODPY_EGG_VERSION}.sql share/postgresql/extension/pgq_coop--${MODPY_EGG_VERSION}.sql share/postgresql/extension/pgq_coop--unpackaged--${MODPY_EGG_VERSION}.sql share/postgresql/extension/pgq_coop.control -share/postgresql/extension/pgq_ext--${MODPY_EGG_VERSION}.sql -share/postgresql/extension/pgq_ext--unpackaged--${MODPY_EGG_VERSION}.sql +share/postgresql/extension/pgq_ext--3.1.sql +share/postgresql/extension/pgq_ext--unpackaged--3.1.sql share/postgresql/extension/pgq_ext.control -share/postgresql/extension/pgq_node--${MODPY_EGG_VERSION}.sql -share/postgresql/extension/pgq_node--unpackaged--${MODPY_EGG_VERSION}.sql +share/postgresql/extension/pgq_node--3.1.sql +share/postgresql/extension/pgq_node--unpackaged--3.1.sql share/postgresql/extension/pgq_node.control share/skytools3/ share/skytools3/extra/