diff options
Diffstat (limited to '')
23 files changed, 196 insertions, 69 deletions
diff --git a/devel/py-buildbot-badges/Makefile b/devel/py-buildbot-badges/Makefile index 8ee3d8a5c842..a310cd0901f6 100644 --- a/devel/py-buildbot-badges/Makefile +++ b/devel/py-buildbot-badges/Makefile @@ -1,6 +1,5 @@ PORTNAME= buildbot-badges -DISTVERSION= 3.11.9 -PORTREVISION= 1 +DISTVERSION= 4.3.0 CATEGORIES= devel python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-buildbot-badges/distinfo b/devel/py-buildbot-badges/distinfo index da45f2b62c3e..849ec4e1b1d5 100644 --- a/devel/py-buildbot-badges/distinfo +++ b/devel/py-buildbot-badges/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1728972121 -SHA256 (buildbot_badges-3.11.9.tar.gz) = 61f84cc834bf2d68defce97c42bc23195f7af0c45deb33faeb4535580895c9d2 -SIZE (buildbot_badges-3.11.9.tar.gz) = 4731 +TIMESTAMP = 1751284052 +SHA256 (buildbot_badges-4.3.0.tar.gz) = bbb1c5e97f82953e2b4f72c97131d75a2e684b108a3d7a140c7f901512364b4c +SIZE (buildbot_badges-4.3.0.tar.gz) = 4662 diff --git a/devel/py-buildbot-console-view/Makefile b/devel/py-buildbot-console-view/Makefile index 6c7316437e96..86aed0347fbd 100644 --- a/devel/py-buildbot-console-view/Makefile +++ b/devel/py-buildbot-console-view/Makefile @@ -1,6 +1,5 @@ PORTNAME= buildbot-console-view -DISTVERSION= 3.11.9 -PORTREVISION= 1 +DISTVERSION= 4.3.0 CATEGORIES= devel python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-buildbot-console-view/distinfo b/devel/py-buildbot-console-view/distinfo index ba2eafecaa1e..9d4419d0a974 100644 --- a/devel/py-buildbot-console-view/distinfo +++ b/devel/py-buildbot-console-view/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1728972398 -SHA256 (buildbot_console_view-3.11.9.tar.gz) = deb76c577c9a757c6a4c0f97745768d06c5e6f44dbe05de9e2121783a2809101 -SIZE (buildbot_console_view-3.11.9.tar.gz) = 19042 +TIMESTAMP = 1751284115 +SHA256 (buildbot_console_view-4.3.0.tar.gz) = 540eb1a890630f85e641a6d337c33e3cbbdfac6ec7ab6a28c4286dcf68c04fc0 +SIZE (buildbot_console_view-4.3.0.tar.gz) = 22361 diff --git a/devel/py-buildbot-grid-view/Makefile b/devel/py-buildbot-grid-view/Makefile index 50e04afe71c1..e3481fd1a983 100644 --- a/devel/py-buildbot-grid-view/Makefile +++ b/devel/py-buildbot-grid-view/Makefile @@ -1,6 +1,5 @@ PORTNAME= buildbot-grid-view -DISTVERSION= 3.11.9 -PORTREVISION= 1 +DISTVERSION= 4.3.0 CATEGORIES= devel python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-buildbot-grid-view/distinfo b/devel/py-buildbot-grid-view/distinfo index 9a14693d3425..2f7050a86440 100644 --- a/devel/py-buildbot-grid-view/distinfo +++ b/devel/py-buildbot-grid-view/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1728972470 -SHA256 (buildbot_grid_view-3.11.9.tar.gz) = 7c70a90c7e61752db78d1e0bd4331264035b1b3387d4fa83290ae1d4ac79af5d -SIZE (buildbot_grid_view-3.11.9.tar.gz) = 14127 +TIMESTAMP = 1751284161 +SHA256 (buildbot_grid_view-4.3.0.tar.gz) = 02663c464157d0f3a65695bbd67373e3e7456ebd051c684d477449ca60cda1ac +SIZE (buildbot_grid_view-4.3.0.tar.gz) = 10078 diff --git a/devel/py-buildbot-react-console-view/Makefile b/devel/py-buildbot-react-console-view/Makefile index b3114dc07a13..ead2e140e5b2 100644 --- a/devel/py-buildbot-react-console-view/Makefile +++ b/devel/py-buildbot-react-console-view/Makefile @@ -1,6 +1,5 @@ PORTNAME= buildbot-react-console-view -DISTVERSION= 3.11.9 -PORTREVISION= 1 +DISTVERSION= 4.0.4 CATEGORIES= devel python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -12,6 +11,9 @@ WWW= https://buildbot.net LICENSE= GPLv2 +DEPRECATED=No longer required by Buildbot 4.X +EXPIRATION_DATE= 2025-09-30 + BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}buildbot-pkg>=${PORTVERSION}:devel/py-buildbot-pkg@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}buildbot-pkg>=${PORTVERSION}:devel/py-buildbot-pkg@${PY_FLAVOR} diff --git a/devel/py-buildbot-react-console-view/distinfo b/devel/py-buildbot-react-console-view/distinfo index 1c4f06b3d205..03df5525b11c 100644 --- a/devel/py-buildbot-react-console-view/distinfo +++ b/devel/py-buildbot-react-console-view/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1728972550 -SHA256 (buildbot_react_console_view-3.11.9.tar.gz) = 157daaf773310f4478e2cb61c2fb592db0403b634bb3ea666650f30c5e82504a -SIZE (buildbot_react_console_view-3.11.9.tar.gz) = 22142 +TIMESTAMP = 1751284287 +SHA256 (buildbot_react_console_view-4.0.4.tar.gz) = 6c4e21f11143a216408c1e652e0f1863ee8218877e7d83a611fc145f8e40eab1 +SIZE (buildbot_react_console_view-4.0.4.tar.gz) = 22134 diff --git a/devel/py-buildbot-waterfall-view/Makefile b/devel/py-buildbot-waterfall-view/Makefile index 9273d836fc86..b14e62571ff1 100644 --- a/devel/py-buildbot-waterfall-view/Makefile +++ b/devel/py-buildbot-waterfall-view/Makefile @@ -1,6 +1,5 @@ PORTNAME= buildbot-waterfall-view -DISTVERSION= 3.11.9 -PORTREVISION= 1 +DISTVERSION= 4.3.0 CATEGORIES= devel python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-buildbot-waterfall-view/distinfo b/devel/py-buildbot-waterfall-view/distinfo index d2c1dcfd6ad5..3e4dd0536ad3 100644 --- a/devel/py-buildbot-waterfall-view/distinfo +++ b/devel/py-buildbot-waterfall-view/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1728972598 -SHA256 (buildbot_waterfall_view-3.11.9.tar.gz) = c044ef894074cae7e6737fd1de32c1d4ec68e7e10d85a63f65f61d31b1382e61 -SIZE (buildbot_waterfall_view-3.11.9.tar.gz) = 194388 +TIMESTAMP = 1751284946 +SHA256 (buildbot_waterfall_view-4.3.0.tar.gz) = 73f366af452c71a9679ddabbd98ea33ccd490ece4ec8e08446db97fc65e4c69f +SIZE (buildbot_waterfall_view-4.3.0.tar.gz) = 33175 diff --git a/devel/py-buildbot-worker/Makefile b/devel/py-buildbot-worker/Makefile index 8fc5f667f575..040cd0ef29d7 100644 --- a/devel/py-buildbot-worker/Makefile +++ b/devel/py-buildbot-worker/Makefile @@ -1,6 +1,5 @@ PORTNAME= buildbot-worker -DISTVERSION= 3.11.9 -PORTREVISION= 1 +DISTVERSION= 4.3.0 CATEGORIES= devel python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -13,10 +12,9 @@ WWW= https://buildbot.net LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}autobahn>=20.12.3:www/py-autobahn@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}future>=0:devel/py-future@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}autobahn>=0.16.0:www/py-autobahn@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}msgpack>0.6.0:devel/py-msgpack@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}twisted>=17.9.0:devel/py-twisted@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}twisted>=21.2.0:devel/py-twisted@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} USES= python @@ -27,8 +25,6 @@ NO_ARCH= yes SUB_LIST+= PYTHON_CMD=${PYTHON_CMD} \ PYTHON_VER=${PYTHON_VER} -BUILDBOT_REMOVE_ME= ${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;}/buildbot_worker - USERS= buildbot GROUPS= buildbot @@ -38,10 +34,11 @@ PLIST_FILES= share/man/man1/buildbot-worker.1.gz # XXX fixup plist. see: # https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=205056 fix-plist: - ${REINPLACE_CMD} -e 's|^${BUILDBOT_REMOVE_ME}$$||' ${TMPPLIST} + ${REINPLACE_CMD} -e '/^buildbot_worker/d' ${TMPPLIST} post-install: ${INSTALL_MAN} ${WRKSRC}/docs/buildbot-worker.1 ${STAGEDIR}${PREFIX}/share/man/man1 + ${RM} -rf ${STAGEDIR}${PREFIX}/buildbot_worker do-test: ${MKDIR} ${WRKDIR}/tmp diff --git a/devel/py-buildbot-worker/distinfo b/devel/py-buildbot-worker/distinfo index c61f171813f3..0aa80374e85c 100644 --- a/devel/py-buildbot-worker/distinfo +++ b/devel/py-buildbot-worker/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1728972057 -SHA256 (buildbot_worker-3.11.9.tar.gz) = beccbfb63960b3f713f0219e8ce5a8d25f9efc604fc34dc04899729fd3f7e2b0 -SIZE (buildbot_worker-3.11.9.tar.gz) = 133480 +TIMESTAMP = 1751293161 +SHA256 (buildbot_worker-4.3.0.tar.gz) = 14f5e806c32ef9669e58a3398e9d53ca54fa9080cd6f04956fed1e251da9f4dc +SIZE (buildbot_worker-4.3.0.tar.gz) = 135399 diff --git a/devel/py-buildbot-worker/files/buildbot-worker.in b/devel/py-buildbot-worker/files/buildbot-worker.in index d9334140c7cf..18f80be2a626 100644 --- a/devel/py-buildbot-worker/files/buildbot-worker.in +++ b/devel/py-buildbot-worker/files/buildbot-worker.in @@ -95,7 +95,7 @@ procname="%%PYTHON_CMD%%" ;; esac echo "===> ${name} profile: ${profile}" - if $0 $1 ${profile}; then + if /usr/sbin/service buildbot-worker $1 ${profile}; then success="${profile} ${success:-}" else failed="${profile} (${retcode}) ${failed:-}" @@ -114,17 +114,17 @@ buildbot_worker_prestart() echo "su -m ${buildbot_worker_user} -c \"exec ${command} create-worker ${buildbot_worker_basedir} <MASTER HOST> <MASTER USER> <MASTER_PASS>\"" exit 1 fi - rc_flags="start ${buildbot_worker_basedir} ${rc_flags}" + rc_flags="start ${rc_flags} ${buildbot_worker_basedir}" } buildbot_worker_prestop() { - rc_flags="stop ${buildbot_worker_basedir} ${rc_flags}" + rc_flags="stop ${rc_flags} ${buildbot_worker_basedir}" } buildbot_worker_reload() { - rc_flags="${buildbot_worker_basedir} ${rc_flags}" + rc_flags="${rc_flags} ${buildbot_worker_basedir}" ${command} sighup ${rc_flags} } diff --git a/devel/py-buildbot-worker/files/patch-setup.py b/devel/py-buildbot-worker/files/patch-setup.py new file mode 100644 index 000000000000..d9aa0b88b9ae --- /dev/null +++ b/devel/py-buildbot-worker/files/patch-setup.py @@ -0,0 +1,54 @@ +--- setup.py.orig 2025-06-30 14:40:44 UTC ++++ setup.py +@@ -25,23 +25,30 @@ from setuptools.command.sdist import sdist + from setuptools import Command + from setuptools import setup + from setuptools.command.sdist import sdist ++try: ++ from setuptools.command.install_data import install_data ++except ImportError: ++ from distutils.command.install_data import install_data + + from buildbot_worker import version + + BUILDING_WHEEL = bool("bdist_wheel" in sys.argv) + + +-class our_install_data(Command): ++class our_install_data(install_data): + def initialize_options(self): ++ super().initialize_options() + self.install_dir = None + + def finalize_options(self): ++ super().finalize_options() + self.set_undefined_options( + 'install', + ('install_lib', 'install_dir'), + ) + + def run(self): ++ super().run() + # ensure there's a buildbot_worker/VERSION file + fn = os.path.join(self.install_dir, 'buildbot_worker', 'VERSION') + with open(fn, 'w') as f: +@@ -121,8 +128,6 @@ setup_args = { + 'entry_points': { + 'console_scripts': [ + 'buildbot-worker=buildbot_worker.scripts.runner:run', +- # this will also be shipped on non windows :-( +- 'buildbot_worker_windows_service=buildbot_worker.scripts.windows_service:HandleCommandLine', + ] + }, + } +@@ -143,10 +148,6 @@ setup_args['install_requires'] += [ + 'autobahn >= 0.16.0', + 'msgpack >= 0.6.0', + ] +- +-# buildbot_worker_windows_service needs pywin32 +-if sys.platform == "win32": +- setup_args['install_requires'].append('pywin32') + + # Unit test hard dependencies. + test_deps = [ diff --git a/devel/py-buildbot-wsgi-dashboards/Makefile b/devel/py-buildbot-wsgi-dashboards/Makefile new file mode 100644 index 000000000000..19ced7ca77d8 --- /dev/null +++ b/devel/py-buildbot-wsgi-dashboards/Makefile @@ -0,0 +1,23 @@ +PORTNAME= buildbot-wsgi-dashboards +DISTVERSION= 4.3.0 +CATEGORIES= devel python +MASTER_SITES= PYPI +PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} +DISTNAME= buildbot_wsgi_dashboards-${DISTVERSION} + +MAINTAINER= bofh@FreeBSD.org +COMMENT= Buildbot plugin to integrate flask or bottle dashboards to buildbot UI (React) +WWW= https://buildbot.net + +LICENSE= GPLv2 +#LICENSE_FILE= Not packaged in sdist + +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}buildbot-pkg>=${PORTVERSION}:devel/py-buildbot-pkg@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}buildbot-pkg>=${PORTVERSION}:devel/py-buildbot-pkg@${PY_FLAVOR} + +USES= python +USE_PYTHON= autoplist distutils + +NO_ARCH= yes + +.include <bsd.port.mk> diff --git a/devel/py-buildbot-wsgi-dashboards/distinfo b/devel/py-buildbot-wsgi-dashboards/distinfo new file mode 100644 index 000000000000..5574ddf94339 --- /dev/null +++ b/devel/py-buildbot-wsgi-dashboards/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1751285523 +SHA256 (buildbot_wsgi_dashboards-4.3.0.tar.gz) = be87cac6921f6c0b3b1d1e3763ba231cb4049fafd621d8d93e066278132ccfbe +SIZE (buildbot_wsgi_dashboards-4.3.0.tar.gz) = 434342 diff --git a/devel/py-buildbot-wsgi-dashboards/pkg-descr b/devel/py-buildbot-wsgi-dashboards/pkg-descr new file mode 100644 index 000000000000..fe277e6ea0e0 --- /dev/null +++ b/devel/py-buildbot-wsgi-dashboards/pkg-descr @@ -0,0 +1 @@ +Buildbot plugin to integrate flask or bottle dashboards to buildbot UI (React) diff --git a/devel/py-buildbot-www/Makefile b/devel/py-buildbot-www/Makefile index 492321a97078..6240ca842dd2 100644 --- a/devel/py-buildbot-www/Makefile +++ b/devel/py-buildbot-www/Makefile @@ -1,6 +1,5 @@ PORTNAME= buildbot-www -DISTVERSION= 3.11.9 -PORTREVISION= 1 +DISTVERSION= 4.3.0 CATEGORIES= devel python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -18,6 +17,7 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}buildbot-pkg>=${PORTVERSION}:devel/py-buil RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}buildbot-console-view>=${PORTVERSION}:devel/py-buildbot-console-view@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}buildbot-grid-view>=${PORTVERSION}:devel/py-buildbot-grid-view@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}buildbot-waterfall-view>=${PORTVERSION}:devel/py-buildbot-waterfall-view@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}buildbot-wsgi-dashboards>=${PORTVERSION}:devel/py-buildbot-wsgi-dashboards@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}service-identity>=16.0.0:security/py-service-identity@${PY_FLAVOR} USES= python diff --git a/devel/py-buildbot-www/distinfo b/devel/py-buildbot-www/distinfo index 8403e769fbee..69dc7723d5b1 100644 --- a/devel/py-buildbot-www/distinfo +++ b/devel/py-buildbot-www/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1728972647 -SHA256 (buildbot_www-3.11.9.tar.gz) = e5787f2bcf4b120e34562177e5f24c93d3fd410371f0f8a5983a13a854c93d08 -SIZE (buildbot_www-3.11.9.tar.gz) = 3211692 +TIMESTAMP = 1751285024 +SHA256 (buildbot_www-4.3.0.tar.gz) = 9a7e79f856f6714dab341e4dc2de359d65e37197e0774ee28d80009d99e79f02 +SIZE (buildbot_www-4.3.0.tar.gz) = 430203 diff --git a/devel/py-buildbot/Makefile b/devel/py-buildbot/Makefile index f478cb45da4e..df51596ba640 100644 --- a/devel/py-buildbot/Makefile +++ b/devel/py-buildbot/Makefile @@ -1,6 +1,5 @@ PORTNAME= buildbot -DISTVERSION= 3.11.9 -PORTREVISION= 2 +DISTVERSION= 4.3.0 CATEGORIES= devel python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -12,31 +11,31 @@ WWW= https://buildbot.net LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}alembic>=1.6.0:databases/py-alembic@${PY_FLAVOR} \ +RUN_DEPENDS= \ + ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.1:devel/py-Jinja2@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}alembic>=1.6.0:databases/py-alembic@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}autobahn>=0.16.0:www/py-autobahn@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}buildbot-www>=${PORTVERSION}:devel/py-buildbot-www@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}croniter2>=1.3.0:sysutils/py-croniter2@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}python-dateutil>=1.5:devel/py-python-dateutil@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}importlib-resources>=5:devel/py-importlib-resources@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.1:devel/py-Jinja2@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}msgpack>=0.6.0:devel/py-msgpack@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}packaging>0:devel/py-packaging@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyjwt>=0:www/py-pyjwt@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}twisted>=18.7.0:devel/py-twisted@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}python-dateutil>=1.5:devel/py-python-dateutil@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sqlalchemy20>=1.4.0:databases/py-sqlalchemy20@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}treq>=20.9:www/py-treq@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}twisted>=22.1.0:devel/py-twisted@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}txaio>=2.2.2:devel/py-txaio@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}unidiff>=0.7.5:devel/py-unidiff@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}zope.interface>=4.1.1:devel/py-zope.interface@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}boto3>0:www/py-boto3@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}buildbot-pkg==${PORTVERSION}:devel/py-buildbot-pkg@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}lz4>=0:archivers/py-lz4@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}mock>=2.0.0:devel/py-mock@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}markdown>=3.0.0:textproc/py-markdown@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}moto>0:devel/py-moto@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}parameterized>0:devel/py-parameterized@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pyjade>0:textproc/py-pyjade@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}treq>0:www/py-treq@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}requests-futures>0:www/py-requests-futures@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}pypugjs>0:devel/py-pypugjs@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests-futures>0:www/py-requests-futures@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}treq>0:www/py-treq@${PY_FLAVOR} USES= cpe python USE_PYTHON= autoplist concurrent distutils @@ -54,15 +53,22 @@ SUB_LIST= PYTHON_CMD=${PYTHON_CMD} \ BUILDBOT_REMOVE_ME= ${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;}/buildbot/reporters/templates POST_PLIST+= fix-plist -post-patch: - @${REINPLACE_CMD} -e 's|twisted_ver = ">= 18.7.0, <=23.10.0"|twisted_ver = ">= 18.7.0"|g' \ - ${WRKSRC}/setup.py +OPTIONS_DEFINE= BROTLI CONFIGURABLE DOCS ZSTD +OPTIONS_DEFAULT= BROTLI CONFIGURABLE ZSTD + +CONFIGURABLE_DESC= Enable configurable buildbot + +BROTLI_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}brotli>=1.1.0:archivers/py-brotli@${PY_FLAVOR} +CONFIGURABLE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}evalidate>=2.0.0:math/py-evalidate@${PY_FLAVOR} +ZSTD_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zstandard>=0.23.0:archivers/py-zstandard@${PY_FLAVOR} fix-plist: ${REINPLACE_CMD} -e 's|^${BUILDBOT_REMOVE_ME}$$||' ${TMPPLIST} + ${REINPLACE_CMD} -e '/^buildbot/d' ${TMPPLIST} post-install: ${RM} -r ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/buildbot/reporters/templates + ${RM} -rf ${STAGEDIR}${PREFIX}/buildbot do-test: @cd ${WRKSRC} && PYTHONPATH=${WRKSRC} TZ=UTC ${LOCALBASE}/bin/trial-${PYTHON_VER} buildbot diff --git a/devel/py-buildbot/distinfo b/devel/py-buildbot/distinfo index 20f6ce2895cb..8bf0182b08d2 100644 --- a/devel/py-buildbot/distinfo +++ b/devel/py-buildbot/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1728972729 -SHA256 (buildbot-3.11.9.tar.gz) = accf61f253e7b610ff712a50a646b65708b4ccf5e3d4278daf4d1f51a83c6eac -SIZE (buildbot-3.11.9.tar.gz) = 2529422 +TIMESTAMP = 1751297027 +SHA256 (buildbot-4.3.0.tar.gz) = cbf46a15004bb1229712285e4f2b98163a169868ea00783e5e0d7cf8d5e8d962 +SIZE (buildbot-4.3.0.tar.gz) = 2575196 diff --git a/devel/py-buildbot/files/buildbot.in b/devel/py-buildbot/files/buildbot.in index 74c4ebc47cba..c671e55bfa41 100644 --- a/devel/py-buildbot/files/buildbot.in +++ b/devel/py-buildbot/files/buildbot.in @@ -35,7 +35,7 @@ procname="%%PYTHON_CMD%%" buildbot_check() { echo "Checking BuildBot config" - rc_flags="${buildbot_basedir} ${rc_flags}" + rc_flags="${rc_flags} ${buildbot_basedir}" ${command} checkconfig ${rc_flags} } @@ -47,17 +47,17 @@ buildbot_prestart() if [ ! -f "${buildbot_basedir}/master.cfg" ]; then install -o ${buildbot_user} -g ${buildbot_user} -m 750 ${buildbot_basedir}/master.cfg.sample ${buildbot_basedir}/master.cfg fi - rc_flags="start ${buildbot_basedir} ${rc_flags}" + rc_flags="start ${rc_flags} ${buildbot_basedir}" } buildbot_prestop() { - rc_flags="stop ${buildbot_basedir} ${rc_flags}" + rc_flags="stop ${rc_flags} ${buildbot_basedir}" } buildbot_reload() { - rc_flags="${buildbot_basedir} ${rc_flags}" + rc_flags="${rc_flags} ${buildbot_basedir}" ${command} sighup ${rc_flags} } diff --git a/devel/py-buildbot/files/patch-setup.py b/devel/py-buildbot/files/patch-setup.py new file mode 100644 index 000000000000..c12c43212261 --- /dev/null +++ b/devel/py-buildbot/files/patch-setup.py @@ -0,0 +1,45 @@ +--- setup.py.orig 2025-06-30 15:33:51 UTC ++++ setup.py +@@ -28,25 +28,32 @@ from setuptools.command.sdist import sdist + + from setuptools import Command + from setuptools.command.sdist import sdist ++try: ++ from setuptools.command.install_data import install_data ++except ImportError: ++ from distutils.command.install_data import install_data + + from buildbot import version + + BUILDING_WHEEL = bool("bdist_wheel" in sys.argv) + + +-class install_data_twisted(Command): ++class install_data_twisted(install_data): + """make sure VERSION file is installed in package.""" + + def initialize_options(self): ++ super().initialize_options() + self.install_dir = None + + def finalize_options(self): ++ super().finalize_options() + self.set_undefined_options( + 'install', + ('install_lib', 'install_dir'), + ) + + def run(self): ++ super().run() + # ensure there's a buildbot/VERSION file + fn = os.path.join(self.install_dir, 'buildbot', 'VERSION') + with open(fn, 'w') as f: +@@ -640,8 +647,6 @@ setup_args = { + { + 'console_scripts': [ + 'buildbot=buildbot.scripts.runner:run', +- # this will also be shipped on non windows :-( +- 'buildbot_windows_service=buildbot.scripts.windows_service:HandleCommandLine', + ] + }, + ), |