diff --git a/databases/py-gdbm/Makefile b/databases/py-gdbm/Makefile
index 107ed2a86f1b..eb6c9d6369a5 100644
--- a/databases/py-gdbm/Makefile
+++ b/databases/py-gdbm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2019/12/15 14:42:27 adam Exp $
+# $NetBSD: Makefile,v 1.41 2020/01/08 13:44:41 joerg Exp $
 
 PKGNAME=	${PYPKGPREFIX}-gdbm-${PY_DISTVERSION}
 PKGREVISION=	1
@@ -8,8 +8,6 @@ MAINTAINER=	dolecek@ics.muni.cz
 HOMEPAGE=	https://docs.python.org/3/library/dbm.html#module-dbm.gnu
 COMMENT=	Python interface to gdbm - GNU database manager
 
-USE_TOOLS+=	patch
-
 .include "../../lang/python/pyversion.mk"
 .if !empty(PYPKGPREFIX:Mpy3?)
 GDBM_MODNAME=	_gdbm
@@ -17,7 +15,6 @@ GDBM_MODNAME=	_gdbm
 GDBM_MODNAME=	gdbm
 .endif
 
-EXTRACT_ELEMENTS=	${PYSUBDIR}/Modules/${GDBM_MODNAME}module.c
 PYDISTUTILSPKG=		yes
 
 PY_SETUP_SUBST+=	GDBMPREFIX=${BUILDLINK_PREFIX.gdbm}
@@ -25,14 +22,6 @@ PY_SETUP_SUBST+=	GDBM_MODNAME=${GDBM_MODNAME}
 PLIST_SUBST+=		GDBM_MODNAME=${GDBM_MODNAME}
 PYSETUPINSTALLARGS+=	--install-lib ${PREFIX}/${PYLIB}/lib-dynload
 
-# ignore errors due to missing files (EXTRACT_ELEMENTS!)
-do-patch:
-	set -e;								\
-	cd ${WRKSRC};							\
-	for f in ${PATCHDIR}/patch-*; do				\
-		${PATCH} --batch < "$$f" || ${TRUE};			\
-	done
-
 .include "../../databases/gdbm/buildlink3.mk"
 .include "../../lang/python/extension.mk"
 .include "../../lang/python/srcdist.mk"
diff --git a/databases/py-sqlite3/Makefile b/databases/py-sqlite3/Makefile
index 5b9e6e034363..9eb31a6915b0 100644
--- a/databases/py-sqlite3/Makefile
+++ b/databases/py-sqlite3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2019/11/02 15:38:10 rillig Exp $
+# $NetBSD: Makefile,v 1.36 2020/01/08 13:44:41 joerg Exp $
 
 PKGNAME=	${PYPKGPREFIX}-sqlite3-${PY_DISTVERSION}
 PKGREVISION=	15
@@ -9,23 +9,12 @@ HOMEPAGE=	https://www.python.org/
 COMMENT=	Built-in sqlite support for Python 2.5 and up
 
 USE_GCC_RUNTIME=	yes
-USE_TOOLS+=		patch
-
-EXTRACT_ELEMENTS=	${PYSUBDIR}/Modules/_sqlite
 
 # part of python itself; using distutils.mk will install a useless egg
 PYDISTUTILSPKG=		yes
 PY_SETUP_SUBST+=	SQLITE_PREFIX=${BUILDLINK_PREFIX.sqlite3}
 PYSETUPINSTALLARGS+=	--install-lib ${PREFIX}/${PYLIB}/lib-dynload
 
-# ignore errors due to missing files (EXTRACT_ELEMENTS!)
-do-patch:
-	set -e;								\
-	cd ${WRKSRC};							\
-	for f in ${PATCHDIR}/patch-*; do				\
-		${PATCH} --batch < "$$f" || ${TRUE};			\
-	done
-
 .include "../../databases/sqlite3/buildlink3.mk"
 .include "../../lang/python/extension.mk"
 .include "../../lang/python/srcdist.mk"
diff --git a/devel/py-curses/Makefile b/devel/py-curses/Makefile
index 4da04cafec17..d4da423d7457 100644
--- a/devel/py-curses/Makefile
+++ b/devel/py-curses/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.50 2019/12/15 14:42:27 adam Exp $
+# $NetBSD: Makefile,v 1.51 2020/01/08 13:44:41 joerg Exp $
 
 PKGNAME=	${PYPKGPREFIX}-curses-${PY_DISTVERSION}
 PKGREVISION=	5
@@ -8,7 +8,6 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 #HOMEPAGE=	https://www.python.org/doc/current/lib/module-curses.html
 COMMENT=	Curses module for Python
 
-EXTRACT_ELEMENTS=	${PYSUBDIR}/Modules/_cursesmodule.c
 PYDISTUTILSPKG=		yes
 PY_PATCHPLIST=		yes
 
@@ -20,14 +19,6 @@ FAKE_NCURSES=	yes
 PY_SETUP_SUBST=		NCURSESPREFIX=${BUILDLINK_PREFIX.ncurses}
 PYSETUPINSTALLARGS+=	--install-lib ${PREFIX}/${PYLIB}/lib-dynload
 
-# ignore errors due to missing files (EXTRACT_ELEMENTS!)
-do-patch:
-	set -e;								\
-	cd ${WRKSRC};							\
-	for f in ${PATCHDIR}/patch-*; do				\
-		${PATCH} --batch < "$$f" || ${TRUE};			\
-	done
-
 .include "../../lang/python/extension.mk"
 .include "../../lang/python/srcdist.mk"
 .include "../../mk/curses.buildlink3.mk"
diff --git a/devel/py-cursespanel/Makefile b/devel/py-cursespanel/Makefile
index f25d7c50677b..8d04bb420474 100644
--- a/devel/py-cursespanel/Makefile
+++ b/devel/py-cursespanel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2019/12/15 14:42:27 adam Exp $
+# $NetBSD: Makefile,v 1.34 2020/01/08 13:44:41 joerg Exp $
 
 PKGNAME=	${PYPKGPREFIX}-cursespanel-${PY_DISTVERSION}
 PKGREVISION=	4
@@ -13,19 +13,11 @@ DEPENDS+=	${PYPKGPREFIX}-curses-[0-9]*:../../devel/py-curses
 USE_CURSES=	getsyx
 FAKE_NCURSES=	yes
 
-EXTRACT_ELEMENTS=	${PYSUBDIR}/Modules/_curses_panel.c
 PYDISTUTILSPKG=		yes
 
 PY_SETUP_SUBST=		NCURSESPREFIX=${BUILDLINK_PREFIX.ncurses}
 PYSETUPINSTALLARGS+=	--install-lib ${PREFIX}/${PYLIB}/lib-dynload
 
-# ignore errors due to missing files (EXTRACT_ELEMENTS!)
-do-patch:
-	(cd ${WRKSRC}; \
-	for f in ${PATCHDIR}/patch-*;do \
-	${PATCH} --batch <$$f || ${TRUE}; \
-	done)
-
 .include "../../lang/python/extension.mk"
 .include "../../lang/python/srcdist.mk"
 .include "../../mk/curses.buildlink3.mk"
diff --git a/devel/py-idle/Makefile b/devel/py-idle/Makefile
index 5d848d8c2fd3..7d8f68d9ba75 100644
--- a/devel/py-idle/Makefile
+++ b/devel/py-idle/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2019/11/03 10:18:28 rillig Exp $
+# $NetBSD: Makefile,v 1.39 2020/01/08 13:44:41 joerg Exp $
 
 PKGNAME=	${PYPKGPREFIX}-idle-${PY_DISTVERSION}
 CATEGORIES=	devel python
@@ -11,13 +11,6 @@ DEPENDS+=	${PYPKGPREFIX}-Tk-[0-9]*:../../x11/py-Tk
 
 PY_PATCHPLIST=	yes
 
-# ignore errors due to missing files (EXTRACT_ELEMENTS!)
-do-patch:
-	(cd ${WRKSRC}; \
-	for f in ${PATCHDIR}/patch-*;do \
-	${PATCH} --batch <$$f || ${TRUE}; \
-	done)
-
 #
 # With Python-2.3 and up, the Idle code is part of the base library.
 # We just install a wrapper script. Also, threads are required now.
@@ -31,7 +24,6 @@ IDLE_NAME=	idle3
 IDLE_NAME=	idle
 .endif
 
-EXTRACT_ELEMENTS=	${PYSUBDIR}/Tools/scripts/${IDLE_NAME}
 REPLACE_PYTHON=		Tools/scripts/${IDLE_NAME}
 NO_BUILD=		yes
 INSTALLATION_DIRS=	bin
diff --git a/devel/py-readline/Makefile b/devel/py-readline/Makefile
index 2dd9ef5294db..be96916054c7 100644
--- a/devel/py-readline/Makefile
+++ b/devel/py-readline/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2019/12/15 14:42:26 adam Exp $
+# $NetBSD: Makefile,v 1.35 2020/01/08 13:44:41 joerg Exp $
 
 PKGNAME=	${PYPKGPREFIX}-readline-${PY_DISTVERSION}
 CATEGORIES=	devel misc python
@@ -7,8 +7,6 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://docs.python.org/3/library/readline.html
 COMMENT=	Line editing support for Python
 
-EXTRACT_ELEMENTS=	${PYSUBDIR}/Modules/readline.c
-
 USE_GCC_RUNTIME=	yes
 
 PYDISTUTILSPKG=		yes
@@ -16,13 +14,6 @@ PY_SETUP_SUBST+=	RLPREFIX=${BUILDLINK_PREFIX.readline}
 PY_SETUP_SUBST+=	RLRTPREFIX=${BUILDLINK_PREFIX.readline}
 PYSETUPINSTALLARGS+=	--install-lib ${PREFIX}/${PYLIB}/lib-dynload
 
-# ignore errors due to missing files (EXTRACT_ELEMENTS!)
-do-patch:
-	(cd ${WRKSRC}; \
-	for f in ${PATCHDIR}/patch-*;do \
-	${PATCH} --batch <$$f || ${TRUE}; \
-	done)
-
 .include "../../devel/readline/buildlink3.mk"
 .include "../../lang/python/extension.mk"
 .include "../../lang/python/srcdist.mk"
diff --git a/lang/python/srcdist.mk b/lang/python/srcdist.mk
index 01379b64f70e..6b5b94496138 100644
--- a/lang/python/srcdist.mk
+++ b/lang/python/srcdist.mk
@@ -1,4 +1,4 @@
-# $NetBSD: srcdist.mk,v 1.39 2019/12/15 14:42:26 adam Exp $
+# $NetBSD: srcdist.mk,v 1.40 2020/01/08 13:44:41 joerg Exp $
 
 .include "../../lang/python/pyversion.mk"
 
@@ -11,10 +11,6 @@ WRKSRC=		${WRKDIR}/${PYSUBDIR}
 # This is used for standard modules shipped with Python but build as
 # separate packages.
 
-.  if ${_PYTHON_VERSION} != 27
-EXTRACT_ELEMENTS+=	${PYSUBDIR}/Modules/clinic
-.  endif
-
 # Standard modules depend on their own version
 BUILDLINK_API_DEPENDS.${PYPACKAGE}+=	${PYPACKAGE}>=${PY_DISTVERSION}
 BUILDLINK_ABI_DEPENDS.${PYPACKAGE}+=	${PYPACKAGE}>=${PY_DISTVERSION}
@@ -23,5 +19,5 @@ python-std-patchsetup:
 	${SED} ${PY_SETUP_SUBST:S/=/@!/:S/$/!g/:S/^/ -e s!@/} \
 		<${FILESDIR}/setup.py >${WRKSRC}/setup.py
 
-post-extract: python-std-patchsetup
+post-patch: python-std-patchsetup
 .endif
diff --git a/textproc/py-cElementTree/Makefile b/textproc/py-cElementTree/Makefile
index daea215465bd..9c2d543d7f91 100644
--- a/textproc/py-cElementTree/Makefile
+++ b/textproc/py-cElementTree/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2020/01/03 08:03:59 adam Exp $
+# $NetBSD: Makefile,v 1.17 2020/01/08 13:44:42 joerg Exp $
 
 PKGNAME=	${PYPKGPREFIX}-cElementTree-${PY_DISTVERSION}
 CATEGORIES=	textproc python
@@ -7,10 +7,7 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.effbot.org/zone/celementtree.htm
 COMMENT=	C implementation of Python ElementTree API
 
-EXTRACT_ELEMENTS=	${PYSUBDIR}/Modules/_elementtree.c
-
 USE_GCC_RUNTIME=	yes
-USE_TOOLS+=		patch
 
 PYDISTUTILSPKG=		yes
 PY_SETUP_SUBST+=	EXPATPREFIX=${BUILDLINK_DIR}
@@ -18,13 +15,6 @@ PY_SETUP_SUBST+=	EXPATRTPREFIX=${BUILDLINK_PREFIX.expat}
 
 PYSETUPINSTALLARGS+=	--install-lib ${PREFIX}/${PYLIB}/lib-dynload
 
-# ignore errors due to missing files (EXTRACT_ELEMENTS!)
-do-patch:
-	(cd ${WRKSRC}; \
-	for f in ${PATCHDIR}/patch-*;do \
-	${PATCH} --batch <$$f || ${TRUE}; \
-	done)
-
 .include "../../textproc/expat/buildlink3.mk"
 .include "../../lang/python/extension.mk"
 .include "../../lang/python/srcdist.mk"
diff --git a/textproc/py-expat/Makefile b/textproc/py-expat/Makefile
index 6bd45f8df2db..00b24057de35 100644
--- a/textproc/py-expat/Makefile
+++ b/textproc/py-expat/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2019/11/04 21:43:45 rillig Exp $
+# $NetBSD: Makefile,v 1.30 2020/01/08 13:44:42 joerg Exp $
 
 PKGNAME=	${PYPKGPREFIX}-expat-${PY_DISTVERSION}
 CATEGORIES=	textproc python
@@ -7,12 +7,6 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://www.python.org/
 COMMENT=	Python interface to expat
 
-EXTRACT_ELEMENTS=	${PYSUBDIR}/Modules/pyexpat.c
-.include "../../lang/python/pyversion.mk"
-.if ${_PYTHON_VERSION} != 27
-EXTRACT_ELEMENTS+=	${PYSUBDIR}/Modules/clinic/pyexpat.c.h
-.endif
-
 USE_GCC_RUNTIME=	yes
 
 PYDISTUTILSPKG=		yes
diff --git a/x11/py-Tk/Makefile b/x11/py-Tk/Makefile
index a83d083e8b0f..81da4e38fc5c 100644
--- a/x11/py-Tk/Makefile
+++ b/x11/py-Tk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.69 2020/01/03 06:24:42 adam Exp $
+# $NetBSD: Makefile,v 1.70 2020/01/08 13:44:42 joerg Exp $
 
 PKGNAME=	${PYPKGPREFIX}-Tk-${PY_DISTVERSION}
 PKGREVISION=	5
@@ -11,8 +11,6 @@ LICENSE=	python-software-foundation
 
 USE_GCC_RUNTIME=	yes
 
-EXTRACT_ELEMENTS=	${PYSUBDIR}/Modules/_tkinter.c \
-			${PYSUBDIR}/Modules/tkappinit.c
 PYDISTUTILSPKG=		yes
 PY_SETUP_SUBST+=	BLPREFIX=${LOCALBASE}
 PY_SETUP_SUBST+=	TCLRTPREFIX=${BUILDLINK_PREFIX.tcl}
@@ -30,17 +28,6 @@ PY_SETUP_SUBST+=	X11LIB=\'X11\'
 .endif
 
 .include "../../lang/python/extension.mk"
-
-.if ${_PYTHON_VERSION} >= 27
-EXTRACT_ELEMENTS+=	${PYSUBDIR}/Modules/tkinter.h
-.endif
-
-# ignore errors due to missing files (EXTRACT_ELEMENTS!)
-do-patch:
-	set -e; cd ${WRKSRC} && for f in ${PATCHDIR}/patch-*; do \
-	${PATCH} ${PATCHARGS} --batch <$$f || ${TRUE}; \
-	done
-
 .include "../../lang/python/srcdist.mk"
 .include "../../lang/tcl/buildlink3.mk"
 .include "../../x11/tk/buildlink3.mk"