4 files changed, 185 insertions, 82 deletions

diff --git a/databases/skytools/Makefile b/databases/skytools/Makefile
index 3a42a01ce0b0..cebb7ab341f9 100644
--- a/databases/skytools/Makefile
+++ b/databases/skytools/Makefile
@@ -2,40 +2,40 @@
 # $FreeBSD$
 
 PORTNAME=	skytools
-PORTVERSION=	2.1.12
-PORTREVISION=	1
+PORTVERSION=	3.2
 CATEGORIES=	databases
-MASTER_SITES=	http://pgfoundry.org/frs/download.php/2872/
+MASTER_SITES=	http://pgfoundry.org/frs/download.php/3622/
 
-MAINTAINER= ports@FreeBSD.org
+MAINTAINER=	sam@cassiba.com
 COMMENT=	PostgreSQL tools from Skype: walshipping, queueing, replication
 
 GNU_CONFIGURE=	yes
 USES=		gmake shebangfix
 
 USE_PGSQL=	yes
-WANT_PGSQL_VER=	91-
 USE_PYTHON=	2
 INSTALLS_EGGINFO=	yes
 
 python_OLD_CMD=	/usr/bin/env python
 python_CMD=	/usr/bin/env python2
-SHEBANG_FILES=	scripts/catsql.py scripts/bulk_loader.py \
-		scripts/cube_dispatcher.py scripts/queue_splitter.py \
+SHEBANG_FILES=	setup_pkgloader.py setup_skytools.py \
+		scripts/catsql.py scripts/data_maintainer.py \
+		scripts/find_sql_functions.py scripts/grantfu.py \
+		scripts/queue_loader.py scripts/queue_splitter.py \
 		scripts/queue_mover.py scripts/scriptmgr.py \
-		scripts/skytools_upgrade.py scripts/table_dispatcher.py
-
-MAN1=	bulk_loader.1 cube_dispatcher.1 londiste.1 pgqadm.1 queue_mover.1 \
-	queue_splitter.1 scriptmgr.1 skytools_upgrade.1 table_dispatcher.1 \
-	walmgr.1
-MAN5=	londiste.5
+		scripts/simple_consumer.py scripts/simple_local_consumer.py \
+		scripts/skytools_upgrade.py
 
 CONFIGURE_ARGS=	--with-python=${PYTHON_CMD} \
 		--docdir=${EXAMPLESDIR} \
 		--with-pgconfig=${LOCALBASE}/bin/pg_config
 
-NO_STAGE=	yes
 post-patch:
-	@${REINPLACE_CMD} -e 's=share/doc=share/examples=' ${WRKSRC}/setup.py
+	@${REINPLACE_CMD} -e 's=share/doc=share/examples=' ${WRKSRC}/setup_skytools.py
+
+post-install:
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/pgqd
+	${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/skytools/*.so
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/postgresql/*.so
 
 .include <bsd.port.mk>
diff --git a/databases/skytools/distinfo b/databases/skytools/distinfo
index 1822dd93b615..14cacfbed709 100644
--- a/databases/skytools/distinfo
+++ b/databases/skytools/distinfo
@@ -1,2 +1,2 @@
-SHA256 (skytools-2.1.12.tar.gz) = f385947b121a05d9d64ca70dd46585f592161ad939303735ebb9d62f246d6ac0
-SIZE (skytools-2.1.12.tar.gz) = 259101
+SHA256 (skytools-3.2.tar.gz) = 0fa9c819ab50ca2cbcc5e71cd80ab734120c9d628667af08f9a95ca62086ab5f
+SIZE (skytools-3.2.tar.gz) = 693507
diff --git a/databases/skytools/pkg-descr b/databases/skytools/pkg-descr
index bdf911dae900..e04f6cf87622 100644
--- a/databases/skytools/pkg-descr
+++ b/databases/skytools/pkg-descr
@@ -1,5 +1,5 @@
-This is a package of tools in use in Skype for replication and
+This is a package of tools from Skype for replication and
 failover.  Also it includes a generic queuing mechanism PgQ and
 utility library for Python scripts.
 
-WWW: https://developer.skype.com/SkypeGarage/DbProjects/SkyTools
+WWW: http://pgfoundry.org/projects/skytools/
diff --git a/databases/skytools/pkg-plist b/databases/skytools/pkg-plist
index 6ff4389caa5b..453ebb467653 100644
--- a/databases/skytools/pkg-plist
+++ b/databases/skytools/pkg-plist
@@ -1,23 +1,40 @@
-bin/bulk_loader.py
-bin/cube_dispatcher.py
-bin/londiste.py
-bin/pgqadm.py
-bin/queue_mover.py
-bin/queue_splitter.py
-bin/scriptmgr.py
-bin/skytools_upgrade.py
-bin/table_dispatcher.py
-bin/walmgr.py
+bin/data_maintainer3
+bin/londiste3
+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
 %%PYTHON_SITELIBDIR%%/londiste/__init__.py
 %%PYTHON_SITELIBDIR%%/londiste/__init__.pyc
 %%PYTHON_SITELIBDIR%%/londiste/compare.py
 %%PYTHON_SITELIBDIR%%/londiste/compare.pyc
-%%PYTHON_SITELIBDIR%%/londiste/file_read.py
-%%PYTHON_SITELIBDIR%%/londiste/file_read.pyc
-%%PYTHON_SITELIBDIR%%/londiste/file_write.py
-%%PYTHON_SITELIBDIR%%/londiste/file_write.pyc
-%%PYTHON_SITELIBDIR%%/londiste/installer.py
-%%PYTHON_SITELIBDIR%%/londiste/installer.pyc
+%%PYTHON_SITELIBDIR%%/londiste/exec_attrs.py
+%%PYTHON_SITELIBDIR%%/londiste/exec_attrs.pyc
+%%PYTHON_SITELIBDIR%%/londiste/handler.py
+%%PYTHON_SITELIBDIR%%/londiste/handler.pyc
+%%PYTHON_SITELIBDIR%%/londiste/handlers/__init__.py
+%%PYTHON_SITELIBDIR%%/londiste/handlers/__init__.pyc
+%%PYTHON_SITELIBDIR%%/londiste/handlers/applyfn.py
+%%PYTHON_SITELIBDIR%%/londiste/handlers/applyfn.pyc
+%%PYTHON_SITELIBDIR%%/londiste/handlers/bulk.py
+%%PYTHON_SITELIBDIR%%/londiste/handlers/bulk.pyc
+%%PYTHON_SITELIBDIR%%/londiste/handlers/dispatch.py
+%%PYTHON_SITELIBDIR%%/londiste/handlers/dispatch.pyc
+%%PYTHON_SITELIBDIR%%/londiste/handlers/multimaster.py
+%%PYTHON_SITELIBDIR%%/londiste/handlers/multimaster.pyc
+%%PYTHON_SITELIBDIR%%/londiste/handlers/qtable.py
+%%PYTHON_SITELIBDIR%%/londiste/handlers/qtable.pyc
+%%PYTHON_SITELIBDIR%%/londiste/handlers/shard.py
+%%PYTHON_SITELIBDIR%%/londiste/handlers/shard.pyc
+%%PYTHON_SITELIBDIR%%/londiste/handlers/vtable.py
+%%PYTHON_SITELIBDIR%%/londiste/handlers/vtable.pyc
 %%PYTHON_SITELIBDIR%%/londiste/playback.py
 %%PYTHON_SITELIBDIR%%/londiste/playback.pyc
 %%PYTHON_SITELIBDIR%%/londiste/repair.py
@@ -28,94 +45,180 @@ bin/walmgr.py
 %%PYTHON_SITELIBDIR%%/londiste/syncer.pyc
 %%PYTHON_SITELIBDIR%%/londiste/table_copy.py
 %%PYTHON_SITELIBDIR%%/londiste/table_copy.pyc
+%%PYTHON_SITELIBDIR%%/londiste/util.py
+%%PYTHON_SITELIBDIR%%/londiste/util.pyc
 %%PYTHON_SITELIBDIR%%/pgq/__init__.py
 %%PYTHON_SITELIBDIR%%/pgq/__init__.pyc
+%%PYTHON_SITELIBDIR%%/pgq/baseconsumer.py
+%%PYTHON_SITELIBDIR%%/pgq/baseconsumer.pyc
+%%PYTHON_SITELIBDIR%%/pgq/cascade/__init__.py
+%%PYTHON_SITELIBDIR%%/pgq/cascade/__init__.pyc
+%%PYTHON_SITELIBDIR%%/pgq/cascade/admin.py
+%%PYTHON_SITELIBDIR%%/pgq/cascade/admin.pyc
+%%PYTHON_SITELIBDIR%%/pgq/cascade/consumer.py
+%%PYTHON_SITELIBDIR%%/pgq/cascade/consumer.pyc
+%%PYTHON_SITELIBDIR%%/pgq/cascade/nodeinfo.py
+%%PYTHON_SITELIBDIR%%/pgq/cascade/nodeinfo.pyc
+%%PYTHON_SITELIBDIR%%/pgq/cascade/worker.py
+%%PYTHON_SITELIBDIR%%/pgq/cascade/worker.pyc
 %%PYTHON_SITELIBDIR%%/pgq/consumer.py
 %%PYTHON_SITELIBDIR%%/pgq/consumer.pyc
+%%PYTHON_SITELIBDIR%%/pgq/coopconsumer.py
+%%PYTHON_SITELIBDIR%%/pgq/coopconsumer.pyc
 %%PYTHON_SITELIBDIR%%/pgq/event.py
 %%PYTHON_SITELIBDIR%%/pgq/event.pyc
-%%PYTHON_SITELIBDIR%%/pgq/maint.py
-%%PYTHON_SITELIBDIR%%/pgq/maint.pyc
+%%PYTHON_SITELIBDIR%%/pgq/localconsumer.py
+%%PYTHON_SITELIBDIR%%/pgq/localconsumer.pyc
 %%PYTHON_SITELIBDIR%%/pgq/producer.py
 %%PYTHON_SITELIBDIR%%/pgq/producer.pyc
+%%PYTHON_SITELIBDIR%%/pgq/remoteconsumer.py
+%%PYTHON_SITELIBDIR%%/pgq/remoteconsumer.pyc
 %%PYTHON_SITELIBDIR%%/pgq/status.py
 %%PYTHON_SITELIBDIR%%/pgq/status.pyc
-%%PYTHON_SITELIBDIR%%/pgq/ticker.py
-%%PYTHON_SITELIBDIR%%/pgq/ticker.pyc
+%%PYTHON_SITELIBDIR%%/pkgloader-1.0-py2.7.egg-info
+%%PYTHON_SITELIBDIR%%/pkgloader.py
+%%PYTHON_SITELIBDIR%%/pkgloader.pyc
+%%PYTHON_SITELIBDIR%%/skytools-3.2-py2.7.egg-info
 %%PYTHON_SITELIBDIR%%/skytools/__init__.py
 %%PYTHON_SITELIBDIR%%/skytools/__init__.pyc
+%%PYTHON_SITELIBDIR%%/skytools/_chashtext.so
 %%PYTHON_SITELIBDIR%%/skytools/_cquoting.so
 %%PYTHON_SITELIBDIR%%/skytools/_pyquoting.py
 %%PYTHON_SITELIBDIR%%/skytools/_pyquoting.pyc
+%%PYTHON_SITELIBDIR%%/skytools/adminscript.py
+%%PYTHON_SITELIBDIR%%/skytools/adminscript.pyc
+%%PYTHON_SITELIBDIR%%/skytools/apipkg.py
+%%PYTHON_SITELIBDIR%%/skytools/apipkg.pyc
+%%PYTHON_SITELIBDIR%%/skytools/checker.py
+%%PYTHON_SITELIBDIR%%/skytools/checker.pyc
 %%PYTHON_SITELIBDIR%%/skytools/config.py
 %%PYTHON_SITELIBDIR%%/skytools/config.pyc
+%%PYTHON_SITELIBDIR%%/skytools/dbservice.py
+%%PYTHON_SITELIBDIR%%/skytools/dbservice.pyc
 %%PYTHON_SITELIBDIR%%/skytools/dbstruct.py
 %%PYTHON_SITELIBDIR%%/skytools/dbstruct.pyc
+%%PYTHON_SITELIBDIR%%/skytools/fileutil.py
+%%PYTHON_SITELIBDIR%%/skytools/fileutil.pyc
 %%PYTHON_SITELIBDIR%%/skytools/gzlog.py
 %%PYTHON_SITELIBDIR%%/skytools/gzlog.pyc
+%%PYTHON_SITELIBDIR%%/skytools/hashtext.py
+%%PYTHON_SITELIBDIR%%/skytools/hashtext.pyc
 %%PYTHON_SITELIBDIR%%/skytools/installer_config.py
 %%PYTHON_SITELIBDIR%%/skytools/installer_config.pyc
+%%PYTHON_SITELIBDIR%%/skytools/natsort.py
+%%PYTHON_SITELIBDIR%%/skytools/natsort.pyc
 %%PYTHON_SITELIBDIR%%/skytools/parsing.py
 %%PYTHON_SITELIBDIR%%/skytools/parsing.pyc
+%%PYTHON_SITELIBDIR%%/skytools/plpy_applyrow.py
+%%PYTHON_SITELIBDIR%%/skytools/plpy_applyrow.pyc
 %%PYTHON_SITELIBDIR%%/skytools/psycopgwrapper.py
 %%PYTHON_SITELIBDIR%%/skytools/psycopgwrapper.pyc
+%%PYTHON_SITELIBDIR%%/skytools/querybuilder.py
+%%PYTHON_SITELIBDIR%%/skytools/querybuilder.pyc
 %%PYTHON_SITELIBDIR%%/skytools/quoting.py
 %%PYTHON_SITELIBDIR%%/skytools/quoting.pyc
 %%PYTHON_SITELIBDIR%%/skytools/scripting.py
 %%PYTHON_SITELIBDIR%%/skytools/scripting.pyc
 %%PYTHON_SITELIBDIR%%/skytools/skylog.py
 %%PYTHON_SITELIBDIR%%/skytools/skylog.pyc
+%%PYTHON_SITELIBDIR%%/skytools/sockutil.py
+%%PYTHON_SITELIBDIR%%/skytools/sockutil.pyc
 %%PYTHON_SITELIBDIR%%/skytools/sqltools.py
 %%PYTHON_SITELIBDIR%%/skytools/sqltools.pyc
-%%EXAMPLESDIR%%/conf/bulk_loader.ini.templ
-%%EXAMPLESDIR%%/conf/cube_dispatcher.ini.templ
-%%EXAMPLESDIR%%/conf/londiste.ini
-%%EXAMPLESDIR%%/conf/pgqadm.ini
-%%EXAMPLESDIR%%/conf/queue_mover.ini.templ
-%%EXAMPLESDIR%%/conf/queue_splitter.ini.templ
-%%EXAMPLESDIR%%/conf/scriptmgr.ini.templ
-%%EXAMPLESDIR%%/conf/skylog.ini
-%%EXAMPLESDIR%%/conf/table_dispatcher.ini.templ
-%%EXAMPLESDIR%%/conf/wal-master.ini
-%%EXAMPLESDIR%%/conf/wal-slave.ini
-lib/postgresql/logtriga.so
-lib/postgresql/pgq_lowlevel.so
-lib/postgresql/pgq_triggers.so
-share/doc/postgresql/contrib/README.londiste
-share/doc/postgresql/contrib/README.pgq
-share/doc/postgresql/contrib/README.pgq_ext
-share/postgresql/contrib/logtriga.sql
+%%PYTHON_SITELIBDIR%%/skytools/timeutil.py
+%%PYTHON_SITELIBDIR%%/skytools/timeutil.pyc
+%%PYTHON_SITELIBDIR%%/skytools/tnetstrings.py
+%%PYTHON_SITELIBDIR%%/skytools/tnetstrings.pyc
+%%PYTHON_SITELIBDIR%%/skytools/utf8.py
+%%PYTHON_SITELIBDIR%%/skytools/utf8.pyc
+man/man1/londiste3.1.gz
+man/man1/pgqd.1.gz
+man/man1/qadmin.1.gz
+man/man1/queue_mover3.1.gz
+man/man1/queue_splitter3.1.gz
+man/man1/scriptmgr3.1.gz
+man/man1/simple_consumer3.1.gz
+man/man1/simple_local_consumer3.1.gz
+man/man1/skytools_upgrade3.1.gz
+man/man1/walmgr3.1.gz
+share/doc/postgresql/extension/README.pgq
+share/doc/postgresql/extension/README.pgq_ext
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%3/conf/pgqd.ini.templ
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%3/conf/wal-master.ini
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%3/conf/wal-slave.ini
 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
-@dirrmtry lib/postgresql
-@dirrmtry share/doc/postgresql/contrib
-@dirrmtry share/doc/postgresql
+share/postgresql/extension/londiste--3.1--3.2.sql
+share/postgresql/extension/londiste--3.1.1--3.2.sql
+share/postgresql/extension/londiste--3.1.3--3.2.sql
+share/postgresql/extension/londiste--3.1.4--3.2.sql
+share/postgresql/extension/londiste--3.1.6--3.2.sql
+share/postgresql/extension/londiste--3.2.sql
+share/postgresql/extension/londiste--unpackaged--3.2.sql
+share/postgresql/extension/londiste.control
+share/postgresql/extension/pgq--3.1--3.2.sql
+share/postgresql/extension/pgq--3.1.1--3.2.sql
+share/postgresql/extension/pgq--3.1.2--3.2.sql
+share/postgresql/extension/pgq--3.1.3--3.2.sql
+share/postgresql/extension/pgq--3.1.6--3.2.sql
+share/postgresql/extension/pgq--3.2.sql
+share/postgresql/extension/pgq--unpackaged--3.2.sql
+share/postgresql/extension/pgq.control
+share/postgresql/extension/pgq_coop--3.1--3.1.1.sql
+share/postgresql/extension/pgq_coop--3.1.1.sql
+share/postgresql/extension/pgq_coop--unpackaged--3.1.1.sql
+share/postgresql/extension/pgq_coop.control
+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--3.1--3.2.sql
+share/postgresql/extension/pgq_node--3.1.3--3.2.sql
+share/postgresql/extension/pgq_node--3.1.6--3.2.sql
+share/postgresql/extension/pgq_node--3.2.sql
+share/postgresql/extension/pgq_node--unpackaged--3.2.sql
+share/postgresql/extension/pgq_node.control
+%%DATADIR%%3/londiste.sql
+%%DATADIR%%3/londiste.upgrade.sql
+%%DATADIR%%3/londiste.upgrade_2.1_to_3.1.sql
+%%DATADIR%%3/pgq.sql
+%%DATADIR%%3/pgq.upgrade.sql
+%%DATADIR%%3/pgq.upgrade_2.1_to_3.0.sql
+%%DATADIR%%3/pgq_coop.sql
+%%DATADIR%%3/pgq_coop.upgrade.sql
+%%DATADIR%%3/pgq_ext.sql
+%%DATADIR%%3/pgq_ext.upgrade.sql
+%%DATADIR%%3/pgq_node.sql
+%%DATADIR%%3/pgq_node.upgrade.sql
+@dirrmtry %%PYTHON_SITELIBDIR%%/londiste/handlers
+@dirrmtry %%PYTHON_SITELIBDIR%%/londiste
+@dirrmtry %%PYTHON_SITELIBDIR%%/pgq/cascade
+@dirrmtry %%PYTHON_SITELIBDIR%%/pgq
+@dirrmtry %%PYTHON_SITELIBDIR%%/skytools
+@dirrmtry share/doc/postgresql/extension
+%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%3/conf
+%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%3
 @dirrmtry share/postgresql/contrib
-@dirrmtry share/postgresql
-%%DATADIR%%/logtriga.sql
-%%DATADIR%%/londiste.sql
-%%DATADIR%%/pgq.sql
-%%DATADIR%%/pgq_ext.sql
-%%DATADIR%%/upgrade/final/v2.1.5_londiste.sql
-%%DATADIR%%/upgrade/final/v2.1.5_pgq_core.sql
-%%DATADIR%%/upgrade/final/v2.1.5_pgq_ext.sql
-%%DATADIR%%/upgrade/final/v2.1.6_londiste.sql
-%%DATADIR%%/upgrade/final/v2.1.6_pgq_ext.sql
-%%DATADIR%%/upgrade/final/v2.1.7_londiste.sql
-%%DATADIR%%/upgrade/final/v2.1.7_pgq_core.sql
-%%DATADIR%%/upgrade/final/v2.1.8_pgq_core.sql
-@dirrm %%DATADIR%%/upgrade/final
-@dirrm %%DATADIR%%/upgrade
-@dirrm %%DATADIR%%
-@dirrm %%EXAMPLESDIR%%/conf
-@dirrm %%EXAMPLESDIR%%
-@dirrm %%PYTHON_SITELIBDIR%%/skytools
-@dirrm %%PYTHON_SITELIBDIR%%/pgq
-@dirrm %%PYTHON_SITELIBDIR%%/londiste
-@dirrmtry %%PYTHON_SITELIBDIR%%
+@dirrmtry share/postgresql/extension
+@dirrmtry %%DATADIR%%3