diff options
| author | Kirill Ponomarev <krion@FreeBSD.org> | 2020-06-02 11:23:53 +0000 |
|---|---|---|
| committer | Kirill Ponomarev <krion@FreeBSD.org> | 2020-06-02 11:23:53 +0000 |
| commit | af84cfffe3e4d240e5b22552e7f41cb1d2f8f847 (patch) | |
| tree | 218c7bc30a5d1249f27305e22a26433f441b879f /sysutils/py-salt | |
| parent | f9cdc30a356d644bba3ceb8769055337885da376 (diff) | |
| download | ports-af84cfffe3e4d240e5b22552e7f41cb1d2f8f847.tar.gz ports-af84cfffe3e4d240e5b22552e7f41cb1d2f8f847.zip | |
Update py-salt to version 3000 and repo copy py-salt to py-salt-2019.
We decided to run both versions for a while until 2019 is EOL and give people
the possibility to run newest 3000 version.
Approved by: maintainer
Notes
Notes:
svn path=/head/; revision=537537
Diffstat (limited to 'sysutils/py-salt')
| -rw-r--r-- | sysutils/py-salt/Makefile | 5 | ||||
| -rw-r--r-- | sysutils/py-salt/distinfo | 6 | ||||
| -rw-r--r-- | sysutils/py-salt/files/patch-requirements_base.txt | 11 |
3 files changed, 6 insertions, 16 deletions
diff --git a/sysutils/py-salt/Makefile b/sysutils/py-salt/Makefile index d064714cd186..ab9fcbe85a34 100644 --- a/sysutils/py-salt/Makefile +++ b/sysutils/py-salt/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= salt -PORTVERSION= 2019.2.5 +PORTVERSION= 3000.3 CATEGORIES= sysutils python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -33,6 +33,8 @@ CPE_PRODUCT= salt USE_PYTHON= autoplist distutils NO_ARCH= yes +CONFLICTS= py[0-9]*-salt-2019* + # we must pass these options before the target name, and python.mk has no # early-arguments variable, so we have to manipulate the target PYDISTUTILS_INSTALL_TARGET=\ @@ -91,7 +93,6 @@ post-patch: -e 's|/srv/pillar|${ETCDIR}/pillar|' ${WRKSRC}/${file} .endfor @${REINPLACE_CMD} -e 's|yumpkg5|pkgng|' ${WRKSRC}/conf/minion - @${REINPLACE_CMD} -e 's|msgpack-python|msgpack|' ${WRKSRC}/requirements/base.txt post-install: @${MKDIR} ${STAGEDIR}${ETCDIR} diff --git a/sysutils/py-salt/distinfo b/sysutils/py-salt/distinfo index a42b7ce02d79..28d70fb0f028 100644 --- a/sysutils/py-salt/distinfo +++ b/sysutils/py-salt/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1589397818 -SHA256 (salt-2019.2.5.tar.gz) = 7d7b80f17017a34bf86c6d7d6b7a94df78694d1401e69192aa3abd406f0edf3f -SIZE (salt-2019.2.5.tar.gz) = 14574347 +TIMESTAMP = 1590047008 +SHA256 (salt-3000.3.tar.gz) = fcca49985e697d914e5a7f34b2fd8bbd833bcf7779d30174a279a4de2294cea7 +SIZE (salt-3000.3.tar.gz) = 15237557 diff --git a/sysutils/py-salt/files/patch-requirements_base.txt b/sysutils/py-salt/files/patch-requirements_base.txt deleted file mode 100644 index 4969efb2aecc..000000000000 --- a/sysutils/py-salt/files/patch-requirements_base.txt +++ /dev/null @@ -1,11 +0,0 @@ ---- requirements/base.txt.orig 2019-10-27 09:11:13 UTC -+++ requirements/base.txt -@@ -2,7 +2,7 @@ Jinja2 - # This should be changed to msgpack-python for Packages - # msgpack-python>0.3,!=0.5.5 - msgpack>=0.5,!=0.5.5 --PyYAML<5.1 -+PyYAML - MarkupSafe - requests>=1.0.0 - tornado>=4.2.1,<6.0; python_version < '3' |