Does this look correct? Index: Makefile =================================================================== RCS file: /cvs/ports/devel/pudb/Makefile,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 Makefile --- Makefile 18 Jul 2015 00:31:07 -0000 1.1.1.1 +++ Makefile 18 Jul 2015 07:56:10 -0000 @@ -3,7 +3,9 @@ COMMENT = console-based visual debugger for Python MODPY_EGG_VERSION = 2015.3 +REVISION = 0 DISTNAME = pudb-${MODPY_EGG_VERSION} +FULLPKGNAME = ${PKGNAME}${FLAVOR_EXT} CATEGORIES = devel @@ -16,9 +18,22 @@ MODULES = lang/python MODPY_PI = Yes MODPY_SETUPTOOLS = Yes -RUN_DEPENDS = devel/py-urwid>=1.1.1 \ - textproc/py-pygments +RUN_DEPENDS = devel/py-urwid${MODPY_FLAVOR}>=1.1.1 \ + textproc/py-pygments${MODPY_FLAVOR} TEST_DEPENDS = ${RUN_DEPENDS} + +FLAVORS = python3 +FLAVOR ?= + +.if ${FLAVOR:Mpython3} +CONFLICT_MARKER = pudb-*-python3 +.else +CONFLICT_MARKER = pudb-*-!python3 +.endif + +PUDB_SCRIPT_NAME = pudb${MODPY_MAJOR_VERSION:S/2//} + +SUBST_VARS += CONFLICT_MARKER PUDB_SCRIPT_NAME .include <bsd.port.mk> Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/devel/pudb/pkg/PLIST,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 PLIST --- pkg/PLIST 18 Jul 2015 00:31:07 -0000 1.1.1.1 +++ pkg/PLIST 18 Jul 2015 07:56:10 -0000 @@ -1,5 +1,7 @@ -@comment $OpenBSD: PLIST,v 1.1.1.1 2015/07/18 00:31:07 jca Exp $ -bin/pudb +@comment $OpenBSD$ +@option no-default-conflict +@conflict ${CONFLICT_MARKER} +bin/${PUDB_SCRIPT_NAME} lib/python${MODPY_VERSION}/site-packages/pudb/ lib/python${MODPY_VERSION}/site-packages/pudb-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/ lib/python${MODPY_VERSION}/site-packages/pudb-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO @@ -9,30 +11,31 @@ lib/python${MODPY_VERSION}/site-packages lib/python${MODPY_VERSION}/site-packages/pudb-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt lib/python${MODPY_VERSION}/site-packages/pudb-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt lib/python${MODPY_VERSION}/site-packages/pudb/__init__.py -lib/python${MODPY_VERSION}/site-packages/pudb/__init__.pyc lib/python${MODPY_VERSION}/site-packages/pudb/__main__.py -lib/python${MODPY_VERSION}/site-packages/pudb/__main__.pyc +${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pudb/${MODPY_PYCACHE}/ +lib/python${MODPY_VERSION}/site-packages/pudb/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/pudb/${MODPY_PYCACHE}__main__.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/pudb/${MODPY_PYCACHE}b.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/pudb/${MODPY_PYCACHE}debugger.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/pudb/${MODPY_PYCACHE}ipython.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/pudb/${MODPY_PYCACHE}lowlevel.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/pudb/${MODPY_PYCACHE}py3compat.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/pudb/${MODPY_PYCACHE}run.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/pudb/${MODPY_PYCACHE}settings.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/pudb/${MODPY_PYCACHE}shell.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/pudb/${MODPY_PYCACHE}source_view.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/pudb/${MODPY_PYCACHE}theme.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/pudb/${MODPY_PYCACHE}ui_tools.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/pudb/${MODPY_PYCACHE}var_view.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/pudb/b.py -lib/python${MODPY_VERSION}/site-packages/pudb/b.pyc lib/python${MODPY_VERSION}/site-packages/pudb/debugger.py -lib/python${MODPY_VERSION}/site-packages/pudb/debugger.pyc lib/python${MODPY_VERSION}/site-packages/pudb/ipython.py -lib/python${MODPY_VERSION}/site-packages/pudb/ipython.pyc lib/python${MODPY_VERSION}/site-packages/pudb/lowlevel.py -lib/python${MODPY_VERSION}/site-packages/pudb/lowlevel.pyc lib/python${MODPY_VERSION}/site-packages/pudb/py3compat.py -lib/python${MODPY_VERSION}/site-packages/pudb/py3compat.pyc lib/python${MODPY_VERSION}/site-packages/pudb/run.py -lib/python${MODPY_VERSION}/site-packages/pudb/run.pyc lib/python${MODPY_VERSION}/site-packages/pudb/settings.py -lib/python${MODPY_VERSION}/site-packages/pudb/settings.pyc lib/python${MODPY_VERSION}/site-packages/pudb/shell.py -lib/python${MODPY_VERSION}/site-packages/pudb/shell.pyc lib/python${MODPY_VERSION}/site-packages/pudb/source_view.py -lib/python${MODPY_VERSION}/site-packages/pudb/source_view.pyc lib/python${MODPY_VERSION}/site-packages/pudb/theme.py -lib/python${MODPY_VERSION}/site-packages/pudb/theme.pyc lib/python${MODPY_VERSION}/site-packages/pudb/ui_tools.py -lib/python${MODPY_VERSION}/site-packages/pudb/ui_tools.pyc lib/python${MODPY_VERSION}/site-packages/pudb/var_view.py -lib/python${MODPY_VERSION}/site-packages/pudb/var_view.pyc
-- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE