3 files changed, 44 insertions, 12 deletions

diff --git a/databases/skytools/Makefile b/databases/skytools/Makefile
index 09bee216226e..607c2ffdcea8 100644
--- a/databases/skytools/Makefile
+++ b/databases/skytools/Makefile
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	skytools
-PORTVERSION=	2.1.4
-PORTREVISION=	2
+PORTVERSION=	2.1.7
 CATEGORIES=	databases
-MASTER_SITES=	http://pgfoundry.org/frs/download.php/1354/
+MASTER_SITES=	http://pgfoundry.org/frs/download.php/1813/
 
 MAINTAINER=	skv@FreeBSD.org
 COMMENT=	PostgreSQL tools from Skype: walshipping, queueing, replication
@@ -21,6 +20,11 @@ USE_PGSQL=	yes
 USE_PYTHON=	2.4+
 INSTALLS_EGGINFO=	yes
 
+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
+
 CONFIGURE_ARGS=	--with-python=${PYTHON_CMD} \
 		--docdir=${EXAMPLESDIR} \
 		--with-pgconfig=${LOCALBASE}/bin/pg_config
diff --git a/databases/skytools/distinfo b/databases/skytools/distinfo
index d11c376008c2..2ba5db9ac574 100644
--- a/databases/skytools/distinfo
+++ b/databases/skytools/distinfo
@@ -1,3 +1,3 @@
-MD5 (skytools-2.1.4.tar.gz) = 2877393a7a78df5cead31bd1858eddc5
-SHA256 (skytools-2.1.4.tar.gz) = 3d644971d7ac2340336ab4462367b543dc26904cebb68005b42580ba93ff17ca
-SIZE (skytools-2.1.4.tar.gz) = 143249
+MD5 (skytools-2.1.7.tar.gz) = e2d1c55dd8aea00e1b20e921e5ec3e87
+SHA256 (skytools-2.1.7.tar.gz) = c2db6b02ffb8aeb56bffdc1b490fb2f490905143a6f496dbea35d8eb0815c0bd
+SIZE (skytools-2.1.7.tar.gz) = 238045
diff --git a/databases/skytools/pkg-plist b/databases/skytools/pkg-plist
index 090d49f3f94a..cf2920d67bc0 100644
--- a/databases/skytools/pkg-plist
+++ b/databases/skytools/pkg-plist
@@ -5,6 +5,7 @@ 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
 %%PYTHON_SITELIBDIR%%/londiste/__init__.py
@@ -43,6 +44,9 @@ bin/walmgr.py
 %%PYTHON_SITELIBDIR%%/pgq/ticker.pyc
 %%PYTHON_SITELIBDIR%%/skytools/__init__.py
 %%PYTHON_SITELIBDIR%%/skytools/__init__.pyc
+%%PYTHON_SITELIBDIR%%/skytools/_cquoting.so
+%%PYTHON_SITELIBDIR%%/skytools/_pyquoting.py
+%%PYTHON_SITELIBDIR%%/skytools/_pyquoting.pyc
 %%PYTHON_SITELIBDIR%%/skytools/config.py
 %%PYTHON_SITELIBDIR%%/skytools/config.pyc
 %%PYTHON_SITELIBDIR%%/skytools/dbstruct.py
@@ -51,6 +55,10 @@ bin/walmgr.py
 %%PYTHON_SITELIBDIR%%/skytools/gzlog.pyc
 %%PYTHON_SITELIBDIR%%/skytools/installer_config.py
 %%PYTHON_SITELIBDIR%%/skytools/installer_config.pyc
+%%PYTHON_SITELIBDIR%%/skytools/parsing.py
+%%PYTHON_SITELIBDIR%%/skytools/parsing.pyc
+%%PYTHON_SITELIBDIR%%/skytools/psycopgwrapper.py
+%%PYTHON_SITELIBDIR%%/skytools/psycopgwrapper.pyc
 %%PYTHON_SITELIBDIR%%/skytools/quoting.py
 %%PYTHON_SITELIBDIR%%/skytools/quoting.pyc
 %%PYTHON_SITELIBDIR%%/skytools/scripting.py
@@ -59,10 +67,6 @@ bin/walmgr.py
 %%PYTHON_SITELIBDIR%%/skytools/skylog.pyc
 %%PYTHON_SITELIBDIR%%/skytools/sqltools.py
 %%PYTHON_SITELIBDIR%%/skytools/sqltools.pyc
-@dirrm %%PYTHON_SITELIBDIR%%/skytools
-@dirrm %%PYTHON_SITELIBDIR%%/pgq
-@dirrm %%PYTHON_SITELIBDIR%%/londiste
-@dirrmtry %%PYTHON_SITELIBDIR%%
 %%EXAMPLESDIR%%/conf/bulk_loader.ini.templ
 %%EXAMPLESDIR%%/conf/cube_dispatcher.ini.templ
 %%EXAMPLESDIR%%/conf/londiste.ini
@@ -73,9 +77,9 @@ bin/walmgr.py
 %%EXAMPLESDIR%%/conf/table_dispatcher.ini.templ
 %%EXAMPLESDIR%%/conf/wal-master.ini
 %%EXAMPLESDIR%%/conf/wal-slave.ini
-@dirrm %%EXAMPLESDIR%%/conf
-@dirrm %%EXAMPLESDIR%%
 lib/postgresql/logtriga.so
+lib/postgresql/pgq_lowlevel.so
+lib/postgresql/pgq_triggers.so
 lib/postgresql/txid.so
 share/doc/postgresql/contrib/README.londiste
 share/doc/postgresql/contrib/README.pgq
@@ -87,6 +91,9 @@ share/postgresql/contrib/londiste.upgrade.sql
 share/postgresql/contrib/pgq.sql
 share/postgresql/contrib/pgq.upgrade.sql
 share/postgresql/contrib/pgq_ext.sql
+share/postgresql/contrib/pgq_lowlevel.sql
+share/postgresql/contrib/pgq_triggers.sql
+share/postgresql/contrib/uninstall_pgq.sql
 share/postgresql/contrib/uninstall_txid.sql
 share/postgresql/contrib/txid.sql
 @dirrmtry lib/postgresql
@@ -94,3 +101,24 @@ share/postgresql/contrib/txid.sql
 @dirrmtry share/doc/postgresql
 @dirrmtry share/postgresql/contrib
 @dirrmtry share/postgresql
+%%DATADIR%%/logtriga.sql
+%%DATADIR%%/londiste.sql
+%%DATADIR%%/pgq.sql
+%%DATADIR%%/pgq_ext.sql
+%%DATADIR%%/txid.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
+@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%%