From owner-svn-ports-head@FreeBSD.ORG Mon Sep 29 21:12:12 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A1B20168; Mon, 29 Sep 2014 21:12:12 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 8DEE8910; Mon, 29 Sep 2014 21:12:12 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s8TLCCG8044514; Mon, 29 Sep 2014 21:12:12 GMT (envelope-from swills@FreeBSD.org) Received: (from swills@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s8TLCB8d044510; Mon, 29 Sep 2014 21:12:11 GMT (envelope-from swills@FreeBSD.org) Message-Id: <201409292112.s8TLCB8d044510@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: swills set sender to swills@FreeBSD.org using -f From: Steve Wills Date: Mon, 29 Sep 2014 21:12:11 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r369556 - in head/sysutils/rubygem-smart_proxy_salt: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 29 Sep 2014 21:12:12 -0000 Author: swills Date: Mon Sep 29 21:12:11 2014 New Revision: 369556 URL: http://svnweb.freebsd.org/changeset/ports/369556 QAT: https://qat.redports.org/buildarchive/r369556/ Log: sysutils/rubygem-smart_proxy_salt: fix various bugs to make port functional PR: 194014 Submitted by: Michael Moll Added: head/sysutils/rubygem-smart_proxy_salt/files/foreman.yaml.sample (contents, props changed) head/sysutils/rubygem-smart_proxy_salt/files/patch-bin-foreman-node (contents, props changed) Modified: head/sysutils/rubygem-smart_proxy_salt/Makefile head/sysutils/rubygem-smart_proxy_salt/pkg-plist Modified: head/sysutils/rubygem-smart_proxy_salt/Makefile ============================================================================== --- head/sysutils/rubygem-smart_proxy_salt/Makefile Mon Sep 29 21:05:03 2014 (r369555) +++ head/sysutils/rubygem-smart_proxy_salt/Makefile Mon Sep 29 21:12:11 2014 (r369556) @@ -3,6 +3,7 @@ PORTNAME= smart_proxy_salt PORTVERSION= 0.0.2 +PORTREVISION= 1 CATEGORIES= sysutils ruby MASTER_SITES= RG @@ -12,14 +13,22 @@ COMMENT= SaltStack Plug-In for Foreman's LICENSE= GPLv3 RUN_DEPENDS= foreman-proxy>=1.6.0:${PORTSDIR}/net/foreman-proxy \ - ${PYTHON_PKGNAMEPREFIX}salt:${PORTSDIR}/sysutils/py-salt + ${PYTHON_PKGNAMEPREFIX}salt>0:${PORTSDIR}/sysutils/py-salt +USE_PYTHON= yes USE_RUBY= yes USE_RUBYGEMS= yes RUBYGEM_AUTOPLIST= yes .include +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 + post-install: ${MKDIR} ${STAGEDIR}${PREFIX}/etc/foreman-proxy ${MKDIR} ${STAGEDIR}${PREFIX}/etc/foreman-proxy/settings.d @@ -27,5 +36,7 @@ post-install: ${MKDIR} ${STAGEDIR}${PREFIX}/share/foreman-proxy ${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} ${FILESDIR}/foreman.yaml.sample ${STAGEDIR}${PREFIX}/etc/salt/foreman.yaml.sample .include Added: head/sysutils/rubygem-smart_proxy_salt/files/foreman.yaml.sample ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/rubygem-smart_proxy_salt/files/foreman.yaml.sample Mon Sep 29 21:12:11 2014 (r369556) @@ -0,0 +1,10 @@ +--- +:proto: http +:host: foreman.example.com +:port: 3000 +:ssl_ca: "" +:ssl_cert: "" +:ssl_key: "" +:timeout: 10 +:salt: /usr/local/bin/salt +:upload_grains: true Added: head/sysutils/rubygem-smart_proxy_salt/files/patch-bin-foreman-node ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/rubygem-smart_proxy_salt/files/patch-bin-foreman-node Mon Sep 29 21:12:11 2014 (r369556) @@ -0,0 +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 +@@ -5,7 +5,7 @@ + + require 'yaml' + +-$settings_file = "/etc/salt/foreman.yaml" ++$settings_file = "%%LOCALBASE%%/etc/salt/foreman.yaml" + SETTINGS = YAML.load_file($settings_file) + + require 'net/http' Modified: head/sysutils/rubygem-smart_proxy_salt/pkg-plist ============================================================================== --- head/sysutils/rubygem-smart_proxy_salt/pkg-plist Mon Sep 29 21:05:03 2014 (r369555) +++ head/sysutils/rubygem-smart_proxy_salt/pkg-plist Mon Sep 29 21:12:11 2014 (r369556) @@ -1,3 +1,4 @@ bin/foreman-node share/foreman-proxy/bundler.d/salt.rb @sample etc/foreman-proxy/settings.d/salt.yml.sample +@sample etc/salt/foreman.yaml.sample