Page MenuHomeFreeBSD
Files F144659751

D17821.1776060263.diff
No OneTemporary
Actions

Size
15 KB
Referenced Files
None
Subscribers
None

D17821.1776060263.diff
View Options

Index: head/devel/py-buildbot-console-view/Makefile
===================================================================
--- head/devel/py-buildbot-console-view/Makefile
+++ head/devel/py-buildbot-console-view/Makefile
@@ -2,15 +2,16 @@
# $FreeBSD$
PORTNAME= buildbot-console-view
-PORTVERSION= 0.9.15
+PORTVERSION= 1.5.0
CATEGORIES= devel python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= koobs@FreeBSD.org
-COMMENT= Continuous Integration Framework (Console View)
+COMMENT= Buildbot Console View plugin
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}
Index: head/devel/py-buildbot-console-view/distinfo
===================================================================
--- head/devel/py-buildbot-console-view/distinfo
+++ head/devel/py-buildbot-console-view/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1514920209
-SHA256 (buildbot-console-view-0.9.15.tar.gz) = f4ec92518d9d4f189c239d928ea984f51b13b5ecd2cd3461b22e6391dba9b772
-SIZE (buildbot-console-view-0.9.15.tar.gz) = 640529
+TIMESTAMP = 1541214151
+SHA256 (buildbot-console-view-1.5.0.tar.gz) = 698e1d2966ca29220e1ab7a246f6f5c492b82bea640a96c22fe541b2d135e7ad
+SIZE (buildbot-console-view-1.5.0.tar.gz) = 641186
Index: head/devel/py-buildbot-grid-view/Makefile
===================================================================
--- head/devel/py-buildbot-grid-view/Makefile
+++ head/devel/py-buildbot-grid-view/Makefile
@@ -1,15 +1,16 @@
# $FreeBSD$
PORTNAME= buildbot-grid-view
-PORTVERSION= 0.9.15
+PORTVERSION= 1.5.0
CATEGORIES= devel python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= koobs@FreeBSD.org
-COMMENT= Continuous Integration Framework (Grid View)
+COMMENT= Buildbot Grid View plugin
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}
Index: head/devel/py-buildbot-grid-view/distinfo
===================================================================
--- head/devel/py-buildbot-grid-view/distinfo
+++ head/devel/py-buildbot-grid-view/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1514920210
-SHA256 (buildbot-grid-view-0.9.15.tar.gz) = 771d2375a71caa4e92c6a4e2b57886222bf290ade398aec59f2a97573db9aa8d
-SIZE (buildbot-grid-view-0.9.15.tar.gz) = 638858
+TIMESTAMP = 1541214745
+SHA256 (buildbot-grid-view-1.5.0.tar.gz) = abc1504e8ecacf92d0f72854dd670618d7926ad168eff5621594bffaec01e757
+SIZE (buildbot-grid-view-1.5.0.tar.gz) = 639274
Index: head/devel/py-buildbot-pkg/Makefile
===================================================================
--- head/devel/py-buildbot-pkg/Makefile
+++ head/devel/py-buildbot-pkg/Makefile
@@ -2,15 +2,16 @@
# $FreeBSD$
PORTNAME= buildbot-pkg
-PORTVERSION= 0.9.15
+PORTVERSION= 1.5.0
CATEGORIES= devel python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= koobs@FreeBSD.org
-COMMENT= Continuous Integration Framework (packaging)
+COMMENT= Buildbot packaging tools
LICENSE= GPLv2
+#LICENSE_FILE= Not packaged in sdist
USES= python
USE_PYTHON= autoplist distutils
Index: head/devel/py-buildbot-pkg/distinfo
===================================================================
--- head/devel/py-buildbot-pkg/distinfo
+++ head/devel/py-buildbot-pkg/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1514920210
-SHA256 (buildbot-pkg-0.9.15.tar.gz) = f012a68096be19c4d2bbcd515f706d07d1a2daf540637f6bf2828ab1b84f0bf8
-SIZE (buildbot-pkg-0.9.15.tar.gz) = 4902
+TIMESTAMP = 1541214448
+SHA256 (buildbot-pkg-1.5.0.tar.gz) = 4646dfbcedaf81d258609a1186708de0f1902d176aed64d3c86c3020288cd4de
+SIZE (buildbot-pkg-1.5.0.tar.gz) = 4856
Index: head/devel/py-buildbot-waterfall-view/Makefile
===================================================================
--- head/devel/py-buildbot-waterfall-view/Makefile
+++ head/devel/py-buildbot-waterfall-view/Makefile
@@ -2,15 +2,16 @@
# $FreeBSD$
PORTNAME= buildbot-waterfall-view
-PORTVERSION= 0.9.15
+PORTVERSION= 1.5.0
CATEGORIES= devel python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= koobs@FreeBSD.org
-COMMENT= Continuous Integration Framework (Waterfall View)
+COMMENT= Buildbot Waterfall View plugin
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}
Index: head/devel/py-buildbot-waterfall-view/distinfo
===================================================================
--- head/devel/py-buildbot-waterfall-view/distinfo
+++ head/devel/py-buildbot-waterfall-view/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1514920211
-SHA256 (buildbot-waterfall-view-0.9.15.tar.gz) = 9fe8e38f1e2d50ac76a1218317df4ecff7473f40065fa7f1fe024f84c7078ff5
-SIZE (buildbot-waterfall-view-0.9.15.tar.gz) = 713913
+TIMESTAMP = 1541214915
+SHA256 (buildbot-waterfall-view-1.5.0.tar.gz) = d1ab3bd9027d8ca387ef508f657f9a0dec4ffd9d00708cdb3df6a113fbc4d37c
+SIZE (buildbot-waterfall-view-1.5.0.tar.gz) = 714352
Index: head/devel/py-buildbot-worker/Makefile
===================================================================
--- head/devel/py-buildbot-worker/Makefile
+++ head/devel/py-buildbot-worker/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= buildbot-worker
-PORTVERSION= 0.9.15
-PORTREVISION= 1
+PORTVERSION= 1.5.0
CATEGORIES= devel python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
@@ -14,13 +13,11 @@
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}future>=0.15.2:devel/py-future@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}twisted>=14.0.1:devel/py-twisted@${PY_FLAVOR}
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}twisted>0:devel/py-twisted@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}future>=0:devel/py-future@${PY_FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR}
USES= python
-USE_PYTHON= autoplist distutils
+USE_PYTHON= autoplist concurrent distutils
USE_RC_SUBR= buildbot-worker
SUB_LIST+= PYTHON_CMD=${PYTHON_CMD} PYTHON_VER=${PYTHON_VER}
@@ -29,11 +26,19 @@
PLIST_FILES= man/man1/buildbot-worker.1.gz
+.include <bsd.port.pre.mk>
+
+.if ${PYTHON_VER} >= 3.0
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}twisted>=17.9.0:devel/py-twisted@${PY_FLAVOR}
+.else
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}twisted>=16.1.0:devel/py-twisted@${PY_FLAVOR}
+.endif
+
post-install:
${INSTALL_MAN} ${WRKSRC}/docs/buildbot-worker.1 ${STAGEDIR}${MANPREFIX}/man/man1
do-test:
${MKDIR} ${WRKDIR}/tmp
- cd ${WRKDIR}/tmp && ${PYTHON_CMD} -m twisted.trial buildbot_worker.test
+ cd ${WRKDIR}/tmp && PYTHONPATH=${WRKSRC} ${PYTHON_CMD} -m twisted.trial buildbot_worker.test
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
Index: head/devel/py-buildbot-worker/distinfo
===================================================================
--- head/devel/py-buildbot-worker/distinfo
+++ head/devel/py-buildbot-worker/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1514920212
-SHA256 (buildbot-worker-0.9.15.tar.gz) = c80399cb2ee57b562389bd5adeb2001c6da1931ea6264e08284634e78ea28e9a
-SIZE (buildbot-worker-0.9.15.tar.gz) = 100728
+TIMESTAMP = 1541212854
+SHA256 (buildbot-worker-1.5.0.tar.gz) = 533e4fd3cacddcfa8e4b5c33c3d021b7bda3a437ba4d9c23c1a1a0df0e5233bc
+SIZE (buildbot-worker-1.5.0.tar.gz) = 105814
Index: head/devel/py-buildbot-worker/files/buildbot-worker.in
===================================================================
--- head/devel/py-buildbot-worker/files/buildbot-worker.in
+++ head/devel/py-buildbot-worker/files/buildbot-worker.in
@@ -73,7 +73,7 @@
eval buildbot_worker_basedir="\${buildbot_worker_${profile}_basedir:-${buildbot_worker_basedir}}"
eval pidfile="\${buildbot_worker_${profile}_basedir:-${buildbot_worker_basedir}}/twistd.pid"
else
- echo "%%PREFIX%%/etc/rc.d/${name}: extra argument ignored"
+ echo "$0: extra argument ignored"
fi
# A specific profile is not in the command
else
@@ -102,7 +102,7 @@
;;
esac
echo "===> ${name} profile: ${profile}"
- if %%PREFIX%%/etc/rc.d/${name} $1 ${profile}; then
+ if $0 $1 ${profile}; then
success="${profile} ${success:-}"
else
failed="${profile} (${retcode}) ${failed:-}"
Index: head/devel/py-buildbot-worker/files/patch-setup.py
===================================================================
--- head/devel/py-buildbot-worker/files/patch-setup.py
+++ head/devel/py-buildbot-worker/files/patch-setup.py
@@ -1,12 +1,46 @@
---- setup.py.orig 2017-07-01 19:16:48 UTC
+# modernize buildbot_worker setup.py with package_data
+# https://github.com/buildbot/buildbot/pull/4394
+
+--- setup.py.orig 2018-10-09 18:37:18 UTC
+++ setup.py
-@@ -106,9 +106,6 @@ setup_args = {
+@@ -31,23 +31,6 @@ from distutils.core import setup
+ from buildbot_worker import version
+
+
+-class our_install_data(install_data):
+-
+- def finalize_options(self):
+- self.set_undefined_options('install',
+- ('install_lib', 'install_dir'),
+- )
+- install_data.finalize_options(self)
+-
+- def run(self):
+- install_data.run(self)
+- # ensure there's a buildbot_worker/VERSION file
+- fn = os.path.join(self.install_dir, 'buildbot_worker', 'VERSION')
+- with open(fn, 'w') as f:
+- f.write(version)
+- self.outfiles.append(fn)
+-
+-
+ class our_sdist(sdist):
+
+ def make_release_tree(self, base_dir, files):
+@@ -105,11 +88,12 @@ setup_args = {
"buildbot_worker.test.unit",
"buildbot_worker.test.util",
],
- # mention data_files, even if empty, so install_data is called and
- # VERSION gets copied
- 'data_files': [("buildbot_worker", [])],
++ 'package_data': {
++ '': [
++ 'VERSION',
++ ]
++ },
'cmdclass': {
- 'install_data': our_install_data,
+- 'install_data': our_install_data,
'sdist': our_sdist
+ },
+ 'entry_points': {
Index: head/devel/py-buildbot-www/Makefile
===================================================================
--- head/devel/py-buildbot-www/Makefile
+++ head/devel/py-buildbot-www/Makefile
@@ -2,15 +2,16 @@
# $FreeBSD$
PORTNAME= buildbot-www
-PORTVERSION= 0.9.15
+PORTVERSION= 1.5.0
CATEGORIES= devel python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= koobs@FreeBSD.org
-COMMENT= Continuous Integration Framework (WWW)
+COMMENT= Buildbot UI
LICENSE= GPLv2
+#LICENSE_FILE= Not packaged in sdist
BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}buildbot>=${PORTVERSION}:devel/py-buildbot@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}buildbot-pkg>=${PORTVERSION}:devel/py-buildbot-pkg@${PY_FLAVOR} \
Index: head/devel/py-buildbot-www/distinfo
===================================================================
--- head/devel/py-buildbot-www/distinfo
+++ head/devel/py-buildbot-www/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1514920213
-SHA256 (buildbot-www-0.9.15.tar.gz) = 830bb3903d456462a48c723647d698f13c4a07966a89819895314b68ce7f8da1
-SIZE (buildbot-www-0.9.15.tar.gz) = 717948
+TIMESTAMP = 1541214992
+SHA256 (buildbot-www-1.5.0.tar.gz) = 4204477dc67ed42443d1f03cd9189a0e57d9d3d7c4662df306e8e29c9d3d5a46
+SIZE (buildbot-www-1.5.0.tar.gz) = 718533
Index: head/devel/py-buildbot/Makefile
===================================================================
--- head/devel/py-buildbot/Makefile
+++ head/devel/py-buildbot/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= buildbot
-PORTVERSION= 0.9.15
+PORTVERSION= 1.5.0
CATEGORIES= devel python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
@@ -13,38 +13,44 @@
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}twisted>=14.0.1:devel/py-twisted@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.1:devel/py-Jinja2@${PY_FLAVOR} \
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.1:devel/py-Jinja2@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}autobahn>=0.16.0:www/py-autobahn@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}dateutil>=2.1:devel/py-dateutil@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>=4.1.1:devel/py-zope.interface@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}future>=0.15.2:devel/py-future@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}lz4>=0:archivers/py-lz4@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pyjwt>=1.4.0:www/py-pyjwt@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}ramlfications>0:devel/py-ramlfications@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}sqlalchemy-migrate>=0.7:databases/py-sqlalchemy-migrate@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=0.6:databases/py-sqlalchemy10@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=0.8.0:databases/py-sqlalchemy10@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}sqlalchemy-migrate>=0.9:databases/py-sqlalchemy-migrate@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}dateutil>=1.5:devel/py-dateutil@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}txaio>=2.2.2:devel/py-txaio@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pyjwt>=0:www/py-pyjwt@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}treq>0:www/py-treq@${PY_FLAVOR}
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}boto3>0:www/py-boto3@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}buildbot-worker>=${PORTVERSION}:devel/py-buildbot-worker@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}buildbot-www>=${PORTVERSION}:devel/py-buildbot-www@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}mock>=2.0.0:devel/py-mock@${PY_FLAVOR}
+ ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}treq>0:www/py-treq@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}txrequests>0:www/py-txrequests@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}boto3>0:www/py-boto3@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}mock>=2.0.0:devel/py-mock@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}lz4>=0:archivers/py-lz4@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}buildbot-pkg>0:devel/py-buildbot-pkg@${PY_FLAVOR}
+# to be ported ${PYTHON_PKGNAMEPREFIX}pyjade>0:www/py-pyjade@${PY_FLAVOR}
+# to be ported ${PYTHON_PKGNAMEPREFIX}moto>0:www/py-moto@${PY_FLAVOR}
USES= python
USE_RC_SUBR= buildbot
-USE_PYTHON= autoplist distutils
+USE_PYTHON= autoplist concurrent distutils
SUB_LIST= PYTHON_CMD=${PYTHON_CMD}
NO_ARCH= yes
-post-patch:
- @${FIND} ${WRKSRC} -type f | ${XARGS} -n 10 ${REINPLACE_CMD} -e \
- 's|/usr/bin/python|${PYTHON_CMD}|g'
- @${FIND} ${WRKSRC} -name \*.bak -delete
+.include <bsd.port.pre.mk>
+.if ${PYTHON_VER} >= 3.0
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}twisted>=17.9.0:devel/py-twisted@${PY_FLAVOR}
+.else
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}twisted>=16.1.0:devel/py-twisted@${PY_FLAVOR}
+.endif
+
do-test:
${MKDIR} ${WRKDIR}/tmp
- cd ${WRKDIR}/tmp && ${PYTHON_CMD} -m twisted.trial buildbot.test
+ cd ${WRKDIR}/tmp && PYTHONPATH=${WRKSRC} ${PYTHON_CMD} -m twisted.trial buildbot.test
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
Index: head/devel/py-buildbot/distinfo
===================================================================
--- head/devel/py-buildbot/distinfo
+++ head/devel/py-buildbot/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1514920208
-SHA256 (buildbot-0.9.15.tar.gz) = d8f0aa6fded7c13e61e339a67970a821801c89f1be12275aeadc389080ff2a86
-SIZE (buildbot-0.9.15.tar.gz) = 3073156
+TIMESTAMP = 1541129797
+SHA256 (buildbot-1.5.0.tar.gz) = d02a717222bcdc98205624c7d6b0b2ae24653170f2971946f26bf8cadea4fd52
+SIZE (buildbot-1.5.0.tar.gz) = 3191364

File Metadata

Mime Type
text/plain
Expires
Mon, Apr 13, 6:04 AM (2 h, 47 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
28332329
Default Alt Text
D17821.1776060263.diff (15 KB)

Event Timeline