Update to 4.1.1

- While I'm here:
  - Sort RUN_DEPENDS
  - Use post-install: instaed of post-stage:
  - Fix indent
  - Rename gemspec patch to patch-gemspec
  - Clean up patch-gemspec

Changes:	https://github.com/gollum/gollum/blob/master/HISTORY.md
		https://github.com/gollum/gollum/commits/master

4 files changed, 24 insertions, 44 deletions

diff --git a/www/rubygem-gollum/Makefile b/www/rubygem-gollum/Makefile
index c6a4f93ad437..0bcaeff3c808 100644
--- a/www/rubygem-gollum/Makefile
+++ b/www/rubygem-gollum/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	gollum
-PORTVERSION=	4.1.0
+PORTVERSION=	4.1.1
 CATEGORIES=	www rubygems
 MASTER_SITES=	RG
 
@@ -12,25 +12,23 @@ COMMENT=	Gollum is a simple wiki system built on top of Git
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-gollum-lib>=4.0.1:www/rubygem-gollum-lib \
+RUN_DEPENDS=	git:devel/git \
+		rubygem-gemojione>=3.2:graphics/rubygem-gemojione \
+		rubygem-gollum-lib>=4.0.1:www/rubygem-gollum-lib \
 		rubygem-kramdown>=1.9:textproc/rubygem-kramdown \
-		rubygem-sinatra>=1.4.4:www/rubygem-sinatra \
 		rubygem-mustache0>=0.99.5:devel/rubygem-mustache0 \
-		rubygem-gemojione2>=2.0:graphics/rubygem-gemojione2 \
-		rubygem-useragent>=0.16.2:devel/rubygem-useragent \
-		git>=0:devel/git
-
-USE_RC_SUBR=	${PORTNAME}
-
-post-stage:
-		${MKDIR} ${STAGEDIR}${PREFIX}/www/gollum
+		rubygem-sinatra>=1.4.4:www/rubygem-sinatra \
+		rubygem-useragent>=0.16.2:devel/rubygem-useragent
 
 NO_ARCH=	yes
+USE_RC_SUBR=	${PORTNAME}
 USE_RUBY=	yes
 USES=		gem
 
 PLIST_FILES=	bin/gollum
-
 PLIST_DIRS=     %%WWWDIR%%
 
+post-install:
+	${MKDIR} ${STAGEDIR}${PREFIX}/www/gollum
+
 .include <bsd.port.mk>
diff --git a/www/rubygem-gollum/distinfo b/www/rubygem-gollum/distinfo
index e0d144d8efbd..2d133db3fd4c 100644
--- a/www/rubygem-gollum/distinfo
+++ b/www/rubygem-gollum/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1489612818
-SHA256 (rubygem/gollum-4.1.0.gem) = a1537447d14106a18f3439252edc7812d80076cb47aeff8169de80f918311fe4
-SIZE (rubygem/gollum-4.1.0.gem) = 2106368
+TIMESTAMP = 1492429348
+SHA256 (rubygem/gollum-4.1.1.gem) = fa70f19bb0e43a239d672bc9a38b79a8bc9bed344fc80794dfefa68b3c742a4b
+SIZE (rubygem/gollum-4.1.1.gem) = 2105856
diff --git a/www/rubygem-gollum/files/patch-gemspec b/www/rubygem-gollum/files/patch-gemspec
new file mode 100644
index 000000000000..f433ec4e330c
--- /dev/null
+++ b/www/rubygem-gollum/files/patch-gemspec
@@ -0,0 +1,11 @@
+--- gollum.gemspec.orig	2017-04-17 16:38:20 UTC
++++ gollum.gemspec
+@@ -27,7 +27,7 @@ Gem::Specification.new do |s|
+ 
+     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+       s.add_runtime_dependency(%q<gollum-lib>.freeze, [">= 4.0.1", "~> 4.0"])
+-      s.add_runtime_dependency(%q<kramdown>.freeze, ["~> 1.9.0"])
++      s.add_runtime_dependency(%q<kramdown>.freeze, [">= 1.9.0"])
+       s.add_runtime_dependency(%q<sinatra>.freeze, [">= 1.4.4", "~> 1.4"])
+       s.add_runtime_dependency(%q<mustache>.freeze, ["< 1.0.0", ">= 0.99.5"])
+       s.add_runtime_dependency(%q<useragent>.freeze, ["~> 0.16.2"])
diff --git a/www/rubygem-gollum/files/patch-gollum.gemspec b/www/rubygem-gollum/files/patch-gollum.gemspec
deleted file mode 100644
index 945696520acb..000000000000
--- a/www/rubygem-gollum/files/patch-gollum.gemspec
+++ /dev/null
@@ -1,29 +0,0 @@
---- gollum.gemspec.orig	2017-03-16 10:32:51 UTC
-+++ gollum.gemspec
-@@ -27,7 +27,7 @@ Gem::Specification.new do |s|
- 
-     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-       s.add_runtime_dependency(%q<gollum-lib>.freeze, [">= 4.0.1", "~> 4.0"])
--      s.add_runtime_dependency(%q<kramdown>.freeze, ["~> 1.9.0"])
-+      s.add_runtime_dependency(%q<kramdown>.freeze, [">= 1.9.0"])
-       s.add_runtime_dependency(%q<sinatra>.freeze, [">= 1.4.4", "~> 1.4"])
-       s.add_runtime_dependency(%q<mustache>.freeze, ["< 1.0.0", ">= 0.99.5"])
-       s.add_runtime_dependency(%q<useragent>.freeze, ["~> 0.16.2"])
-@@ -41,7 +41,7 @@ Gem::Specification.new do |s|
-       s.add_development_dependency(%q<webrick>.freeze, ["~> 1.3.1"])
-     else
-       s.add_dependency(%q<gollum-lib>.freeze, [">= 4.0.1", "~> 4.0"])
--      s.add_dependency(%q<kramdown>.freeze, ["~> 1.9.0"])
-+      s.add_dependency(%q<kramdown>.freeze, [">= 1.9.0"])
-       s.add_dependency(%q<sinatra>.freeze, [">= 1.4.4", "~> 1.4"])
-       s.add_dependency(%q<mustache>.freeze, ["< 1.0.0", ">= 0.99.5"])
-       s.add_dependency(%q<useragent>.freeze, ["~> 0.16.2"])
-@@ -56,7 +56,7 @@ Gem::Specification.new do |s|
-     end
-   else
-     s.add_dependency(%q<gollum-lib>.freeze, [">= 4.0.1", "~> 4.0"])
--    s.add_dependency(%q<kramdown>.freeze, ["~> 1.9.0"])
-+    s.add_dependency(%q<kramdown>.freeze, [">= 1.9.0"])
-     s.add_dependency(%q<sinatra>.freeze, [">= 1.4.4", "~> 1.4"])
-     s.add_dependency(%q<mustache>.freeze, ["< 1.0.0", ">= 0.99.5"])
-     s.add_dependency(%q<useragent>.freeze, ["~> 0.16.2"])