Re: UPDATE: devel/py-buildslave

2011-04-18 Thread Piotr Sikora
Hi,
again my fault, spaces -> tabs.

Best regards,
Piotr Sikora < piotr.sik...@frickle.com >

Index: Makefile
===
RCS file: /cvs/ports/devel/py-buildslave/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- Makefile30 Nov 2010 10:59:01 -  1.1.1.1
+++ Makefile16 Apr 2011 12:31:40 -
@@ -1,34 +1,37 @@
 # $OpenBSD: Makefile,v 1.1.1.1 2010/11/30 10:59:01 eric Exp $
 
-COMMENT=   buildslave implementation for the buildot system
+COMMENT =  buildslave implementation for the buildot system
 
-MODPY_EGG_VERSION= 0.8.2
-DISTNAME=  buildbot-slave-${MODPY_EGG_VERSION}
-PKGNAME=   py-buildslave-${MODPY_EGG_VERSION}
+MODPY_EGG_VERSION =0.8.3
+DISTNAME = buildbot-slave-${MODPY_EGG_VERSION}
+PKGNAME =  py-buildslave-${MODPY_EGG_VERSION}
 
-CATEGORIES=devel
+CATEGORIES =   devel
 
-HOMEPAGE=  http://buildbot.net/
+HOMEPAGE = http://buildbot.net/
 
-MAINTAINER=Eric Faurot 
+MAINTAINER =   Eric Faurot 
 
 # GPLv2
-PERMIT_PACKAGE_CDROM=  Yes
-PERMIT_PACKAGE_FTP=Yes
-PERMIT_DISTFILES_CDROM=Yes
-PERMIT_DISTFILES_FTP=  Yes
-
-MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=buildbot/}
-
-MODULES=   lang/python
-
-RUN_DEPENDS=   devel/py-twisted/core \
-   devel/py-twisted/conch \
-   devel/py-twisted/mail \
-   devel/py-twisted/web \
-   devel/py-twisted/words
+PERMIT_PACKAGE_CDROM = Yes
+PERMIT_PACKAGE_FTP =   Yes
+PERMIT_DISTFILES_CDROM =   Yes
+PERMIT_DISTFILES_FTP = Yes
 
-REGRESS_DEPENDS=   ${RUN_DEPENDS}
+MASTER_SITES = http://buildbot.googlecode.com/files/
+
+MODULES =  lang/python
+
+MODPY_SETUPTOOLS = Yes
+
+RUN_DEPENDS =  devel/py-twisted/core
+
+REGRESS_DEPENDS =  ${RUN_DEPENDS} \
+   devel/py-mock
+
+HOMEDIR =  /var/buildslave
+
+SUBST_VARS +=  HOMEDIR
 
 post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/py-buildslave
Index: distinfo
===
RCS file: /cvs/ports/devel/py-buildslave/distinfo,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 distinfo
--- distinfo30 Nov 2010 10:59:01 -  1.1.1.1
+++ distinfo16 Apr 2011 12:31:40 -
@@ -1,5 +1,5 @@
-MD5 (buildbot-slave-0.8.2.tar.gz) = p2v8E4BiEilYJcldaJWrTg==
-RMD160 (buildbot-slave-0.8.2.tar.gz) = E4wsBdd/kVkN5lL6rmcEX86HPXU=
-SHA1 (buildbot-slave-0.8.2.tar.gz) = V0nJ4iugM2sjn9tt/go5J4V5Iwo=
-SHA256 (buildbot-slave-0.8.2.tar.gz) = 
e97Lli8r2HfhsGvDNiiUnhVAAQY06s/DePaPDbQH+wc=
-SIZE (buildbot-slave-0.8.2.tar.gz) = 79997
+MD5 (buildbot-slave-0.8.3.tar.gz) = y52dDC2SXlG7PI1iCD13pw==
+RMD160 (buildbot-slave-0.8.3.tar.gz) = 1Vas02TpjYZ3xIRykhGUfDCHhw8=
+SHA1 (buildbot-slave-0.8.3.tar.gz) = 9C0prA09Yw8nfxPjkpZXirsdFqw=
+SHA256 (buildbot-slave-0.8.3.tar.gz) = 
4Ng8WJRJW4LAtwJIBlPqcS5SiPZEoPBmEJnma6ZO1Ww=
+SIZE (buildbot-slave-0.8.3.tar.gz) = 86438
Index: patches/patch-setup_py
===
RCS file: patches/patch-setup_py
diff -N patches/patch-setup_py
--- patches/patch-setup_py  30 Nov 2010 10:59:01 -  1.1.1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,16 +0,0 @@
-$OpenBSD: patch-setup_py,v 1.1.1.1 2010/11/30 10:59:01 eric Exp $
 setup.py.orig  Fri Oct 29 02:33:35 2010
-+++ setup.py   Tue Nov 30 11:03:13 2010
-@@ -93,11 +93,7 @@ setup_args = {
- if sys.platform == "win32":
- setup_args['zip_safe'] = False
- 
--try:
--# If setuptools is installed, then we'll add setuptools-specific arguments
--# to the setup args.
--import setuptools #@UnusedImport
--except ImportError:
-+if True:
- setup_args['scripts'] = [
- 'bin/buildslave'
- ]
Index: pkg/PLIST
===
RCS file: /cvs/ports/devel/py-buildslave/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 PLIST
--- pkg/PLIST   30 Nov 2010 10:59:01 -  1.1.1.1
+++ pkg/PLIST   16 Apr 2011 12:31:40 -
@@ -1,6 +1,13 @@
 @comment $OpenBSD: PLIST,v 1.1.1.1 2010/11/30 10:59:01 eric Exp $
+@newgroup _buildslave:674
+@newuser _buildslave:674:_buildslave:daemon:Buildslave 
daemon:${HOMEDIR}:/sbin/nologin
 bin/buildslave
-lib/python${MODPY_VERSION}/site-packages/buildbot_slave-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info
+lib/python${MODPY_VERSION}/site-packages/buildbot_slave-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
+lib/python${MODPY_VERSION}/site-packages/buildbot_slave-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
+lib/python${MODPY_VERSION}/site-packages/buildbot_slave-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
+lib/python${MODPY_VERSION}/site-packages/buildbot_slave-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
+lib/python${MODPY_VERSION}/site-packa

UPDATE: devel/py-buildslave

2011-04-18 Thread Eric Faurot
Hi again,

This diff updates py-buildslave to 0.8.3p1, and adds
a _buildslave user as well as a rc.d startup script.

Tweaked from a diff by Piotr Sikora again

ok?

Index: Makefile
===
RCS file: /cvs/ports/devel/py-buildslave/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- Makefile30 Nov 2010 10:59:01 -  1.1.1.1
+++ Makefile16 Apr 2011 12:31:40 -
@@ -1,34 +1,37 @@
 # $OpenBSD: Makefile,v 1.1.1.1 2010/11/30 10:59:01 eric Exp $
 
-COMMENT=   buildslave implementation for the buildot system
+COMMENT =  buildslave implementation for the buildot system
 
-MODPY_EGG_VERSION= 0.8.2
-DISTNAME=  buildbot-slave-${MODPY_EGG_VERSION}
-PKGNAME=   py-buildslave-${MODPY_EGG_VERSION}
+MODPY_EGG_VERSION =0.8.3
+DISTNAME = buildbot-slave-${MODPY_EGG_VERSION}
+PKGNAME =  py-buildslave-${MODPY_EGG_VERSION}
 
-CATEGORIES=devel
+CATEGORIES =   devel
 
-HOMEPAGE=  http://buildbot.net/
+HOMEPAGE = http://buildbot.net/
 
-MAINTAINER=Eric Faurot 
+MAINTAINER =   Eric Faurot 
 
 # GPLv2
-PERMIT_PACKAGE_CDROM=  Yes
-PERMIT_PACKAGE_FTP=Yes
-PERMIT_DISTFILES_CDROM=Yes
-PERMIT_DISTFILES_FTP=  Yes
-
-MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=buildbot/}
-
-MODULES=   lang/python
-
-RUN_DEPENDS=   devel/py-twisted/core \
-   devel/py-twisted/conch \
-   devel/py-twisted/mail \
-   devel/py-twisted/web \
-   devel/py-twisted/words
+PERMIT_PACKAGE_CDROM = Yes
+PERMIT_PACKAGE_FTP =   Yes
+PERMIT_DISTFILES_CDROM =   Yes
+PERMIT_DISTFILES_FTP = Yes
 
-REGRESS_DEPENDS=   ${RUN_DEPENDS}
+MASTER_SITES = http://buildbot.googlecode.com/files/
+
+MODULES =  lang/python
+
+MODPY_SETUPTOOLS = Yes
+
+RUN_DEPENDS =  devel/py-twisted/core
+
+REGRESS_DEPENDS =  ${RUN_DEPENDS} \
+   devel/py-mock
+
+HOMEDIR =  /var/buildslave
+
+SUBST_VARS +=  HOMEDIR
 
 post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/py-buildslave
Index: distinfo
===
RCS file: /cvs/ports/devel/py-buildslave/distinfo,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 distinfo
--- distinfo30 Nov 2010 10:59:01 -  1.1.1.1
+++ distinfo16 Apr 2011 12:31:40 -
@@ -1,5 +1,5 @@
-MD5 (buildbot-slave-0.8.2.tar.gz) = p2v8E4BiEilYJcldaJWrTg==
-RMD160 (buildbot-slave-0.8.2.tar.gz) = E4wsBdd/kVkN5lL6rmcEX86HPXU=
-SHA1 (buildbot-slave-0.8.2.tar.gz) = V0nJ4iugM2sjn9tt/go5J4V5Iwo=
-SHA256 (buildbot-slave-0.8.2.tar.gz) = 
e97Lli8r2HfhsGvDNiiUnhVAAQY06s/DePaPDbQH+wc=
-SIZE (buildbot-slave-0.8.2.tar.gz) = 79997
+MD5 (buildbot-slave-0.8.3.tar.gz) = y52dDC2SXlG7PI1iCD13pw==
+RMD160 (buildbot-slave-0.8.3.tar.gz) = 1Vas02TpjYZ3xIRykhGUfDCHhw8=
+SHA1 (buildbot-slave-0.8.3.tar.gz) = 9C0prA09Yw8nfxPjkpZXirsdFqw=
+SHA256 (buildbot-slave-0.8.3.tar.gz) = 
4Ng8WJRJW4LAtwJIBlPqcS5SiPZEoPBmEJnma6ZO1Ww=
+SIZE (buildbot-slave-0.8.3.tar.gz) = 86438
Index: patches/patch-setup_py
===
RCS file: patches/patch-setup_py
diff -N patches/patch-setup_py
--- patches/patch-setup_py  30 Nov 2010 10:59:01 -  1.1.1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,16 +0,0 @@
-$OpenBSD: patch-setup_py,v 1.1.1.1 2010/11/30 10:59:01 eric Exp $
 setup.py.orig  Fri Oct 29 02:33:35 2010
-+++ setup.py   Tue Nov 30 11:03:13 2010
-@@ -93,11 +93,7 @@ setup_args = {
- if sys.platform == "win32":
- setup_args['zip_safe'] = False
- 
--try:
--# If setuptools is installed, then we'll add setuptools-specific arguments
--# to the setup args.
--import setuptools #@UnusedImport
--except ImportError:
-+if True:
- setup_args['scripts'] = [
- 'bin/buildslave'
- ]
Index: pkg/PLIST
===
RCS file: /cvs/ports/devel/py-buildslave/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 PLIST
--- pkg/PLIST   30 Nov 2010 10:59:01 -  1.1.1.1
+++ pkg/PLIST   16 Apr 2011 12:31:40 -
@@ -1,6 +1,13 @@
 @comment $OpenBSD: PLIST,v 1.1.1.1 2010/11/30 10:59:01 eric Exp $
+@newgroup _buildslave:674
+@newuser _buildslave:674:_buildslave:daemon:Buildslave 
daemon:${HOMEDIR}:/sbin/nologin
 bin/buildslave
-lib/python${MODPY_VERSION}/site-packages/buildbot_slave-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info
+lib/python${MODPY_VERSION}/site-packages/buildbot_slave-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
+lib/python${MODPY_VERSION}/site-packages/buildbot_slave-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
+lib/python${MODPY_VERSION}/site-packages/buildbot_slave-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
+lib/python${MODPY_VERSION}/site-packages/buildbot_slave-${MODPY_EGG_VERSION}-py${MOD