Index: head/sysutils/rubygem-smart_proxy_salt/Makefile
===================================================================
--- head/sysutils/rubygem-smart_proxy_salt/Makefile	(revision 558448)
+++ head/sysutils/rubygem-smart_proxy_salt/Makefile	(revision 558449)
@@ -1,43 +1,43 @@
 # Created by: Michael Moll <kvedulv@kvedulv.de>
 # $FreeBSD$
 
 PORTNAME=	smart_proxy_salt
-PORTVERSION=	2.1.9
+PORTVERSION=	3.1.2
 CATEGORIES=	sysutils ruby
 MASTER_SITES=	RG
 
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	SaltStack Plug-In for Foreman's Smart Proxy
 
 LICENSE=	GPLv3
 
 RUN_DEPENDS=	foreman-proxy>=1.8.0:net/foreman-proxy \
 		${PYTHON_PKGNAMEPREFIX}salt>0:sysutils/py-salt@${PY_FLAVOR}
 
-NO_ARCH=	yes
-
-USE_RUBY=	yes
 USES=		gem python
+USE_RUBY=	yes
+
+NO_ARCH=	yes
 
 post-patch:
 		@${REINPLACE_CMD} \
 			-e "s|/usr/bin/env ruby|${RUBY}|g" \
 			-e "s|/usr/bin/env python|${PYTHON_CMD}|g" \
 			-e "s|%%LOCALBASE%%|${LOCALBASE}|g" \
 			${WRKSRC}/bin/foreman-node \
 			${WRKSRC}/sbin/upload-salt-reports
 
 post-install:
 		${MKDIR} ${STAGEDIR}${PREFIX}/etc/foreman-proxy/settings.d
 		${INSTALL_DATA} ${WRKSRC}/settings.d/salt.yml.example \
 			${STAGEDIR}${PREFIX}/etc/foreman-proxy/settings.d/salt.yml.sample
 		${MKDIR} ${STAGEDIR}${PREFIX}/share/foreman-proxy/bundler.d
 		${INSTALL_DATA} ${FILESDIR}/salt.rb \
 			${STAGEDIR}${PREFIX}/share/foreman-proxy/bundler.d/salt.rb
 		${MKDIR} ${STAGEDIR}${PREFIX}/etc/salt
 		${INSTALL_DATA} ${WRKSRC}/etc/foreman.yaml.example \
 			${STAGEDIR}${PREFIX}/etc/salt/foreman.yaml.sample
 		${INSTALL_SCRIPT} ${WRKSRC}/sbin/upload-salt-reports \
 			${STAGEDIR}${PREFIX}/sbin
 
 .include <bsd.port.mk>
Index: head/sysutils/rubygem-smart_proxy_salt/distinfo
===================================================================
--- head/sysutils/rubygem-smart_proxy_salt/distinfo	(revision 558448)
+++ head/sysutils/rubygem-smart_proxy_salt/distinfo	(revision 558449)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1525719377
-SHA256 (rubygem/smart_proxy_salt-2.1.9.gem) = 4de1c4cbd882637052002d49764a4a7bbc58f4f100c026f8b7c0dd0a3dcbd4b0
-SIZE (rubygem/smart_proxy_salt-2.1.9.gem) = 23552
+TIMESTAMP = 1608381889
+SHA256 (rubygem/smart_proxy_salt-3.1.2.gem) = 38d436c75b8b44413df1fe334605ce45745749659430b7fac7b590c9b91549bd
+SIZE (rubygem/smart_proxy_salt-3.1.2.gem) = 24576
Index: head/sysutils/rubygem-smart_proxy_salt/files/patch-bin-foreman-node
===================================================================
--- head/sysutils/rubygem-smart_proxy_salt/files/patch-bin-foreman-node	(revision 558448)
+++ head/sysutils/rubygem-smart_proxy_salt/files/patch-bin-foreman-node	(revision 558449)
@@ -1,11 +1,11 @@
---- bin/foreman-node.orig	2015-05-15 19:21:46 UTC
+--- bin/foreman-node.orig	2020-12-19 12:50:21 UTC
 +++ bin/foreman-node
-@@ -5,7 +5,7 @@
+@@ -7,7 +7,7 @@
  
  require 'yaml'
  
--$settings_file = '/etc/salt/foreman.yaml'
-+$settings_file = '%%LOCALBASE%%/etc/salt/foreman.yaml'
- SETTINGS = YAML.load_file($settings_file)
+-settings_file = '/etc/salt/foreman.yaml'
++settings_file = '%%LOCALBASE%%/etc/salt/foreman.yaml'
+ SETTINGS = YAML.load_file(settings_file)
  
  require 'net/http'
Index: head/sysutils/rubygem-smart_proxy_salt/files/patch-sbin-upload-salt-reports
===================================================================
--- head/sysutils/rubygem-smart_proxy_salt/files/patch-sbin-upload-salt-reports	(revision 558448)
+++ head/sysutils/rubygem-smart_proxy_salt/files/patch-sbin-upload-salt-reports	(revision 558449)
@@ -1,15 +1,15 @@
---- sbin/upload-salt-reports.orig	2014-11-24 22:04:49.000000000 +0100
-+++ sbin/upload-salt-reports	2014-11-24 22:04:56.000000000 +0100
-@@ -1,9 +1,9 @@
- #!/usr/bin/env python
- # Uploads reports from the Salt job cache to Foreman
+--- sbin/upload-salt-reports.orig	2020-12-19 12:46:33 UTC
++++ sbin/upload-salt-reports
+@@ -3,9 +3,9 @@
  
+ from __future__ import print_function
+ 
 -LAST_UPLOADED = '/etc/salt/last_uploaded'
 -FOREMAN_CONFIG = '/etc/salt/foreman.yaml'
 -LOCK_FILE = '/var/lock/salt-report-upload.lock'
 +LAST_UPLOADED = '%%LOCALBASE%%/etc/salt/last_uploaded'
 +FOREMAN_CONFIG = '%%LOCALBASE%%/etc/salt/foreman.yaml'
 +LOCK_FILE = '/var/run/salt-report-upload.lock'
  
- import urllib
- import httplib
+ try:
+     from http.client import HTTPConnection, HTTPSConnection