From 023268983662c7cb885837425c76324915d615f8 Mon Sep 17 00:00:00 2001 From: jasper Date: Wed, 11 Jul 2018 11:29:02 +0000 Subject: [PATCH] add python3 flavor to py-redis ok rpointel@ --- databases/Makefile | 3 ++- databases/py-redis/Makefile | 10 +++++++--- databases/py-redis/pkg/PLIST | 19 ++++++++++--------- 3 files changed, 19 insertions(+), 13 deletions(-) diff --git a/databases/Makefile b/databases/Makefile index 67f4d735278..effa980fefc 100644 --- a/databases/Makefile +++ b/databases/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.365 2018/06/23 21:48:36 landry Exp $ +# $OpenBSD: Makefile,v 1.366 2018/07/11 11:29:02 jasper Exp $ SUBDIR = SUBDIR += architect @@ -189,6 +189,7 @@ SUBDIR += py-pygresql SUBDIR += py-pygresql,python3 SUBDIR += py-redis + SUBDIR += py-redis,python3 SUBDIR += py-sql SUBDIR += py-sql,python3 SUBDIR += py-sqlalchemy diff --git a/databases/py-redis/Makefile b/databases/py-redis/Makefile index 195dcaf045f..0d6e4a7e5b6 100644 --- a/databases/py-redis/Makefile +++ b/databases/py-redis/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.32 2017/11/03 16:18:39 rpointel Exp $ +# $OpenBSD: Makefile,v 1.33 2018/07/11 11:29:02 jasper Exp $ COMMENT = Python interface to Redis @@ -7,6 +7,7 @@ MODPY_EGG_VERSION = 2.10.6 GH_ACCOUNT = andymccurdy GH_PROJECT = redis-py GH_TAGNAME = ${MODPY_EGG_VERSION} +REVISION = 0 DISTNAME = ${GH_PROJECT}-${MODPY_EGG_VERSION} PKGNAME = py-redis-${MODPY_EGG_VERSION} @@ -21,13 +22,16 @@ PERMIT_PACKAGE_CDROM = Yes MODULES = lang/python +FLAVORS = python3 +FLAVOR ?= + MODPY_SETUPTOOLS = Yes # Be sure to have a redis server running on localhost TEST_IS_INTERACTIVE = Yes TEST_DEPENDS = databases/redis \ - devel/py-py \ - devel/py-test>=2.5.0 + devel/py-py${MODPY_FLAVOR} \ + devel/py-test${MODPY_FLAVOR}>=2.5.0 .include diff --git a/databases/py-redis/pkg/PLIST b/databases/py-redis/pkg/PLIST index 9ca3e859888..c73d0d89da2 100644 --- a/databases/py-redis/pkg/PLIST +++ b/databases/py-redis/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.8 2014/09/16 07:14:14 dcoppa Exp $ +@comment $OpenBSD: PLIST,v 1.9 2018/07/11 11:29:02 jasper Exp $ lib/python${MODPY_VERSION}/site-packages/redis/ lib/python${MODPY_VERSION}/site-packages/redis-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/ lib/python${MODPY_VERSION}/site-packages/redis-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO @@ -6,18 +6,19 @@ lib/python${MODPY_VERSION}/site-packages/redis-${MODPY_EGG_VERSION}-py${MODPY_VE lib/python${MODPY_VERSION}/site-packages/redis-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt lib/python${MODPY_VERSION}/site-packages/redis-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt lib/python${MODPY_VERSION}/site-packages/redis/__init__.py -lib/python${MODPY_VERSION}/site-packages/redis/__init__.pyc +${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/redis/${MODPY_PYCACHE}/ +lib/python${MODPY_VERSION}/site-packages/redis/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/redis/${MODPY_PYCACHE}_compat.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/redis/${MODPY_PYCACHE}client.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/redis/${MODPY_PYCACHE}connection.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/redis/${MODPY_PYCACHE}exceptions.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/redis/${MODPY_PYCACHE}lock.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/redis/${MODPY_PYCACHE}sentinel.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/redis/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/redis/_compat.py -lib/python${MODPY_VERSION}/site-packages/redis/_compat.pyc lib/python${MODPY_VERSION}/site-packages/redis/client.py -lib/python${MODPY_VERSION}/site-packages/redis/client.pyc lib/python${MODPY_VERSION}/site-packages/redis/connection.py -lib/python${MODPY_VERSION}/site-packages/redis/connection.pyc lib/python${MODPY_VERSION}/site-packages/redis/exceptions.py -lib/python${MODPY_VERSION}/site-packages/redis/exceptions.pyc lib/python${MODPY_VERSION}/site-packages/redis/lock.py -lib/python${MODPY_VERSION}/site-packages/redis/lock.pyc lib/python${MODPY_VERSION}/site-packages/redis/sentinel.py -lib/python${MODPY_VERSION}/site-packages/redis/sentinel.pyc lib/python${MODPY_VERSION}/site-packages/redis/utils.py -lib/python${MODPY_VERSION}/site-packages/redis/utils.pyc