diff --git a/devel/py-cxx/Makefile b/devel/py-cxx/Makefile
index f6b608e7dbc3..c10652b1297f 100644
--- a/devel/py-cxx/Makefile
+++ b/devel/py-cxx/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	cxx
-PORTVERSION=	6.0.0
+PORTVERSION=	7.1.3
 CATEGORIES=	devel python
 MASTER_SITES=	SF/${PORTNAME}/CXX/PyCXX%20V${PORTVERSION}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -11,10 +11,9 @@ DISTNAME=	pycxx-${PORTVERSION}
 MAINTAINER=	lwhsu@FreeBSD.org
 COMMENT=	Make it easier to extend Python with C++
 
-USES=		python:2.7
-USE_PYTHON=	distutils pythonprefix
+USES=		python
+USE_PYTHON=	autoplist concurrent distutils pythonprefix
 PYDISTUTILS_PKGNAME=	CXX
-PYDISTUTILS_PKGVERSION=	5.3
 
 DOCSDIR=	${PREFIX}/share/doc/py-${PORTNAME}
 PORTDOCS=	*
@@ -23,7 +22,7 @@ OPTIONS_DEFINE=	DOCS
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/Doc/PyCXX.html ${STAGEDIR}${DOCSDIR}
+	cd ${WRKSRC}/Doc/ && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}
 
 post-patch:
 	@${REINPLACE_CMD} \
diff --git a/devel/py-cxx/distinfo b/devel/py-cxx/distinfo
index 4d7d43571c36..525d327bcb12 100644
--- a/devel/py-cxx/distinfo
+++ b/devel/py-cxx/distinfo
@@ -1,2 +1,3 @@
-SHA256 (pycxx-6.0.0.tar.gz) = 96af0e55c13c1f3eebefd64c367c9e8af0f41bf273a6290e54911aeec1c98932
-SIZE (pycxx-6.0.0.tar.gz) = 81977
+TIMESTAMP = 1574401937
+SHA256 (pycxx-7.1.3.tar.gz) = 822c8586f195aacdb7e919630e951abe866368eab3057336ff467e3f0de4ef8b
+SIZE (pycxx-7.1.3.tar.gz) = 151478
diff --git a/devel/py-cxx/files/patch-setup.py b/devel/py-cxx/files/patch-setup.py
deleted file mode 100644
index 8300ead0bf12..000000000000
--- a/devel/py-cxx/files/patch-setup.py
+++ /dev/null
@@ -1,12 +0,0 @@
---- setup.py.orig	Fri Oct 22 03:55:55 2004
-+++ setup.py	Sat Feb 10 00:52:11 2007
-@@ -3,7 +3,8 @@
- from distutils.command.install import install
- from distutils.core import setup
- 
--headers = glob (os.path.join ("CXX","*.hxx"))
-+headers = glob (os.path.join ("CXX", "*.hxx")) + \
-+          glob (os.path.join ("CXX", "*.h"))
- sources = glob (os.path.join ("Src", "*.cxx")) + \
-           glob (os.path.join ("Src", "*.c"))
- 
diff --git a/devel/py-cxx/pkg-plist b/devel/py-cxx/pkg-plist
deleted file mode 100644
index 07f2cdafe755..000000000000
--- a/devel/py-cxx/pkg-plist
+++ /dev/null
@@ -1,20 +0,0 @@
-%%PYTHON_INCLUDEDIR%%/CXX/Config.hxx
-%%PYTHON_INCLUDEDIR%%/CXX/CxxDebug.hxx
-%%PYTHON_INCLUDEDIR%%/CXX/Exception.hxx
-%%PYTHON_INCLUDEDIR%%/CXX/ExtensionModule.hxx
-%%PYTHON_INCLUDEDIR%%/CXX/ExtensionOldType.hxx
-%%PYTHON_INCLUDEDIR%%/CXX/ExtensionType.hxx
-%%PYTHON_INCLUDEDIR%%/CXX/ExtensionTypeBase.hxx
-%%PYTHON_INCLUDEDIR%%/CXX/Extensions.hxx
-%%PYTHON_INCLUDEDIR%%/CXX/IndirectPythonInterface.hxx
-%%PYTHON_INCLUDEDIR%%/CXX/Objects.hxx
-%%PYTHON_INCLUDEDIR%%/CXX/PythonType.hxx
-%%PYTHON_INCLUDEDIR%%/CXX/Version.hxx
-%%PYTHON_INCLUDEDIR%%/CXX/WrapPython.h
-%%PYTHON_SITELIBDIR%%/CXX/__init__.py
-%%PYTHON_SITELIBDIR%%/CXX/__init__.pyc
-%%PYTHON_SITELIBDIR%%/CXX/__init__.pyo
-share/%%PYTHON_VERSION%%/CXX/IndirectPythonInterface.cxx
-share/%%PYTHON_VERSION%%/CXX/cxx_extensions.cxx
-share/%%PYTHON_VERSION%%/CXX/cxxextensions.c
-share/%%PYTHON_VERSION%%/CXX/cxxsupport.cxx