cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

switch py-construct, py-sane, and py-zmq to be python3-only

Browse Source 
This is one of the many changes needed to update numpy to v1.17.0 or
newer as numpy is now python3-only.

Analysis of py-zmq consumers flubbed by me. Luckily bket@ did a much
better dependency analysis of the py-zmq consumers.

ok bket@
This commit is contained in:
daniel 2020-10-10 18:45:00 +00:00
parent 3b400aa2d4
commit a84c79776d
11 changed files with 27 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
devel/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.2022 2020/10/10 01:41:26 afresh1 Exp $
# $OpenBSD: Makefile,v 1.2023 2020/10/10 18:45:00 daniel Exp $
SUBDIR =
SUBDIR += 64tass
@ -1405,7 +1405,6 @@
SUBDIR += py-configparser
SUBDIR += py-constantly
SUBDIR += py-constantly,python3
SUBDIR += py-construct
SUBDIR += py-construct,python3
SUBDIR += py-contextlib2
SUBDIR += py-contextlib2,python3

6
devel/py-construct/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.7 2020/07/03 21:12:42 sthen Exp $
# $OpenBSD: Makefile,v 1.8 2020/10/10 18:45:00 daniel Exp $
COMMENT = powerful declarative parser/builder for binary data
@ -7,7 +7,7 @@ EPOCH = 0
MODPY_EGG_VERSION = 2.5.3
DISTNAME = construct-${MODPY_EGG_VERSION}
PKGNAME = py-${DISTNAME}
REVISION = 1
REVISION = 2
CATEGORIES = devel
@ -23,7 +23,7 @@ MODPY_PYTEST = Yes
MODPY_PI = Yes
FLAVORS = python3
FLAVOR ?=
FLAVOR = python3
TEST_DEPENDS = math/py-numpy${MODPY_FLAVOR}

4
devel/py-construct/pkg/PLIST
View File

@ -1,4 +1,6 @@
@comment $OpenBSD: PLIST,v 1.2 2017/02/23 13:11:21 rpointel Exp $
@comment $OpenBSD: PLIST,v 1.3 2020/10/10 18:45:00 daniel Exp $
@conflict py-construct-*
@pkgpath devel/py-construct
lib/python${MODPY_VERSION}/site-packages/construct/
lib/python${MODPY_VERSION}/site-packages/construct-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
lib/python${MODPY_VERSION}/site-packages/construct-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO

4
devel/quirks/Makefile
View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.1059 2020/10/10 18:30:42 daniel Exp $
# $OpenBSD: Makefile,v 1.1060 2020/10/10 18:45:00 daniel Exp $
COMMENT = exceptions to pkg_add rules
CATEGORIES = devel databases
DISTFILES =
# API.rev
PKGNAME = quirks-3.451
PKGNAME = quirks-3.452
PKG_ARCH = *
MAINTAINER = Marc Espie <espie@openbsd.org>

5
devel/quirks/files/Quirks.pm
View File

@ -1,7 +1,7 @@
#! /usr/bin/perl
# ex:ts=8 sw=4:
# $OpenBSD: Quirks.pm,v 1.1077 2020/10/10 18:30:42 daniel Exp $
# $OpenBSD: Quirks.pm,v 1.1078 2020/10/10 18:45:00 daniel Exp $
#
# Copyright (c) 2009 Marc Espie <espie@openbsd.org>
#
@ -488,6 +488,9 @@ my $stem_extensions = {
'py-patsy' => 'py3-patsy',
'py-scs' => 'py3-scs',
'py-augeas' => 'py3-augeas',
'py-construct' => 'py3-construct',
'py-sane' => 'py3-sane',
'py-zmq' => 'py3-zmq',
};
my $obsolete_reason = {

3
graphics/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.522 2020/10/08 12:03:49 daniel Exp $
# $OpenBSD: Makefile,v 1.523 2020/10/10 18:45:00 daniel Exp $
SUBDIR =
SUBDIR += DevIL
@ -258,7 +258,6 @@
SUBDIR += py-pyx
SUBDIR += py-qrcode
SUBDIR += py-qrcode,python3
SUBDIR += py-sane
SUBDIR += py-sane,python3
SUBDIR += py-seaborn,python3
SUBDIR += pycha

6
graphics/py-sane/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.8 2020/07/03 21:12:56 sthen Exp $
# $OpenBSD: Makefile,v 1.9 2020/10/10 18:45:00 daniel Exp $
COMMENT= Python SANE module
@ -7,7 +7,7 @@ DISTNAME= Sane-${MODPY_EGG_VERSION}
DISTFILES= ${DISTNAME}{v${MODPY_EGG_VERSION}}.tar.gz
PKGNAME= py-${DISTNAME:L}
CATEGORIES= graphics
REVISION= 1
REVISION= 2
HOMEPAGE= http://python-pillow.github.io/
@ -20,7 +20,7 @@ WANTLIB += pthread sane ${MODPY_WANTLIB}
MASTER_SITES= https://github.com/python-pillow/Sane/archive/
FLAVORS= python3
FLAVOR?=
FLAVOR = python3
MODULES= lang/python
SUBST_VARS= MODPY_SITEPKG

4
graphics/py-sane/pkg/PLIST
View File

@ -1,5 +1,7 @@
@comment $OpenBSD: PLIST,v 1.3 2016/04/03 07:56:27 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.4 2020/10/10 18:45:00 daniel Exp $
@conflict py-sane-*
@pkgpath graphics/py-Pillow,-sane${MODPY_FLAVOR}
@pkgpath graphics/py-sane
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}/
lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}sane.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/_sane.so

3
net/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.1222 2020/09/12 15:33:31 jasper Exp $
# $OpenBSD: Makefile,v 1.1223 2020/10/10 18:45:00 daniel Exp $
SUBDIR =
SUBDIR += adns
@ -635,7 +635,6 @@
SUBDIR += py-websocket-client,python3
SUBDIR += py-xmpppy
SUBDIR += py-zeroconf,python3
SUBDIR += py-zmq
SUBDIR += py-zmq,python3
SUBDIR += py-zsi
SUBDIR += qbittorrent

6
net/py-zmq/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.28 2020/07/03 21:13:03 sthen Exp $
# $OpenBSD: Makefile,v 1.29 2020/10/10 18:45:00 daniel Exp $
COMMENT = Python bindings for ZeroMQ
@ -6,7 +6,7 @@ MODPY_EGG_VERSION = 18.0.1
DISTNAME = pyzmq-${MODPY_EGG_VERSION}
PKGNAME = ${DISTNAME:S/py/py-/}
EPOCH = 0
REVISION = 0
REVISION = 1
CATEGORIES = net devel
@ -35,6 +35,6 @@ TEST_DEPENDS = devel/py-test${MODPY_FLAVOR} \
www/py-tornado${MODPY_FLAVOR}
FLAVORS = python3
FLAVOR ?=
FLAVOR = python3
.include <bsd.port.mk>

4
net/py-zmq/pkg/PLIST
View File

@ -1,4 +1,6 @@
@comment $OpenBSD: PLIST,v 1.14 2019/02/23 18:09:47 mariani Exp $
@comment $OpenBSD: PLIST,v 1.15 2020/10/10 18:45:00 daniel Exp $
@conflict py-zmq-*
@pkgpath net/py-zmq
lib/python${MODPY_VERSION}/site-packages/pyzmq-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info
lib/python${MODPY_VERSION}/site-packages/zmq/
lib/python${MODPY_VERSION}/site-packages/zmq/__init__.py