1 files changed, 34 insertions, 6 deletions

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%%