- Update to 0.8.7p1

- Take Maintainership
- Switch to setuptools, update pkg-plist accordingly
- Remove unecessary setup.py patch
- Add LICENSE
- Sort RUN_DEPENDS
- Add TESTS options, TEST_DEPENDS and regression-test target:

Changes: http://buildbot.net/buildbot/docs/0.8.7p1/relnotes/index.html

Approved by:	rm (mentor), tj (maintainer, via IRC)

devel/buildbot/Makefile

@@ -2,25 +2,52 @@
 # $FreeBSD$
 
 PORTNAME=	buildbot
-PORTVERSION=	0.8.6p1
+PORTVERSION=	0.8.7p1
 CATEGORIES=	devel python
 MASTER_SITES=	GOOGLE_CODE
 
-MAINTAINER=	tj@FreeBSD.org
+MAINTAINER=	koobs@FreeBSD.org
 COMMENT=	Automated system from compile/test cycle to validate code changes
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Jinja2>=2.1:${PORTSDIR}/devel/py-Jinja2 \
-		${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \
-		${PYTHON_PKGNAMEPREFIX}sqlalchemy>=0.7:${PORTSDIR}/databases/py-sqlalchemy \
-		${PYTHON_PKGNAMEPREFIX}migrate>=0.7:${PORTSDIR}/databases/py-migrate
+LICENSE=	GPLv2
 
-USE_PYTHON=	yes
-USE_PYDISTUTILS=	yes
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Jinja2>=2.1:${PORTSDIR}/devel/py-Jinja2 \
+		${PYTHON_PKGNAMEPREFIX}dateutil>=2.1:${PORTSDIR}/devel/py-dateutil \
+		${PYTHON_PKGNAMEPREFIX}migrate>=0.6.1:${PORTSDIR}/databases/py-migrate \
+		${PYTHON_PKGNAMEPREFIX}sqlalchemy>=0.6.1:${PORTSDIR}/databases/py-sqlalchemy \
+		${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3
+
+TEST_DEPENDS:=	${RUN_DEPENDS} \
+		${PYTHON_PKGNAMEPREFIX}mock>0:${PORTSDIR}/devel/py-mock \
+		trial:${PORTSDIR}/devel/py-twistedCore \
+		${PYTHON_PKGNAMEPREFIX}twistedWeb>9.0.0:${PORTSDIR}/www/py-twistedWeb \
+		${PYTHON_PKGNAMEPREFIX}twistedWords>9.0.0:${PORTSDIR}/net-im/py-twistedWords
+
+USE_PYTHON=		yes
+USE_PYDISTUTILS=	easy_install
 USE_TWISTED_RUN=	conch mail web words
 
+MAKE_ENV+=		NO_INSTALL_REQS=1
+
+OPTIONS_DEFINE=		TESTS
+OPTIONS_DEFAULT=	TESTS
+TESTS_DESC=		Install py-mock for unit tests
+# Ports infrastructure bug
+OPTIONSFILE?=		${PORT_DBDIR}/py-${PORTNAME}/options
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MTESTS}
+BUILD_DEPENDS:=		${TEST_DEPENDS}
+post-build: regression-test
+.endif
+
 post-patch:
 	@${FIND} ${WRKSRC} -type f | ${XARGS} -n 10 ${REINPLACE_CMD} -e \
 		's|/usr/bin/python|${PYTHON_CMD}|g'
 	@${FIND} ${WRKSRC} -name \*.bak -delete
 
+regression-test:
+	@cd ${WRKSRC} && trial buildbot
+
 .include <bsd.port.mk>

devel/buildbot/distinfo

@@ -1,2 +1,2 @@
-SHA256 (buildbot-0.8.6p1.tar.gz) = 4d10a27809bf82b367cf6230e4e3628f4df8940787d6affed7d787dc52016c2c
-SIZE (buildbot-0.8.6p1.tar.gz) = 4454055
+SHA256 (buildbot-0.8.7p1.tar.gz) = 8dee3f887bce55a7f7cf01e6c421a2511898c2f89f55f202f5193a100a9a5776
+SIZE (buildbot-0.8.7p1.tar.gz) = 4597202

devel/buildbot/files/patch-setup.py

@@ -1,37 +0,0 @@
---- setup.py.orig	2012-06-02 08:58:34.000000000 -0400
-+++ setup.py	2012-06-02 08:58:58.000000000 -0400
-@@ -279,34 +279,6 @@
- py_25 = sys.version_info[0] > 2 or (sys.version_info[0] == 2 and sys.version_info[1] >= 5)
- py_26 = sys.version_info[0] > 2 or (sys.version_info[0] == 2 and sys.version_info[1] >= 6)
- 
--try:
--    # If setuptools is installed, then we'll add setuptools-specific arguments
--    # to the setup args.
--    import setuptools #@UnusedImport
--except ImportError:
--    pass
--else:
--    ## dependencies
--    setup_args['install_requires'] = [
--        'twisted >= 8.0.0',
--        'Jinja2 >= 2.1',
--        'sqlalchemy >= 0.6',
--        # buildbot depends on sqlalchemy internals, and these are the tested
--        # versions.
--        'sqlalchemy-migrate ==0.6.0, ==0.6.1, ==0.7.0, ==0.7.1, ==0.7.2',
--    ]
--    # Python-2.6 and up includes json
--    if not py_26:
--        setup_args['install_requires'].append('simplejson')
--
--    # Python-2.6 and up includes a working A sqlite (py25's is broken)
--    if not py_26:
--        setup_args['install_requires'].append('pysqlite')
--
--    if os.getenv('NO_INSTALL_REQS'):
--        setup_args['install_requires'] = None
--        setup_args['tests_require'] = None
--
- setup(**setup_args)
- 
- # Local Variables: