4 files changed, 18 insertions, 46 deletions

diff --git a/sysutils/rubygem-hammer_cli/Makefile b/sysutils/rubygem-hammer_cli/Makefile
index 06a5af29b6e5..2b64320d251a 100644
--- a/sysutils/rubygem-hammer_cli/Makefile
+++ b/sysutils/rubygem-hammer_cli/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	hammer_cli
-PORTVERSION=	0.1.4
+PORTVERSION=	0.2.0
 CATEGORIES=	sysutils ruby
 MASTER_SITES=	RG
 
@@ -14,7 +14,6 @@ LICENSE=	GPLv3
 RUN_DEPENDS=	rubygem-apipie-bindings>=0.0.10:${PORTSDIR}/devel/rubygem-apipie-bindings \
 		rubygem-awesome_print>=1.1.0:${PORTSDIR}/devel/rubygem-awesome_print \
 		rubygem-clamp>=0.6.3_1:${PORTSDIR}/devel/rubygem-clamp \
-		rubygem-fastercsv>=1.5.5:${PORTSDIR}/devel/rubygem-fastercsv \
 		rubygem-fast_gettext>=0.8.1:${PORTSDIR}/devel/rubygem-fast_gettext \
 		rubygem-highline>=1.6.20:${PORTSDIR}/devel/rubygem-highline \
 		rubygem-json>=1.8.1:${PORTSDIR}/devel/rubygem-json \
@@ -30,6 +29,7 @@ RUBYGEM_AUTOPLIST=	yes
 
 post-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/hammer/cli.modules.d
-	${INSTALL_DATA} ${FILESDIR}/cli_config.yml.sample ${STAGEDIR}${PREFIX}/etc/hammer
+	${INSTALL_DATA} ${WRKSRC}/config/cli_config.template.yml \
+		${STAGEDIR}${PREFIX}/etc/hammer/cli_config.yml.sample
 
 .include <bsd.port.mk>
diff --git a/sysutils/rubygem-hammer_cli/distinfo b/sysutils/rubygem-hammer_cli/distinfo
index a32564c71ad3..980701d432ee 100644
--- a/sysutils/rubygem-hammer_cli/distinfo
+++ b/sysutils/rubygem-hammer_cli/distinfo
@@ -1,2 +1,2 @@
-SHA256 (rubygem/hammer_cli-0.1.4.gem) = 5ede832cf281891550b584948f3bcfb07cc19659740079ac18c30d3d201c4ed2
-SIZE (rubygem/hammer_cli-0.1.4.gem) = 141824
+SHA256 (rubygem/hammer_cli-0.2.0.gem) = 14f212f1d2342084a707e3e54500ccf204483ad5fe7d5bce9745084c678b78a1
+SIZE (rubygem/hammer_cli-0.2.0.gem) = 145408
diff --git a/sysutils/rubygem-hammer_cli/files/cli_config.yml.sample b/sysutils/rubygem-hammer_cli/files/cli_config.yml.sample
deleted file mode 100644
index fa34e958da27..000000000000
--- a/sysutils/rubygem-hammer_cli/files/cli_config.yml.sample
+++ /dev/null
@@ -1,30 +0,0 @@
-# User interface related settings
-:ui:
-  # Enable interactive queries?
-  :interactive: true
-  # Number of records listed per page
-  :per_page: 20
-  # Location of shell history file
-  :history_file: '~/.hammer/history'
-
-
-# Enable/disable color output of logger in Clamp commands
-:watch_plain: false
-
-# Force reload of Apipie cache with every Hammer invocation
-:reload_cache: false
-
-# Directory where the logs are stored. The default is /var/log/hammer/ and the log file is named hammer.log
-:log_dir: '~/.hammer/log'
-
-# Logging level. One of debug, info, warning, error, fatal
-:log_level: 'error'
-
-#:log_owner: 'foreman'
-#:log_group: 'foreman'
-
-# Maximum log size in bytes. Log rotates when the value gets exceeded
-#:log_size: 5 #in MB
-
-# Mark translated strings with X characters (for developers)
-#:mark_translated: false
diff --git a/sysutils/rubygem-hammer_cli/files/patch-gemspec b/sysutils/rubygem-hammer_cli/files/patch-gemspec
index c7c779a1565f..abc60acb94b5 100644
--- a/sysutils/rubygem-hammer_cli/files/patch-gemspec
+++ b/sysutils/rubygem-hammer_cli/files/patch-gemspec
@@ -1,11 +1,13 @@
---- hammer_cli.gemspec.orig	2015-01-22 02:42:09.000000000 +0000
-+++ hammer_cli.gemspec	2015-01-22 02:42:46.000000000 +0000
-@@ -64,7 +64,7 @@
-     s.add_dependency(%q<json>, [">= 0"])
-     s.add_dependency(%q<rb-readline>, [">= 0"])
-     s.add_dependency(%q<fastercsv>, [">= 0"])
--    s.add_dependency(%q<mime-types>, ["~> 1.0"])
-+    s.add_dependency(%q<mime-types>, [">= 1.0"])
-     s.add_dependency(%q<apipie-bindings>, ["~> 0.0.10"])
-   end
- end
+--- hammer_cli.gemspec.orig	2015-04-24 10:43:18 UTC
++++ hammer_cli.gemspec
+@@ -33,9 +33,7 @@ Gem::Specification.new do |s|
+       s.add_runtime_dependency(%q<fast_gettext>, [">= 0"])
+       s.add_runtime_dependency(%q<locale>, [">= 2.0.6"])
+       s.add_runtime_dependency(%q<json>, [">= 0"])
+-      s.add_runtime_dependency(%q<rb-readline>, [">= 0"])
+-      s.add_runtime_dependency(%q<fastercsv>, [">= 0"])
+-      s.add_runtime_dependency(%q<mime-types>, ["~> 1.0"])
++      s.add_runtime_dependency(%q<mime-types>, [">= 1.0"])
+       s.add_runtime_dependency(%q<apipie-bindings>, ["~> 0.0.10"])
+     else
+       s.add_dependency(%q<clamp>, [">= 0"])