Hi,
This a major update to skytools 3.1.
Tested on @amd64 with PostgreSQL 9.2.
Comments/feedbacks welcome.
Regards,
Index: Makefile
===================================================================
RCS file: /cvs/ports/databases/skytools/Makefile,v
retrieving revision 1.16
diff -u -p -r1.16 Makefile
--- Makefile 4 Nov 2011 08:16:24 -0000 1.16
+++ Makefile 16 Sep 2012 10:07:06 -0000
@@ -2,9 +2,8 @@
COMMENT= PostgreSQL tools from Skype
-MODPY_EGG_VERSION= 2.1.12
+MODPY_EGG_VERSION= 3.1
DISTNAME= skytools-${MODPY_EGG_VERSION}
-REVISION = 2
CATEGORIES= databases
@@ -20,7 +19,7 @@ PERMIT_DISTFILES_CDROM= Yes
WANTLIB= c ${MODPY_WANTLIB}
-MASTER_SITES= http://pgfoundry.org/frs/download.php/2872/
+MASTER_SITES= http://pgfoundry.org/frs/download.php/3321/
MODULES= lang/python
@@ -45,10 +44,5 @@ pre-configure:
@find ${WRKSRC} -name '*.py' \
-exec perl -pi -e 's,/usr/bin/env python,${MODPY_BIN},' {} \;
@perl -pi -e 's,share/doc,share/examples,' ${WRKSRC}/setup.py
-
-post-install:
-.for i in ${BINFILES}
- @cd ${PREFIX}/bin && mv ${i} `basename ${i} .py`
-.endfor
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/databases/skytools/distinfo,v
retrieving revision 1.7
diff -u -p -r1.7 distinfo
--- distinfo 16 Nov 2010 12:28:42 -0000 1.7
+++ distinfo 16 Sep 2012 10:07:06 -0000
@@ -1,5 +1,2 @@
-MD5 (skytools-2.1.12.tar.gz) = lPM5HVs8OsbC7cv72nBVcw==
-RMD160 (skytools-2.1.12.tar.gz) = GYNWB3kRkOdErvTX8ViedySux3w=
-SHA1 (skytools-2.1.12.tar.gz) = ttriWLVBrDALBb60oU4D5vsoW80=
-SHA256 (skytools-2.1.12.tar.gz) = 84WUexIaBdnWTKcN1GWF9ZIWGtk5MDc167nWLyRtasA=
-SIZE (skytools-2.1.12.tar.gz) = 259101
+SHA256 (skytools-3.1.tar.gz) = uSo4eKcRwlekTdci2q4l3uUEGwS1nlGtihCy2Z9STpc=
+SIZE (skytools-3.1.tar.gz) = 620850
Index: patches/patch-doc_Makefile
===================================================================
RCS file: /cvs/ports/databases/skytools/patches/patch-doc_Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 patch-doc_Makefile
--- patches/patch-doc_Makefile 16 Nov 2010 12:28:42 -0000 1.2
+++ patches/patch-doc_Makefile 16 Sep 2012 10:07:06 -0000
@@ -1,12 +1,14 @@
$OpenBSD: patch-doc_Makefile,v 1.2 2010/11/16 12:28:42 pea Exp $
---- doc/Makefile.orig Wed Nov 10 14:26:13 2010
-+++ doc/Makefile Tue Nov 16 11:34:20 2010
-@@ -21,7 +21,7 @@ SCRIPT_HTMLS = $(SCRIPT_TXTS:.txt=.html)
+--- 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)
- COMMON = common.switches.txt common.config.txt common.logutriga.txt
+ COMMON = common.switches.txt common.config.txt
--GETATTRS = python ./getattrs.py
-+GETATTRS = ${MODPY_BIN} ./getattrs.py
-
- all: man
+-GETATTRS = python ../misc/getattrs.py
+-FIXMAN = python ../misc/fixman.py
++GETATTRS = ${MODPY_BIN} ../misc/getattrs.py
++FIXMAN = ${MODPY_BIN} ../misc/fixman.py
+ #AFLAGS = -a linkcss
+ #AFLAGS = -a stylesheet=extra.css
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/databases/skytools/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST
--- pkg/PLIST 10 Apr 2009 12:00:13 -0000 1.4
+++ pkg/PLIST 16 Sep 2012 10:07:06 -0000
@@ -1,28 +1,44 @@
@comment $OpenBSD: PLIST,v 1.4 2009/04/10 12:00:13 pea Exp $
-bin/bulk_loader
-bin/cube_dispatcher
-bin/londiste
-bin/pgqadm
-bin/queue_mover
-bin/queue_splitter
-bin/scriptmgr
-bin/skytools_upgrade
-bin/table_dispatcher
-bin/walmgr
-lib/postgresql/logtriga.so
+bin/londiste3
+@bin bin/pgqd
+bin/qadmin
+bin/queue_mover3
+bin/queue_splitter3
+bin/scriptmgr3
+bin/simple_consumer3
+bin/simple_local_consumer3
+bin/skytools_upgrade3
+bin/walmgr3
lib/postgresql/pgq_lowlevel.so
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/file_read.py
-lib/python${MODPY_VERSION}/site-packages/londiste/file_read.pyc
-lib/python${MODPY_VERSION}/site-packages/londiste/file_write.py
-lib/python${MODPY_VERSION}/site-packages/londiste/file_write.pyc
-lib/python${MODPY_VERSION}/site-packages/londiste/installer.py
-lib/python${MODPY_VERSION}/site-packages/londiste/installer.pyc
+lib/python${MODPY_VERSION}/site-packages/londiste/exec_attrs.py
+lib/python${MODPY_VERSION}/site-packages/londiste/exec_attrs.pyc
+lib/python${MODPY_VERSION}/site-packages/londiste/handler.py
+lib/python${MODPY_VERSION}/site-packages/londiste/handler.pyc
+lib/python${MODPY_VERSION}/site-packages/londiste/handlers/
+lib/python${MODPY_VERSION}/site-packages/londiste/handlers/__init__.py
+lib/python${MODPY_VERSION}/site-packages/londiste/handlers/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/londiste/handlers/applyfn.py
+lib/python${MODPY_VERSION}/site-packages/londiste/handlers/applyfn.pyc
+lib/python${MODPY_VERSION}/site-packages/londiste/handlers/bulk.py
+lib/python${MODPY_VERSION}/site-packages/londiste/handlers/bulk.pyc
+lib/python${MODPY_VERSION}/site-packages/londiste/handlers/dispatch.py
+lib/python${MODPY_VERSION}/site-packages/londiste/handlers/dispatch.pyc
+lib/python${MODPY_VERSION}/site-packages/londiste/handlers/multimaster.py
+lib/python${MODPY_VERSION}/site-packages/londiste/handlers/multimaster.pyc
+lib/python${MODPY_VERSION}/site-packages/londiste/handlers/part.py
+lib/python${MODPY_VERSION}/site-packages/londiste/handlers/part.pyc
+lib/python${MODPY_VERSION}/site-packages/londiste/handlers/qtable.py
+lib/python${MODPY_VERSION}/site-packages/londiste/handlers/qtable.pyc
+lib/python${MODPY_VERSION}/site-packages/londiste/handlers/vtable.py
+lib/python${MODPY_VERSION}/site-packages/londiste/handlers/vtable.pyc
lib/python${MODPY_VERSION}/site-packages/londiste/playback.py
lib/python${MODPY_VERSION}/site-packages/londiste/playback.pyc
lib/python${MODPY_VERSION}/site-packages/londiste/repair.py
@@ -36,96 +52,158 @@ lib/python${MODPY_VERSION}/site-packages
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
+lib/python${MODPY_VERSION}/site-packages/pgq/cascade/
+lib/python${MODPY_VERSION}/site-packages/pgq/cascade/__init__.py
+lib/python${MODPY_VERSION}/site-packages/pgq/cascade/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/pgq/cascade/admin.py
+lib/python${MODPY_VERSION}/site-packages/pgq/cascade/admin.pyc
+lib/python${MODPY_VERSION}/site-packages/pgq/cascade/consumer.py
+lib/python${MODPY_VERSION}/site-packages/pgq/cascade/consumer.pyc
+lib/python${MODPY_VERSION}/site-packages/pgq/cascade/nodeinfo.py
+lib/python${MODPY_VERSION}/site-packages/pgq/cascade/nodeinfo.pyc
+lib/python${MODPY_VERSION}/site-packages/pgq/cascade/worker.py
+lib/python${MODPY_VERSION}/site-packages/pgq/cascade/worker.pyc
lib/python${MODPY_VERSION}/site-packages/pgq/consumer.py
lib/python${MODPY_VERSION}/site-packages/pgq/consumer.pyc
+lib/python${MODPY_VERSION}/site-packages/pgq/coopconsumer.py
+lib/python${MODPY_VERSION}/site-packages/pgq/coopconsumer.pyc
lib/python${MODPY_VERSION}/site-packages/pgq/event.py
lib/python${MODPY_VERSION}/site-packages/pgq/event.pyc
+lib/python${MODPY_VERSION}/site-packages/pgq/localconsumer.py
+lib/python${MODPY_VERSION}/site-packages/pgq/localconsumer.pyc
lib/python${MODPY_VERSION}/site-packages/pgq/maint.py
lib/python${MODPY_VERSION}/site-packages/pgq/maint.pyc
lib/python${MODPY_VERSION}/site-packages/pgq/producer.py
lib/python${MODPY_VERSION}/site-packages/pgq/producer.pyc
+lib/python${MODPY_VERSION}/site-packages/pgq/remoteconsumer.py
+lib/python${MODPY_VERSION}/site-packages/pgq/remoteconsumer.pyc
lib/python${MODPY_VERSION}/site-packages/pgq/status.py
lib/python${MODPY_VERSION}/site-packages/pgq/status.pyc
lib/python${MODPY_VERSION}/site-packages/pgq/ticker.py
lib/python${MODPY_VERSION}/site-packages/pgq/ticker.pyc
+lib/python${MODPY_VERSION}/site-packages/pkgloader-1.0-py${MODPY_VERSION}.egg-info
+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-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info
+lib/python${MODPY_VERSION}/site-packages/${FULLPKGNAME\-}-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
lib/python${MODPY_VERSION}/site-packages/skytools/_pyquoting.py
lib/python${MODPY_VERSION}/site-packages/skytools/_pyquoting.pyc
+lib/python${MODPY_VERSION}/site-packages/skytools/adminscript.py
+lib/python${MODPY_VERSION}/site-packages/skytools/adminscript.pyc
+lib/python${MODPY_VERSION}/site-packages/skytools/apipkg.py
+lib/python${MODPY_VERSION}/site-packages/skytools/apipkg.pyc
+lib/python${MODPY_VERSION}/site-packages/skytools/checker.py
+lib/python${MODPY_VERSION}/site-packages/skytools/checker.pyc
lib/python${MODPY_VERSION}/site-packages/skytools/config.py
lib/python${MODPY_VERSION}/site-packages/skytools/config.pyc
+lib/python${MODPY_VERSION}/site-packages/skytools/dbservice.py
+lib/python${MODPY_VERSION}/site-packages/skytools/dbservice.pyc
lib/python${MODPY_VERSION}/site-packages/skytools/dbstruct.py
lib/python${MODPY_VERSION}/site-packages/skytools/dbstruct.pyc
+lib/python${MODPY_VERSION}/site-packages/skytools/fileutil.py
+lib/python${MODPY_VERSION}/site-packages/skytools/fileutil.pyc
lib/python${MODPY_VERSION}/site-packages/skytools/gzlog.py
lib/python${MODPY_VERSION}/site-packages/skytools/gzlog.pyc
+lib/python${MODPY_VERSION}/site-packages/skytools/hashtext.so
lib/python${MODPY_VERSION}/site-packages/skytools/installer_config.py
lib/python${MODPY_VERSION}/site-packages/skytools/installer_config.pyc
+lib/python${MODPY_VERSION}/site-packages/skytools/natsort.py
+lib/python${MODPY_VERSION}/site-packages/skytools/natsort.pyc
lib/python${MODPY_VERSION}/site-packages/skytools/parsing.py
lib/python${MODPY_VERSION}/site-packages/skytools/parsing.pyc
+lib/python${MODPY_VERSION}/site-packages/skytools/plpy_applyrow.py
+lib/python${MODPY_VERSION}/site-packages/skytools/plpy_applyrow.pyc
lib/python${MODPY_VERSION}/site-packages/skytools/psycopgwrapper.py
lib/python${MODPY_VERSION}/site-packages/skytools/psycopgwrapper.pyc
+lib/python${MODPY_VERSION}/site-packages/skytools/querybuilder.py
+lib/python${MODPY_VERSION}/site-packages/skytools/querybuilder.pyc
lib/python${MODPY_VERSION}/site-packages/skytools/quoting.py
lib/python${MODPY_VERSION}/site-packages/skytools/quoting.pyc
lib/python${MODPY_VERSION}/site-packages/skytools/scripting.py
lib/python${MODPY_VERSION}/site-packages/skytools/scripting.pyc
lib/python${MODPY_VERSION}/site-packages/skytools/skylog.py
lib/python${MODPY_VERSION}/site-packages/skytools/skylog.pyc
+lib/python${MODPY_VERSION}/site-packages/skytools/sockutil.py
+lib/python${MODPY_VERSION}/site-packages/skytools/sockutil.pyc
lib/python${MODPY_VERSION}/site-packages/skytools/sqltools.py
lib/python${MODPY_VERSION}/site-packages/skytools/sqltools.pyc
-@man man/man1/bulk_loader.1
-@man man/man1/cube_dispatcher.1
-@man man/man1/londiste.1
-@man man/man1/pgqadm.1
-@man man/man1/queue_mover.1
-@man man/man1/queue_splitter.1
-@man man/man1/scriptmgr.1
-@man man/man1/skytools_upgrade.1
-@man man/man1/table_dispatcher.1
-@man man/man1/walmgr.1
-@man man/man5/londiste.5
+lib/python${MODPY_VERSION}/site-packages/skytools/timeutil.py
+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/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}
share/doc/postgresql/
-share/doc/postgresql/contrib/
-share/doc/postgresql/contrib/README.londiste
-share/doc/postgresql/contrib/README.pgq
-share/doc/postgresql/contrib/README.pgq_ext
-share/examples/skytools/
-share/examples/skytools/conf/
-share/examples/skytools/conf/bulk_loader.ini.templ
-share/examples/skytools/conf/cube_dispatcher.ini.templ
-share/examples/skytools/conf/londiste.ini
-share/examples/skytools/conf/pgqadm.ini
-share/examples/skytools/conf/queue_mover.ini.templ
-share/examples/skytools/conf/queue_splitter.ini.templ
-share/examples/skytools/conf/scriptmgr.ini.templ
-share/examples/skytools/conf/skylog.ini
-share/examples/skytools/conf/table_dispatcher.ini.templ
-share/examples/skytools/conf/wal-master.ini
-share/examples/skytools/conf/wal-slave.ini
+share/doc/postgresql/extension/
+share/doc/postgresql/extension/README.pgq
+share/doc/postgresql/extension/README.pgq_ext
+share/doc/skytools3/
+share/doc/skytools3/conf/
+share/doc/skytools3/conf/pgqd.ini.templ
+share/doc/skytools3/conf/wal-master.ini
+share/doc/skytools3/conf/wal-slave.ini
share/postgresql/contrib/
-share/postgresql/contrib/logtriga.sql
share/postgresql/contrib/londiste.sql
share/postgresql/contrib/londiste.upgrade.sql
+share/postgresql/contrib/newgrants_londiste.sql
+share/postgresql/contrib/newgrants_pgq.sql
+share/postgresql/contrib/newgrants_pgq_coop.sql
+share/postgresql/contrib/newgrants_pgq_ext.sql
+share/postgresql/contrib/newgrants_pgq_node.sql
+share/postgresql/contrib/oldgrants_londiste.sql
+share/postgresql/contrib/oldgrants_pgq.sql
+share/postgresql/contrib/oldgrants_pgq_coop.sql
+share/postgresql/contrib/oldgrants_pgq_ext.sql
+share/postgresql/contrib/oldgrants_pgq_node.sql
share/postgresql/contrib/pgq.sql
share/postgresql/contrib/pgq.upgrade.sql
+share/postgresql/contrib/pgq_coop.sql
+share/postgresql/contrib/pgq_coop.upgrade.sql
share/postgresql/contrib/pgq_ext.sql
+share/postgresql/contrib/pgq_ext.upgrade.sql
share/postgresql/contrib/pgq_lowlevel.sql
+share/postgresql/contrib/pgq_node.sql
+share/postgresql/contrib/pgq_node.upgrade.sql
share/postgresql/contrib/pgq_triggers.sql
+share/postgresql/contrib/txid.sql
share/postgresql/contrib/uninstall_pgq.sql
-share/skytools/
-share/skytools/logtriga.sql
-share/skytools/londiste.sql
-share/skytools/pgq.sql
-share/skytools/pgq_ext.sql
-share/skytools/upgrade/
-share/skytools/upgrade/final/
-share/skytools/upgrade/final/v2.1.5_londiste.sql
-share/skytools/upgrade/final/v2.1.5_pgq_core.sql
-share/skytools/upgrade/final/v2.1.5_pgq_ext.sql
-share/skytools/upgrade/final/v2.1.6_londiste.sql
-share/skytools/upgrade/final/v2.1.6_pgq_ext.sql
-share/skytools/upgrade/final/v2.1.7_londiste.sql
-share/skytools/upgrade/final/v2.1.7_pgq_core.sql
-share/skytools/upgrade/final/v2.1.8_pgq_core.sql
+share/postgresql/extension/
+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--${MODPY_EGG_VERSION}.sql
+share/postgresql/extension/pgq--unpackaged--${MODPY_EGG_VERSION}.sql
+share/postgresql/extension/pgq.control
+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.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.control
+share/skytools3/
+share/skytools3/extra/
+share/skytools3/extra/v3.0_pgq_core.sql
+share/skytools3/londiste.sql
+share/skytools3/londiste.upgrade.sql
+share/skytools3/pgq.sql
+share/skytools3/pgq.upgrade.sql
+share/skytools3/pgq_coop.sql
+share/skytools3/pgq_coop.upgrade.sql
+share/skytools3/pgq_ext.sql
+share/skytools3/pgq_ext.upgrade.sql
+share/skytools3/pgq_node.sql
+share/skytools3/pgq_node.upgrade.sql
