svn commit: r467481 - in branches/2018Q2/sysutils/py-salt: . files

[Renato Botelho]

Author: garga
Date: Mon Apr 16 12:40:02 2018
New Revision: 467481
URL: https://svnweb.freebsd.org/changeset/ports/467481

Log:
  MFH: r467246
  
  Fix saltstack bootstrap renaming desired to be installed package from
  swig -> swig30 since former package doesn't exist
  
  PR:		226830
  Submitted by:	garga
  Approved by:	maintainer timeout (> 2 weeks)
  Obtained from:	https://github.com/saltstack/salt-bootstrap/issues/1192
  Sponsored by:	Rubicon communications, LLC (Netgate)
  Approved by:	ports-secteam (delphij)

Added:
  branches/2018Q2/sysutils/py-salt/files/patch-salt_cloud_deploy_bootstrap-salt.sh
     - copied unchanged from r467246, head/sysutils/py-salt/files/patch-salt_cloud_deploy_bootstrap-salt.sh
Modified:
  branches/2018Q2/sysutils/py-salt/Makefile
Directory Properties:
  branches/2018Q2/   (props changed)

Modified: branches/2018Q2/sysutils/py-salt/Makefile
==============================================================================
--- branches/2018Q2/sysutils/py-salt/Makefile	Mon Apr 16 12:28:44 2018	(r467480)
+++ branches/2018Q2/sysutils/py-salt/Makefile	Mon Apr 16 12:40:02 2018	(r467481)
@@ -3,7 +3,7 @@
 
 PORTNAME=	salt
 PORTVERSION=	2017.7.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}

Copied: branches/2018Q2/sysutils/py-salt/files/patch-salt_cloud_deploy_bootstrap-salt.sh (from r467246, head/sysutils/py-salt/files/patch-salt_cloud_deploy_bootstrap-salt.sh)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2018Q2/sysutils/py-salt/files/patch-salt_cloud_deploy_bootstrap-salt.sh	Mon Apr 16 12:40:02 2018	(r467481, copy of r467246, head/sysutils/py-salt/files/patch-salt_cloud_deploy_bootstrap-salt.sh)
@@ -0,0 +1,14 @@
+--- salt/cloud/deploy/bootstrap-salt.sh.orig	2018-03-21 17:37:20 UTC
++++ salt/cloud/deploy/bootstrap-salt.sh
+@@ -4885,9 +4885,9 @@ install_freebsd_9_stable_deps() {
+         __configure_freebsd_pkg_details || return 1
+     fi
+ 
+-    # Now install swig
++    # Now install swig30
+     # shellcheck disable=SC2086
+-    /usr/local/sbin/pkg install ${FROM_FREEBSD} -y swig || return 1
++    /usr/local/sbin/pkg install ${FROM_FREEBSD} -y swig30 || return 1
+ 
+     # YAML module is used for generating custom master/minion configs
+     # shellcheck disable=SC2086