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

Collapse All | Expand All

(-)b/devel/py-setuptools/Makefile (-21 / +23 lines)
Lines 1-6 Link Here
1 
PORTNAME=	setuptools
 1 
PORTNAME=	setuptools
2 
PORTVERSION=	63.1.0
 2 
DISTVERSION=	75.3.0
3 
PORTREVISION=	2
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-48 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=	${_CORE_DEPENDS}

            

            

              20
              
USE_PYTHON=	allflavors autoplist concurrent distutils


              19
              
RUN_DEPENDS=	${_CORE_DEPENDS}

            

        

          21
          

          20
          

        

            

              
              
              21
              
USES=		cpe python

            

        

          22
          
CPE_VENDOR=	python

          22
          
CPE_VENDOR=	python

        

            

              
              
              23
              
USE_PYTHON=	allflavors autoplist concurrent pep517 pytest

            

            

              24
              

            

            

              25
              
EXTRACT_AFTER_ARGS=	${_DIST_EXCLUDES:S,^,--exclude setuptools/_vendor/,}

            

        

          23
          

          26
          

        

            

              24
              
MAKE_ENV+=	SETUPTOOLS_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1

              
              
            

        

          25
          
NO_ARCH=	yes

          27
          
NO_ARCH=	yes

        

            

              26
              
PYDISTUTILS_SETUP=	${PYSETUP}

              
              
            

        

          27
          

          28
          

        

          
            

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


              29
              
_CORE_DEPENDS=	${PYTHON_PKGNAMEPREFIX}more-itertools>=8.8:devel/py-more-itertools@${PY_FLAVOR} \

            

            

              
              

              30
              
		${PYTHON_PKGNAMEPREFIX}packaging>=24:devel/py-packaging@${PY_FLAVOR} \

            

            


              31
              
		${PYTHON_PKGNAMEPREFIX}wheel>=0.43.0:devel/py-wheel@${PY_FLAVOR}

            

            


              32
              
# circular dependencies:

            

            


              33
              
#_CORE_DEPENDS=	${PYTHON_PKGNAMEPREFIX}jaraco.text>=3.7:devel/py-jaraco.text@${PY_FLAVOR} \

            

            


              34
              
#		${PYTHON_PKGNAMEPREFIX}platformdirs>=4.2.2:devel/py-platformdirs@${PY_FLAVOR}

            

            


              35
              
_DIST_EXCLUDES=	importlib_metadata* importlib_resources* more_itertools* \

            

            


              36
              
		packaging* tomli* wheel* zipp*

            

        

          29
          

          37
          

        

        

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

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

        

        

          31
          

          39
          

        

          
            

              32
              
.if ${FLAVOR} != ${FLAVORS:[1]}


              40
              
.if ${PYTHON_REL} < 30900

            

            

              33
              
SUB_FILES+=	pkg-message


              41
              
_CORE_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}importlib-resources>=5.10.2:devel/py-importlib-resources@${PY_FLAVOR}

            

            

              34
              
SUB_LIST+=	PYTHON_VER=${PYTHON_VER}


              42
              
.endif

            

            

              
              

              43
              
.if ${PYTHON_REL} < 31000

            

            


              44
              
_CORE_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}importlib-metadata>=6:devel/py-importlib-metadata@${PY_FLAVOR}

            

            


              45
              
.endif

            

            


              46
              
.if ${PYTHON_REL} < 31100

            

            


              47
              
_CORE_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}tomli>=2.0.1:textproc/py-tomli@${PY_FLAVOR}

            

        

          35
          
.endif

          48
          
.endif

        

            

              36
              

              
              
            

            

              37
              
# These create dependency loops in redports/poudriere, because setuptools

            

            

              38
              
# is currently an explicit BUILD & RUN dependency in Uses/python.mk.

            

            

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

            

            

              41
              

            

            

              42
              
post-install:

            

            

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

            

            

              44
              

            

            

              45
              
do-test:

            

            

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

            

        

          47
          

          49
          

        

        

          48
          
.include <bsd.port.post.mk>

          50
          
.include <bsd.port.post.mk>

        



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




  

    
      
            Lines 1-3
          
      
      
        Link Here
      
    
  

          
            

              1
              
TIMESTAMP = 1657634036


              1
              
TIMESTAMP = 1741858617

            

            

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


              2
              
SHA256 (python/setuptools-75.3.0.tar.gz) = fba5dd4d766e97be1b1681d98712680ae8f2f26d7881245f2ce9e40714f1a686

            

            

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


              3
              
SIZE (python/setuptools-75.3.0.tar.gz) = 1351577

            



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

            



(-)a/devel/py-setuptools/files/pkg-message.in
      (-9 lines)




  

    
      
          Removed
      
      
        Link Here
      
    
  

            

              1
              
[

            

            

              2
              
{ type: install

            

            

              3
              
  message: <<EOM

            

            

              4
              
  Only %%PREFIX%%/bin/easy_install-%%PYTHON_VER%% script has been installed

            

            

              5
              
  since Python %%PYTHON_VER%% is not the default Python version.

            

            

              6
              
EOM

            

            

              7
              
}

            

            

              8
              
]

            

            

              9
              
- 

            






  

  Return to bug 270358