Attachment #229879 for bug #260207




# Created by: Sir l33tname <sirl33tname@gmail.com>

PORTNAME=	gollum
PORTVERSION=	5.2.3
PORTREVISION=	1
CATEGORIES=	www rubygems
MASTER_SITES=	RG


LICENSE_FILE=	${WRKSRC}/LICENSE

RUN_DEPENDS=	git:devel/git \
		rubygem-gemojione>=3.3.0:graphics/rubygem-gemojione \
		rubygem-gollum-lib>=5.1.3:www/rubygem-gollum-lib \
		rubygem-gollum-rugged_adapter>=1.0:www/rubygem-gollum-rugged_adapter \
		rubygem-kramdown>=2.3.1:textproc/rubygem-kramdown \
		rubygem-kramdown-parser-gfm>=1.1.0:textproc/rubygem-kramdown-parser-gfm \
		rubygem-mustache0>=0.99.5:devel/rubygem-mustache0 \
		rubygem-sinatra>=2.1.0:www/rubygem-sinatra \
		rubygem-sinatra-contrib>=2.1.0:www/rubygem-sinatra-contrib \
		rubygem-mustache-sinatra>=1.0.1:devel/rubygem-mustache-sinatra \
		rubygem-useragent>=0.16.2:devel/rubygem-useragent \
		rubygem-octicons>=12.0.0:misc/rubygem-octicons \
		rubygem-sprockets>=3.7:devel/rubygem-sprockets \
		rubygem-sass>=3.5:textproc/rubygem-sass \
		rubygem-uglifier>=4.1:www/rubygem-uglifier \
		rubygem-sprockets-helpers>=1.2:devel/rubygem-sprockets-helpers \
		rubygem-rss>=0.2.9:www/rubygem-rss \
		rubygem-webrick>=1.7.0:www/rubygem-webrick \

USES=		cpe gem
CPE_VENDOR=	${PORTNAME}_project

Lines 1-3 Link Here

(-)b/www/rubygem-gollum/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1547307875	1	TIMESTAMP = 1638085846
2	SHA256 (rubygem/gollum-4.1.4.gem) = 87c2dc6c68c91a423727a59b9d3e78e9e4656e2308065a1d779dd1711c586146	2	SHA256 (rubygem/gollum-5.2.3.gem) = 5dad0200fbb2203c588aca350fe0543e66494f897c2bc95ed457642333a2b7fd
3	SIZE (rubygem/gollum-4.1.4.gem) = 2106880	3	SIZE (rubygem/gollum-5.2.3.gem) = 4806656




# 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



pidfile=/var/run/${name}.pid
command="/usr/sbin/daemon"
command_args="-P ${pidfile} -r -f gollum --host ${gollum_ip} --port ${gollum_port} ${gollum_path}"

load_rc_config $name
run_rc_command "$1"




--- gollum.gemspec.orig	2021-12-04 11:08:45 UTC
+++ gollum.gemspec
@@ -33,13 +33,12 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<mustache-sinatra>.freeze, ["~> 1.0"])
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<gollum-lib>.freeze, ["~> 4.2", ">= 4.2.10"])
-      s.add_runtime_dependency(%q<kramdown>.freeze, ["~> 1.9.0"])
+      s.add_runtime_dependency(%q<kramdown>.freeze, ["~> 1.9"])
       s.add_runtime_dependency(%q<sinatra>.freeze, ["~> 1.4", ">= 1.4.4"])
       s.add_runtime_dependency(%q<mustache>.freeze, [">= 0.99.5", "< 1.0.0"])
       s.add_runtime_dependency(%q<useragent>.freeze, ["~> 0.16.2"])
       s.add_runtime_dependency(%q<gemojione>.freeze, ["~> 4.1"])
-      s.add_runtime_dependency(%q<octicons>.freeze, ["~> 12.0"])
+      s.add_runtime_dependency(%q<octicons>.freeze, ["~> 16.0"])
       s.add_runtime_dependency(%q<sprockets>.freeze, ["~> 3.7"])
       s.add_runtime_dependency(%q<sass>.freeze, ["~> 3.5"])
-      s.add_runtime_dependency(%q<uglifier>.freeze, ["~> 4.2"])
+      s.add_runtime_dependency(%q<uglifier>.freeze, [">= 4.1"])
       s.add_runtime_dependency(%q<sprockets-helpers>.freeze, ["~> 1.2"])
       s.add_runtime_dependency(%q<rss>.freeze, ["~> 0.2.9"])
-      s.add_runtime_dependency(%q<therubyrhino>.freeze, ["~> 2.1.0"])
       s.add_runtime_dependency(%q<webrick>.freeze, ["~> 1.7"])
       s.add_development_dependency(%q<rack-test>.freeze, ["~> 0.6.3"])
       s.add_development_dependency(%q<shoulda>.freeze, ["~> 3.6.0"])

Return to bug 260207

Lines 1-8 Link Here

(-)b/www/rubygem-gollum/Makefile (-7 / +17 lines)
1	# Created by: Sir l33tname <sirl33tname@gmail.com>	1	# Created by: Sir l33tname <sirl33tname@gmail.com>
2		2
3	PORTNAME= gollum	3	PORTNAME= gollum
4	PORTVERSION= 4.1.4	4	PORTVERSION= 5.2.3
5	PORTREVISION= 1
6	CATEGORIES= www rubygems	5	CATEGORIES= www rubygems
7	MASTER_SITES= RG	6	MASTER_SITES= RG
8		7
Lines 13-24 LICENSE= MIT Link Here
13	LICENSE_FILE= ${WRKSRC}/LICENSE	12	LICENSE_FILE= ${WRKSRC}/LICENSE
14		13
15	RUN_DEPENDS= git:devel/git \	14	RUN_DEPENDS= git:devel/git \
16	rubygem-gemojione>=3.2:graphics/rubygem-gemojione \	15	rubygem-gemojione>=3.3.0:graphics/rubygem-gemojione \
17	rubygem-gollum-lib>=4.2.10:www/rubygem-gollum-lib \	16	rubygem-gollum-lib>=5.1.3:www/rubygem-gollum-lib \
18	rubygem-kramdown1>=1.9.0:textproc/rubygem-kramdown1 \	17	rubygem-gollum-rugged_adapter>=1.0:www/rubygem-gollum-rugged_adapter \
		18	rubygem-kramdown>=2.3.1:textproc/rubygem-kramdown \
		19	rubygem-kramdown-parser-gfm>=1.1.0:textproc/rubygem-kramdown-parser-gfm \
19	rubygem-mustache0>=0.99.5:devel/rubygem-mustache0 \	20	rubygem-mustache0>=0.99.5:devel/rubygem-mustache0 \
20	rubygem-sinatra1>=1.4.4:www/rubygem-sinatra1 \	21	rubygem-sinatra>=2.1.0:www/rubygem-sinatra \
21	rubygem-useragent>=0.16.2:devel/rubygem-useragent	22	rubygem-sinatra-contrib>=2.1.0:www/rubygem-sinatra-contrib \
		23	rubygem-mustache-sinatra>=1.0.1:devel/rubygem-mustache-sinatra \
		24	rubygem-useragent>=0.16.2:devel/rubygem-useragent \
		25	rubygem-octicons>=12.0.0:misc/rubygem-octicons \
		26	rubygem-sprockets>=3.7:devel/rubygem-sprockets \
		27	rubygem-sass>=3.5:textproc/rubygem-sass \
		28	rubygem-uglifier>=4.1:www/rubygem-uglifier \
		29	rubygem-sprockets-helpers>=1.2:devel/rubygem-sprockets-helpers \
		30	rubygem-rss>=0.2.9:www/rubygem-rss \
		31	rubygem-webrick>=1.7.0:www/rubygem-webrick \
22		32
23	USES= cpe gem	33	USES= cpe gem
24	CPE_VENDOR= ${PORTNAME}_project	34	CPE_VENDOR= ${PORTNAME}_project

Lines 9-27 Link Here

(-)b/www/rubygem-gollum/files/gollum.in (-6 / +6 lines)
9	# to enable this service:	9	# to enable this service:
10	#	10	#
11	# gollum_enable (bool): Set to NO by default.	11	# gollum_enable (bool): Set to NO by default.
12	# Set it to YES to enable.	12	# Set it to YES to enable.
13	#	13	#
14	# gollum_path Set it to the location where	14	# gollum_path Set it to the location where
15	# your git repo is located.	15	# your git repo is located.
16	#	16	#
17	# gollum_user User to run command as	17	# gollum_user User to run command as
18	# Default is root	18	# Default is root
19	#	19	#
20	# gollum_ip Set the IP address gollum listens on	20	# gollum_ip Set the IP address gollum listens on
21	# Default is "0.0.0.0"	21	# Default is "0.0.0.0"
22	#	22	#
23	# gollum_port Set the IP address gollum listens on	23	# gollum_port Set the IP address gollum listens on
24	# Default is "80"	24	# Default is "80"
25		25
26	. /etc/rc.subr	26	. /etc/rc.subr
27		27
Lines 43-49 load_rc_config $name Link Here
43		43
44	pidfile=/var/run/${name}.pid	44	pidfile=/var/run/${name}.pid
45	command="/usr/sbin/daemon"	45	command="/usr/sbin/daemon"
46	command_args="-P ${pidfile} -r -f gollum --host ${gollum_ip} --port ${gollum_port} --live-preview ${gollum_path}"	46	command_args="-P ${pidfile} -r -f gollum --host ${gollum_ip} --port ${gollum_port} ${gollum_path}"
47		47
48	load_rc_config $name	48	load_rc_config $name
49	run_rc_command "$1"	49	run_rc_command "$1"

Lines 1-11 Link Here

(-)b/www/rubygem-gollum/files/patch-gemspec (-10 / +16 lines)
1	--- gollum.gemspec.orig 2019-02-07 15:28:31 UTC	1	--- gollum.gemspec.orig 2021-12-04 11:08:45 UTC
2	+++ gollum.gemspec	2	+++ gollum.gemspec
3	@@ -27,7 +27,7 @@ Gem::Specification.new do \|s\|	3	@@ -33,13 +33,12 @@ Gem::Specification.new do \|s\|
4		4	s.add_runtime_dependency(%q<mustache-sinatra>.freeze, ["~> 1.0"])
5	if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
6	s.add_runtime_dependency(%q<gollum-lib>.freeze, ["~> 4.2", ">= 4.2.10"])
7	- s.add_runtime_dependency(%q<kramdown>.freeze, ["~> 1.9.0"])
8	+ s.add_runtime_dependency(%q<kramdown>.freeze, ["~> 1.9"])
9	s.add_runtime_dependency(%q<sinatra>.freeze, ["~> 1.4", ">= 1.4.4"])
10	s.add_runtime_dependency(%q<mustache>.freeze, [">= 0.99.5", "< 1.0.0"])
11	s.add_runtime_dependency(%q<useragent>.freeze, ["~> 0.16.2"])	5	s.add_runtime_dependency(%q<useragent>.freeze, ["~> 0.16.2"])
12	-	6	s.add_runtime_dependency(%q<gemojione>.freeze, ["~> 4.1"])
		7	- s.add_runtime_dependency(%q<octicons>.freeze, ["~> 12.0"])
		8	+ s.add_runtime_dependency(%q<octicons>.freeze, ["~> 16.0"])
		9	s.add_runtime_dependency(%q<sprockets>.freeze, ["~> 3.7"])
		10	s.add_runtime_dependency(%q<sass>.freeze, ["~> 3.5"])
		11	- s.add_runtime_dependency(%q<uglifier>.freeze, ["~> 4.2"])
		12	+ s.add_runtime_dependency(%q<uglifier>.freeze, [">= 4.1"])
		13	s.add_runtime_dependency(%q<sprockets-helpers>.freeze, ["~> 1.2"])
		14	s.add_runtime_dependency(%q<rss>.freeze, ["~> 0.2.9"])
		15	- s.add_runtime_dependency(%q<therubyrhino>.freeze, ["~> 2.1.0"])
		16	s.add_runtime_dependency(%q<webrick>.freeze, ["~> 1.7"])
		17	s.add_development_dependency(%q<rack-test>.freeze, ["~> 0.6.3"])
		18	s.add_development_dependency(%q<shoulda>.freeze, ["~> 3.6.0"])