Index: head/www/rubygem-gollum/Makefile =================================================================== --- head/www/rubygem-gollum/Makefile (revision 436747) +++ head/www/rubygem-gollum/Makefile (revision 436748) @@ -1,31 +1,36 @@ # Created by: Sir l33tname # $FreeBSD$ PORTNAME= gollum -PORTVERSION= 4.0.1 +PORTVERSION= 4.1.0 CATEGORIES= www rubygems MASTER_SITES= RG MAINTAINER= sirl33tname@gmail.com 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 \ rubygem-kramdown>=1.9:textproc/rubygem-kramdown \ rubygem-sinatra>=1.4.4:www/rubygem-sinatra \ rubygem-mustache0>=0.99.5:devel/rubygem-mustache0 \ - rubygem-gemojione>=2.0:graphics/rubygem-gemojione \ + 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 + NO_ARCH= yes USE_RUBY= yes USES= gem PLIST_FILES= bin/gollum + +PLIST_DIRS= %%WWWDIR%% .include Index: head/www/rubygem-gollum/distinfo =================================================================== --- head/www/rubygem-gollum/distinfo (revision 436747) +++ head/www/rubygem-gollum/distinfo (revision 436748) @@ -1,3 +1,3 @@ -TIMESTAMP = 1487950668 -SHA256 (rubygem/gollum-4.0.1.gem) = af79532583634cb2bc22dad7c2a36327df5560b924756cdf2f475b3d10e8ef0a -SIZE (rubygem/gollum-4.0.1.gem) = 2103296 +TIMESTAMP = 1489612818 +SHA256 (rubygem/gollum-4.1.0.gem) = a1537447d14106a18f3439252edc7812d80076cb47aeff8169de80f918311fe4 +SIZE (rubygem/gollum-4.1.0.gem) = 2106368 Index: head/www/rubygem-gollum/files/gollum.in =================================================================== --- head/www/rubygem-gollum/files/gollum.in (revision 436747) +++ head/www/rubygem-gollum/files/gollum.in (revision 436748) @@ -1,46 +1,51 @@ #!/bin/sh # Created by: l33tname # $FreeBSD$ # # PROVIDE: gollum # REQUIRE: LOGIN # KEYWORD: shutdown # # Add the following lines to /etc/rc.conf.local or /etc/rc.conf # to enable this service: # # gollum_enable (bool): Set to NO by default. # Set it to YES to enable. # # gollum_path Set it to the location where # your git repo is located. # +# gollum_user User to run command as +# Default is root +# # gollum_ip Set the IP address gollum listens on # Default is "0.0.0.0" # # gollum_port Set the IP address gollum listens on # Default is "80" . /etc/rc.subr # setup enviroment export PATH=$PATH:%%PREFIX%%/bin . /etc/rc.subr name="gollum" rcvar="${name}_enable" load_rc_config $name : ${gollum_enable:=NO} : ${gollum_path:=%%PREFIX%%/www/gollum} +: ${gollum_user:=root} : ${gollum_ip:=0.0.0.0} : ${gollum_port:=80} pidfile=/var/run/${name}.pid command="/usr/sbin/daemon" command_args="-P ${pidfile} -r -f gollum --host ${gollum_ip} --port ${gollum_port} --live-preview ${gollum_path}" load_rc_config $name run_rc_command "$1" + Index: head/www/rubygem-gollum/files/patch-gollum.gemspec =================================================================== --- head/www/rubygem-gollum/files/patch-gollum.gemspec (revision 436747) +++ head/www/rubygem-gollum/files/patch-gollum.gemspec (revision 436748) @@ -1,41 +1,29 @@ ---- gollum.gemspec.orig 2017-03-12 10:42:22 UTC +--- gollum.gemspec.orig 2017-03-16 10:32:51 UTC +++ gollum.gemspec -@@ -27,10 +27,10 @@ Gem::Specification.new do |s| +@@ -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.freeze, [">= 4.0.1", "~> 4.0"]) -- s.add_runtime_dependency(%q.freeze, ["~> 1.8.0"]) -+ s.add_runtime_dependency(%q.freeze, [">= 1.8.0"]) +- s.add_runtime_dependency(%q.freeze, ["~> 1.9.0"]) ++ s.add_runtime_dependency(%q.freeze, [">= 1.9.0"]) s.add_runtime_dependency(%q.freeze, [">= 1.4.4", "~> 1.4"]) s.add_runtime_dependency(%q.freeze, ["< 1.0.0", ">= 0.99.5"]) -- s.add_runtime_dependency(%q.freeze, ["~> 0.14.0"]) -+ s.add_runtime_dependency(%q.freeze, [">= 0.14.0"]) - s.add_development_dependency(%q.freeze, ["~> 0.6.2"]) - s.add_development_dependency(%q.freeze, ["~> 3.5.0"]) - s.add_development_dependency(%q.freeze, ["~> 0.14.16"]) -@@ -39,10 +39,10 @@ Gem::Specification.new do |s| + s.add_runtime_dependency(%q.freeze, ["~> 0.16.2"]) +@@ -41,7 +41,7 @@ Gem::Specification.new do |s| s.add_development_dependency(%q.freeze, ["~> 1.3.1"]) else s.add_dependency(%q.freeze, [">= 4.0.1", "~> 4.0"]) -- s.add_dependency(%q.freeze, ["~> 1.8.0"]) -+ s.add_dependency(%q.freeze, [">= 1.8.0"]) +- s.add_dependency(%q.freeze, ["~> 1.9.0"]) ++ s.add_dependency(%q.freeze, [">= 1.9.0"]) s.add_dependency(%q.freeze, [">= 1.4.4", "~> 1.4"]) s.add_dependency(%q.freeze, ["< 1.0.0", ">= 0.99.5"]) -- s.add_dependency(%q.freeze, ["~> 0.14.0"]) -+ s.add_dependency(%q.freeze, [">= 0.14.0"]) - s.add_dependency(%q.freeze, ["~> 0.6.2"]) - s.add_dependency(%q.freeze, ["~> 3.5.0"]) - s.add_dependency(%q.freeze, ["~> 0.14.16"]) -@@ -52,10 +52,10 @@ Gem::Specification.new do |s| + s.add_dependency(%q.freeze, ["~> 0.16.2"]) +@@ -56,7 +56,7 @@ Gem::Specification.new do |s| end else s.add_dependency(%q.freeze, [">= 4.0.1", "~> 4.0"]) -- s.add_dependency(%q.freeze, ["~> 1.8.0"]) -+ s.add_dependency(%q.freeze, [">= 1.8.0"]) +- s.add_dependency(%q.freeze, ["~> 1.9.0"]) ++ s.add_dependency(%q.freeze, [">= 1.9.0"]) s.add_dependency(%q.freeze, [">= 1.4.4", "~> 1.4"]) s.add_dependency(%q.freeze, ["< 1.0.0", ">= 0.99.5"]) -- s.add_dependency(%q.freeze, ["~> 0.14.0"]) -+ s.add_dependency(%q.freeze, [">= 0.14.0"]) - s.add_dependency(%q.freeze, ["~> 0.6.2"]) - s.add_dependency(%q.freeze, ["~> 3.5.0"]) - s.add_dependency(%q.freeze, ["~> 0.14.16"]) + s.add_dependency(%q.freeze, ["~> 0.16.2"])