From 968e7ce608ca96961be863e0d6f4923e1e5f025a Mon Sep 17 00:00:00 2001
From: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
Date: Mon, 19 Mar 2018 20:23:56 +0000
Subject: [PATCH] Relax USES=python

- Fix RUN_DEPENDS: remove duplicate net/py-ipaddress
- Simplify Makefile: use PY_IPADDRESS
- Sort RUN_DEPENDS
- Add NO_ARCH
- Use PYTHON_REL instead of PYTHON_SUFFIX
- Fix indent
- Bump PORTREVISION for dependency change

PR:		226738
Submitted by:	sunpoet (myself)
Approved by:	lifanov (maintainer)
---
 sysutils/docker-compose/Makefile | 55 ++++++++++++++++----------------
 1 file changed, 28 insertions(+), 27 deletions(-)

diff --git a/sysutils/docker-compose/Makefile b/sysutils/docker-compose/Makefile
index 6350c5085a8b..e09610af1532 100644
--- a/sysutils/docker-compose/Makefile
+++ b/sysutils/docker-compose/Makefile
@@ -1,42 +1,43 @@
 # $FreeBSD$
 
-PORTNAME=		docker-compose
-PORTVERSION=		1.19.0
-CATEGORIES=		sysutils python
-MASTER_SITES=		CHEESESHOP
+PORTNAME=	docker-compose
+PORTVERSION=	1.19.0
+PORTREVISION=	1
+CATEGORIES=	sysutils python
+MASTER_SITES=	CHEESESHOP
 
-MAINTAINER=		lifanov@FreeBSD.org
-COMMENT=		Define and run multi-container applications with Docker
+MAINTAINER=	lifanov@FreeBSD.org
+COMMENT=	Define and run multi-container applications with Docker
 
-LICENSE=		APACHE20
-LICENSE_FILE=		${WRKSRC}/LICENSE
+LICENSE=	APACHE20
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml@${FLAVOR} \
-			${PYTHON_PKGNAMEPREFIX}cached-property>=1.2.0:devel/py-cached-property@${FLAVOR} \
-			${PYTHON_PKGNAMEPREFIX}colorama>=0.3.7:devel/py-colorama@${FLAVOR} \
-			${PYTHON_PKGNAMEPREFIX}docker>=2.7.0:sysutils/py-docker@${FLAVOR} \
-			${PYTHON_PKGNAMEPREFIX}dockerpty>=0.4.1:devel/py-dockerpty@${FLAVOR} \
-			${PYTHON_PKGNAMEPREFIX}docopt>=0.6.1:devel/py-docopt@${FLAVOR} \
-			${PY_ENUM34} \
-			${PYTHON_PKGNAMEPREFIX}ipaddress>=1.0.16:net/py-ipaddress@${FLAVOR} \
-			${PYTHON_PKGNAMEPREFIX}jsonschema>=2.5.1:devel/py-jsonschema@${FLAVOR} \
-			${PYTHON_PKGNAMEPREFIX}requests>=2.11.1:www/py-requests@${FLAVOR} \
-			${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${FLAVOR} \
-			${PYTHON_PKGNAMEPREFIX}texttable>=0.9.0:textproc/py-texttable@${FLAVOR} \
-			${PYTHON_PKGNAMEPREFIX}websocket-client>=0.32.0:www/py-websocket-client@${FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cached-property>=1.2.0:devel/py-cached-property@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}colorama>=0.3.7:devel/py-colorama@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}docker>=2.7.0:sysutils/py-docker@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}dockerpty>=0.4.1:devel/py-dockerpty@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}docopt>=0.6.1:devel/py-docopt@${FLAVOR} \
+		${PY_ENUM34} \
+		${PY_IPADDRESS} \
+		${PYTHON_PKGNAMEPREFIX}jsonschema>=2.5.1:devel/py-jsonschema@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}requests>=2.11.1:www/py-requests@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}texttable>=0.9.0:textproc/py-texttable@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}websocket-client>=0.32.0:www/py-websocket-client@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml@${FLAVOR}
 
-USES=		python:-3.3
+NO_ARCH=	yes
+USES=		python
 USE_PYTHON=	distutils autoplist concurrent optsuffix
 
 .include <bsd.port.pre.mk>
 
-.if ${PYTHON_SUFFIX} < 35
-RUN_DEPENDS+=		${PYTHON_PKGNAMEPREFIX}backports.ssl_match_hostname>0:security/py-backports.ssl_match_hostname@${FLAVOR}
+.if ${PYTHON_REL} < 3500
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}backports.ssl_match_hostname>0:security/py-backports.ssl_match_hostname@${FLAVOR}
 .endif
 
-.if ${PYTHON_SUFFIX} < 32
-RUN_DEPENDS+=		${PYTHON_PKGNAMEPREFIX}functools32>0:devel/py-functools32@${FLAVOR} \
-			${PYTHON_PKGNAMEPREFIX}ipaddress>=1.0.16:net/py-ipaddress@${FLAVOR}
+.if ${PYTHON_REL} < 3200
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}functools32>0:devel/py-functools32@${FLAVOR}
 .endif
 
 .include <bsd.port.post.mk>