7 files changed, 19 insertions, 33 deletions

diff --git a/sysutils/rubygem-smart_proxy_salt/Makefile b/sysutils/rubygem-smart_proxy_salt/Makefile
index 8ddbb17b1420..a0446e41ae63 100644
--- a/sysutils/rubygem-smart_proxy_salt/Makefile
+++ b/sysutils/rubygem-smart_proxy_salt/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	smart_proxy_salt
-PORTVERSION=	1.0.0
+PORTVERSION=	2.1.2
 CATEGORIES=	sysutils ruby
 MASTER_SITES=	RG
 
@@ -11,7 +11,7 @@ COMMENT=	SaltStack Plug-In for Foreman's Smart Proxy
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	foreman-proxy>=1.6.0:${PORTSDIR}/net/foreman-proxy \
+RUN_DEPENDS=	foreman-proxy>=1.8.0:${PORTSDIR}/net/foreman-proxy \
 		${PYTHON_PKGNAMEPREFIX}salt>0:${PORTSDIR}/sysutils/py-salt
 
 USES=		python
@@ -19,8 +19,6 @@ USE_RUBY=	yes
 USE_RUBYGEMS=	yes
 RUBYGEM_AUTOPLIST=	yes
 
-.include <bsd.port.pre.mk>
-
 post-patch:
 		@${REINPLACE_CMD} \
 			-e "s|/usr/bin/env ruby|${RUBY}|g" \
@@ -30,14 +28,16 @@ post-patch:
 			${WRKSRC}/sbin/upload-salt-reports
 
 post-install:
-		${MKDIR} ${STAGEDIR}${PREFIX}/etc/foreman-proxy
 		${MKDIR} ${STAGEDIR}${PREFIX}/etc/foreman-proxy/settings.d
-		${INSTALL_DATA} ${FILESDIR}/salt.yml.sample ${STAGEDIR}${PREFIX}/etc/foreman-proxy/settings.d/salt.yml.sample
-		${MKDIR} ${STAGEDIR}${PREFIX}/share/foreman-proxy
+		${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
+		${INSTALL_DATA} ${FILESDIR}/salt.rb \
+			${STAGEDIR}${PREFIX}/share/foreman-proxy/bundler.d/salt.rb
 		${MKDIR} ${STAGEDIR}${PREFIX}/etc/salt
-		${INSTALL_DATA} ${FILESDIR}/foreman.yaml.sample ${STAGEDIR}${PREFIX}/etc/salt/foreman.yaml.sample
-		${INSTALL_SCRIPT} ${WRKSRC}/sbin/upload-salt-reports ${STAGEDIR}${PREFIX}/sbin
+		${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.post.mk>
+.include <bsd.port.mk>
diff --git a/sysutils/rubygem-smart_proxy_salt/distinfo b/sysutils/rubygem-smart_proxy_salt/distinfo
index 19d3ff539206..a669a6dd1a3e 100644
--- a/sysutils/rubygem-smart_proxy_salt/distinfo
+++ b/sysutils/rubygem-smart_proxy_salt/distinfo
@@ -1,2 +1,2 @@
-SHA256 (rubygem/smart_proxy_salt-1.0.0.gem) = a0a84ef93c6608701b8fd53d56c7e9e3a1793f13a0e65fc8ee4fada8be07ab3f
-SIZE (rubygem/smart_proxy_salt-1.0.0.gem) = 22016
+SHA256 (rubygem/smart_proxy_salt-2.1.2.gem) = 6d7d74233e25e7c762b44cc3fc7241373a0c4d46aad4431c3ebe4aba9041550d
+SIZE (rubygem/smart_proxy_salt-2.1.2.gem) = 23040
diff --git a/sysutils/rubygem-smart_proxy_salt/files/foreman.yaml.sample b/sysutils/rubygem-smart_proxy_salt/files/foreman.yaml.sample
deleted file mode 100644
index 67c3fe0529f8..000000000000
--- a/sysutils/rubygem-smart_proxy_salt/files/foreman.yaml.sample
+++ /dev/null
@@ -1,10 +0,0 @@
----
-:proto: http
-:host: foreman.example.com
-:port: 3000
-:ssl_ca: "" 
-:ssl_cert: ""
-:ssl_key: ""
-:timeout:  10
-:salt:  /usr/local/bin/salt
-:upload_grains:  true
diff --git a/sysutils/rubygem-smart_proxy_salt/files/patch-bin-foreman-node b/sysutils/rubygem-smart_proxy_salt/files/patch-bin-foreman-node
index 9fc3fa72e9a6..bf841f2d29d8 100644
--- a/sysutils/rubygem-smart_proxy_salt/files/patch-bin-foreman-node
+++ b/sysutils/rubygem-smart_proxy_salt/files/patch-bin-foreman-node
@@ -1,11 +1,11 @@
---- bin/foreman-node.orig	2014-09-27 23:35:54.000000000 +0200
-+++ bin/foreman-node	2014-09-27 23:39:19.000000000 +0200
+--- bin/foreman-node.orig	2015-05-15 19:21:46 UTC
++++ bin/foreman-node
 @@ -5,7 +5,7 @@
  
  require 'yaml'
  
--$settings_file = "/etc/salt/foreman.yaml"
-+$settings_file = "%%LOCALBASE%%/etc/salt/foreman.yaml"
+-$settings_file = '/etc/salt/foreman.yaml'
++$settings_file = '%%LOCALBASE%%/etc/salt/foreman.yaml'
  SETTINGS = YAML.load_file($settings_file)
  
  require 'net/http'
diff --git a/sysutils/rubygem-smart_proxy_salt/files/salt.rb b/sysutils/rubygem-smart_proxy_salt/files/salt.rb
index e33da60fbe95..4c5802061146 100644
--- a/sysutils/rubygem-smart_proxy_salt/files/salt.rb
+++ b/sysutils/rubygem-smart_proxy_salt/files/salt.rb
@@ -1 +1 @@
-gem 'smart_proxy_salt', '0.0.2'
+gem 'smart_proxy_salt'
diff --git a/sysutils/rubygem-smart_proxy_salt/files/salt.yml.sample b/sysutils/rubygem-smart_proxy_salt/files/salt.yml.sample
deleted file mode 100644
index 7b35c6ac8a03..000000000000
--- a/sysutils/rubygem-smart_proxy_salt/files/salt.yml.sample
+++ /dev/null
@@ -1,4 +0,0 @@
----
-:enabled: true
-:autosign_file: /usr/local/etc/salt/autosign.conf
-:salt_command_user: root
diff --git a/sysutils/rubygem-smart_proxy_salt/pkg-message b/sysutils/rubygem-smart_proxy_salt/pkg-message
index dd6e8241cff4..699821a526df 100644
--- a/sysutils/rubygem-smart_proxy_salt/pkg-message
+++ b/sysutils/rubygem-smart_proxy_salt/pkg-message
@@ -1,5 +1,5 @@
 Further configuration is required to connect salt and foreman-proxy, see:
-https://github.com/theforeman/foreman_salt/wiki#21-smart-proxy
+http://theforeman.org/plugins/foreman_salt/2.0/#2.1SmartProxy
 
 To upload reports from SaltStack highstates to Foreman, add a line like this to your /etc/crontab:
 */10 * * * * root /usr/local/sbin/upload-salt-reports >>/var/log/foreman-proxy/salt-cron.log 2>&1