This tweaks conflict markers for py-setuptools and py-distribute. Packages fine on i386. Okay?
-- WBR, Vadim Zhukov Index: py-distribute/Makefile =================================================================== RCS file: /cvs/ports/devel/py-distribute/Makefile,v retrieving revision 1.7 diff -u -p -r1.7 Makefile --- py-distribute/Makefile 3 Jun 2014 11:34:24 -0000 1.7 +++ py-distribute/Makefile 24 Jul 2014 17:10:54 -0000 @@ -5,7 +5,7 @@ COMMENT = fork of setuptools Python pac MODPY_EGG_VERSION = 0.6.27 DISTNAME = distribute-${MODPY_EGG_VERSION} PKGNAME = py-${DISTNAME} -REVISION = 1 +REVISION = 2 CATEGORIES = devel Index: py-distribute/pkg/PFRAG.python3 =================================================================== RCS file: py-distribute/pkg/PFRAG.python3 diff -N py-distribute/pkg/PFRAG.python3 --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ py-distribute/pkg/PFRAG.python3 24 Jul 2014 17:10:54 -0000 @@ -0,0 +1,2 @@ +@comment $OpenBSD$ +@conflict py3-setuptools-* Index: py-distribute/pkg/PLIST =================================================================== RCS file: /cvs/ports/devel/py-distribute/pkg/PLIST,v retrieving revision 1.3 diff -u -p -r1.3 PLIST --- py-distribute/pkg/PLIST 27 Jun 2012 19:00:50 -0000 1.3 +++ py-distribute/pkg/PLIST 24 Jul 2014 17:10:54 -0000 @@ -1,5 +1,6 @@ @comment $OpenBSD: PLIST,v 1.3 2012/06/27 19:00:50 rpointel Exp $ @pkgpath devel/py3-distribute +%%python3%% !%%python3%% @comment bin/easy_install bin/easy_install-${MODPY_VERSION} Index: py-setuptools/Makefile =================================================================== RCS file: /cvs/ports/devel/py-setuptools/Makefile,v retrieving revision 1.23 diff -u -p -r1.23 Makefile --- py-setuptools/Makefile 3 Jun 2014 11:34:24 -0000 1.23 +++ py-setuptools/Makefile 24 Jul 2014 17:10:54 -0000 @@ -9,7 +9,7 @@ EPOCH = 0 CATEGORIES= devel PKG_ARCH= * -REVISION = 0 +REVISION = 1 MASTER_SITES= ${MASTER_SITE_PYPI:=s/setuptools/} HOMEPAGE= http://peak.telecommunity.com/DevCenter/setuptools Index: py-setuptools/pkg/PFRAG.no-python3 =================================================================== RCS file: py-setuptools/pkg/PFRAG.no-python3 diff -N py-setuptools/pkg/PFRAG.no-python3 --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ py-setuptools/pkg/PFRAG.no-python3 24 Jul 2014 17:10:54 -0000 @@ -0,0 +1,2 @@ +@comment $OpenBSD$ +@conflict py-distribute-* Index: py-setuptools/pkg/PFRAG.python3 =================================================================== RCS file: py-setuptools/pkg/PFRAG.python3 diff -N py-setuptools/pkg/PFRAG.python3 --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ py-setuptools/pkg/PFRAG.python3 24 Jul 2014 17:10:54 -0000 @@ -0,0 +1,2 @@ +@comment $OpenBSD$ +@conflict py3-distribute-* Index: py-setuptools/pkg/PLIST =================================================================== RCS file: /cvs/ports/devel/py-setuptools/pkg/PLIST,v retrieving revision 1.8 diff -u -p -r1.8 PLIST --- py-setuptools/pkg/PLIST 27 Apr 2014 17:04:23 -0000 1.8 +++ py-setuptools/pkg/PLIST 24 Jul 2014 17:10:54 -0000 @@ -1,5 +1,6 @@ @comment $OpenBSD: PLIST,v 1.8 2014/04/27 17:04:23 rpointel Exp $ -@conflict py-distribute-* +%%python3%% +!%%python3%% @comment bin/easy_install bin/easy_install-${MODPY_VERSION} ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}/