Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 2 Jun 2020 11:23:53 +0000 (UTC)
From:      Kirill Ponomarev <krion@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r537537 - in head: . sysutils sysutils/py-salt sysutils/py-salt-2019 sysutils/py-salt/files
Message-ID:  <202006021123.052BNrfL002881@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: krion
Date: Tue Jun  2 11:23:53 2020
New Revision: 537537
URL: https://svnweb.freebsd.org/changeset/ports/537537

Log:
  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

Added:
  head/sysutils/py-salt-2019/
     - copied from r537534, head/sysutils/py-salt/
Deleted:
  head/sysutils/py-salt/files/patch-requirements_base.txt
Modified:
  head/MOVED
  head/UPDATING
  head/sysutils/Makefile
  head/sysutils/py-salt-2019/Makefile
  head/sysutils/py-salt/Makefile
  head/sysutils/py-salt/distinfo

Modified: head/MOVED
==============================================================================
--- head/MOVED	Tue Jun  2 11:19:05 2020	(r537536)
+++ head/MOVED	Tue Jun  2 11:23:53 2020	(r537537)
@@ -15054,3 +15054,4 @@ sysutils/ansible23|sysutils/ansible|2020-05-31|Has exp
 devel/graphql.el||2020-05-31|Has expired: No longer required by anything
 lang/perl5.26|lang/perl5.28|2020-05-31|Has expired: Support ends three years after .0 release, please upgrade to a more recent version of Perl
 www/py-beautifulsoup460|www/py-beautifulsoup448|2020-05-31|Has expired: Use www/py-beautifulsoup448 instead
+sysutils/py-salt|sysutils/py-salt-2019|2020-06-02|Move to new name

Modified: head/UPDATING
==============================================================================
--- head/UPDATING	Tue Jun  2 11:19:05 2020	(r537536)
+++ head/UPDATING	Tue Jun  2 11:23:53 2020	(r537537)
@@ -5,6 +5,19 @@ they are unavoidable.
 You should get into the habit of checking this file for changes each time
 you update your ports collection, before attempting any port upgrades.
 
+20200602:
+  AFFECTS: users of sysutils/py-salt
+  AUTHOR: krion@FreeBSD.org
+
+  This port is moved to sysutils/py-salt-2019 and sysutils/py-salt was
+  updated to version 3000.
+
+  If you wish to use pysalt-2019 in the future, you might run the
+  following command:
+
+  # pkg set -o sysutils/py-salt:sysutils/py-salt-2019
+  # pkg upgrade
+
 20200531:
   AFFECTS: users of mail/postfix-policyd-spf-python
   AUTHOR:  yasu@utahime.org

Modified: head/sysutils/Makefile
==============================================================================
--- head/sysutils/Makefile	Tue Jun  2 11:19:05 2020	(r537536)
+++ head/sysutils/Makefile	Tue Jun  2 11:23:53 2020	(r537537)
@@ -992,6 +992,7 @@
     SUBDIR += py-ranger
     SUBDIR += py-rdiff-backup
     SUBDIR += py-salt
+	SUBDIR += py-salt-2019
     SUBDIR += py-scandir
     SUBDIR += py-scarab
     SUBDIR += py-scriptine

Modified: head/sysutils/py-salt-2019/Makefile
==============================================================================
--- head/sysutils/py-salt/Makefile	Tue Jun  2 10:28:48 2020	(r537534)
+++ head/sysutils/py-salt-2019/Makefile	Tue Jun  2 11:23:53 2020	(r537537)
@@ -33,6 +33,8 @@ CPE_PRODUCT=	salt
 USE_PYTHON=	autoplist distutils
 NO_ARCH=	yes
 
+CONFLICTS=	py[0-9]*-salt-3000*
+
 # 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=\

Modified: head/sysutils/py-salt/Makefile
==============================================================================
--- head/sysutils/py-salt/Makefile	Tue Jun  2 11:19:05 2020	(r537536)
+++ head/sysutils/py-salt/Makefile	Tue Jun  2 11:23:53 2020	(r537537)
@@ -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}

Modified: head/sysutils/py-salt/distinfo
==============================================================================
--- head/sysutils/py-salt/distinfo	Tue Jun  2 11:19:05 2020	(r537536)
+++ head/sysutils/py-salt/distinfo	Tue Jun  2 11:23:53 2020	(r537537)
@@ -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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202006021123.052BNrfL002881>