From owner-svn-ports-all@FreeBSD.ORG Tue Jan 28 09:33:52 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 0C47571E; Tue, 28 Jan 2014 09:33:52 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id EAB1919DE; Tue, 28 Jan 2014 09:33:51 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0S9XpOI097964; Tue, 28 Jan 2014 09:33:51 GMT (envelope-from koobs@svn.freebsd.org) Received: (from koobs@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0S9Xp43097962; Tue, 28 Jan 2014 09:33:51 GMT (envelope-from koobs@svn.freebsd.org) Message-Id: <201401280933.s0S9Xp43097962@svn.freebsd.org> From: Kubilay Kocak Date: Tue, 28 Jan 2014 09:33:51 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r341524 - in head/devel/buildbot-slave: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Jan 2014 09:33:52 -0000 Author: koobs Date: Tue Jan 28 09:33:51 2014 New Revision: 341524 URL: http://svnweb.freebsd.org/changeset/ports/341524 QAT: https://qat.redports.org/buildarchive/r341524/ Log: devel/buildbot-slave: Modernise and enable STAGE support - Enable STAGE support - Enable AUTOPLIST support (Delete pkg-plist accordingly) - Deprecate easy_install target - Remove OPTIONSFILE override - Switch MASTER_SITES to CHEESESHOP (Remove PROJECTHOST accordingly) - Patch out empty directory in setup.py:data_files - Re-order USE[S] sections - Tweak COMMENT Requested by: bapt Deleted: head/devel/buildbot-slave/pkg-plist Modified: head/devel/buildbot-slave/Makefile head/devel/buildbot-slave/files/patch-setup.py Modified: head/devel/buildbot-slave/Makefile ============================================================================== --- head/devel/buildbot-slave/Makefile Tue Jan 28 09:25:02 2014 (r341523) +++ head/devel/buildbot-slave/Makefile Tue Jan 28 09:33:51 2014 (r341524) @@ -3,11 +3,12 @@ PORTNAME= buildbot-slave PORTVERSION= 0.8.8 +PORTREVISION= 1 CATEGORIES= devel python -MASTER_SITES= GOOGLE_CODE +MASTER_SITES= CHEESESHOP MAINTAINER= koobs@FreeBSD.org -COMMENT= Slave part of Buildbot, an continuous integration system +COMMENT= Buildbot Continuous Integration Framework (Slave) LICENSE= GPLv2 @@ -15,28 +16,26 @@ TEST_DEPENDS:= ${RUN_DEPENDS} \ trial:${PORTSDIR}/devel/py-twistedCore \ ${PYTHON_PKGNAMEPREFIX}mock>0:${PORTSDIR}/devel/py-mock -PROJECTHOST= buildbot -USE_PYTHON= yes -USE_PYDISTUTILS= easy_install +OPTIONS_DEFINE= TESTS +TESTS_DESC= Install py-mock for test suite + USES= twisted:run,runner +USE_PYTHON= yes +USE_PYDISTUTILS= yes +PYDISTUTILS_AUTOPLIST= yes MAKE_ENV+= NO_INSTALL_REQS=1 -OPTIONS_DEFINE= TESTS -TESTS_DESC= Install py-mock for test suite -OPTIONSFILE?= ${PORT_DBDIR}/py-${PORTNAME}/options - -NO_STAGE= yes .include .if ${PORT_OPTIONS:MTESTS} BUILD_DEPENDS:= ${TEST_DEPENDS} .endif -MAN1= buildslave.1 +PLIST_FILES= man/man1/buildslave.1.gz post-install: - ${INSTALL_MAN} ${WRKSRC}/docs/buildslave.1 ${MANPREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/docs/buildslave.1 ${STAGEDIR}${MANPREFIX}/man/man1 regression-test: extract @cd ${WRKSRC} && trial buildslave.test Modified: head/devel/buildbot-slave/files/patch-setup.py ============================================================================== --- head/devel/buildbot-slave/files/patch-setup.py Tue Jan 28 09:25:02 2014 (r341523) +++ head/devel/buildbot-slave/files/patch-setup.py Tue Jan 28 09:33:51 2014 (r341524) @@ -1,15 +1,12 @@ ---- ./setup.py.orig 2012-09-23 00:57:03.000000000 +1000 -+++ ./setup.py 2012-12-07 22:19:57.724590221 +1100 -@@ -105,11 +105,7 @@ - } - } - --# set zip_safe to false to force Windows installs to always unpack eggs --# into directories, which seems to work better -- --# see http://buildbot.net/trac/ticket/907 --if sys.platform == "win32": -- setup_args['zip_safe'] = False -+setup_args['zip_safe'] = False - - try: - # If setuptools is installed, then we'll add setuptools-specific arguments +--- ./setup.py.orig 2014-01-28 19:18:29.885753132 +1100 ++++ ./setup.py 2014-01-28 19:18:53.182782954 +1100 +@@ -96,9 +96,6 @@ + "buildslave.test.unit", + ], + 'scripts': scripts, +- # mention data_files, even if empty, so install_data is called and +- # VERSION gets copied +- 'data_files': [("buildslave", [])], + 'cmdclass': { + 'install_data': our_install_data, + 'sdist': our_sdist