View | Details | Raw Unified | Return to bug 270358 | Differences between
and this patch

Collapse All | Expand All

(-)b/devel/py-setuptools/Makefile (-14 / +9 lines)
Lines 1-6 Link Here
1
PORTNAME=	setuptools
1
PORTNAME=	setuptools
2
PORTVERSION=	63.1.0
2
PORTVERSION=	69.0.2
3
PORTREVISION=	1
4
CATEGORIES=	devel python
3
CATEGORIES=	devel python
5
MASTER_SITES=	PYPI
4
MASTER_SITES=	PYPI
6
PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
5
PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
Lines 16-33 WWW= https://pypi.org/project/setuptools/ Link Here
16
LICENSE=	MIT
15
LICENSE=	MIT
17
LICENSE_FILE=	${WRKSRC}/LICENSE
16
LICENSE_FILE=	${WRKSRC}/LICENSE
18
17
19
USES=		cpe python
18
BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR}
20
USE_PYTHON=	allflavors autoplist concurrent distutils
19
RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR}
21
20
21
USES=		cpe python
22
CPE_VENDOR=	python
22
CPE_VENDOR=	python
23
USE_PYTHON=	allflavors autoplist concurrent pep517
23
24
24
MAKE_ENV+=	SETUPTOOLS_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1
25
NO_ARCH=	yes
25
NO_ARCH=	yes
26
PYDISTUTILS_SETUP=	${PYSETUP}
27
26
28
PLIST_FILES=	"@sample %%PYTHON_SITELIBDIR%%/easy-install.pth.dist %%PYTHON_SITELIBDIR%%/easy-install.pth"
27
.include <bsd.port.options.mk>
29
30
.include <bsd.port.pre.mk>
31
28
32
.if ${FLAVOR} != ${FLAVORS:[1]}
29
.if ${FLAVOR} != ${FLAVORS:[1]}
33
SUB_FILES+=	pkg-message
30
SUB_FILES+=	pkg-message
Lines 39-48 SUB_LIST+= PYTHON_VER=${PYTHON_VER} Link Here
39
#TEST_DEPENDS=  ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR}
36
#TEST_DEPENDS=  ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR}
40
# pkg install -y py38-pytest py38-mock py38-pytest-fixture-config py38-pytest-virtualenv py38-paver
37
# pkg install -y py38-pytest py38-mock py38-pytest-fixture-config py38-pytest-virtualenv py38-paver
41
38
42
post-install:
43
	${INSTALL_DATA} ${FILESDIR}/easy-install.pth.dist ${STAGEDIR}${PYTHON_SITELIBDIR}/
44
45
do-test:
39
do-test:
46
	cd ${WRKSRC} && ${PYTHON_CMD} -m pytest -v -rs
40
	cd ${WRKSRC} && \
41
		${PYTHON_CMD} -m pytest -v -rs
47
42
48
.include <bsd.port.post.mk>
43
.include <bsd.port.mk>
(-)b/devel/py-setuptools/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1657634036
1
TIMESTAMP = 1701219846
2
SHA256 (python/setuptools-63.1.0.tar.gz) = 16923d366ced322712c71ccb97164d07472abeecd13f3a6c283f6d5d26722793
2
SHA256 (python/setuptools-69.0.2.tar.gz) = 735896e78a4742605974de002ac60562d286fa8051a7e2299445e8e8fbb01aa6
3
SIZE (python/setuptools-63.1.0.tar.gz) = 2599380
3
SIZE (python/setuptools-69.0.2.tar.gz) = 2219248
(-)a/devel/py-setuptools/files/easy-install.pth.dist (-2 lines)
Removed Link Here
1
import sys; sys.__plen = len(sys.path)
2
import sys; new=sys.path[sys.__plen:]; del sys.path[sys.__plen:]; p=getattr(sys,'__egginsert',0); sys.path[p:p]=new; sys.__egginsert = p+len(new)
(-)a/devel/py-setuptools/files/patch-setuptools_package__index.py (-12 lines)
Removed Link Here
1
--- setuptools/package_index.py.orig	2022-07-04 02:25:25 UTC
2
+++ setuptools/package_index.py
3
@@ -197,7 +197,7 @@ def unique_values(func):
4
     return wrapper
5
 
6
 
7
-REL = re.compile(r"""<([^>]*\srel\s*=\s*['"]?([^'">]+)[^>]*)>""", re.I)
8
+REL = re.compile(r"""<([^>]*\srel\s{0,10}=\s{0,10}['"]?([^'" >]+)[^>]*)>""", re.I)
9
 # this line is here to fix emacs' cruddy broken syntax highlighting
10
 
11
 
12
- 

Return to bug 270358