diff --git a/sysutils/docker-compose/Makefile b/sysutils/docker-compose/Makefile index 77712ee484a0..a5199b8563a7 100644 --- a/sysutils/docker-compose/Makefile +++ b/sysutils/docker-compose/Makefile @@ -1,30 +1,25 @@ PORTNAME= docker-compose -PORTVERSION= 1.24.0 -PORTREVISION= 5 -CATEGORIES= sysutils python -MASTER_SITES= PYPI +DISTVERSIONPREFIX= v +DISTVERSION= 5.1.3 +CATEGORIES= sysutils -MAINTAINER= ports@FreeBSD.org +MAINTAINER= leafoliage@FreeBSD.org COMMENT= Define and run multi-container applications with Docker WWW= https://github.com/docker/compose/ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cached-property>=1.2.0:devel/py-cached-property@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}colorama>=0.3.7:devel/py-colorama@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}docker>=3.6.0:sysutils/py-docker@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}dockerpty>=0.4.1:devel/py-dockerpty@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}docopt>=0.6.1:devel/py-docopt@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}jsonschema>=2.5.1:devel/py-jsonschema@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}requests>=2.11.1:www/py-requests@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}texttable>=0.9.0:textproc/py-texttable@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}websocket-client>=0.32.0:www/py-websocket-client@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pyyaml>=3.11:devel/py-pyyaml@${PY_FLAVOR} +USES= go:modules +USE_GITHUB= nodefault +GH_ACCOUNT= docker +GH_PROJECT= compose -NO_ARCH= yes -USES= python -USE_PYTHON= distutils autoplist concurrent optsuffix +GO_MODULE= github.com/docker/compose/v5 +GO_TARGET= ./cmd:${PREFIX}/lib/docker/cli-plugins/docker-compose +GO_BUILDFLAGS= -ldflags="\ + -X github.com/docker/compose/v5/internal.Version=v${PORTVERSION}" + +PLIST_FILES= lib/docker/cli-plugins/docker-compose .include diff --git a/sysutils/docker-compose/distinfo b/sysutils/docker-compose/distinfo index 9c654bb668bf..224d4394ba09 100644 --- a/sysutils/docker-compose/distinfo +++ b/sysutils/docker-compose/distinfo @@ -1,3 +1,5 @@ -TIMESTAMP = 1555549016 -SHA256 (docker-compose-1.24.0.tar.gz) = 5582a51827676f5243473310e911503e1016bbdf3be1b89dcb4201f42b5fa369 -SIZE (docker-compose-1.24.0.tar.gz) = 258666 +TIMESTAMP = 1778059474 +SHA256 (go/sysutils_docker-compose/docker-compose-v5.1.3/v5.1.3.mod) = e769198139e826d170f2acc4959681dd462cab1d58f78e609d6f6ee0fda8aa85 +SIZE (go/sysutils_docker-compose/docker-compose-v5.1.3/v5.1.3.mod) = 7511 +SHA256 (go/sysutils_docker-compose/docker-compose-v5.1.3/v5.1.3.zip) = e6261e4e783f9a30fb405d440340a60ca188e5394c5181d8647a2bab5d492b38 +SIZE (go/sysutils_docker-compose/docker-compose-v5.1.3/v5.1.3.zip) = 820448 diff --git a/sysutils/docker-compose/files/patch-setup.py b/sysutils/docker-compose/files/patch-setup.py deleted file mode 100644 index 0c18cf902e0d..000000000000 --- a/sysutils/docker-compose/files/patch-setup.py +++ /dev/null @@ -1,21 +0,0 @@ ---- setup.py.orig 2019-02-04 16:11:53 UTC -+++ setup.py -@@ -32,14 +32,14 @@ def find_version(*file_paths): - install_requires = [ - 'cached-property >= 1.2.0, < 2', - 'docopt >= 0.6.1, < 0.7', -- 'PyYAML >= 3.10, < 4.3', -- 'requests >= 2.6.1, != 2.11.0, != 2.12.2, != 2.18.0, < 2.21', -- 'texttable >= 0.9.0, < 0.10', -+ 'PyYAML >= 3.10, < 6', -+ 'requests >= 2.6.1, != 2.11.0, != 2.12.2, != 2.18.0, < 3', -+ 'texttable >= 0.9.0, < 2', - 'websocket-client >= 0.32.0, < 1.0', - 'docker[ssh] >= 3.7.0, < 4.0', - 'dockerpty >= 0.4.1, < 0.5', - 'six >= 1.3.0, < 2', -- 'jsonschema >= 2.5.1, < 3', -+ 'jsonschema >= 2.5.1, < 4', - ] - -