From 7f796a27164c8d34a05e57a7d7d8bfbe989a083b Mon Sep 17 00:00:00 2001
From: sthen <sthen@openbsd.org>
Date: Mon, 31 Oct 2022 20:02:46 +0000
Subject: [PATCH] aggregate6: adjust dependency on py-radix to allow use of the
 newer version ok job@ (maintainer)

---
 net/aggregate6/Makefile               |  4 ++--
 net/aggregate6/patches/patch-setup_py |  6 ++++--
 net/aggregate6/pkg/PLIST              | 18 ++++++++++--------
 3 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/net/aggregate6/Makefile b/net/aggregate6/Makefile
index 9d2dff9eb65..c485e86ae73 100644
--- a/net/aggregate6/Makefile
+++ b/net/aggregate6/Makefile
@@ -4,7 +4,7 @@ MODPY_EGG_VERSION=	1.0.12
 
 DISTNAME=	aggregate6-${MODPY_EGG_VERSION}
 CATEGORIES=	net
-REVISION=	2
+REVISION=	3
 
 HOMEPAGE=	https://github.com/job/aggregate6/
 
@@ -16,7 +16,7 @@ PERMIT_PACKAGE=	Yes
 MODULES=	lang/python
 
 MODPY_PI=	Yes
-MODPY_SETUPTOOLS=	Yes
+MODPY_PYBUILD=	setuptools
 
 RUN_DEPENDS=	devel/py-radix${MODPY_FLAVOR}
 
diff --git a/net/aggregate6/patches/patch-setup_py b/net/aggregate6/patches/patch-setup_py
index d2f3543bd49..04b4c6152f4 100644
--- a/net/aggregate6/patches/patch-setup_py
+++ b/net/aggregate6/patches/patch-setup_py
@@ -1,12 +1,14 @@
 Index: setup.py
 --- setup.py.orig
 +++ setup.py
-@@ -70,7 +70,7 @@ setup(
+@@ -70,8 +70,8 @@ setup(
          'Programming Language :: Python :: 3',
          'Programming Language :: Python :: 3.6'
      ],
 -    setup_requires=["nose", "coverage", "mock"],
+-    install_requires=["py-radix==0.10.0"] + (
 +    tests_require=["nose", "coverage", "mock"],
-     install_requires=["py-radix==0.10.0"] + (
++    install_requires=["py-radix>=0.10.0"] + (
          ["future", "ipaddress"] if sys.version_info.major == 2 else []
      ),
+     packages=find_packages(exclude=['tests', 'tests.*']),
diff --git a/net/aggregate6/pkg/PLIST b/net/aggregate6/pkg/PLIST
index d35f3ce6717..b9d6a5cc837 100644
--- a/net/aggregate6/pkg/PLIST
+++ b/net/aggregate6/pkg/PLIST
@@ -1,17 +1,19 @@
 bin/aggregate6
 lib/python${MODPY_VERSION}/site-packages/aggregate6/
-lib/python${MODPY_VERSION}/site-packages/aggregate6-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/aggregate6-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/aggregate6-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/aggregate6-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/aggregate6-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/entry_points.txt
-lib/python${MODPY_VERSION}/site-packages/aggregate6-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
-lib/python${MODPY_VERSION}/site-packages/aggregate6-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/aggregate6-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/aggregate6-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/aggregate6-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/aggregate6-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/aggregate6-${MODPY_EGG_VERSION}.dist-info/entry_points.txt
+lib/python${MODPY_VERSION}/site-packages/aggregate6-${MODPY_EGG_VERSION}.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/aggregate6/__init__.py
 lib/python${MODPY_VERSION}/site-packages/aggregate6/__main__.py
-lib/python${MODPY_VERSION}/site-packages/aggregate6/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/aggregate6/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/aggregate6/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/aggregate6/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/aggregate6/${MODPY_PYCACHE}__main__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/aggregate6/${MODPY_PYCACHE}__main__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/aggregate6/${MODPY_PYCACHE}aggregate6.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/aggregate6/${MODPY_PYCACHE}aggregate6.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/aggregate6/aggregate6.py
 @man man/man7/aggregate6.7