On 2020/11/20 17:06, Jeremy Evans wrote: > skytools patch to fix build (dead upstream for about 3 years)
it's still actively developed, but has been reorganized into separate projects (py-skytools, pgq, londiste, walmgr etc). Since the current distfile is no longer available here's an update to the most recent skytools-legacy version (the patches will still be needed for 13.x though).. is anyone still using this that can test? Index: Makefile =================================================================== RCS file: /cvs/ports/databases/skytools/Makefile,v retrieving revision 1.32 diff -u -p -r1.32 Makefile --- Makefile 20 Mar 2020 16:44:22 -0000 1.32 +++ Makefile 21 Nov 2020 14:06:55 -0000 @@ -2,44 +2,52 @@ COMMENT= PostgreSQL tools from Skype -# XXX outdated; http://pgfoundry.org/frs/download.php/3622/skytools-3.2.tar.gz -MODPY_EGG_VERSION= 3.1.1 -DISTNAME= skytools-${MODPY_EGG_VERSION} -REVISION= 6 +MODPY_EGG_VERSION= 3.2.6 +GH_ACCOUNT= pgq +GH_PROJECT= skytools-legacy +GH_TAGNAME= ${MODPY_EGG_VERSION} +PKGNAME= skytools-${MODPY_EGG_VERSION} CATEGORIES= databases -HOMEPAGE= http://pgfoundry.org/projects/skytools +HOMEPAGE= https://wiki.postgresql.org/wiki/SkyTools MAINTAINER= Pierre-Emmanuel Andre <p...@openbsd.org> # BSD PERMIT_PACKAGE= Yes -WANTLIB= c pq pthread ${MODPY_WANTLIB} - -MASTER_SITES= https://github.com/downloads/markokr/skytools/ +WANTLIB= c pq pthread ${MODPY_WANTLIB} MODULES= lang/python +MASTER_SITES0= https://github.com/markokr/libusual/archive/ +DISTFILES= ${DISTNAME}.tar.gz libusual-{}2c1cb7f9bfa0a2a183354eb2630a3e4136d0f96b.tar.gz:0 + BUILD_DEPENDS= databases/postgresql,-server>=12 \ - databases/postgresql,-main>=12 + databases/postgresql,-main>=12 \ + textproc/asciidoc \ + textproc/xmlto LIB_DEPENDS= databases/postgresql,-main>=12 -RUN_DEPENDS= databases/py-psycopg2 +RUN_DEPENDS= databases/py-psycopg2 NO_TEST= Yes USE_GMAKE= Yes -CONFIGURE_STYLE=gnu -CONFIGURE_ARGS= --with-python=${MODPY_BIN} +CONFIGURE_STYLE= autoreconf +AUTOCONF_VERSION= 2.69 +AUTOMAKE_VERSION= 1.16 +AUTORECONF= ./autogen.sh +CONFIGURE_ARGS= --with-python=${MODPY_BIN} \ + --with-asciidoc + +MAKE_ENV= PYTHON=${MODPY_BIN} +MAKE_FLAGS= V=1 -BINFILES= bulk_loader.py cube_dispatcher.py londiste.py \ - pgqadm.py queue_mover.py queue_splitter.py \ - scriptmgr.py skytools_upgrade.py table_dispatcher.py \ - walmgr.py +post-extract: + mv ${WRKDIR}/libusual-*/* ${WRKSRC}/lib/ pre-configure: - ${SUBST_CMD} ${WRKSRC}/doc/Makefile find ${WRKSRC} -name '*.py' \ -exec sed -i 's,/usr/bin/env python,${MODPY_BIN},' {} + Index: distinfo =================================================================== RCS file: /cvs/ports/databases/skytools/distinfo,v retrieving revision 1.9 diff -u -p -r1.9 distinfo --- distinfo 17 Oct 2012 20:22:46 -0000 1.9 +++ distinfo 21 Nov 2020 14:06:55 -0000 @@ -1,2 +1,4 @@ -SHA256 (skytools-3.1.1.tar.gz) = Elpb0XPfYKFPqtHGQ8RtJoVMv3UWwAWoc0GiDdQivA0= -SIZE (skytools-3.1.1.tar.gz) = 651345 +SHA256 (libusual-2c1cb7f9bfa0a2a183354eb2630a3e4136d0f96b.tar.gz) = Kd+d00RJyiefLINSu9eBQc++igtASgPfGp9ERG6kXE8= +SHA256 (skytools-legacy-3.2.6.tar.gz) = XmMDNbzxJlKtqtyNcNofqWW0teq/YofNTnr0CXX7YtY= +SIZE (libusual-2c1cb7f9bfa0a2a183354eb2630a3e4136d0f96b.tar.gz) = 236130 +SIZE (skytools-legacy-3.2.6.tar.gz) = 513553 Index: patches/patch-doc_Makefile =================================================================== RCS file: patches/patch-doc_Makefile diff -N patches/patch-doc_Makefile --- patches/patch-doc_Makefile 17 Oct 2012 20:22:46 -0000 1.4 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,14 +0,0 @@ -$OpenBSD: patch-doc_Makefile,v 1.4 2012/10/17 20:22:46 pea Exp $ ---- 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 = ${MODPY_BIN} ../misc/getattrs.py -+FIXMAN = ${MODPY_BIN} ../misc/fixman.py - - #AFLAGS = -a linkcss - #AFLAGS = -a stylesheet=extra.css Index: patches/patch-sql_pgq_triggers_common_c =================================================================== RCS file: /cvs/ports/databases/skytools/patches/patch-sql_pgq_triggers_common_c,v retrieving revision 1.1 diff -u -p -r1.1 patch-sql_pgq_triggers_common_c --- patches/patch-sql_pgq_triggers_common_c 19 Feb 2019 05:11:57 -0000 1.1 +++ patches/patch-sql_pgq_triggers_common_c 21 Nov 2020 14:06:55 -0000 @@ -13,7 +13,7 @@ Index: sql/pgq/triggers/common.c #include <commands/trigger.h> #include <catalog/pg_type.h> #include <catalog/pg_namespace.h> -@@ -121,9 +122,9 @@ static void fill_magic_columns(PgqTriggerEvent *ev) +@@ -125,9 +126,9 @@ static void fill_magic_columns(PgqTriggerEvent *ev) for (i = 0; i < tupdesc->natts; i++) { /* Skip dropped columns */ @@ -25,7 +25,7 @@ Index: sql/pgq/triggers/common.c if (!is_magic_field(col_name)) continue; if (strcmp(col_name, "_pgq_ev_type") == 0) -@@ -477,7 +478,7 @@ static void parse_oldstyle_args(PgqTriggerEvent *ev, T +@@ -481,7 +482,7 @@ static void parse_oldstyle_args(PgqTriggerEvent *ev, T */ tupdesc = tg->tg_relation->rd_att; for (i = 0, attcnt = 0; i < tupdesc->natts; i++) { @@ -34,7 +34,7 @@ Index: sql/pgq/triggers/common.c attcnt++; } -@@ -594,9 +595,9 @@ bool pgqtriga_skip_col(PgqTriggerEvent *ev, int i, int +@@ -598,9 +599,9 @@ bool pgqtriga_skip_col(PgqTriggerEvent *ev, int i, int const char *name; tupdesc = tg->tg_relation->rd_att; @@ -46,7 +46,7 @@ Index: sql/pgq/triggers/common.c if (is_magic_field(name)) { ev->tgargs->custom_fields = 1; -@@ -628,9 +629,9 @@ bool pgqtriga_is_pkey(PgqTriggerEvent *ev, int i, int +@@ -632,9 +633,9 @@ bool pgqtriga_is_pkey(PgqTriggerEvent *ev, int i, int return ev->attkind[attkind_idx] == 'k'; } else if (ev->pkey_list) { tupdesc = tg->tg_relation->rd_att; Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/databases/skytools/pkg/PLIST,v retrieving revision 1.6 diff -u -p -r1.6 PLIST --- pkg/PLIST 17 Oct 2012 20:22:46 -0000 1.6 +++ pkg/PLIST 21 Nov 2020 14:06:55 -0000 @@ -1,4 +1,5 @@ @comment $OpenBSD: PLIST,v 1.6 2012/10/17 20:22:46 pea Exp $ +bin/data_maintainer3 bin/londiste3 @bin bin/pgqd bin/qadmin @@ -9,8 +10,8 @@ bin/simple_consumer3 bin/simple_local_consumer3 bin/skytools_upgrade3 bin/walmgr3 -lib/postgresql/pgq_lowlevel.so -lib/postgresql/pgq_triggers.so +@so lib/postgresql/pgq_lowlevel.so +@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 @@ -31,10 +32,10 @@ lib/python${MODPY_VERSION}/site-packages 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/shard.py +lib/python${MODPY_VERSION}/site-packages/londiste/handlers/shard.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 @@ -52,6 +53,8 @@ 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/baseconsumer.py +lib/python${MODPY_VERSION}/site-packages/pgq/baseconsumer.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 @@ -71,16 +74,12 @@ lib/python${MODPY_VERSION}/site-packages 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 @@ -88,7 +87,8 @@ lib/python${MODPY_VERSION}/site-packages lib/python${MODPY_VERSION}/site-packages/skytools-${MODPY_EGG_VERSION}-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 +@so lib/python${MODPY_VERSION}/site-packages/skytools/_chashtext.so +@so 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 @@ -107,7 +107,8 @@ lib/python${MODPY_VERSION}/site-packages 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/hashtext.py +lib/python${MODPY_VERSION}/site-packages/skytools/hashtext.pyc 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 @@ -132,6 +133,8 @@ lib/python${MODPY_VERSION}/site-packages lib/python${MODPY_VERSION}/site-packages/skytools/sqltools.pyc 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/tnetstrings.py +lib/python${MODPY_VERSION}/site-packages/skytools/tnetstrings.pyc lib/python${MODPY_VERSION}/site-packages/skytools/utf8.py lib/python${MODPY_VERSION}/site-packages/skytools/utf8.pyc @man man/man1/londiste3.1 @@ -179,31 +182,47 @@ 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--3.1--3.2.4.sql +share/postgresql/extension/londiste--3.1.1--3.2.4.sql +share/postgresql/extension/londiste--3.1.3--3.2.4.sql +share/postgresql/extension/londiste--3.1.4--3.2.4.sql +share/postgresql/extension/londiste--3.1.6--3.2.4.sql +share/postgresql/extension/londiste--3.2--3.2.4.sql +share/postgresql/extension/londiste--3.2.3--3.2.4.sql +share/postgresql/extension/londiste--3.2.4.sql +share/postgresql/extension/londiste--unpackaged--3.2.4.sql share/postgresql/extension/londiste.control share/postgresql/extension/pgq--3.1--${MODPY_EGG_VERSION}.sql +share/postgresql/extension/pgq--3.1.1--${MODPY_EGG_VERSION}.sql +share/postgresql/extension/pgq--3.1.2--${MODPY_EGG_VERSION}.sql +share/postgresql/extension/pgq--3.1.3--${MODPY_EGG_VERSION}.sql +share/postgresql/extension/pgq--3.1.6--${MODPY_EGG_VERSION}.sql +share/postgresql/extension/pgq--3.2--${MODPY_EGG_VERSION}.sql +share/postgresql/extension/pgq--3.2.3--${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--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.sql -share/postgresql/extension/pgq_node--unpackaged--3.1.sql +share/postgresql/extension/pgq_node--3.1--3.2.5.sql +share/postgresql/extension/pgq_node--3.1.3--3.2.5.sql +share/postgresql/extension/pgq_node--3.1.6--3.2.5.sql +share/postgresql/extension/pgq_node--3.2--3.2.5.sql +share/postgresql/extension/pgq_node--3.2.5.sql +share/postgresql/extension/pgq_node--unpackaged--3.2.5.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/londiste.upgrade_2.1_to_3.1.sql share/skytools3/pgq.sql share/skytools3/pgq.upgrade.sql +share/skytools3/pgq.upgrade_2.1_to_3.0.sql share/skytools3/pgq_coop.sql share/skytools3/pgq_coop.upgrade.sql share/skytools3/pgq_ext.sql
