On Sat, Aug 30, 2014 at 6:48 PM, Edd Barrett <vex...@gmail.com> wrote:
> On Sat, Aug 30, 2014 at 05:09:07PM +0100, Edd Barrett wrote:
>> OK to commit the following now? Then I will regenerate the update diff.
>
> So the updated diff is now:
ok
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/devel/py-py/Makefile,v
> retrieving revision 1.22
> diff -u -p -r1.22 Makefile
> --- Makefile 30 Aug 2014 16:34:33 -0000 1.22
> +++ Makefile 30 Aug 2014 16:45:24 -0000
> @@ -2,8 +2,7 @@
>
> COMMENT= cross-python path, ini-parsing, io, code, log
> facilities
>
> -MODPY_EGG_VERSION = 1.4.15
> -REVISION = 2
> +MODPY_EGG_VERSION = 1.4.23
> DISTNAME= py-${MODPY_EGG_VERSION}
> PKGNAME= py-${DISTNAME}
>
> @@ -25,6 +24,9 @@ MODPY_SETUPTOOLS= Yes
> FLAVORS= python3
> FLAVOR?=
>
> -NO_TEST= Yes
> +TEST_DEPENDS += devel/py-test${MODPY_FLAVOR}
> +
> +do-test:
> + cd ${WRKBUILD} && ${LOCALBASE}/bin/py.test testing
>
> .include <bsd.port.mk>
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/devel/py-py/distinfo,v
> retrieving revision 1.5
> diff -u -p -r1.5 distinfo
> --- distinfo 18 Sep 2013 20:04:17 -0000 1.5
> +++ distinfo 30 Aug 2014 16:45:24 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (py-1.4.15.tar.gz) = ZWY04YRtVo7SLIcrXhWKTV7vF03VskUYbni5SgJYwEI=
> -SIZE (py-1.4.15.tar.gz) = 189237
> +SHA256 (py-1.4.23.tar.gz) = uo8qOJTK8RIXmaKyOdZ4c6Vr0N+iThZz2SmQqK5zcMo=
> +SIZE (py-1.4.23.tar.gz) = 189520
> Index: pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/devel/py-py/pkg/PLIST,v
> retrieving revision 1.8
> diff -u -p -r1.8 PLIST
> --- pkg/PLIST 30 Aug 2014 16:34:33 -0000 1.8
> +++ pkg/PLIST 30 Aug 2014 16:45:24 -0000
> @@ -1,5 +1,6 @@
> @comment $OpenBSD: PLIST,v 1.8 2014/08/30 16:34:33 edd Exp $
> lib/python${MODPY_VERSION}/site-packages/py/
> +${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/py/${MODPY_PYCACHE}/
>
> lib/python${MODPY_VERSION}/site-packages/py-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
>
> lib/python${MODPY_VERSION}/site-packages/py-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
>
> lib/python${MODPY_VERSION}/site-packages/py-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
> @@ -7,77 +8,78 @@ lib/python${MODPY_VERSION}/site-packages
>
> lib/python${MODPY_VERSION}/site-packages/py-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/not-zip-safe
>
> lib/python${MODPY_VERSION}/site-packages/py-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
> lib/python${MODPY_VERSION}/site-packages/py/__init__.py
> -lib/python${MODPY_VERSION}/site-packages/py/__metainfo.py
> -${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/py/${MODPY_PYCACHE}/
>
> lib/python${MODPY_VERSION}/site-packages/py/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/py/__metainfo.py
>
> lib/python${MODPY_VERSION}/site-packages/py/${MODPY_PYCACHE}__metainfo.${MODPY_PYC_MAGIC_TAG}pyc
> -lib/python${MODPY_VERSION}/site-packages/py/${MODPY_PYCACHE}_apipkg.${MODPY_PYC_MAGIC_TAG}pyc
> -lib/python${MODPY_VERSION}/site-packages/py/${MODPY_PYCACHE}_builtin.${MODPY_PYC_MAGIC_TAG}pyc
> -lib/python${MODPY_VERSION}/site-packages/py/${MODPY_PYCACHE}_error.${MODPY_PYC_MAGIC_TAG}pyc
> -lib/python${MODPY_VERSION}/site-packages/py/${MODPY_PYCACHE}_iniconfig.${MODPY_PYC_MAGIC_TAG}pyc
> -lib/python${MODPY_VERSION}/site-packages/py/${MODPY_PYCACHE}_std.${MODPY_PYC_MAGIC_TAG}pyc
> -lib/python${MODPY_VERSION}/site-packages/py/${MODPY_PYCACHE}_xmlgen.${MODPY_PYC_MAGIC_TAG}pyc
> -lib/python${MODPY_VERSION}/site-packages/py/${MODPY_PYCACHE}test.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/py/_apipkg.py
> +lib/python${MODPY_VERSION}/site-packages/py/${MODPY_PYCACHE}_apipkg.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/py/_builtin.py
> +lib/python${MODPY_VERSION}/site-packages/py/${MODPY_PYCACHE}_builtin.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/py/_code/
> -lib/python${MODPY_VERSION}/site-packages/py/_code/__init__.py
>
> ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/py/_code/${MODPY_PYCACHE}/
> +lib/python${MODPY_VERSION}/site-packages/py/_code/__init__.py
>
> lib/python${MODPY_VERSION}/site-packages/py/_code/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
> -lib/python${MODPY_VERSION}/site-packages/py/_code/${MODPY_PYCACHE}_assertionnew.${MODPY_PYC_MAGIC_TAG}pyc
> -lib/python${MODPY_VERSION}/site-packages/py/_code/${MODPY_PYCACHE}_assertionold.${MODPY_PYC_MAGIC_TAG}pyc
> -lib/python${MODPY_VERSION}/site-packages/py/_code/${MODPY_PYCACHE}assertion.${MODPY_PYC_MAGIC_TAG}pyc
> -lib/python${MODPY_VERSION}/site-packages/py/_code/${MODPY_PYCACHE}code.${MODPY_PYC_MAGIC_TAG}pyc
> -lib/python${MODPY_VERSION}/site-packages/py/_code/${MODPY_PYCACHE}source.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/py/_code/_assertionnew.py
> +lib/python${MODPY_VERSION}/site-packages/py/_code/${MODPY_PYCACHE}_assertionnew.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/py/_code/_assertionold.py
> +lib/python${MODPY_VERSION}/site-packages/py/_code/${MODPY_PYCACHE}_assertionold.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/py/_code/_py2traceback.py
> +lib/python${MODPY_VERSION}/site-packages/py/_code/${MODPY_PYCACHE}_py2traceback.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/py/_code/assertion.py
> +lib/python${MODPY_VERSION}/site-packages/py/_code/${MODPY_PYCACHE}assertion.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/py/_code/code.py
> +lib/python${MODPY_VERSION}/site-packages/py/_code/${MODPY_PYCACHE}code.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/py/_code/source.py
> +lib/python${MODPY_VERSION}/site-packages/py/_code/${MODPY_PYCACHE}source.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/py/_error.py
> +lib/python${MODPY_VERSION}/site-packages/py/${MODPY_PYCACHE}_error.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/py/_iniconfig.py
> +lib/python${MODPY_VERSION}/site-packages/py/${MODPY_PYCACHE}_iniconfig.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/py/_io/
> -lib/python${MODPY_VERSION}/site-packages/py/_io/__init__.py
>
> ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/py/_io/${MODPY_PYCACHE}/
> +lib/python${MODPY_VERSION}/site-packages/py/_io/__init__.py
>
> lib/python${MODPY_VERSION}/site-packages/py/_io/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
> -lib/python${MODPY_VERSION}/site-packages/py/_io/${MODPY_PYCACHE}capture.${MODPY_PYC_MAGIC_TAG}pyc
> -lib/python${MODPY_VERSION}/site-packages/py/_io/${MODPY_PYCACHE}saferepr.${MODPY_PYC_MAGIC_TAG}pyc
> -lib/python${MODPY_VERSION}/site-packages/py/_io/${MODPY_PYCACHE}terminalwriter.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/py/_io/capture.py
> +lib/python${MODPY_VERSION}/site-packages/py/_io/${MODPY_PYCACHE}capture.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/py/_io/saferepr.py
> +lib/python${MODPY_VERSION}/site-packages/py/_io/${MODPY_PYCACHE}saferepr.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/py/_io/terminalwriter.py
> +lib/python${MODPY_VERSION}/site-packages/py/_io/${MODPY_PYCACHE}terminalwriter.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/py/_log/
> -lib/python${MODPY_VERSION}/site-packages/py/_log/__init__.py
>
> ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/py/_log/${MODPY_PYCACHE}/
> +lib/python${MODPY_VERSION}/site-packages/py/_log/__init__.py
>
> lib/python${MODPY_VERSION}/site-packages/py/_log/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
> -lib/python${MODPY_VERSION}/site-packages/py/_log/${MODPY_PYCACHE}log.${MODPY_PYC_MAGIC_TAG}pyc
> -lib/python${MODPY_VERSION}/site-packages/py/_log/${MODPY_PYCACHE}warning.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/py/_log/log.py
> +lib/python${MODPY_VERSION}/site-packages/py/_log/${MODPY_PYCACHE}log.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/py/_log/warning.py
> +lib/python${MODPY_VERSION}/site-packages/py/_log/${MODPY_PYCACHE}warning.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/py/_path/
> -lib/python${MODPY_VERSION}/site-packages/py/_path/__init__.py
>
> ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/py/_path/${MODPY_PYCACHE}/
> +lib/python${MODPY_VERSION}/site-packages/py/_path/__init__.py
>
> lib/python${MODPY_VERSION}/site-packages/py/_path/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
> -lib/python${MODPY_VERSION}/site-packages/py/_path/${MODPY_PYCACHE}cacheutil.${MODPY_PYC_MAGIC_TAG}pyc
> -lib/python${MODPY_VERSION}/site-packages/py/_path/${MODPY_PYCACHE}common.${MODPY_PYC_MAGIC_TAG}pyc
> -lib/python${MODPY_VERSION}/site-packages/py/_path/${MODPY_PYCACHE}local.${MODPY_PYC_MAGIC_TAG}pyc
> -lib/python${MODPY_VERSION}/site-packages/py/_path/${MODPY_PYCACHE}svnurl.${MODPY_PYC_MAGIC_TAG}pyc
> -lib/python${MODPY_VERSION}/site-packages/py/_path/${MODPY_PYCACHE}svnwc.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/py/_path/cacheutil.py
> +lib/python${MODPY_VERSION}/site-packages/py/_path/${MODPY_PYCACHE}cacheutil.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/py/_path/common.py
> +lib/python${MODPY_VERSION}/site-packages/py/_path/${MODPY_PYCACHE}common.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/py/_path/local.py
> +lib/python${MODPY_VERSION}/site-packages/py/_path/${MODPY_PYCACHE}local.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/py/_path/svnurl.py
> +lib/python${MODPY_VERSION}/site-packages/py/_path/${MODPY_PYCACHE}svnurl.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/py/_path/svnwc.py
> +lib/python${MODPY_VERSION}/site-packages/py/_path/${MODPY_PYCACHE}svnwc.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/py/_process/
> -lib/python${MODPY_VERSION}/site-packages/py/_process/__init__.py
>
> ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/py/_process/${MODPY_PYCACHE}/
> +lib/python${MODPY_VERSION}/site-packages/py/_process/__init__.py
>
> lib/python${MODPY_VERSION}/site-packages/py/_process/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
> -lib/python${MODPY_VERSION}/site-packages/py/_process/${MODPY_PYCACHE}cmdexec.${MODPY_PYC_MAGIC_TAG}pyc
> -lib/python${MODPY_VERSION}/site-packages/py/_process/${MODPY_PYCACHE}forkedfunc.${MODPY_PYC_MAGIC_TAG}pyc
> -lib/python${MODPY_VERSION}/site-packages/py/_process/${MODPY_PYCACHE}killproc.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/py/_process/cmdexec.py
> +lib/python${MODPY_VERSION}/site-packages/py/_process/${MODPY_PYCACHE}cmdexec.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/py/_process/forkedfunc.py
> +lib/python${MODPY_VERSION}/site-packages/py/_process/${MODPY_PYCACHE}forkedfunc.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/py/_process/killproc.py
> +lib/python${MODPY_VERSION}/site-packages/py/_process/${MODPY_PYCACHE}killproc.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/py/_std.py
> +lib/python${MODPY_VERSION}/site-packages/py/${MODPY_PYCACHE}_std.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/py/_xmlgen.py
> +lib/python${MODPY_VERSION}/site-packages/py/${MODPY_PYCACHE}_xmlgen.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/py/test.py
> +lib/python${MODPY_VERSION}/site-packages/py/${MODPY_PYCACHE}test.${MODPY_PYC_MAGIC_TAG}pyc
>
> --
> Best Regards
> Edd Barrett
>
> http://www.theunixzoo.co.uk
>
