From owner-svn-ports-all@freebsd.org Mon Mar 19 20:23:57 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 03984F6A247; Mon, 19 Mar 2018 20:23:57 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id AD0F5838AE; Mon, 19 Mar 2018 20:23:56 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A7FCE13397; Mon, 19 Mar 2018 20:23:56 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2JKNuba008988; Mon, 19 Mar 2018 20:23:56 GMT (envelope-from sunpoet@FreeBSD.org) Received: (from sunpoet@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2JKNuCV008987; Mon, 19 Mar 2018 20:23:56 GMT (envelope-from sunpoet@FreeBSD.org) Message-Id: <201803192023.w2JKNuCV008987@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: sunpoet set sender to sunpoet@FreeBSD.org using -f From: Sunpoet Po-Chuan Hsieh Date: Mon, 19 Mar 2018 20:23:56 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r465030 - head/sysutils/docker-compose X-SVN-Group: ports-head X-SVN-Commit-Author: sunpoet X-SVN-Commit-Paths: head/sysutils/docker-compose X-SVN-Commit-Revision: 465030 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 19 Mar 2018 20:23:57 -0000 Author: sunpoet Date: Mon Mar 19 20:23:56 2018 New Revision: 465030 URL: https://svnweb.freebsd.org/changeset/ports/465030 Log: 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) Modified: head/sysutils/docker-compose/Makefile Modified: head/sysutils/docker-compose/Makefile ============================================================================== --- head/sysutils/docker-compose/Makefile Mon Mar 19 20:22:56 2018 (r465029) +++ head/sysutils/docker-compose/Makefile Mon Mar 19 20:23:56 2018 (r465030) @@ -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 -.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