On Wed, 23 Dec 2015 20:41:03 +0100, Daniel Jakots
<vigdis+o...@chown.me> wrote:
> This diff adds a py3 flavor to py-oauthlib. It needs the patch
> previously sent by shadchin@ on ports for devel/py-mock (because it
> adds the py3 flavor).
... which needs the py3 flavor from www/py-jwt. py-jwt collides but
sthen@ kindly solved the problem. His diff:
Index: Makefile
===================================================================
RCS file: /cvs/ports/www/py-jwt/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- Makefile 29 Sep 2015 10:52:55 -0000 1.3
+++ Makefile 21 Dec 2015 21:49:53 -0000
@@ -3,26 +3,32 @@
COMMENT = JSON Web Token implementation in Python
MODPY_EGG_VERSION = 1.3.0
+REVISION = 1
DISTNAME = PyJWT-${MODPY_EGG_VERSION}
PKGNAME = py-jwt-${MODPY_EGG_VERSION}
CATEGORIES = www
MAINTAINER = Johan Huldtgren <jhuldtg...@gmail.com>
-REVISION = 0
HOMEPAGE = http://github.com/jpadilla/pyjwt
# BSD
PERMIT_PACKAGE_CDROM = Yes
-MODPY_PI = Yes
-
MODULES = lang/python
+
+FLAVORS = python3
+FLAVOR ?=
+
+MODPY_PI = Yes
MODPY_SETUPTOOLS = Yes
-RUN_DEPENDS = security/py-cryptography
+RUN_DEPENDS = security/py-cryptography${MODPY_FLAVOR}
# tests are available, but need pytest-runner plus dep's (which aren't in
# tree) at build time; if adding these, remove patch-setup_py
NO_TEST = Yes
+
+post-install:
+ mv ${PREFIX}/bin/jwt ${PREFIX}/bin/jwt${MODPY_BIN_SUFFIX}
.include <bsd.port.mk>
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/www/py-jwt/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- pkg/PLIST 26 Jun 2015 07:35:50 -0000 1.1.1.1
+++ pkg/PLIST 21 Dec 2015 21:49:53 -0000
@@ -1,5 +1,5 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2015/06/26 07:35:50 landry Exp $
-bin/jwt
+bin/jwt${MODPY_BIN_SUFFIX}
lib/python${MODPY_VERSION}/site-packages/PyJWT-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
lib/python${MODPY_VERSION}/site-packages/PyJWT-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
lib/python${MODPY_VERSION}/site-packages/PyJWT-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
@@ -9,28 +9,31 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/PyJWT-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
lib/python${MODPY_VERSION}/site-packages/jwt/
lib/python${MODPY_VERSION}/site-packages/jwt/__init__.py
-lib/python${MODPY_VERSION}/site-packages/jwt/__init__.pyc
lib/python${MODPY_VERSION}/site-packages/jwt/__main__.py
-lib/python${MODPY_VERSION}/site-packages/jwt/__main__.pyc
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/jwt/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/jwt/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jwt/${MODPY_PYCACHE}__main__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jwt/${MODPY_PYCACHE}algorithms.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jwt/${MODPY_PYCACHE}api_jws.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jwt/${MODPY_PYCACHE}api_jwt.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jwt/${MODPY_PYCACHE}compat.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jwt/${MODPY_PYCACHE}exceptions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jwt/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/jwt/algorithms.py
-lib/python${MODPY_VERSION}/site-packages/jwt/algorithms.pyc
lib/python${MODPY_VERSION}/site-packages/jwt/api_jws.py
-lib/python${MODPY_VERSION}/site-packages/jwt/api_jws.pyc
lib/python${MODPY_VERSION}/site-packages/jwt/api_jwt.py
-lib/python${MODPY_VERSION}/site-packages/jwt/api_jwt.pyc
lib/python${MODPY_VERSION}/site-packages/jwt/compat.py
-lib/python${MODPY_VERSION}/site-packages/jwt/compat.pyc
lib/python${MODPY_VERSION}/site-packages/jwt/contrib/
lib/python${MODPY_VERSION}/site-packages/jwt/contrib/__init__.py
-lib/python${MODPY_VERSION}/site-packages/jwt/contrib/__init__.pyc
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/jwt/contrib/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/jwt/contrib/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/jwt/contrib/algorithms/
lib/python${MODPY_VERSION}/site-packages/jwt/contrib/algorithms/__init__.py
-lib/python${MODPY_VERSION}/site-packages/jwt/contrib/algorithms/__init__.pyc
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/jwt/contrib/algorithms/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/jwt/contrib/algorithms/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jwt/contrib/algorithms/${MODPY_PYCACHE}py_ecdsa.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jwt/contrib/algorithms/${MODPY_PYCACHE}pycrypto.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/jwt/contrib/algorithms/py_ecdsa.py
-lib/python${MODPY_VERSION}/site-packages/jwt/contrib/algorithms/py_ecdsa.pyc
lib/python${MODPY_VERSION}/site-packages/jwt/contrib/algorithms/pycrypto.py
-lib/python${MODPY_VERSION}/site-packages/jwt/contrib/algorithms/pycrypto.pyc
lib/python${MODPY_VERSION}/site-packages/jwt/exceptions.py
-lib/python${MODPY_VERSION}/site-packages/jwt/exceptions.pyc
lib/python${MODPY_VERSION}/site-packages/jwt/utils.py
-lib/python${MODPY_VERSION}/site-packages/jwt/utils.pyc
