On Mon, 09 Mar 2020, Stuart Henderson wrote:
> On 2020/03/08 18:47, Paco Esteban wrote:
> > Hi ports@,
> >
> > Here's an update for www/py-multidict to 4.7.5
>
> Could you convert to new-style FLAVOR=python3 / FLAVORS=python3 while there
> please?
> (depends in py-yarl, py-aiohttp, py-gunicorn will need bumps and
> ${MODPY_FLAVOR}
> adding to the multidict line).
>
> > --- pkg/PLIST 26 Apr 2018 13:05:38 -0000 1.3
> > +++ pkg/PLIST 6 Mar 2020 18:22:56 -0000
> > @@ -1,5 +1,5 @@
> > @comment $OpenBSD: PLIST,v 1.3 2018/04/26 13:05:38 danj Exp $
> > -@pkgpath www/py3-multidict
> > +@pkgpath www/${MODPY_PY_PREFIX}multidict
>
> Please put this line back how it was.
Find attached the modified diff for www/py-multidict. I've also
included 2 diffs for www/py-yarl and www/py-aiohttp. For py-gunicorn,
I'll send as a response to the thread I started for its update.
I'll also commit mods to www/Makefile and quirks if this is ok.
Cheers,
--
Paco Esteban.
0x5818130B8A6DBC03
Index: Makefile
===================================================================
RCS file: /home/cvs/ports/www/py-multidict/Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile
--- Makefile 12 Jul 2019 20:51:02 -0000 1.7
+++ Makefile 9 Mar 2020 14:37:16 -0000
@@ -2,13 +2,12 @@
COMMENT = multidict implementation
-MODPY_EGG_VERSION = 4.2.0
-REVISION = 1
+MODPY_EGG_VERSION = 4.7.5
DISTNAME = multidict-${MODPY_EGG_VERSION}
PKGNAME = py-${DISTNAME}
CATEGORIES = www devel
-WANTLIB += pthread ${MODPY_WANTLIB}
+WANTLIB += pthread ${MODPY_WANTLIB}
# Apache2
PERMIT_PACKAGE = Yes
@@ -17,8 +16,12 @@ MODULES = lang/python
MODPY_PI = Yes
MODPY_SETUPTOOLS = Yes
-MODPY_VERSION = ${MODPY_DEFAULT_VERSION_3}
+MODPY_PYTEST = Yes
-TEST_DEPENDS = devel/py-test${MODPY_FLAVOR}
+FLAVORS = python3
+FLAVOR = python3
+
+TEST_DEPENDS = devel/py-test${MODPY_FLAVOR} \
+ devel/py-test-cov${MODPY_FLAVOR}
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /home/cvs/ports/www/py-multidict/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo 26 Apr 2018 13:05:38 -0000 1.3
+++ distinfo 9 Mar 2020 14:34:30 -0000
@@ -1,2 +1,2 @@
-SHA256 (multidict-4.2.0.tar.gz) = JAUnJBleRocnOfqhDGEZV7us6uKO7JLhzkkVCxFexe0=
-SIZE (multidict-4.2.0.tar.gz) = 137359
+SHA256 (multidict-4.7.5.tar.gz) = ruKDxJYB+kwTrcZMCcl4g4p+gS+FN3rhMKJNcZjAMx4=
+SIZE (multidict-4.7.5.tar.gz) = 50845
Index: patches/patch-multidict__multidict_c
===================================================================
RCS file: patches/patch-multidict__multidict_c
diff -N patches/patch-multidict__multidict_c
--- patches/patch-multidict__multidict_c 1 Aug 2018 22:39:13 -0000
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,16 +0,0 @@
-$OpenBSD: patch-multidict__multidict_c,v 1.1 2018/08/01 22:39:13 juanfra Exp $
-
-Os breaks the build on GCC4 platforms.
-
-Index: multidict/_multidict.c
---- multidict/_multidict.c.orig
-+++ multidict/_multidict.c
-@@ -20116,8 +20116,6 @@ static int __Pyx_modinit_function_import_code(void) {
- #ifndef CYTHON_SMALL_CODE
- #if defined(__clang__)
- #define CYTHON_SMALL_CODE
--#elif defined(__GNUC__)
-- #define CYTHON_SMALL_CODE __attribute__((optimize("Os")))
- #else
- #define CYTHON_SMALL_CODE
- #endif
Index: pkg/PLIST
===================================================================
RCS file: /home/cvs/ports/www/py-multidict/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST
--- pkg/PLIST 26 Apr 2018 13:05:38 -0000 1.3
+++ pkg/PLIST 9 Mar 2020 14:35:43 -0000
@@ -8,18 +8,23 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/multidict-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
lib/python${MODPY_VERSION}/site-packages/multidict/__init__.py
lib/python${MODPY_VERSION}/site-packages/multidict/__init__.pyi
-lib/python${MODPY_VERSION}/site-packages/multidict/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/multidict/${MODPY_PYCACHE}/
lib/python${MODPY_VERSION}/site-packages/multidict/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/multidict/${MODPY_PYCACHE}_abc.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/multidict/${MODPY_PYCACHE}_compat.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/multidict/${MODPY_PYCACHE}_multidict_base.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/multidict/${MODPY_PYCACHE}_multidict_py.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/multidict/_abc.py
lib/python${MODPY_VERSION}/site-packages/multidict/_compat.py
-lib/python${MODPY_VERSION}/site-packages/multidict/_istr.c
-lib/python${MODPY_VERSION}/site-packages/multidict/_istr.pyd
-lib/python${MODPY_VERSION}/site-packages/multidict/_istr.so
lib/python${MODPY_VERSION}/site-packages/multidict/_multidict.c
-lib/python${MODPY_VERSION}/site-packages/multidict/_multidict.pyx
-lib/python${MODPY_VERSION}/site-packages/multidict/_multidict.so
+@so lib/python${MODPY_VERSION}/site-packages/multidict/_multidict.so
+lib/python${MODPY_VERSION}/site-packages/multidict/_multidict_base.py
lib/python${MODPY_VERSION}/site-packages/multidict/_multidict_py.py
+lib/python${MODPY_VERSION}/site-packages/multidict/_multilib/
+lib/python${MODPY_VERSION}/site-packages/multidict/_multilib/defs.h
+lib/python${MODPY_VERSION}/site-packages/multidict/_multilib/dict.h
+lib/python${MODPY_VERSION}/site-packages/multidict/_multilib/istr.h
+lib/python${MODPY_VERSION}/site-packages/multidict/_multilib/iter.h
+lib/python${MODPY_VERSION}/site-packages/multidict/_multilib/pair_list.h
+lib/python${MODPY_VERSION}/site-packages/multidict/_multilib/views.h
lib/python${MODPY_VERSION}/site-packages/multidict/py.typed
Index: Makefile
===================================================================
RCS file: /home/cvs/ports/www/py-yarl/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- Makefile 16 Jan 2020 09:51:58 -0000 1.6
+++ Makefile 9 Mar 2020 14:45:51 -0000
@@ -5,6 +5,7 @@ COMMENT = yet another URL library
MODPY_EGG_VERSION = 1.4.2
DISTNAME = yarl-${MODPY_EGG_VERSION}
PKGNAME = py-${DISTNAME}
+REVISION = 0
CATEGORIES = www devel
@@ -24,7 +25,7 @@ MODPY_SETUPTOOLS = Yes
MODPY_VERSION = ${MODPY_DEFAULT_VERSION_3}
RUN_DEPENDS = net/py-idna${MODPY_FLAVOR}>=2.0 \
- www/py-multidict>=4.0
+ www/py-multidict${MODPY_FLAVOR}>=4.0
TEST_DEPENDS = devel/py-test-runner${MODPY_FLAVOR}
.include <bsd.port.mk>
Index: Makefile
===================================================================
RCS file: /home/cvs/ports/www/py-aiohttp/Makefile,v
retrieving revision 1.9
diff -u -p -r1.9 Makefile
--- Makefile 23 Oct 2019 12:42:57 -0000 1.9
+++ Makefile 9 Mar 2020 14:44:13 -0000
@@ -6,7 +6,7 @@ MODPY_EGG_VERSION = 3.5.4
DISTNAME = aiohttp-${MODPY_EGG_VERSION}
PKGNAME = py-${DISTNAME}
CATEGORIES = www
-REVISION = 1
+REVISION = 2
# Apache2
PERMIT_PACKAGE = Yes
@@ -24,7 +24,7 @@ RUN_DEPENDS = devel/py-attrs${MODPY_FLA
textproc/py-chardet${MODPY_FLAVOR} \
# these are py3 only
RUN_DEPENDS += devel/py-async-timeout \
- www/py-multidict \
+ www/py-multidict${MODPY_FLAVOR} \
www/py-yarl
TEST_DEPENDS = devel/py-test${MODPY_FLAVOR} \
www/py-gunicorn${MODPY_FLAVOR}
