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

Collapse All | Expand All

(-)b/devel/py-setuptools/Makefile (-10 / +5 lines)
Lines 1-6 Link Here
1 
PORTNAME=	setuptools
 1 
PORTNAME=	setuptools
2 
PORTVERSION=	63.1.0
 2 
PORTVERSION=	68.0.0
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-31 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
          

        

            

              
              
              18
              
BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR}

            

            

              19
              
RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR}

            

            

              20
              

            

        

          19
          
USES=		cpe python:3.7+

          21
          
USES=		cpe python:3.7+

        

          
            

              20
              
USE_PYTHON=	allflavors autoplist concurrent distutils


              22
              
USE_PYTHON=	allflavors autoplist concurrent pep517

            

        

          21
          

          23
          

        

        

          22
          
CPE_VENDOR=	python

          24
          
CPE_VENDOR=	python

        

        

          23
          

          25
          

        

            

              24
              
MAKE_ENV+=	SETUPTOOLS_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1

              
              
            

        

          25
          
NO_ARCH=	yes

          26
          
NO_ARCH=	yes

        

            

              26
              
PYDISTUTILS_SETUP=	${PYSETUP}

              
              
            

            

              27
              

            

            

              28
              
PLIST_FILES=	"@sample %%PYTHON_SITELIBDIR%%/easy-install.pth.dist %%PYTHON_SITELIBDIR%%/easy-install.pth"

            

        

          29
          

          27
          

        

        

          30
          
.include <bsd.port.pre.mk>

          28
          
.include <bsd.port.pre.mk>

        

        

          31
          

          29
          

        

  

    
      
            Lines 39-47
          SUB_LIST+=	PYTHON_VER=${PYTHON_VER}
      
      
        Link Here
      
    
  

        

          39
          
#TEST_DEPENDS=  ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR}

          37
          
#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

          38
          
# pkg install -y py38-pytest py38-mock py38-pytest-fixture-config py38-pytest-virtualenv py38-paver

        

        

          41
          

          39
          

        

            

              42
              
post-install:

              
              
            

            

              43
              
	${INSTALL_DATA} ${FILESDIR}/easy-install.pth.dist ${STAGEDIR}${PYTHON_SITELIBDIR}/

            

            

              44
              

            

        

          45
          
do-test:

          40
          
do-test:

        

        

          46
          
	cd ${WRKSRC} && ${PYTHON_CMD} -m pytest -v -rs

          41
          
	cd ${WRKSRC} && ${PYTHON_CMD} -m pytest -v -rs

        

        

          47
          

          42
          

        



(-)b/devel/py-setuptools/distinfo
      (-3 / +3 lines)




  

    
      
            Lines 1-3
          
      
      
        Link Here
      
    
  

          
            

              1
              
TIMESTAMP = 1657634036


              1
              
TIMESTAMP = 1687390055

            

            

              2
              
SHA256 (python/setuptools-63.1.0.tar.gz) = 16923d366ced322712c71ccb97164d07472abeecd13f3a6c283f6d5d26722793


              2
              
SHA256 (python/setuptools-68.0.0.tar.gz) = baf1fdb41c6da4cd2eae722e135500da913332ab3f2f5c7d33af9b492acb5235

            

            

              3
              
SIZE (python/setuptools-63.1.0.tar.gz) = 2599380


              3
              
SIZE (python/setuptools-68.0.0.tar.gz) = 2194111

            



(-)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
      (-11 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
              
 

            






  

  Return to bug 270358