diff --git a/misc/netron/Makefile b/misc/netron/Makefile
index 93bd451e5eb7..ac920049e783 100644
--- a/misc/netron/Makefile
+++ b/misc/netron/Makefile
@@ -1,44 +1,42 @@
 PORTNAME=	netron
 DISTVERSIONPREFIX=	v
 DISTVERSION=	4.1.9
 CATEGORIES=	misc python # machine-learning
 MASTER_SITES=	LOCAL/yuri/:js
 DISTFILES=	netron-${DISTVERSION}-node_modules.tgz:js
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Visualizer for neural network, deep learning, machine learning models
 WWW=		https://github.com/lutzroeder/netron
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		python
 USE_GITHUB=	yes
 GH_ACCOUNT=	lutzroeder
 USE_PYTHON=	distutils noflavors
 
 NO_ARCH=	yes
 
-PLIST_SUB=	PYTHON_CPYTHON=cpython-${PYTHON_VER:S/.//}
-
 post-extract:
 	@${RLN} ${WRKDIR}/node_modules ${WRKSRC}/node_modules
 
 #
 # To update the netron-${DISTVERSION}-node_modules.tgz archive:
 # 1. Comment out the DISTFILES and post-extract lines
 # 2. Run 'make makesum regenerate-node_modules-distfile clean'
 # 3. Upload the archive
 # 4. Uncomment the lines from step #1
 # 5. Run 'make makesum'
 #
 
 regenerate-node_modules-distfile: patch # requires npm installed by www/npm
 	@${MAKE} clean patch && \
 	cd ${WRKSRC} && \
 	${RM} -r node_modules && \
 	npm install -l && \
 	${TAR} czf ${DISTDIR}/netron-${DISTVERSION}-node_modules.tgz node_modules && \
 	${ECHO} "Please upload the file ${DISTDIR}/netron-${DISTVERSION}-node_modules.tgz"
 
 .include <bsd.port.mk>
diff --git a/misc/netron/pkg-plist b/misc/netron/pkg-plist
index 24316e8f5173..c486552e30b2 100644
--- a/misc/netron/pkg-plist
+++ b/misc/netron/pkg-plist
@@ -1,96 +1,96 @@
 bin/netron
 %%PYTHON_SITELIBDIR%%/netron/__init__.py
-%%PYTHON_SITELIBDIR%%/netron/__pycache__/__init__.%%PYTHON_CPYTHON%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/netron/__pycache__/__init__.%%PYTHON_CPYTHON%%.pyc
-%%PYTHON_SITELIBDIR%%/netron/__pycache__/__version__.%%PYTHON_CPYTHON%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/netron/__pycache__/__version__.%%PYTHON_CPYTHON%%.pyc
-%%PYTHON_SITELIBDIR%%/netron/__pycache__/server.%%PYTHON_CPYTHON%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/netron/__pycache__/server.%%PYTHON_CPYTHON%%.pyc
+%%PYTHON_SITELIBDIR%%/netron/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/netron/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/netron/__pycache__/__version__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/netron/__pycache__/__version__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/netron/__pycache__/server.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/netron/__pycache__/server.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/netron/__version__.py
 %%PYTHON_SITELIBDIR%%/netron/armnn-metadata.json
 %%PYTHON_SITELIBDIR%%/netron/armnn-schema.js
 %%PYTHON_SITELIBDIR%%/netron/armnn.js
 %%PYTHON_SITELIBDIR%%/netron/barracuda.js
 %%PYTHON_SITELIBDIR%%/netron/base.js
 %%PYTHON_SITELIBDIR%%/netron/bigdl-metadata.json
 %%PYTHON_SITELIBDIR%%/netron/bigdl-proto.js
 %%PYTHON_SITELIBDIR%%/netron/bigdl.js
 %%PYTHON_SITELIBDIR%%/netron/bson.js
 %%PYTHON_SITELIBDIR%%/netron/caffe-metadata.json
 %%PYTHON_SITELIBDIR%%/netron/caffe-proto.js
 %%PYTHON_SITELIBDIR%%/netron/caffe.js
 %%PYTHON_SITELIBDIR%%/netron/caffe2-metadata.json
 %%PYTHON_SITELIBDIR%%/netron/caffe2-proto.js
 %%PYTHON_SITELIBDIR%%/netron/caffe2.js
 %%PYTHON_SITELIBDIR%%/netron/chainer.js
 %%PYTHON_SITELIBDIR%%/netron/cntk-metadata.json
 %%PYTHON_SITELIBDIR%%/netron/cntk-proto.js
 %%PYTHON_SITELIBDIR%%/netron/cntk.js
 %%PYTHON_SITELIBDIR%%/netron/coreml-metadata.json
 %%PYTHON_SITELIBDIR%%/netron/coreml-proto.js
 %%PYTHON_SITELIBDIR%%/netron/coreml.js
 %%PYTHON_SITELIBDIR%%/netron/d3.min.js
 %%PYTHON_SITELIBDIR%%/netron/dagre.min.js
 %%PYTHON_SITELIBDIR%%/netron/darknet-metadata.json
 %%PYTHON_SITELIBDIR%%/netron/darknet.js
 %%PYTHON_SITELIBDIR%%/netron/dl4j-metadata.json
 %%PYTHON_SITELIBDIR%%/netron/dl4j.js
 %%PYTHON_SITELIBDIR%%/netron/favicon.ico
 %%PYTHON_SITELIBDIR%%/netron/flatbuffers.js
 %%PYTHON_SITELIBDIR%%/netron/flux-metadata.json
 %%PYTHON_SITELIBDIR%%/netron/flux.js
 %%PYTHON_SITELIBDIR%%/netron/gzip.js
 %%PYTHON_SITELIBDIR%%/netron/hdf5.js
 %%PYTHON_SITELIBDIR%%/netron/icon.png
 %%PYTHON_SITELIBDIR%%/netron/index.html
 %%PYTHON_SITELIBDIR%%/netron/index.js
 %%PYTHON_SITELIBDIR%%/netron/keras-metadata.json
 %%PYTHON_SITELIBDIR%%/netron/keras.js
 %%PYTHON_SITELIBDIR%%/netron/long.js
 %%PYTHON_SITELIBDIR%%/netron/marked.min.js
 %%PYTHON_SITELIBDIR%%/netron/mediapipe.js
 %%PYTHON_SITELIBDIR%%/netron/mlnet-metadata.json
 %%PYTHON_SITELIBDIR%%/netron/mlnet.js
 %%PYTHON_SITELIBDIR%%/netron/mnn-metadata.json
 %%PYTHON_SITELIBDIR%%/netron/mnn-schema.js
 %%PYTHON_SITELIBDIR%%/netron/mnn.js
 %%PYTHON_SITELIBDIR%%/netron/mxnet-metadata.json
 %%PYTHON_SITELIBDIR%%/netron/mxnet.js
 %%PYTHON_SITELIBDIR%%/netron/ncnn-metadata.json
 %%PYTHON_SITELIBDIR%%/netron/ncnn.js
 %%PYTHON_SITELIBDIR%%/netron/numpy.js
 %%PYTHON_SITELIBDIR%%/netron/onnx-metadata.json
 %%PYTHON_SITELIBDIR%%/netron/onnx-proto.js
 %%PYTHON_SITELIBDIR%%/netron/onnx.js
 %%PYTHON_SITELIBDIR%%/netron/openvino-metadata.json
 %%PYTHON_SITELIBDIR%%/netron/openvino.js
 %%PYTHON_SITELIBDIR%%/netron/paddle-metadata.json
 %%PYTHON_SITELIBDIR%%/netron/paddle-proto.js
 %%PYTHON_SITELIBDIR%%/netron/paddle.js
 %%PYTHON_SITELIBDIR%%/netron/pako.min.js
 %%PYTHON_SITELIBDIR%%/netron/pickle.js
 %%PYTHON_SITELIBDIR%%/netron/protobuf.min.js
 %%PYTHON_SITELIBDIR%%/netron/prototxt.js
 %%PYTHON_SITELIBDIR%%/netron/python.js
 %%PYTHON_SITELIBDIR%%/netron/pytorch-metadata.json
 %%PYTHON_SITELIBDIR%%/netron/pytorch.js
 %%PYTHON_SITELIBDIR%%/netron/server.py
 %%PYTHON_SITELIBDIR%%/netron/sklearn-metadata.json
 %%PYTHON_SITELIBDIR%%/netron/sklearn.js
 %%PYTHON_SITELIBDIR%%/netron/tar.js
 %%PYTHON_SITELIBDIR%%/netron/tengine-metadata.json
 %%PYTHON_SITELIBDIR%%/netron/tengine.js
 %%PYTHON_SITELIBDIR%%/netron/tf-metadata.json
 %%PYTHON_SITELIBDIR%%/netron/tf-proto.js
 %%PYTHON_SITELIBDIR%%/netron/tf.js
 %%PYTHON_SITELIBDIR%%/netron/tflite-metadata.json
 %%PYTHON_SITELIBDIR%%/netron/tflite-schema.js
 %%PYTHON_SITELIBDIR%%/netron/tflite.js
 %%PYTHON_SITELIBDIR%%/netron/torch-metadata.json
 %%PYTHON_SITELIBDIR%%/netron/torch.js
 %%PYTHON_SITELIBDIR%%/netron/view-grapher.css
 %%PYTHON_SITELIBDIR%%/netron/view-grapher.js
 %%PYTHON_SITELIBDIR%%/netron/view-sidebar.css
 %%PYTHON_SITELIBDIR%%/netron/view-sidebar.js
 %%PYTHON_SITELIBDIR%%/netron/view.js
 %%PYTHON_SITELIBDIR%%/netron/zip.js