6 files changed, 35 insertions, 28 deletions

diff --git a/sysutils/rubygem-hammer_cli/Makefile b/sysutils/rubygem-hammer_cli/Makefile
index 1314f0fef28a..e8335d406e93 100644
--- a/sysutils/rubygem-hammer_cli/Makefile
+++ b/sysutils/rubygem-hammer_cli/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	hammer_cli
-PORTVERSION=	0.1.3
+PORTVERSION=	0.1.4
 CATEGORIES=	sysutils ruby
 MASTER_SITES=	RG
 
@@ -11,7 +11,7 @@ COMMENT=	Provides CLI interfaces for Ruby apps
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	rubygem-apipie-bindings>=0.0.8:${PORTSDIR}/devel/rubygem-apipie-bindings \
+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 \
@@ -28,11 +28,8 @@ USE_RUBY=	yes
 USE_RUBYGEMS=	yes
 RUBYGEM_AUTOPLIST=	yes
 
-.include <bsd.port.pre.mk>
-
 post-install:
-		${MKDIR} ${STAGEDIR}${PREFIX}/etc/hammer
-		${MKDIR} ${STAGEDIR}${PREFIX}/etc/hammer/cli.modules.d
-		${INSTALL_DATA} ${FILESDIR}/cli_config.yml.sample ${STAGEDIR}${PREFIX}/etc/hammer/cli_config.yml.sample
+	${MKDIR} ${STAGEDIR}${PREFIX}/etc/hammer/cli.modules.d
+	${INSTALL_DATA} ${FILESDIR}/cli_config.yml.sample ${STAGEDIR}${PREFIX}/etc/hammer
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/sysutils/rubygem-hammer_cli/distinfo b/sysutils/rubygem-hammer_cli/distinfo
index 92cb55d21eb7..a32564c71ad3 100644
--- a/sysutils/rubygem-hammer_cli/distinfo
+++ b/sysutils/rubygem-hammer_cli/distinfo
@@ -1,2 +1,2 @@
-SHA256 (rubygem/hammer_cli-0.1.3.gem) = e142a14e59e9718d3ff3d7a0ab1a40d4cb3ade565ac44d13a5cd1e06d18e2b25
-SIZE (rubygem/hammer_cli-0.1.3.gem) = 121344
+SHA256 (rubygem/hammer_cli-0.1.4.gem) = 5ede832cf281891550b584948f3bcfb07cc19659740079ac18c30d3d201c4ed2
+SIZE (rubygem/hammer_cli-0.1.4.gem) = 141824
diff --git a/sysutils/rubygem-hammer_cli/files/cli_config.yml.sample b/sysutils/rubygem-hammer_cli/files/cli_config.yml.sample
index 39519d46d9cb..fa34e958da27 100644
--- a/sysutils/rubygem-hammer_cli/files/cli_config.yml.sample
+++ b/sysutils/rubygem-hammer_cli/files/cli_config.yml.sample
@@ -11,6 +11,9 @@
 # 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'
 
diff --git a/sysutils/rubygem-hammer_cli/files/patch-localization b/sysutils/rubygem-hammer_cli/files/patch-localization
deleted file mode 100644
index 62d8e313fe4f..000000000000
--- a/sysutils/rubygem-hammer_cli/files/patch-localization
+++ /dev/null
@@ -1,13 +0,0 @@
---- lib/hammer_cli/i18n.rb
-+++ lib/hammer_cli/i18n.rb
-@@ -108,6 +108,10 @@ def locale_dir
-         '/usr/share/locale'
-       end
- 
-+      def domain_name
-+        "#{super}@system"
-+      end
-+
-     end
- 
- 
diff --git a/sysutils/rubygem-hammer_cli/files/patch-versions b/sysutils/rubygem-hammer_cli/files/patch-versions
index b35bed46eb95..aadc0002dedc 100644
--- a/sysutils/rubygem-hammer_cli/files/patch-versions
+++ b/sysutils/rubygem-hammer_cli/files/patch-versions
@@ -1,6 +1,27 @@
---- hammer_cli-0.1.3.gemspec.orig	2014-08-25 23:09:28.000000000 +0200
-+++ hammer_cli-0.1.3.gemspec	2014-08-25 23:09:42.000000000 +0200
-@@ -155,7 +155,7 @@
+--- hammer_cli-0.1.4.gemspec.orig	2014-12-10 22:09:22.000000000 +0100
++++ hammer_cli-0.1.4.gemspec	2014-12-10 22:10:25.000000000 +0100
+@@ -138,20 +138,6 @@
+       - !ruby/object:Gem::Version
+         version: '0'
+ - !ruby/object:Gem::Dependency
+-  name: rb-readline
+-  requirement: !ruby/object:Gem::Requirement
+-    requirements:
+-    - - '>='
+-      - !ruby/object:Gem::Version
+-        version: '0'
+-  type: :runtime
+-  prerelease: false
+-  version_requirements: !ruby/object:Gem::Requirement
+-    requirements:
+-    - - '>='
+-      - !ruby/object:Gem::Version
+-        version: '0'
+-- !ruby/object:Gem::Dependency
+   name: fastercsv
+   requirement: !ruby/object:Gem::Requirement
+     requirements:
+@@ -169,7 +155,7 @@
    name: mime-types
    requirement: !ruby/object:Gem::Requirement
      requirements:
diff --git a/sysutils/rubygem-hammer_cli/pkg-plist b/sysutils/rubygem-hammer_cli/pkg-plist
index ccedd52aad55..3c30017abb9e 100644
--- a/sysutils/rubygem-hammer_cli/pkg-plist
+++ b/sysutils/rubygem-hammer_cli/pkg-plist
@@ -1,4 +1,3 @@
 bin/hammer
 @sample etc/hammer/cli_config.yml.sample
-@dirrmtry etc/hammer/cli.modules.d
-@dirrmtry etc/hammer
+@dir etc/hammer/cli.modules.d