Diff below drops py2-flavor of devel/py-convert and migrates it to py3-only. While here move HOMEPAGE to https.
Initial plan was to migrate this port to py3-only as part of the update to 5.3.1 [0]. Unfortunately this update fails to run all tests for some. New plan is to migrate now, and update later. All consumers are already py3-only: RUN_DEPENDS /usr/ports/devel/spyder/spyder,python3 /usr/ports/www/jupyter-notebook TEST_DEPENDS /usr/ports/devel/py-nbconvert /usr/ports/devel/py-nbconvert,python3 /usr/ports/devel/spyder/spyder,python3 /usr/ports/www/jupyter-notebook /usr/ports/www/py-bokeh OK? [0] https://marc.info/?l=openbsd-ports&m=158351871906886&w=2 diff --git Makefile Makefile index 416fdaf1c1a..6c9b4d2714b 100644 --- Makefile +++ Makefile @@ -5,11 +5,11 @@ COMMENT = converting Jupyter notebooks MODPY_EGG_VERSION = 5.2.1 DISTNAME = nbconvert-${MODPY_EGG_VERSION} PKGNAME = py-${DISTNAME} -REVISION = 1 +REVISION = 2 CATEGORIES = devel -HOMEPAGE = http://jupyter.org/ +HOMEPAGE = https://jupyter.org/ # BSD PERMIT_PACKAGE = Yes @@ -22,7 +22,7 @@ MODPY_PYTEST = Yes MODPY_PYTEST_ARGS = nbconvert FLAVORS = python3 -FLAVOR ?= +FLAVOR = python3 RUN_DEPENDS = devel/py-entrypoints${MODPY_FLAVOR} \ devel/py-jupyter_client${MODPY_FLAVOR}>=5.0.0 \ @@ -41,7 +41,4 @@ TEST_DEPENDS = ${BASE_PKGPATH}=${MODPY_EGG_VERSION} \ devel/py-ipykernel${MODPY_FLAVOR}>=4.5.2 \ devel/py-nose${MODPY_FLAVOR} -post-install: - mv ${PREFIX}/bin/jupyter-nbconvert{,${MODPY_BIN_SUFFIX}} - .include <bsd.port.mk> diff --git pkg/PLIST pkg/PLIST index 0d17d5c47fc..01549870bb1 100644 --- pkg/PLIST +++ pkg/PLIST @@ -1,5 +1,7 @@ @comment $OpenBSD: PLIST,v 1.5 2017/05/25 11:45:25 shadchin Exp $ -bin/jupyter-nbconvert${MODPY_BIN_SUFFIX} +@conflict py-nbconvert-* +@pkgpath devel/py-nbconvert +bin/jupyter-nbconvert lib/python${MODPY_VERSION}/site-packages/nbconvert/ lib/python${MODPY_VERSION}/site-packages/nbconvert-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/ lib/python${MODPY_VERSION}/site-packages/nbconvert-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
