Index: devel/py-flit-core/Makefile
===================================================================
--- devel/py-flit-core/Makefile
+++ devel/py-flit-core/Makefile
@@ -1,9 +1,9 @@
-PORTNAME=	flit-core
+PORTNAME=	flit_core
 PORTVERSION=	3.8.0
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-DISTNAME=	flit_core-${PORTVERSION}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Distribution-building parts of Flit
@@ -14,12 +14,14 @@
 
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}testpath>=0:devel/py-testpath@${PY_FLAVOR}
 
-USES=		python:3.4+
-USE_PYTHON=	autoplist concurrent distutils pytest
+USES=		python
+USE_PYTHON=	allflavors autoplist concurrent pep517 pytest
+PEP517_BUILD_CMD=	${PYTHON_CMD} -m ${PORTNAME}.wheel
+PEP517_BUILD_DEPEND=
+PEP517_INSTALL_CMD=	${PYTHON_CMD} ${BUILD_WRKSRC}/bootstrap_install.py \
+			-i ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} ${BUILD_WRKSRC}/dist/${PORTNAME}-*.whl
+PEP517_INSTALL_DEPEND=
 
 NO_ARCH=	yes
 
-post-patch:
-	@${SED} -e 's|%%PORTVERSION%%|${PORTVERSION}|' ${FILESDIR}/setup.py > ${WRKSRC}/setup.py
-
 .include <bsd.port.mk>
Index: devel/py-flit-core/files/setup.py
===================================================================
--- devel/py-flit-core/files/setup.py
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/usr/bin/env python
-# setup.py generated by flit for tools that don't yet use PEP 517
-
-from distutils.core import setup
-
-packages = \
-['flit_core',
- 'flit_core.tests',
- 'flit_core.tests.samples.imported_version.package1',
- 'flit_core.tests.samples.ns1-pkg.ns1.pkg',
- 'flit_core.tests.samples.package1',
- 'flit_core.tests.samples.package1.subpkg',
- 'flit_core.tests.samples.package1.subpkg2',
- 'flit_core.vendor',
- 'flit_core.vendor.tomli']
-
-package_data = \
-{'': ['*'],
- 'flit_core.tests': ['samples/*',
-                     'samples/conflicting_modules/*',
-                     'samples/conflicting_modules/src/*',
-                     'samples/constructed_version/*',
-                     'samples/imported_version/*',
-                     'samples/inclusion/*',
-                     'samples/inclusion/LICENSES/*',
-                     'samples/inclusion/doc/*',
-                     'samples/inclusion/doc/subdir/*',
-                     'samples/inclusion/doc/subdir/subsubdir/*',
-                     'samples/normalization/*',
-                     'samples/ns1-pkg/*',
-                     'samples/ns1-pkg/ns1/*',
-                     'samples/pep517/*',
-                     'samples/pep621/*',
-                     'samples/pep621_nodynamic/*',
-                     'samples/with_data_dir/*',
-                     'samples/with_data_dir/data/*',
-                     'samples/with_data_dir/data/share/*',
-                     'samples/with_data_dir/data/share/man/*',
-                     'samples/with_data_dir/data/share/man/man1/*'],
- 'flit_core.tests.samples.package1': ['data_dir/*'],
- 'flit_core.tests.samples.package1.subpkg': ['sp_data_dir/*'],
- 'flit_core.vendor': ['tomli-1.2.3.dist-info/*']}
-
-setup(name='flit_core',
-      version='%%PORTVERSION%%',
-      description='Distribution-building parts of Flit. See flit package for more information',
-      author=None,
-      author_email='Thomas Kluyver & contributors <thomas@kluyver.me.uk>',
-      url=None,
-      packages=packages,
-      package_data=package_data,
-      python_requires='>=3.6',
-     )