git: 029f12637419 - main - devel/py-pip: Clean up Makefile after 6c401020d1946446ed7f46742d7dca78c201408f (python36 removal)

The branch main has been updated by sunpoet:

URL: https://cgit.FreeBSD.org/ports/commit/?id=029f12637419af3acdc2ba2dc73541ab29db73c7

commit 029f12637419af3acdc2ba2dc73541ab29db73c7
Author:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
AuthorDate: 2022-01-11 17:37:46 +0000
Commit:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
CommitDate: 2022-01-11 18:47:26 +0000

    devel/py-pip: Clean up Makefile after 6c401020d1946446ed7f46742d7dca78c201408f (python36 removal)
---
 devel/py-pip/Makefile                   |  9 +--------
 devel/py-pip/files/extra-patch-python36 | 11 -----------
 2 files changed, 1 insertion(+), 19 deletions(-)

diff --git a/devel/py-pip/Makefile b/devel/py-pip/Makefile
index 494563f86c74..cb0c4a8855a7 100644
--- a/devel/py-pip/Makefile
+++ b/devel/py-pip/Makefile
@@ -60,13 +60,6 @@ DOCS_PORTDOCS=		*
 DOCS_VARS=		PYDISTUTILS_BUILD_TARGET=build_sphinx \
 			PYDISTUTILS_BUILDARGS="-n --all-files --fresh-env"
 
-.include <bsd.port.pre.mk>
-
-.if ${PYTHON_REL} < 30700 && ${PORT_OPTIONS:MDOCS}
-BUILD_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}future-annotations>=0:devel/py-future-annotations@${PY_FLAVOR}
-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-python36
-.endif
-
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	(cd ${WRKSRC}/build/sphinx/html && \
@@ -80,4 +73,4 @@ do-test:
 	${LN} -sf ${LOCALBASE}/bin/pip ${LOCALBASE}/bin/pip3
 	cd ${WRKSRC} && ${PYTHON_CMD} -m pytest -v -rs
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/py-pip/files/extra-patch-python36 b/devel/py-pip/files/extra-patch-python36
deleted file mode 100644
index 2e8a97bca88b..000000000000
--- a/devel/py-pip/files/extra-patch-python36
+++ /dev/null
@@ -1,11 +0,0 @@
---- docs/docs_feedback_sphinxext.py.orig	2021-01-23 11:51:53 UTC
-+++ docs/docs_feedback_sphinxext.py
-@@ -1,6 +1,7 @@
-+# -*- coding: future_annotations -*-
- """A sphinx extension for collecting per doc feedback."""
- 
--from __future__ import annotations
-+import future_annotations
- 
- from itertools import chain
- from typing import TYPE_CHECKING