On Sat, 27 Aug 2016 18:08:32 +0200, Daniel Jakots <danj+o...@chown.me>
wrote:
> Hi,
>
> I'd like to update py-setuptools to not to lag too much on upstream. I
> cooked a diff that I used on a test machine (i386 fwiw).
This time it's attached to it won't get mangled.
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/py-setuptools/Makefile,v
retrieving revision 1.28
diff -u -p -r1.28 Makefile
--- Makefile 29 Sep 2015 10:52:11 -0000 1.28
+++ Makefile 26 Aug 2016 15:18:18 -0000
@@ -2,13 +2,12 @@
COMMENT= simplified packaging system for Python modules
-MODPY_EGG_VERSION= 18.2
+MODPY_EGG_VERSION= 26.0.0
DISTNAME= setuptools-${MODPY_EGG_VERSION}
PKGNAME= py-${DISTNAME:S/c/./}
EPOCH = 0
CATEGORIES= devel
PKG_ARCH= *
-REVISION= 0
MODPY_PI = Yes
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/py-setuptools/distinfo,v
retrieving revision 1.10
diff -u -p -r1.10 distinfo
--- distinfo 29 Sep 2015 08:49:37 -0000 1.10
+++ distinfo 26 Aug 2016 15:18:18 -0000
@@ -1,2 +1,2 @@
-SHA256 (setuptools-18.2.tar.gz) = CZSljfJ+pdxSN4KmATV6IZi3ST3MmaMNUYJ6I1hbWx0=
-SIZE (setuptools-18.2.tar.gz) = 630990
+SHA256 (setuptools-26.0.0.tar.gz) = RbUC1/OWrHtg3x8dW9Afkopr1ZeXJfosZT3ZP+ts1oY=
+SIZE (setuptools-26.0.0.tar.gz) = 632557
Index: patches/patch-setup_py
===================================================================
RCS file: /cvs/ports/devel/py-setuptools/patches/patch-setup_py,v
retrieving revision 1.4
diff -u -p -r1.4 patch-setup_py
--- patches/patch-setup_py 29 Sep 2015 08:49:37 -0000 1.4
+++ patches/patch-setup_py 26 Aug 2016 15:18:18 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-setup_py,v 1.4 2015/09/29 08:49:37 edd Exp $
---- setup.py.orig Sat Aug 22 12:30:32 2015
-+++ setup.py Sat Aug 22 12:30:38 2015
-@@ -85,7 +85,7 @@ setup_params = dict(
+--- setup.py.orig Sun Aug 21 00:28:03 2016
++++ setup.py Fri Aug 26 16:28:07 2016
+@@ -102,7 +102,7 @@ setup_params = dict(
py_modules=['easy_install'],
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/py-setuptools/pkg/PLIST,v
retrieving revision 1.10
diff -u -p -r1.10 PLIST
--- pkg/PLIST 29 Sep 2015 08:49:37 -0000 1.10
+++ pkg/PLIST 26 Aug 2016 15:18:18 -0000
@@ -5,12 +5,6 @@
bin/easy_install-${MODPY_VERSION}
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}/
lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}easy_install.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/_markerlib/
-lib/python${MODPY_VERSION}/site-packages/_markerlib/__init__.py
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/_markerlib/${MODPY_PYCACHE}/
-lib/python${MODPY_VERSION}/site-packages/_markerlib/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/_markerlib/${MODPY_PYCACHE}markers.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/_markerlib/markers.py
lib/python${MODPY_VERSION}/site-packages/easy_install.py
lib/python${MODPY_VERSION}/site-packages/pkg_resources/
lib/python${MODPY_VERSION}/site-packages/pkg_resources/__init__.py
@@ -20,6 +14,8 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/pkg_resources/_vendor/__init__.py
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pkg_resources/_vendor/${MODPY_PYCACHE}/
lib/python${MODPY_VERSION}/site-packages/pkg_resources/_vendor/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pkg_resources/_vendor/${MODPY_PYCACHE}pyparsing.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pkg_resources/_vendor/${MODPY_PYCACHE}six.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/pkg_resources/_vendor/packaging/
lib/python${MODPY_VERSION}/site-packages/pkg_resources/_vendor/packaging/__about__.py
lib/python${MODPY_VERSION}/site-packages/pkg_resources/_vendor/packaging/__init__.py
@@ -28,12 +24,24 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/pkg_resources/_vendor/packaging/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/pkg_resources/_vendor/packaging/${MODPY_PYCACHE}_compat.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/pkg_resources/_vendor/packaging/${MODPY_PYCACHE}_structures.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pkg_resources/_vendor/packaging/${MODPY_PYCACHE}markers.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pkg_resources/_vendor/packaging/${MODPY_PYCACHE}requirements.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/pkg_resources/_vendor/packaging/${MODPY_PYCACHE}specifiers.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pkg_resources/_vendor/packaging/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/pkg_resources/_vendor/packaging/${MODPY_PYCACHE}version.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/pkg_resources/_vendor/packaging/_compat.py
lib/python${MODPY_VERSION}/site-packages/pkg_resources/_vendor/packaging/_structures.py
+lib/python${MODPY_VERSION}/site-packages/pkg_resources/_vendor/packaging/markers.py
+lib/python${MODPY_VERSION}/site-packages/pkg_resources/_vendor/packaging/requirements.py
lib/python${MODPY_VERSION}/site-packages/pkg_resources/_vendor/packaging/specifiers.py
+lib/python${MODPY_VERSION}/site-packages/pkg_resources/_vendor/packaging/utils.py
lib/python${MODPY_VERSION}/site-packages/pkg_resources/_vendor/packaging/version.py
+lib/python${MODPY_VERSION}/site-packages/pkg_resources/_vendor/pyparsing.py
+lib/python${MODPY_VERSION}/site-packages/pkg_resources/_vendor/six.py
+lib/python${MODPY_VERSION}/site-packages/pkg_resources/extern/
+lib/python${MODPY_VERSION}/site-packages/pkg_resources/extern/__init__.py
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pkg_resources/extern/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/pkg_resources/extern/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/setuptools/
lib/python${MODPY_VERSION}/site-packages/setuptools-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
lib/python${MODPY_VERSION}/site-packages/setuptools-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
@@ -47,12 +55,12 @@ lib/python${MODPY_VERSION}/site-packages
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/setuptools/${MODPY_PYCACHE}/
lib/python${MODPY_VERSION}/site-packages/setuptools/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/setuptools/${MODPY_PYCACHE}archive_util.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/setuptools/${MODPY_PYCACHE}compat.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/setuptools/${MODPY_PYCACHE}depends.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/setuptools/${MODPY_PYCACHE}dist.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/setuptools/${MODPY_PYCACHE}extension.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/setuptools/${MODPY_PYCACHE}launch.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/setuptools/${MODPY_PYCACHE}lib2to3_ex.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/setuptools/${MODPY_PYCACHE}msvc9_support.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/setuptools/${MODPY_PYCACHE}msvc.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/setuptools/${MODPY_PYCACHE}package_index.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/setuptools/${MODPY_PYCACHE}py26compat.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/setuptools/${MODPY_PYCACHE}py27compat.${MODPY_PYC_MAGIC_TAG}pyc
@@ -88,6 +96,7 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/setuptools/command/${MODPY_PYCACHE}sdist.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/setuptools/command/${MODPY_PYCACHE}setopt.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/setuptools/command/${MODPY_PYCACHE}test.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/setuptools/command/${MODPY_PYCACHE}upload.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/setuptools/command/${MODPY_PYCACHE}upload_docs.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/setuptools/command/alias.py
lib/python${MODPY_VERSION}/site-packages/setuptools/command/bdist_egg.py
@@ -108,13 +117,18 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/setuptools/command/sdist.py
lib/python${MODPY_VERSION}/site-packages/setuptools/command/setopt.py
lib/python${MODPY_VERSION}/site-packages/setuptools/command/test.py
+lib/python${MODPY_VERSION}/site-packages/setuptools/command/upload.py
lib/python${MODPY_VERSION}/site-packages/setuptools/command/upload_docs.py
-lib/python${MODPY_VERSION}/site-packages/setuptools/compat.py
lib/python${MODPY_VERSION}/site-packages/setuptools/depends.py
lib/python${MODPY_VERSION}/site-packages/setuptools/dist.py
lib/python${MODPY_VERSION}/site-packages/setuptools/extension.py
+lib/python${MODPY_VERSION}/site-packages/setuptools/extern/
+lib/python${MODPY_VERSION}/site-packages/setuptools/extern/__init__.py
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/setuptools/extern/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/setuptools/extern/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/setuptools/launch.py
lib/python${MODPY_VERSION}/site-packages/setuptools/lib2to3_ex.py
-lib/python${MODPY_VERSION}/site-packages/setuptools/msvc9_support.py
+lib/python${MODPY_VERSION}/site-packages/setuptools/msvc.py
lib/python${MODPY_VERSION}/site-packages/setuptools/package_index.py
lib/python${MODPY_VERSION}/site-packages/setuptools/py26compat.py
lib/python${MODPY_VERSION}/site-packages/setuptools/py27compat.py
